Changeset 141385 in webkit

Timestamp:

Jan 31, 2013 12:30:52 AM (11 years ago)

Author:

jochen@chromium.org

Message:

[chromium] move postMessage related methods to TestRunner library
​https://bugs.webkit.org/show_bug.cgi?id=108343

Reviewed by Adam Barth.

• DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:

(WebKit):
(WebTestProxyBase):
(WebTestRunner::WebTestProxy::willCheckAndDispatchMessageEvent):

• DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:

(WebTestRunner::WebTestProxyBase::willCheckAndDispatchMessageEvent):
(WebTestRunner):

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::willCheckAndDispatchMessageEvent):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h (modified) (4 diffs)
• DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (modified) (1 diff)
• DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-31  Jochen Eisinger  <jochen@chromium.org>
+
+        [chromium] move postMessage related methods to TestRunner library
+        https://bugs.webkit.org/show_bug.cgi?id=108343
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:
+        (WebKit):
+        (WebTestProxyBase):
+        (WebTestRunner::WebTestProxy::willCheckAndDispatchMessageEvent):
+        * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
+        (WebTestRunner::WebTestProxyBase::willCheckAndDispatchMessageEvent):
+        (WebTestRunner):
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::willCheckAndDispatchMessageEvent):
+
 2013-01-30  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h

@@ -35 +35 @@
 #include "Platform/chromium/public/WebURLError.h"
 #include "WebKit/chromium/public/WebAccessibilityNotification.h"
+#include "WebKit/chromium/public/WebDOMMessageEvent.h"
 #include "WebKit/chromium/public/WebDragOperation.h"
 #include "WebKit/chromium/public/WebEditingAction.h"
 #include "WebKit/chromium/public/WebNavigationPolicy.h"
 #include "WebKit/chromium/public/WebNavigationType.h"
+#include "WebKit/chromium/public/WebSecurityOrigin.h"
 #include "WebKit/chromium/public/WebTextAffinity.h"
 #include "WebKit/chromium/public/WebTextDirection.h"
@@ -55 +57 @@
 class WebNode;
 class WebRange;
-class WebSecurityOrigin;
 class WebSerializedScriptValue;
 class WebSpellCheckClient;
@@ -153 +154 @@
     bool runModalBeforeUnloadDialog(WebKit::WebFrame*, const WebKit::WebString&);
     WebKit::WebNavigationPolicy decidePolicyForNavigation(WebKit::WebFrame*, const WebKit::WebURLRequest&, WebKit::WebNavigationType, const WebKit::WebNode& originatingNode, WebKit::WebNavigationPolicy defaultPolicy, bool isRedirect);
+    bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent);
 
 private:
@@ -474 +476 @@
         return Base::decidePolicyForNavigation(frame, request, type, originatingNode, defaultPolicy, isRedirect);
     }
+    virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent event)
+    {
+        if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event))
+            return true;
+        return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event);
+    }
 };
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp

@@ -1010 +1010 @@
 }
 
-}
+bool WebTestProxyBase::willCheckAndDispatchMessageEvent(WebFrame*, WebFrame*, WebSecurityOrigin, WebDOMMessageEvent)
+{
+    if (m_testInterfaces->testRunner() && m_testInterfaces->testRunner()->shouldInterceptPostMessage()) {
+        m_delegate->printMessage("intercepted postMessage\n");
+        return true;
+    }
+
+    return false;
+}
+
+}

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -642 +642 @@
 bool WebViewHost::willCheckAndDispatchMessageEvent(WebFrame* sourceFrame, WebFrame* targetFrame, WebSecurityOrigin target, WebDOMMessageEvent event)
 {
-    if (m_shell->testRunner()->shouldInterceptPostMessage()) {
-        fputs("intercepted postMessage\n", stdout);
-        return true;
-    }
-
     return false;
 }