Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

Issue 2764773003: Change WebFrameImplBase::initializeCoreFrame to take a Page& (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
index 22ce474058f800c21d241e290475177322fd4fa6..eb9f42c4169b40c3a54ea2bf34ea0890837b6375 100644
--- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
@@ -9,7 +9,6 @@
#include "core/dom/Fullscreen.h"
#include "core/dom/RemoteSecurityContext.h"
#include "core/dom/SecurityContext.h"
-#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
#include "core/frame/Settings.h"
#include "core/frame/csp/ContentSecurityPolicy.h"
@@ -337,7 +336,7 @@ WebLocalFrame* WebRemoteFrameImpl::createLocalChild(
// (one from the initial frame creation, and one from swapping it into the
// remote process). FrameLoader might need a special initialization function
// for this case to avoid that duplicate navigation.
- child->initializeCoreFrame(frame()->host(), owner, name);
+ child->initializeCoreFrame(*frame()->page(), owner, name);
// Partially related with the above FIXME--the init() call may trigger JS
// dispatch. However,
// if the parent is remote, it should never be detached synchronously...
@@ -345,11 +344,10 @@ WebLocalFrame* WebRemoteFrameImpl::createLocalChild(
return child;
}
-void WebRemoteFrameImpl::initializeCoreFrame(FrameHost* host,
+void WebRemoteFrameImpl::initializeCoreFrame(Page& page,
FrameOwner* owner,
const AtomicString& name) {
- setCoreFrame(RemoteFrame::create(m_frameClient.get(),
- host ? &host->page() : nullptr, owner));
+ setCoreFrame(RemoteFrame::create(m_frameClient.get(), &page, owner));
frame()->createView();
m_frame->tree().setName(name);
}
@@ -364,7 +362,7 @@ WebRemoteFrame* WebRemoteFrameImpl::createRemoteChild(
appendChild(child);
RemoteFrameOwner* owner = RemoteFrameOwner::create(
static_cast<SandboxFlags>(sandboxFlags), WebFrameOwnerProperties());
- child->initializeCoreFrame(frame()->host(), owner, name);
+ child->initializeCoreFrame(*frame()->page(), owner, name);
return child;
}
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698