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

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

Issue 2763513002: Change LocalFrame to take a Page instead of a FrameHost (Closed)
Patch Set: 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
Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index 3fa8a3f555a870bc50c7390dd53538b0398635b4..e0d1cd2d7284afc9535846faf92335c01bdcf2f5 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -1530,7 +1530,7 @@ WebLocalFrameImpl* WebLocalFrameImpl::createProvisional(
// TODO(dcheng): This block is very similar to initializeCoreFrame. Try to
// reuse it here.
LocalFrame* frame = LocalFrame::create(webFrame->m_localFrameClientImpl.get(),
- oldFrame->host(), tempOwner,
+ oldFrame->page(), tempOwner,
interfaceProvider, interfaceRegistry);
// Set the name and unique name directly, bypassing any of the normal logic
// to calculate unique name.
@@ -1610,7 +1610,8 @@ void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host,
FrameOwner* owner,
const AtomicString& name,
const AtomicString& uniqueName) {
- setCoreFrame(LocalFrame::create(m_localFrameClientImpl.get(), host, owner,
+ setCoreFrame(LocalFrame::create(m_localFrameClientImpl.get(),
+ host ? &host->page() : nullptr, owner,
m_interfaceProvider, m_interfaceRegistry));
frame()->tree().setPrecalculatedName(name, uniqueName);
// We must call init() after m_frame is assigned because it is referenced
« no previous file with comments | « third_party/WebKit/Source/web/InspectorOverlay.cpp ('k') | third_party/WebKit/Source/web/WebPagePopupImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698