Index: Source/core/page/CreateWindow.cpp |
diff --git a/Source/core/page/CreateWindow.cpp b/Source/core/page/CreateWindow.cpp |
index b8ce0491f25b591d4277241c44791f6513100876..0cd7ee0de15b06140c8ec499b40f34491ee44d93 100644 |
--- a/Source/core/page/CreateWindow.cpp |
+++ b/Source/core/page/CreateWindow.cpp |
@@ -47,7 +47,7 @@ static Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLo |
ASSERT(!features.dialog || request.frameName().isEmpty()); |
if (!request.frameName().isEmpty() && request.frameName() != "_blank") { |
- if (Frame* frame = lookupFrame->loader()->findFrameForNavigation(request.frameName(), openerFrame->document())) { |
+ if (Frame* frame = lookupFrame->loader().findFrameForNavigation(request.frameName(), openerFrame->document())) { |
if (request.frameName() != "_self") { |
if (Page* page = frame->page()) |
page->chrome().focus(); |
@@ -79,7 +79,7 @@ static Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLo |
Frame* frame = page->mainFrame(); |
- frame->loader()->forceSandboxFlags(openerFrame->document()->sandboxFlags()); |
+ frame->loader().forceSandboxFlags(openerFrame->document()->sandboxFlags()); |
if (request.frameName() != "_blank") |
frame->tree().setName(request.frameName()); |
@@ -125,10 +125,10 @@ Frame* createWindow(const String& urlString, const AtomicString& frameName, cons |
} |
// For whatever reason, Firefox uses the first frame to determine the outgoingReferrer. We replicate that behavior here. |
- String referrer = SecurityPolicy::generateReferrerHeader(firstFrame->document()->referrerPolicy(), completedURL, firstFrame->loader()->outgoingReferrer()); |
+ String referrer = SecurityPolicy::generateReferrerHeader(firstFrame->document()->referrerPolicy(), completedURL, firstFrame->loader().outgoingReferrer()); |
ResourceRequest request(completedURL, referrer); |
- FrameLoader::addHTTPOriginIfNeeded(request, firstFrame->loader()->outgoingOrigin()); |
+ FrameLoader::addHTTPOriginIfNeeded(request, firstFrame->loader().outgoingOrigin()); |
FrameLoadRequest frameRequest(activeWindow->document()->securityOrigin(), request, frameName); |
// We pass the opener frame for the lookupFrame in case the active frame is different from |
@@ -138,7 +138,7 @@ Frame* createWindow(const String& urlString, const AtomicString& frameName, cons |
if (!newFrame) |
return 0; |
- newFrame->loader()->setOpener(openerFrame); |
+ newFrame->loader().setOpener(openerFrame); |
newFrame->page()->setOpenedByDOM(); |
if (newFrame->domWindow()->isInsecureScriptAccess(activeWindow, completedURL)) |
@@ -149,7 +149,7 @@ Frame* createWindow(const String& urlString, const AtomicString& frameName, cons |
if (created) { |
FrameLoadRequest request(activeWindow->document()->securityOrigin(), ResourceRequest(completedURL, referrer)); |
- newFrame->loader()->load(request); |
+ newFrame->loader().load(request); |
} else if (!urlString.isEmpty()) { |
newFrame->navigationScheduler().scheduleLocationChange(activeWindow->document()->securityOrigin(), completedURL.string(), referrer, false); |
} |