third_party/WebKit/Source/web/WebLocalFrameImpl.cpp - Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2196843003: Blink ServiceRegistry -> InterfaceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 5 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

« third_party/WebKit/Source/modules/notifications/NotificationManager.cpp ('K') | « third_party/WebKit/Source/platform/text/hyphenation/HyphenationMinikin.cpp ('k') | third_party/WebKit/Source/web/tests/ScreenWakeLockTest.cpp » ('j') | third_party/WebKit/public/platform/InterfaceProvider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c2a1277ba075e8808beba5db21163621758d2265..e679bc334c7c6b26f3f766442599b31941d9673d 100644

--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

@@ -180,7 +180,7 @@

#include "platform/weborigin/KURL.h"

#include "platform/weborigin/SchemeRegistry.h"

#include "platform/weborigin/SecurityPolicy.h"

-#include "public/platform/ServiceRegistry.h"

+#include "public/platform/InterfaceProvider.h"

#include "public/platform/WebFloatPoint.h"

#include "public/platform/WebFloatRect.h"

#include "public/platform/WebLayer.h"

@@ -1398,7 +1398,7 @@ WebLocalFrameImpl* WebLocalFrameImpl::createProvisional(WebFrameClient* client,

// disappear, so Page::m_mainFrame can't be updated just yet.

FrameOwner* tempOwner = DummyFrameOwner::create();

// TODO(dcheng): This block is very similar to initializeCoreFrame. Try to reuse it here.

- LocalFrame* frame = LocalFrame::create(webFrame->m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner, client ? client->serviceRegistry() : nullptr);

+ LocalFrame* frame = LocalFrame::create(webFrame->m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner, client ? client->interfaceProvider() : nullptr);

// 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());

@@ -1492,7 +1492,7 @@ void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame)

void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)

{

- setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->serviceRegistry() : nullptr));

+ setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->interfaceProvider() : nullptr));

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