Changeset 84262 in webkit

Timestamp:

Apr 19, 2011 10:05:16 AM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-04-19 Jer Noble <​jer.noble@apple.com>

Reviewed by Adam Roben.

REGRESSION (r84206): 50 tests failing on SnowLeopard Intel Release (WebKit2 Tests) due to extra "supportsFullScreen() == true" output
​https://bugs.webkit.org/show_bug.cgi?id=58890

Add a layoutTestController flag which controls when full screen callbacks are written to stdout.
Defaults to false.

• WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: Added dumpFullScreenCallbacks().
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::supportsFullScreen): Only write to stdout if shouldDumpFullScreenCallbacks is set. (WTR::InjectedBundlePage::enterFullScreenForElement): Ditto. (WTR::InjectedBundlePage::exitFullScreenForElement): Ditto.
• WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: (WTR::LayoutTestController::LayoutTestController): Initialize new ivar.
• WebKitTestRunner/InjectedBundle/LayoutTestController.h: (WTR::LayoutTestController::dumpFullScreenCallbacks): Added. (WTR::LayoutTestController::shouldDumpFullScreenCallbacks): Added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (3 diffs)
• WebKitTestRunner/InjectedBundle/LayoutTestController.cpp (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/LayoutTestController.h (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-19  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Adam Roben.
+
+        REGRESSION (r84206): 50 tests failing on SnowLeopard Intel Release (WebKit2 Tests) due to extra "supportsFullScreen() == true" output
+        https://bugs.webkit.org/show_bug.cgi?id=58890
+
+        Add a layoutTestController flag which controls when full screen callbacks are written to stdout.
+        Defaults to false.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: Added dumpFullScreenCallbacks().
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::supportsFullScreen): Only write to stdout if shouldDumpFullScreenCallbacks is set.
+        (WTR::InjectedBundlePage::enterFullScreenForElement): Ditto.
+        (WTR::InjectedBundlePage::exitFullScreenForElement): Ditto.
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+        (WTR::LayoutTestController::LayoutTestController): Initialize new ivar.
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+        (WTR::LayoutTestController::dumpFullScreenCallbacks): Added.
+        (WTR::LayoutTestController::shouldDumpFullScreenCallbacks): Added.
+
 2011-04-19  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl

@@ -40 +40 @@
         void dumpStatusCallbacks();
         void dumpTitleChanges();
+        void dumpFullScreenCallbacks();
 
         // Special options.

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -1013 +1013 @@
 bool InjectedBundlePage::supportsFullScreen(WKBundlePageRef pageRef, WKFullScreenKeyboardRequestType requestType)
 {
-    InjectedBundle::shared().os() << "supportsFullScreen() == true\n";
+    if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+        InjectedBundle::shared().os() << "supportsFullScreen() == true\n";
     return true;
 }
@@ -1019 +1020 @@
 void InjectedBundlePage::enterFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
 {
-    InjectedBundle::shared().os() << "enterFullScreenForElement()\n";
+    if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+        InjectedBundle::shared().os() << "enterFullScreenForElement()\n";
     WKBundlePageWillEnterFullScreen(pageRef);
     WKBundlePageDidEnterFullScreen(pageRef);
@@ -1026 +1028 @@
 void InjectedBundlePage::exitFullScreenForElement(WKBundlePageRef pageRef, WKBundleNodeHandleRef elementRef)
 {
-    InjectedBundle::shared().os() << "exitFullScreenForElement()\n";
+    if (InjectedBundle::shared().layoutTestController()->shouldDumpFullScreenCallbacks())
+        InjectedBundle::shared().os() << "exitFullScreenForElement()\n";
     WKBundlePageWillExitFullScreen(pageRef);
     WKBundlePageDidExitFullScreen(pageRef);

trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp

@@ -100 +100 @@
     , m_dumpTitleChanges(false)
     , m_dumpPixels(true)
+    , m_dumpFullScreenCallbacks(false)
     , m_waitToDump(false)
     , m_testRepaint(false)

trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

@@ -68 +68 @@
     void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
     void dumpTitleChanges() { m_dumpTitleChanges = true; }
+    void dumpFullScreenCallbacks() { m_dumpFullScreenCallbacks = true; }
 
     // Special options.
@@ -130 +131 @@
     bool shouldDumpTitleChanges() const { return m_dumpTitleChanges; }
     bool shouldDumpPixels() const { return m_dumpPixels; }
+    bool shouldDumpFullScreenCallbacks() const { return m_dumpFullScreenCallbacks; }
 
     bool waitToDump() const { return m_waitToDump; }
@@ -171 +173 @@
     bool m_dumpTitleChanges;
     bool m_dumpPixels;
+    bool m_dumpFullScreenCallbacks;
     bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
     bool m_testRepaint;