| 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 07c7cca90ddd21bb2f68e76eee597d9cdddb3726..f05dcf768846a88503a977b9ea88d7eeca4c1f8f 100644
|
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| @@ -1425,7 +1425,7 @@ WebLocalFrameImpl* WebLocalFrameImpl::createProvisional(WebFrameClient* client,
|
| // disappear, so Page::m_mainFrame can't be updated just yet.
|
| OwnPtrWillBeRawPtr<FrameOwner> tempOwner = DummyFrameOwner::create();
|
| // TODO(dcheng): This block is very similar to initializeCoreFrame. Try to reuse it here.
|
| - RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(webFrame->m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner.get());
|
| + RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(webFrame->m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner.get(), client->serviceRegistry());
|
| // Set the name and unique name directly, bypassing any of the normal logic
|
| // to calculate unique name.
|
| frame->tree().setPrecalculatedName(toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().name(), toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().uniqueName());
|
| @@ -1550,7 +1550,7 @@ void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame)
|
|
|
| void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)
|
| {
|
| - setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner));
|
| + setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client()->serviceRegistry()));
|
| frame()->tree().setPrecalculatedName(name, uniqueName);
|
| // We must call init() after m_frame is assigned because it is referenced
|
| // during init(). Note that this may dispatch JS events; the frame may be
|
|
|