Title: [141899] trunk/Tools
Revision
141899
Author
[email protected]
Date
2013-02-05 10:07:37 -0800 (Tue, 05 Feb 2013)

Log Message

[chromium] remove methods from the WebTestRunner interface that are only used by WebTestProxyBase
https://bugs.webkit.org/show_bug.cgi?id=108926

Reviewed by Adam Barth.

* DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:
(WebKit):
(WebTestRunner):
* DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
(TestRunner):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (141898 => 141899)


--- trunk/Tools/ChangeLog	2013-02-05 17:59:41 UTC (rev 141898)
+++ trunk/Tools/ChangeLog	2013-02-05 18:07:37 UTC (rev 141899)
@@ -1,5 +1,18 @@
 2013-02-05  Jochen Eisinger  <[email protected]>
 
+        [chromium] remove methods from the WebTestRunner interface that are only used by WebTestProxyBase
+        https://bugs.webkit.org/show_bug.cgi?id=108926
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:
+        (WebKit):
+        (WebTestRunner):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+        (TestRunner):
+
+2013-02-05  Jochen Eisinger  <[email protected]>
+
         [chromium] remove unneccessary 0 checks for testRunner now that the TestRunner library owns it
         https://bugs.webkit.org/show_bug.cgi?id=108923
 

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


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h	2013-02-05 17:59:41 UTC (rev 141898)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h	2013-02-05 18:07:37 UTC (rev 141899)
@@ -31,21 +31,15 @@
 #ifndef WebTestRunner_h
 #define WebTestRunner_h
 
-#include "WebKit/chromium/public/WebTextDirection.h"
-#include <set>
-#include <string>
-
 namespace WebKit {
 class WebArrayBufferView;
 class WebPermissionClient;
-class WebFrame;
 }
 
 namespace WebTestRunner {
 
 class WebTestRunner {
 public:
-    virtual bool shouldDumpEditingCallbacks() const = 0;
     virtual bool shouldDumpAsText() const = 0;
     virtual void setShouldDumpAsText(bool) = 0;
     virtual bool shouldGeneratePixelResults() const = 0;
@@ -54,39 +48,13 @@
     virtual bool shouldDumpChildFramesAsText() const = 0;
     virtual bool shouldDumpAsAudio() const = 0;
     virtual const WebKit::WebArrayBufferView* audioData() const = 0;
-    virtual bool shouldDumpFrameLoadCallbacks() const = 0;
     virtual void setShouldDumpFrameLoadCallbacks(bool) = 0;
-    virtual bool shouldDumpUserGestureInFrameLoadCallbacks() const = 0;
-    virtual bool stopProvisionalFrameLoads() const = 0;
-    virtual bool shouldDumpTitleChanges() const = 0;
-    virtual bool shouldDumpCreateView() const = 0;
-    virtual bool canOpenWindows() const = 0;
-    virtual bool shouldDumpResourceLoadCallbacks() const = 0;
-    virtual bool shouldDumpResourceRequestCallbacks() const = 0;
-    virtual bool shouldDumpResourceResponseMIMETypes() const = 0;
     virtual WebKit::WebPermissionClient* webPermissions() const = 0;
-    virtual bool shouldDumpStatusCallbacks() const = 0;
-    virtual bool shouldDumpProgressFinishedCallback() const = 0;
     virtual bool shouldDumpBackForwardList() const = 0;
-    virtual bool deferMainResourceDataLoad() const = 0;
     virtual bool shouldDumpSelectionRect() const = 0;
     virtual bool testRepaint() const = 0;
     virtual bool sweepHorizontally() const = 0;
     virtual bool isPrinting() const = 0;
-    virtual bool shouldStayOnPageAfterHandlingBeforeUnload() const = 0;
-    virtual void setTitleTextDirection(WebKit::WebTextDirection) = 0;
-    virtual const std::set<std::string>* httpHeadersToClear() const = 0;
-    virtual bool shouldBlockRedirects() const = 0;
-    virtual bool willSendRequestShouldReturnNull() const = 0;
-    virtual void setTopLoadingFrame(WebKit::WebFrame*, bool) = 0;
-    virtual WebKit::WebFrame* topLoadingFrame() const = 0;
-    virtual void policyDelegateDone() = 0;
-    virtual bool policyDelegateEnabled() const = 0;
-    virtual bool policyDelegateIsPermissive() const = 0;
-    virtual bool policyDelegateShouldNotifyDone() const = 0;
-    virtual bool shouldInterceptPostMessage() const = 0;
-    virtual bool isSmartInsertDeleteEnabled() const = 0;
-    virtual bool isSelectTrailingWhitespaceEnabled() const = 0;
 };
 
 }

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h (141898 => 141899)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h	2013-02-05 17:59:41 UTC (rev 141898)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h	2013-02-05 18:07:37 UTC (rev 141899)
@@ -70,7 +70,6 @@
     void setTestIsRunning(bool);
 
     // WebTestRunner implementation.
-    virtual bool shouldDumpEditingCallbacks() const OVERRIDE;
     virtual bool shouldDumpAsText() const OVERRIDE;
     virtual void setShouldDumpAsText(bool) OVERRIDE;
     virtual bool shouldGeneratePixelResults() const OVERRIDE;
@@ -79,40 +78,43 @@
     virtual bool shouldDumpChildFramesAsText() const OVERRIDE;
     virtual bool shouldDumpAsAudio() const OVERRIDE;
     virtual const WebKit::WebArrayBufferView* audioData() const OVERRIDE;
-    virtual bool shouldDumpFrameLoadCallbacks() const OVERRIDE;
     virtual void setShouldDumpFrameLoadCallbacks(bool) OVERRIDE;
-    virtual bool shouldDumpUserGestureInFrameLoadCallbacks() const OVERRIDE;
-    virtual bool stopProvisionalFrameLoads() const OVERRIDE;
-    virtual bool shouldDumpTitleChanges() const OVERRIDE;
-    virtual bool shouldDumpCreateView() const OVERRIDE;
-    virtual bool canOpenWindows() const OVERRIDE;
-    virtual bool shouldDumpResourceLoadCallbacks() const OVERRIDE;
-    virtual bool shouldDumpResourceRequestCallbacks() const OVERRIDE;
-    virtual bool shouldDumpResourceResponseMIMETypes() const OVERRIDE;
     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;
-    virtual void setTitleTextDirection(WebKit::WebTextDirection) OVERRIDE;
-    virtual const std::set<std::string>* httpHeadersToClear() const OVERRIDE;
-    virtual bool shouldBlockRedirects() const OVERRIDE;
-    virtual bool willSendRequestShouldReturnNull() const OVERRIDE;
-    virtual void setTopLoadingFrame(WebKit::WebFrame*, bool) OVERRIDE;
-    virtual WebKit::WebFrame* topLoadingFrame() const OVERRIDE;
-    virtual void policyDelegateDone() OVERRIDE;
-    virtual bool policyDelegateEnabled() const OVERRIDE;
-    virtual bool policyDelegateIsPermissive() const OVERRIDE;
-    virtual bool policyDelegateShouldNotifyDone() const OVERRIDE;
-    virtual bool shouldInterceptPostMessage() const OVERRIDE;
-    virtual bool isSmartInsertDeleteEnabled() const OVERRIDE;
-    virtual bool isSelectTrailingWhitespaceEnabled() const OVERRIDE;
 
+    // Methods used by WebTestProxyBase.
+    bool shouldDumpEditingCallbacks() const;
+    bool shouldDumpFrameLoadCallbacks() const;
+    bool shouldDumpUserGestureInFrameLoadCallbacks() const;
+    bool stopProvisionalFrameLoads() const;
+    bool shouldDumpTitleChanges() const;
+    bool shouldDumpCreateView() const;
+    bool canOpenWindows() const;
+    bool shouldDumpResourceLoadCallbacks() const;
+    bool shouldDumpResourceRequestCallbacks() const;
+    bool shouldDumpResourceResponseMIMETypes() const;
+    bool shouldDumpStatusCallbacks() const;
+    bool shouldDumpProgressFinishedCallback() const;
+    bool deferMainResourceDataLoad() const;
+    bool shouldStayOnPageAfterHandlingBeforeUnload() const;
+    void setTitleTextDirection(WebKit::WebTextDirection);
+    const std::set<std::string>* httpHeadersToClear() const;
+    bool shouldBlockRedirects() const;
+    bool willSendRequestShouldReturnNull() const;
+    void setTopLoadingFrame(WebKit::WebFrame*, bool);
+    WebKit::WebFrame* topLoadingFrame() const;
+    void policyDelegateDone();
+    bool policyDelegateEnabled() const;
+    bool policyDelegateIsPermissive() const;
+    bool policyDelegateShouldNotifyDone() const;
+    bool shouldInterceptPostMessage() const;
+    bool isSmartInsertDeleteEnabled() const;
+    bool isSelectTrailingWhitespaceEnabled() const;
+
     // A single item in the work queue.
     class WorkItem {
     public:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to