third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp - Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform.

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/WebRemoteFrameImpl.cpp

Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/platform/battery/battery_dispatcher_proxy.cc ('K') | « third_party/WebKit/Source/web/WebRemoteFrameImpl.h ('k') | third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp » ('j') | third_party/WebKit/public/platform/ServiceRegistry.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

index c59416b8c9289cb4a7b438080773d28a35e13c54..61a0a39ea5963aa88490719195dded38c75963d1 100644

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

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

@@ -595,9 +595,9 @@ WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const

return WebString();

}

-WebLocalFrame* WebRemoteFrameImpl::createLocalChild(WebTreeScopeType scope, const WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, WebFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& frameOwnerProperties, WebFrame* opener)

+WebLocalFrame* WebRemoteFrameImpl::createLocalChild(WebTreeScopeType scope, const WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, WebFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& frameOwnerProperties, WebFrame* opener, ServiceRegistry* serviceRegistry)

{

- WebLocalFrameImpl* child = WebLocalFrameImpl::create(scope, client, opener);

+ WebLocalFrameImpl* child = WebLocalFrameImpl::create(scope, client, opener, serviceRegistry);

insertAfter(child, previousSibling);

RefPtrWillBeRawPtr<RemoteFrameOwner> owner = RemoteFrameOwner::create(static_cast<SandboxFlags>(sandboxFlags), frameOwnerProperties);

// FIXME: currently this calls LocalFrame::init() on the created LocalFrame, which may