summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp')
-rw-r--r--Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
index 5108e8075..edfaf78f7 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
@@ -47,9 +47,9 @@ static ExtensionMap& allExtensions()
return map;
}
-PassRefPtr<InjectedBundleDOMWindowExtension> InjectedBundleDOMWindowExtension::create(WebFrame* frame, InjectedBundleScriptWorld* world)
+Ref<InjectedBundleDOMWindowExtension> InjectedBundleDOMWindowExtension::create(WebFrame* frame, InjectedBundleScriptWorld* world)
{
- return adoptRef(new InjectedBundleDOMWindowExtension(frame, world));
+ return adoptRef(*new InjectedBundleDOMWindowExtension(frame, world));
}
InjectedBundleDOMWindowExtension* InjectedBundleDOMWindowExtension::get(DOMWindowExtension* extension)
@@ -73,8 +73,10 @@ InjectedBundleDOMWindowExtension::~InjectedBundleDOMWindowExtension()
WebFrame* InjectedBundleDOMWindowExtension::frame() const
{
Frame* frame = m_coreExtension->frame();
- WebFrameLoaderClient* webFrameLoaderClient = frame ? toWebFrameLoaderClient(frame->loader().client()) : 0;
- return webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
+ if (!frame)
+ return nullptr;
+
+ return WebFrame::fromCoreFrame(*frame);
}
InjectedBundleScriptWorld* InjectedBundleDOMWindowExtension::world() const