diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp index b67798e74..1e315660a 100644 --- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp +++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp @@ -52,7 +52,6 @@ #include "MessageEvent.h" #include "MouseEvent.h" #include "Page.h" -#include "PlatformString.h" #include "PluginData.h" #include "PluginDataChromium.h" #include "ProgressTracker.h" @@ -69,7 +68,6 @@ #include "WebFrameImpl.h" #include "WebIntentRequest.h" #include "WebIntentServiceInfo.h" -#include "WebKit.h" #include "WebNode.h" #include "WebPermissionClient.h" #include "WebPlugin.h" @@ -83,14 +81,15 @@ #include "WindowFeatures.h" #include "WrappedResourceRequest.h" #include "WrappedResourceResponse.h" -#include "platform/WebKitPlatformSupport.h" #include "platform/WebURL.h" #include "platform/WebURLError.h" #include "platform/WebVector.h" +#include <public/Platform.h> #include <public/WebMimeRegistry.h> #include <wtf/StringExtras.h> #include <wtf/text/CString.h> +#include <wtf/text/WTFString.h> #if USE(V8) #include <v8.h> @@ -1606,7 +1605,7 @@ bool FrameLoaderClientImpl::willCheckAndDispatchMessageEvent( if (event && event->source() && event->source()->document()) source = WebFrameImpl::fromFrame(event->source()->document()->frame()); return m_webFrame->client()->willCheckAndDispatchMessageEvent( - source, WebSecurityOrigin(target), WebDOMMessageEvent(event)); + source, m_webFrame, WebSecurityOrigin(target), WebDOMMessageEvent(event)); } #if ENABLE(WEB_INTENTS_TAG) |