Modified: trunk/Tools/ChangeLog (141384 => 141385)
--- trunk/Tools/ChangeLog 2013-01-31 08:29:44 UTC (rev 141384)
+++ trunk/Tools/ChangeLog 2013-01-31 08:30:52 UTC (rev 141385)
@@ -1,3 +1,20 @@
+2013-01-31 Jochen Eisinger <[email protected]>
+
+ [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 <[email protected]>
[chromium] move remaining resource load related methods to TestRunner library
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h (141384 => 141385)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h 2013-01-31 08:29:44 UTC (rev 141384)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h 2013-01-31 08:30:52 UTC (rev 141385)
@@ -34,10 +34,12 @@
#include "Platform/chromium/public/WebRect.h"
#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"
#include <map>
@@ -54,7 +56,6 @@
class WebIntentServiceInfo;
class WebNode;
class WebRange;
-class WebSecurityOrigin;
class WebSerializedScriptValue;
class WebSpellCheckClient;
class WebString;
@@ -152,6 +153,7 @@
bool runModalPromptDialog(WebKit::WebFrame*, const WebKit::WebString& message, const WebKit::WebString& defaultValue, WebKit::WebString* actualValue);
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:
void locationChangeDone(WebKit::WebFrame*);
@@ -473,6 +475,12 @@
return policy;
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);
+ }
};
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (141384 => 141385)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-01-31 08:29:44 UTC (rev 141384)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-01-31 08:30:52 UTC (rev 141385)
@@ -1009,4 +1009,14 @@
return result;
}
+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;
}
+
+}
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (141384 => 141385)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-31 08:29:44 UTC (rev 141384)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-31 08:30:52 UTC (rev 141385)
@@ -641,11 +641,6 @@
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;
}
