Title: [139722] trunk/Tools
Revision
139722
Author
[email protected]
Date
2013-01-15 00:19:57 -0800 (Tue, 15 Jan 2013)

Log Message

[chromium] move remaining methods that just set a boolean flag to TestRunner library
https://bugs.webkit.org/show_bug.cgi?id=106823

Reviewed by Darin Fisher.

* DumpRenderTree/chromium/DRTTestRunner.cpp:
(DRTTestRunner::DRTTestRunner):
(DRTTestRunner::reset):
* DumpRenderTree/chromium/DRTTestRunner.h:
(DRTTestRunner):
* DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:
(WebTestRunner::WebTestRunner::shouldDumpBackForwardList):
(WebTestRunner::WebTestRunner::deferMainResourceDataLoad):
(WebTestRunner::WebTestRunner::shouldDumpSelectionRect):
(WebTestRunner::WebTestRunner::testRepaint):
(WebTestRunner::WebTestRunner::sweepHorizontally):
(WebTestRunner::WebTestRunner::isPrinting):
(WebTestRunner::WebTestRunner::shouldStayOnPageAfterHandlingBeforeUnload):
* DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
(WebTestRunner::TestRunner::TestRunner):
(WebTestRunner::TestRunner::reset):
(WebTestRunner::TestRunner::shouldDumpBackForwardList):
(WebTestRunner):
(WebTestRunner::TestRunner::deferMainResourceDataLoad):
(WebTestRunner::TestRunner::shouldDumpSelectionRect):
(WebTestRunner::TestRunner::testRepaint):
(WebTestRunner::TestRunner::sweepHorizontally):
(WebTestRunner::TestRunner::isPrinting):
(WebTestRunner::TestRunner::shouldStayOnPageAfterHandlingBeforeUnload):
(WebTestRunner::TestRunner::dumpBackForwardList):
(WebTestRunner::TestRunner::setDeferMainResourceDataLoad):
(WebTestRunner::TestRunner::dumpSelectionRect):
(WebTestRunner::TestRunner::repaintSweepHorizontally):
(WebTestRunner::TestRunner::setPrinting):
(WebTestRunner::TestRunner::setShouldStayOnPageAfterHandlingBeforeUnload):
* DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
(TestRunner):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (139721 => 139722)


--- trunk/Tools/ChangeLog	2013-01-15 07:55:47 UTC (rev 139721)
+++ trunk/Tools/ChangeLog	2013-01-15 08:19:57 UTC (rev 139722)
@@ -1,3 +1,43 @@
+2013-01-15  Jochen Eisinger  <[email protected]>
+
+        [chromium] move remaining methods that just set a boolean flag to TestRunner library
+        https://bugs.webkit.org/show_bug.cgi?id=106823
+
+        Reviewed by Darin Fisher.
+
+        * DumpRenderTree/chromium/DRTTestRunner.cpp:
+        (DRTTestRunner::DRTTestRunner):
+        (DRTTestRunner::reset):
+        * DumpRenderTree/chromium/DRTTestRunner.h:
+        (DRTTestRunner):
+        * DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:
+        (WebTestRunner::WebTestRunner::shouldDumpBackForwardList):
+        (WebTestRunner::WebTestRunner::deferMainResourceDataLoad):
+        (WebTestRunner::WebTestRunner::shouldDumpSelectionRect):
+        (WebTestRunner::WebTestRunner::testRepaint):
+        (WebTestRunner::WebTestRunner::sweepHorizontally):
+        (WebTestRunner::WebTestRunner::isPrinting):
+        (WebTestRunner::WebTestRunner::shouldStayOnPageAfterHandlingBeforeUnload):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+        (WebTestRunner::TestRunner::TestRunner):
+        (WebTestRunner::TestRunner::reset):
+        (WebTestRunner::TestRunner::shouldDumpBackForwardList):
+        (WebTestRunner):
+        (WebTestRunner::TestRunner::deferMainResourceDataLoad):
+        (WebTestRunner::TestRunner::shouldDumpSelectionRect):
+        (WebTestRunner::TestRunner::testRepaint):
+        (WebTestRunner::TestRunner::sweepHorizontally):
+        (WebTestRunner::TestRunner::isPrinting):
+        (WebTestRunner::TestRunner::shouldStayOnPageAfterHandlingBeforeUnload):
+        (WebTestRunner::TestRunner::dumpBackForwardList):
+        (WebTestRunner::TestRunner::setDeferMainResourceDataLoad):
+        (WebTestRunner::TestRunner::dumpSelectionRect):
+        (WebTestRunner::TestRunner::repaintSweepHorizontally):
+        (WebTestRunner::TestRunner::setPrinting):
+        (WebTestRunner::TestRunner::setShouldStayOnPageAfterHandlingBeforeUnload):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+        (TestRunner):
+
 2013-01-14  Dirk Pranke  <[email protected]>
 
         nrwt: stub out show_results_html for mock ports

Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp (139721 => 139722)


--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp	2013-01-15 07:55:47 UTC (rev 139721)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp	2013-01-15 08:19:57 UTC (rev 139722)
@@ -87,10 +87,8 @@
 DRTTestRunner::DRTTestRunner(TestShell* shell)
     : m_shell(shell)
     , m_closeRemainingWindows(false)
-    , m_deferMainResourceDataLoad(false)
     , m_showDebugLayerTree(false)
     , m_workQueue(this)
-    , m_shouldStayOnPageAfterHandlingBeforeUnload(false)
 {
 
     // Initialize the map that associates methods of this class with the names
@@ -114,8 +112,6 @@
 #endif
     bindMethod("display", &DRTTestRunner::display);
     bindMethod("displayInvalidatedRegion", &DRTTestRunner::displayInvalidatedRegion);
-    bindMethod("dumpBackForwardList", &DRTTestRunner::dumpBackForwardList);
-    bindMethod("dumpSelectionRect", &DRTTestRunner::dumpSelectionRect);
 #if ENABLE(NOTIFICATIONS)
     bindMethod("grantWebNotificationPermission", &DRTTestRunner::grantWebNotificationPermission);
 #endif
@@ -129,12 +125,10 @@
     bindMethod("queueLoadHTMLString", &DRTTestRunner::queueLoadHTMLString);
     bindMethod("queueNonLoadingScript", &DRTTestRunner::queueNonLoadingScript);
     bindMethod("queueReload", &DRTTestRunner::queueReload);
-    bindMethod("repaintSweepHorizontally", &DRTTestRunner::repaintSweepHorizontally);
     bindMethod("setAlwaysAcceptCookies", &DRTTestRunner::setAlwaysAcceptCookies);
     bindMethod("setCloseRemainingWindowsWhenComplete", &DRTTestRunner::setCloseRemainingWindowsWhenComplete);
     bindMethod("setCustomPolicyDelegate", &DRTTestRunner::setCustomPolicyDelegate);
     bindMethod("setDatabaseQuota", &DRTTestRunner::setDatabaseQuota);
-    bindMethod("setDeferMainResourceDataLoad", &DRTTestRunner::setDeferMainResourceDataLoad);
     bindMethod("setGeolocationPermission", &DRTTestRunner::setGeolocationPermission);
     bindMethod("setMockDeviceOrientation", &DRTTestRunner::setMockDeviceOrientation);
     bindMethod("setMockGeolocationPositionUnavailableError", &DRTTestRunner::setMockGeolocationPositionUnavailableError);
@@ -144,7 +138,6 @@
     bindMethod("setPointerLockWillFailSynchronously", &DRTTestRunner::setPointerLockWillFailSynchronously);
 #endif
     bindMethod("setPOSIXLocale", &DRTTestRunner::setPOSIXLocale);
-    bindMethod("setPrinting", &DRTTestRunner::setPrinting);
     bindMethod("setBackingScaleFactor", &DRTTestRunner::setBackingScaleFactor);
     bindMethod("setWillSendRequestClearHeader", &DRTTestRunner::setWillSendRequestClearHeader);
     bindMethod("setWillSendRequestReturnsNull", &DRTTestRunner::setWillSendRequestReturnsNull);
@@ -153,12 +146,10 @@
 #if ENABLE(NOTIFICATIONS)
     bindMethod("simulateLegacyWebNotificationClick", &DRTTestRunner::simulateLegacyWebNotificationClick);
 #endif
-    bindMethod("testRepaint", &DRTTestRunner::testRepaint);
     bindMethod("waitForPolicyDelegate", &DRTTestRunner::waitForPolicyDelegate);
     bindMethod("waitUntilDone", &DRTTestRunner::waitUntilDone);
     bindMethod("windowCount", &DRTTestRunner::windowCount);
 
-    bindMethod("setShouldStayOnPageAfterHandlingBeforeUnload", &DRTTestRunner::setShouldStayOnPageAfterHandlingBeforeUnload);
 
     // Shared properties.
     // webHistoryItemCount is used by tests in LayoutTests\http\tests\history
@@ -219,12 +210,6 @@
     m_queue.append(work);
 }
 
-void DRTTestRunner::dumpBackForwardList(const CppArgumentList&, CppVariant* result)
-{
-    m_dumpBackForwardList = true;
-    result->setNull();
-}
-
 void DRTTestRunner::waitUntilDone(const CppArgumentList&, CppVariant* result)
 {
     if (!webkit_support::BeingDebugged())
@@ -409,16 +394,10 @@
     TestRunner::reset();
     if (m_shell)
         m_shell->webViewHost()->setDeviceScaleFactor(1);
-    m_dumpBackForwardList = false;
-    m_dumpSelectionRect = false;
     m_waitUntilDone = false;
-    m_testRepaint = false;
-    m_sweepHorizontally = false;
-    m_deferMainResourceDataLoad = true;
     m_webHistoryItemCount.set(0);
     m_titleTextDirection.set("ltr");
     m_interceptPostMessage.set(false);
-    m_isPrinting = false;
 
     webkit_support::SetAcceptAllCookies(false);
 
@@ -433,7 +412,6 @@
         m_closeRemainingWindows = true;
     m_workQueue.reset();
     m_taskList.revokeAll();
-    m_shouldStayOnPageAfterHandlingBeforeUnload = false;
 }
 
 void DRTTestRunner::locationChangeDone()
@@ -590,18 +568,6 @@
 }
 #endif
 
-void DRTTestRunner::setDeferMainResourceDataLoad(const CppArgumentList& arguments, CppVariant* result)
-{
-    if (arguments.size() == 1)
-        m_deferMainResourceDataLoad = cppVariantToBool(arguments[0]);
-}
-
-void DRTTestRunner::dumpSelectionRect(const CppArgumentList& arguments, CppVariant* result)
-{
-    m_dumpSelectionRect = true;
-    result->setNull();
-}
-
 void DRTTestRunner::display(const CppArgumentList& arguments, CppVariant* result)
 {
     WebViewHost* host = m_shell->webViewHost();
@@ -621,18 +587,6 @@
     result->setNull();
 }
 
-void DRTTestRunner::testRepaint(const CppArgumentList&, CppVariant* result)
-{
-    m_testRepaint = true;
-    result->setNull();
-}
-
-void DRTTestRunner::repaintSweepHorizontally(const CppArgumentList&, CppVariant* result)
-{
-    m_sweepHorizontally = true;
-    result->setNull();
-}
-
 void DRTTestRunner::clearAllDatabases(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
@@ -653,12 +607,6 @@
         setlocale(LC_ALL, arguments[0].toString().c_str());
 }
 
-void DRTTestRunner::setPrinting(const CppArgumentList& arguments, CppVariant* result)
-{
-    setIsPrinting(true);
-    result->setNull();
-}
-
 void DRTTestRunner::numberOfPendingGeolocationPermissionRequests(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
@@ -774,14 +722,6 @@
 }
 #endif
 
-void DRTTestRunner::setShouldStayOnPageAfterHandlingBeforeUnload(const CppArgumentList& arguments, CppVariant* result)
-{
-    if (arguments.size() == 1 && arguments[0].isBool())
-        m_shouldStayOnPageAfterHandlingBeforeUnload = arguments[0].toBoolean();
-
-    result->setNull();
-}
-
 class InvokeCallbackTask : public WebMethodTask<DRTTestRunner> {
 public:
     InvokeCallbackTask(DRTTestRunner* object, PassOwnArrayPtr<CppVariant> callbackArguments, uint32_t numberOfArguments)

Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h (139721 => 139722)


--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h	2013-01-15 07:55:47 UTC (rev 139721)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h	2013-01-15 08:19:57 UTC (rev 139722)
@@ -75,10 +75,6 @@
 
     virtual ~DRTTestRunner();
 
-    // This function sets a flag that tells the test_shell to print out a text
-    // representation of the back/forward list. It ignores all arguments.
-    void dumpBackForwardList(const CppArgumentList&, CppVariant*);
-
     // Functions for dealing with windows. By default we block all new windows.
     void windowCount(const CppArgumentList&, CppVariant*);
     void setCloseRemainingWindowsWhenComplete(const CppArgumentList&, CppVariant*);
@@ -125,8 +121,6 @@
     // Converts a URL starting with file:///tmp/ to the local mapping.
     void pathToLocalResource(const CppArgumentList&, CppVariant*);
 
-    void dumpSelectionRect(const CppArgumentList&, CppVariant*);
-
 #if ENABLE(NOTIFICATIONS)
     // Grants permission for desktop notifications to an origin
     void grantWebNotificationPermission(const CppArgumentList&, CppVariant*);
@@ -134,12 +128,8 @@
     void simulateLegacyWebNotificationClick(const CppArgumentList&, CppVariant*);
 #endif
 
-    void setDeferMainResourceDataLoad(const CppArgumentList&, CppVariant*);
-
     void display(const CppArgumentList&, CppVariant*);
     void displayInvalidatedRegion(const CppArgumentList&, CppVariant*);
-    void testRepaint(const CppArgumentList&, CppVariant*);
-    void repaintSweepHorizontally(const CppArgumentList&, CppVariant*);
 
     // Clears all databases.
     void clearAllDatabases(const CppArgumentList&, CppVariant*);
@@ -150,9 +140,6 @@
     // Resets between tests.
     void setPOSIXLocale(const CppArgumentList&, CppVariant*);
 
-    // Causes layout to happen as if targetted to printed pages.
-    void setPrinting(const CppArgumentList&, CppVariant*);
-
     // Gets the number of geolocation permissions requests pending.
     void numberOfPendingGeolocationPermissionRequests(const CppArgumentList&, CppVariant*);
 
@@ -175,8 +162,6 @@
     void wasMockSpeechRecognitionAborted(const CppArgumentList&, CppVariant*);
 #endif
 
-    void setShouldStayOnPageAfterHandlingBeforeUnload(const CppArgumentList&, CppVariant*);
-
 #if ENABLE(POINTER_LOCK)
     void didAcquirePointerLock(const CppArgumentList&, CppVariant*);
     void didNotAcquirePointerLock(const CppArgumentList&, CppVariant*);
@@ -192,9 +177,6 @@
     // The following methods are not exposed to _javascript_.
     void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }
 
-    bool shouldDumpSelectionRect() { return m_dumpSelectionRect; }
-    bool shouldDumpBackForwardList() { return m_dumpBackForwardList; }
-    bool deferMainResourceDataLoad() { return m_deferMainResourceDataLoad; }
     void setShowDebugLayerTree(bool value) { m_showDebugLayerTree = value; }
     void setTitleTextDirection(WebKit::WebTextDirection dir)
     {
@@ -206,12 +188,6 @@
         return m_interceptPostMessage.isBool() && m_interceptPostMessage.toBoolean();
     }
 
-    void setIsPrinting(bool value) { m_isPrinting = value; }
-    bool isPrinting() { return m_isPrinting; }
-
-    bool testRepaint() const { return m_testRepaint; }
-    bool sweepHorizontally() const { return m_sweepHorizontally; }
-
     // Called by the webview delegate when the toplevel frame load is done.
     void locationChangeDone();
 
@@ -234,8 +210,6 @@
 
     WebTaskList* taskList() { return &m_taskList; }
 
-    bool shouldStayOnPageAfterHandlingBeforeUnload() const { return m_shouldStayOnPageAfterHandlingBeforeUnload; }
-
 private:
     friend class WorkItem;
     friend class WorkQueue;
@@ -283,38 +257,17 @@
     // Non-owning pointer. The DRTTestRunner is owned by the host.
     TestShell* m_shell;
 
-    // If true, the test_shell will draw the bounds of the current selection rect
-    // taking possible transforms of the selection rect into account.
-    bool m_dumpSelectionRect;
-
-    // If true, the test_shell will produce a dump of the back forward list as
-    // well.
-    bool m_dumpBackForwardList;
-
     // When reset is called, go through and close all but the main test shell
     // window. By default, set to true but toggled to false using
     // setCloseRemainingWindowsWhenComplete().
     bool m_closeRemainingWindows;
 
-    // If true, pixel dump will be produced as a series of 1px-tall, view-wide
-    // individual paints over the height of the view.
-    bool m_testRepaint;
-    // If true and test_repaint_ is true as well, pixel dump will be produced as
-    // a series of 1px-wide, view-tall paints across the width of the view.
-    bool m_sweepHorizontally;
-
     // If true, don't dump output until notifyDone is called.
     bool m_waitUntilDone;
 
-    // If false, all new requests will not defer the main resource data load.
-    bool m_deferMainResourceDataLoad;
-
     // If true, we will show extended information in the graphics layer tree.
     bool m_showDebugLayerTree;
 
-    // If true, layout is to target printed pages.
-    bool m_isPrinting;
-
     WorkQueue m_workQueue;
 
     // Bound variable counting the number of top URLs visited.
@@ -325,8 +278,6 @@
 
     // Bound variable to set whether postMessages should be intercepted or not
     CppVariant m_interceptPostMessage;
-
-    bool m_shouldStayOnPageAfterHandlingBeforeUnload;
 };
 
 #endif // DRTTestRunner_h

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h (139721 => 139722)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h	2013-01-15 07:55:47 UTC (rev 139721)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h	2013-01-15 08:19:57 UTC (rev 139722)
@@ -65,6 +65,13 @@
     virtual WebKit::WebPermissionClient* webPermissions() const { return 0; }
     virtual bool shouldDumpStatusCallbacks() const { return false; }
     virtual bool shouldDumpProgressFinishedCallback() const { return false; }
+    virtual bool shouldDumpBackForwardList() const { return false; }
+    virtual bool deferMainResourceDataLoad() const { return false; }
+    virtual bool shouldDumpSelectionRect() const { return false; }
+    virtual bool testRepaint() const { return false; }
+    virtual bool sweepHorizontally() const { return false; }
+    virtual bool isPrinting() const { return false; }
+    virtual bool shouldStayOnPageAfterHandlingBeforeUnload() const { return false; } 
 };
 
 }

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (139721 => 139722)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp	2013-01-15 07:55:47 UTC (rev 139721)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp	2013-01-15 08:19:57 UTC (rev 139722)
@@ -162,6 +162,13 @@
     bindMethod("setAllowRunningOfInsecureContent", &TestRunner::setAllowRunningOfInsecureContent);
     bindMethod("dumpStatusCallbacks", &TestRunner::dumpWindowStatusChanges);
     bindMethod("dumpProgressFinishedCallback", &TestRunner::dumpProgressFinishedCallback);
+    bindMethod("dumpBackForwardList", &TestRunner::dumpBackForwardList);
+    bindMethod("setDeferMainResourceDataLoad", &TestRunner::setDeferMainResourceDataLoad);
+    bindMethod("dumpSelectionRect", &TestRunner::dumpSelectionRect);
+    bindMethod("testRepaint", &TestRunner::testRepaint);
+    bindMethod("repaintSweepHorizontally", &TestRunner::repaintSweepHorizontally);
+    bindMethod("setPrinting", &TestRunner::setPrinting);
+    bindMethod("setShouldStayOnPageAfterHandlingBeforeUnload", &TestRunner::setShouldStayOnPageAfterHandlingBeforeUnload);
 
     // The following methods interact with the WebTestProxy.
     bindMethod("sendWebIntentResponse", &TestRunner::sendWebIntentResponse);
@@ -254,6 +261,13 @@
     m_dumpResourceResponseMIMETypes = false;
     m_dumpWindowStatusChanges = false;
     m_dumpProgressFinishedCallback = false;
+    m_dumpBackForwardList = false;
+    m_deferMainResourceDataLoad = true;
+    m_dumpSelectionRect = false;
+    m_testRepaint = false;
+    m_sweepHorizontally = false;
+    m_isPrinting = false;
+    m_shouldStayOnPageAfterHandlingBeforeUnload = false;
 
     m_globalFlag.set(false);
     m_platformName.set("chromium");
@@ -378,6 +392,41 @@
     return m_dumpProgressFinishedCallback;
 }
 
+bool TestRunner::shouldDumpBackForwardList() const
+{
+    return m_dumpBackForwardList;
+}
+
+bool TestRunner::deferMainResourceDataLoad() const
+{
+    return m_deferMainResourceDataLoad;
+}
+
+bool TestRunner::shouldDumpSelectionRect() const
+{
+    return m_dumpSelectionRect;
+}
+
+bool TestRunner::testRepaint() const
+{
+    return m_testRepaint;
+}
+
+bool TestRunner::sweepHorizontally() const
+{
+    return m_sweepHorizontally;
+}
+
+bool TestRunner::isPrinting() const
+{
+    return m_isPrinting;
+}
+
+bool TestRunner::shouldStayOnPageAfterHandlingBeforeUnload() const
+{
+    return m_shouldStayOnPageAfterHandlingBeforeUnload;
+}
+
 void TestRunner::dumpPermissionClientCallbacks(const CppArgumentList&, CppVariant* result)
 {
     m_webPermissions->setDumpCallbacks(true);
@@ -440,6 +489,50 @@
     result->setNull();
 }
 
+void TestRunner::dumpBackForwardList(const CppArgumentList&, CppVariant* result)
+{
+    m_dumpBackForwardList = true;
+    result->setNull();
+}
+
+void TestRunner::setDeferMainResourceDataLoad(const CppArgumentList& arguments, CppVariant* result)
+{
+    if (arguments.size() == 1)
+        m_deferMainResourceDataLoad = cppVariantToBool(arguments[0]);
+}
+
+void TestRunner::dumpSelectionRect(const CppArgumentList& arguments, CppVariant* result)
+{
+    m_dumpSelectionRect = true;
+    result->setNull();
+}
+
+void TestRunner::testRepaint(const CppArgumentList&, CppVariant* result)
+{
+    m_testRepaint = true;
+    result->setNull();
+}
+
+void TestRunner::repaintSweepHorizontally(const CppArgumentList&, CppVariant* result)
+{
+    m_sweepHorizontally = true;
+    result->setNull();
+}
+
+void TestRunner::setPrinting(const CppArgumentList& arguments, CppVariant* result)
+{
+    m_isPrinting = true;
+    result->setNull();
+}
+
+void TestRunner::setShouldStayOnPageAfterHandlingBeforeUnload(const CppArgumentList& arguments, CppVariant* result)
+{
+    if (arguments.size() == 1 && arguments[0].isBool())
+        m_shouldStayOnPageAfterHandlingBeforeUnload = arguments[0].toBoolean();
+
+    result->setNull();
+}
+
 void TestRunner::setTabKeyCyclesThroughElements(const CppArgumentList& arguments, CppVariant* result)
 {
     if (arguments.size() > 0 && arguments[0].isBool())

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h (139721 => 139722)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h	2013-01-15 07:55:47 UTC (rev 139721)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h	2013-01-15 08:19:57 UTC (rev 139722)
@@ -83,6 +83,13 @@
     virtual WebKit::WebPermissionClient* webPermissions() const OVERRIDE;
     virtual bool shouldDumpStatusCallbacks() const OVERRIDE;
     virtual bool shouldDumpProgressFinishedCallback() const OVERRIDE;
+    virtual bool shouldDumpBackForwardList() const OVERRIDE;
+    virtual bool deferMainResourceDataLoad() const OVERRIDE;
+    virtual bool shouldDumpSelectionRect() const OVERRIDE;
+    virtual bool testRepaint() const OVERRIDE;
+    virtual bool sweepHorizontally() const OVERRIDE;
+    virtual bool isPrinting() const OVERRIDE;
+    virtual bool shouldStayOnPageAfterHandlingBeforeUnload() const OVERRIDE;
 
 protected:
     // FIXME: make these private once the move from DRTTestRunner to TestRunner
@@ -290,6 +297,20 @@
     // arguments, and ignores any that may be present.
     void dumpProgressFinishedCallback(const CppArgumentList&, CppVariant*);
 
+    // This function sets a flag that tells the test_shell to print out a text
+    // representation of the back/forward list. It ignores all arguments.
+    void dumpBackForwardList(const CppArgumentList&, CppVariant*);
+
+    void setDeferMainResourceDataLoad(const CppArgumentList&, CppVariant*);
+    void dumpSelectionRect(const CppArgumentList&, CppVariant*);
+    void testRepaint(const CppArgumentList&, CppVariant*);
+    void repaintSweepHorizontally(const CppArgumentList&, CppVariant*);
+
+    // Causes layout to happen as if targetted to printed pages.
+    void setPrinting(const CppArgumentList&, CppVariant*);
+
+    void setShouldStayOnPageAfterHandlingBeforeUnload(const CppArgumentList&, CppVariant*);
+
     ///////////////////////////////////////////////////////////////////////////
     // Methods interacting with the WebTestProxy
 
@@ -409,6 +430,30 @@
     // finished callback.
     bool m_dumpProgressFinishedCallback;
 
+    // If true, the test_shell will produce a dump of the back forward list as
+    // well.
+    bool m_dumpBackForwardList;
+
+    // If false, all new requests will not defer the main resource data load.
+    bool m_deferMainResourceDataLoad;
+
+    // If true, the test_shell will draw the bounds of the current selection rect
+    // taking possible transforms of the selection rect into account.
+    bool m_dumpSelectionRect;
+
+    // If true, pixel dump will be produced as a series of 1px-tall, view-wide
+    // individual paints over the height of the view.
+    bool m_testRepaint;
+
+    // If true and test_repaint_ is true as well, pixel dump will be produced as
+    // a series of 1px-wide, view-tall paints across the width of the view.
+    bool m_sweepHorizontally;
+
+    // If true, layout is to target printed pages.
+    bool m_isPrinting;
+
+    bool m_shouldStayOnPageAfterHandlingBeforeUnload;
+
     // WAV audio data is stored here.
     WebKit::WebArrayBufferView m_audioData;
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to