2010-07-13 Maciej Stachowiak <mjs@apple.com>
authormjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Jul 2010 02:39:24 +0000 (02:39 +0000)
committermjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Jul 2010 02:39:24 +0000 (02:39 +0000)
        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@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

LayoutTests/ChangeLog
LayoutTests/platform/mac-wk2/Skipped
WebKitTools/ChangeLog
WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

index 9d0658aac0108bfc240eb0464a522fb9ef7e6b04..3c759ae9644bc2d5c34d31d6154c6eb92b8b388d 100644 (file)
@@ -1,3 +1,13 @@
+2010-07-13  Maciej Stachowiak  <mjs@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@webkit.org>
 
         Reviewed by Adam Barth.
index dcf91f7cee0a276dbe24ea0d428fc26e9fbc1ca6..80204824772ee35064ebd87f3bf979e47b41f563 100644 (file)
@@ -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>
index ea042316d4f2dadcf06624a293b1187119fc82c6..d9f8246dfa5de4f16a75afe2e03dce9f219f7e11 100644 (file)
@@ -1,3 +1,23 @@
+2010-07-13  Maciej Stachowiak  <mjs@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@nokia.com>
 
         Unreviewed. Adding myself as committer.
index cf3e0fbd6cacca297016b91a917b19dfcdaab39d..36e2d668a0233e5500022c9859bb703f2977d5ee 100644 (file)
@@ -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 }
     };
index 203f35857955d63180ee568bec7b3db676f8dc5f..f07cc00448876caa411625581d0f86c29e53611b 100644 (file)
@@ -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;