[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mjs at apple.com
mjs at apple.com
Wed Dec 22 11:09:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit dea005f6499c0cd79e57ffc27fd5ac006a19cf28
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 14 02:39:24 2010 +0000
2010-07-13 Maciej Stachowiak <mjs at apple.com>
Reviewed by Oliver Hunt.
Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
https://bugs.webkit.org/show_bug.cgi?id=42227
* platform/mac-wk2/Skipped: Skip some tests newly revealed as failing
for an already-classified reason.
2010-07-13 Maciej Stachowiak <mjs at apple.com>
Reviewed by Oliver Hunt.
Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
https://bugs.webkit.org/show_bug.cgi?id=42227
* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::LayoutTestController): Initialize new bool
members.
(WTR::LayoutTestController::display): Dummy method.
(WTR::displayCallback): Call the dummy.
(WTR::repaintSweepHorizontallyCallback): ditto
(WTR::testRepaintCallback): ditto
(WTR::LayoutTestController::staticFunctions): Expose new methods.
* WebKitTestRunner/InjectedBundle/LayoutTestController.h:
(WTR::LayoutTestController::setTestRepaint): Set the flag (which currently does
nothing).
(WTR::LayoutTestController::setTestRepaintSweepHorizontally): ditto
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63276 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9d0658a..3c759ae 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-13 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Oliver Hunt.
+
+ Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
+ https://bugs.webkit.org/show_bug.cgi?id=42227
+
+ * platform/mac-wk2/Skipped: Skip some tests newly revealed as failing
+ for an already-classified reason.
+
2010-07-13 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index dcf91f7..8020482 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -88,6 +88,8 @@ compositing/tiling/huge-layer-resize.html
compositing/tiling/huge-layer-with-layer-children-resize.html
compositing/tiling/huge-layer-with-layer-children.html
compositing/tiling/huge-layer.html
+compositing/iframes/iframe-src-change.html
+compositing/iframes/leave-compositing-iframe.html
# Support layoutTestController.dumpEditingDelegates in WebKitTestRunner
# <https://bugs.webkit.org/show_bug.cgi?id=42193>
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ea04231..d9f8246 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-13 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Oliver Hunt.
+
+ Add placebo versions of some repaint test functions to WebKitTestRunner - good enough for non-pixel tests
+ https://bugs.webkit.org/show_bug.cgi?id=42227
+
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+ (WTR::LayoutTestController::LayoutTestController): Initialize new bool
+ members.
+ (WTR::LayoutTestController::display): Dummy method.
+ (WTR::displayCallback): Call the dummy.
+ (WTR::repaintSweepHorizontallyCallback): ditto
+ (WTR::testRepaintCallback): ditto
+ (WTR::LayoutTestController::staticFunctions): Expose new methods.
+ * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+ (WTR::LayoutTestController::setTestRepaint): Set the flag (which currently does
+ nothing).
+ (WTR::LayoutTestController::setTestRepaintSweepHorizontally): ditto
+
2010-07-13 Andreas Kling <andreas.kling at nokia.com>
Unreviewed. Adding myself as committer.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
index cf3e0fb..36e2d66 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
@@ -43,6 +43,8 @@ PassRefPtr<LayoutTestController> LayoutTestController::create(const std::string&
LayoutTestController::LayoutTestController(const std::string& testPathOrURL)
: m_dumpAsText(false)
, m_waitToDump(false)
+ , m_testRepaint(false)
+ , m_testRepaintSweepHorizontally(false)
, m_testPathOrURL(testPathOrURL)
{
}
@@ -53,6 +55,10 @@ LayoutTestController::~LayoutTestController()
static const CFTimeInterval waitToDumpWatchdogInterval = 30.0;
+void LayoutTestController::display()
+{
+ // FIXME: actually implement, once we want pixel tests
+}
void LayoutTestController::invalidateWaitToDumpWatchdog()
{
@@ -109,6 +115,15 @@ bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(JSStringRef anima
return WKBundleFramePauseAnimationOnElementWithId(mainFrame, nameWK.get(), idWK.get(), time);
}
+static JSValueRef displayCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ // Has mac & windows implementation
+ LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+ controller->display();
+
+ return JSValueMakeUndefined(context);
+}
+
static JSValueRef dumpAsTextCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
@@ -155,6 +170,20 @@ static JSValueRef pauseAnimationAtTimeOnElementWithIdCallback(JSContextRef conte
return JSValueMakeBoolean(context, controller->pauseAnimationAtTimeOnElementWithId(animationName.get(), time, elementId.get()));
}
+static JSValueRef repaintSweepHorizontallyCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+ controller->setTestRepaintSweepHorizontally();
+ return JSValueMakeUndefined(context);
+}
+
+static JSValueRef testRepaintCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+ controller->setTestRepaint();
+ return JSValueMakeUndefined(context);
+}
+
// Object Finalization
static void layoutTestControllerObjectFinalize(JSObjectRef object)
@@ -191,10 +220,13 @@ JSClassRef LayoutTestController::getJSClass()
JSStaticFunction* LayoutTestController::staticFunctions()
{
static JSStaticFunction staticFunctions[] = {
+ { "display", displayCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpAsText", dumpAsTextCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "notifyDone", notifyDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "numberOfActiveAnimations", numberOfActiveAnimationsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "pauseAnimationAtTimeOnElementWithId", pauseAnimationAtTimeOnElementWithIdCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "repaintSweepHorizontally", repaintSweepHorizontallyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "testRepaint", testRepaintCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "waitUntilDone", waitUntilDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ 0, 0, 0 }
};
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
index 203f358..f07cc00 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
@@ -49,15 +49,22 @@ public:
void waitToDumpWatchdogTimerFired();
void invalidateWaitToDumpWatchdog();
void notifyDone();
+ void display();
unsigned numberOfActiveAnimations() const;
bool pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId);
+ void setTestRepaint() { m_testRepaint = true; }
+ void setTestRepaintSweepHorizontally() { m_testRepaintSweepHorizontally = true; }
+
private:
LayoutTestController(const std::string& testPathOrURL);
bool m_dumpAsText;
bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
+ bool m_testRepaint;
+ bool m_testRepaintSweepHorizontally;
+
std::string m_testPathOrURL;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list