diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp index d448e84dc..634cbcbe6 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp +++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp @@ -30,7 +30,9 @@ #include "WebFrame.h" #include "WebFrameLoaderClient.h" #include <WebCore/DOMWindowExtension.h> +#include <WebCore/DOMWrapperWorld.h> #include <WebCore/Frame.h> +#include <WebCore/FrameLoader.h> #include <wtf/HashMap.h> using namespace WebCore; @@ -69,8 +71,9 @@ InjectedBundleDOMWindowExtension::~InjectedBundleDOMWindowExtension() WebFrame* InjectedBundleDOMWindowExtension::frame() const { - WebCore::Frame* frame = m_coreExtension->frame(); - return frame ? static_cast<WebFrameLoaderClient*>(frame->loader()->client())->webFrame() : 0; + Frame* frame = m_coreExtension->frame(); + WebFrameLoaderClient* webFrameLoaderClient = frame ? toWebFrameLoaderClient(frame->loader()->client()) : 0; + return webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0; } InjectedBundleScriptWorld* InjectedBundleDOMWindowExtension::world() const |