From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Fri, 13 Sep 2013 12:51:20 +0200
Subject: 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>
---
 .../WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp')

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
-- 
cgit v1.2.1