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

Unified Diff: third_party/WebKit/Source/web/WebFrame.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 | « no previous file | third_party/WebKit/Source/web/WebFrameImplBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebFrame.cpp
diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp
index 96c4787f68761896b6047a5fb31ef8cd3cb5bd57..9bc6b7cda10afdd0c47a117b316bfcb146babe08 100644
--- a/third_party/WebKit/Source/web/WebFrame.cpp
+++ b/third_party/WebKit/Source/web/WebFrame.cpp
@@ -6,7 +6,6 @@
#include "bindings/core/v8/WindowProxyManager.h"
#include "core/HTMLNames.h"
-#include "core/frame/FrameHost.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/frame/RemoteFrame.h"
@@ -68,7 +67,7 @@ bool WebFrame::swap(WebFrame* frame) {
}
m_openedFrameTracker->transferTo(frame);
- FrameHost* host = oldFrame->host();
+ Page* page = oldFrame->page();
AtomicString name = oldFrame->tree().name();
FrameOwner* owner = oldFrame->owner();
@@ -105,7 +104,7 @@ bool WebFrame::swap(WebFrame* frame) {
TRACE_EVENT_SCOPE_THREAD, "frame", &localFrame);
}
} else {
- toWebRemoteFrameImpl(frame)->initializeCoreFrame(host, owner, name);
+ toWebRemoteFrameImpl(frame)->initializeCoreFrame(*page, owner, name);
}
if (m_parent && oldFrame->hasReceivedUserGesture())
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/WebFrameImplBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698