| 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)),
|
|
|