| 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 13c8f97dcd986988733736f005ef8536e1c4abec..67ff6ac936531ba57a930b92e1a42802b4d6980b 100644
|
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| @@ -1448,7 +1448,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());
|
| @@ -1573,7 +1573,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
|
|
|