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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.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/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index e4ed42d17d9e4ff546580d5854fd0c86d711e9bc..429c13655b0cf65c691e469753ecbc0f954cd5cb 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -260,12 +260,12 @@ inline float parentTextZoomFactor(LocalFrame* frame) {
template class CORE_TEMPLATE_EXPORT Supplement<LocalFrame>;
LocalFrame* LocalFrame::create(LocalFrameClient* client,
- FrameHost* host,
+ Page* page,
FrameOwner* owner,
InterfaceProvider* interfaceProvider,
InterfaceRegistry* interfaceRegistry) {
LocalFrame* frame = new LocalFrame(
- client, host, owner,
+ client, page, owner,
interfaceProvider ? interfaceProvider
: InterfaceProvider::getEmptyInterfaceProvider(),
interfaceRegistry ? interfaceRegistry
@@ -844,15 +844,12 @@ bool LocalFrame::shouldThrottleRendering() const {
}
inline LocalFrame::LocalFrame(LocalFrameClient* client,
- FrameHost* host,
+ Page* page,
FrameOwner* owner,
InterfaceProvider* interfaceProvider,
InterfaceRegistry* interfaceRegistry)
- : Frame(client,
- host ? &host->page() : nullptr,
- owner,
- LocalWindowProxyManager::create(*this)),
- m_frameScheduler(page()->chromeClient().createFrameScheduler(
+ : Frame(client, page, owner, LocalWindowProxyManager::create(*this)),
+ m_frameScheduler(page->chromeClient().createFrameScheduler(
client->frameBlameContext())),
m_loader(this),
m_navigationScheduler(NavigationScheduler::create(this)),
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/layout/LayoutTestHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698