| Index: third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
|
| diff --git a/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp b/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
|
| index e0d5903b77c22f174aad56874839cb7224423291..b5b6a933f43d019d88758c2356c62ccbd975d4e7 100644
|
| --- a/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
|
| +++ b/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
|
| @@ -46,17 +46,17 @@ namespace blink {
|
| std::unique_ptr<DummyPageHolder> DummyPageHolder::create(
|
| const IntSize& initialViewSize,
|
| Page::PageClients* pageClients,
|
| - FrameLoaderClient* frameLoaderClient,
|
| + LocalFrameClient* localFrameClient,
|
| FrameSettingOverrideFunction settingOverrider,
|
| InterfaceProvider* interfaceProvider) {
|
| - return WTF::wrapUnique(
|
| - new DummyPageHolder(initialViewSize, pageClients, frameLoaderClient,
|
| - settingOverrider, interfaceProvider));
|
| + return WTF::wrapUnique(new DummyPageHolder(initialViewSize, pageClients,
|
| + localFrameClient, settingOverrider,
|
| + interfaceProvider));
|
| }
|
|
|
| DummyPageHolder::DummyPageHolder(const IntSize& initialViewSize,
|
| Page::PageClients* pageClientsArgument,
|
| - FrameLoaderClient* frameLoaderClient,
|
| + LocalFrameClient* localFrameClient,
|
| FrameSettingOverrideFunction settingOverrider,
|
| InterfaceProvider* interfaceProvider) {
|
| Page::PageClients pageClients;
|
| @@ -76,11 +76,11 @@ DummyPageHolder::DummyPageHolder(const IntSize& initialViewSize,
|
| if (settingOverrider)
|
| (*settingOverrider)(settings);
|
|
|
| - m_frameLoaderClient = frameLoaderClient;
|
| - if (!m_frameLoaderClient)
|
| - m_frameLoaderClient = EmptyLocalFrameClient::create();
|
| + m_localFrameClient = localFrameClient;
|
| + if (!m_localFrameClient)
|
| + m_localFrameClient = EmptyLocalFrameClient::create();
|
|
|
| - m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost(),
|
| + m_frame = LocalFrame::create(m_localFrameClient.get(), &m_page->frameHost(),
|
| nullptr, interfaceProvider);
|
| m_frame->setView(FrameView::create(*m_frame, initialViewSize));
|
| m_frame->view()->page()->frameHost().visualViewport().setSize(
|
|
|