third_party/WebKit/Source/web/tests/FrameTestHelpers.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/tests/FrameTestHelpers.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.cpp ('k') | third_party/WebKit/public/blink_headers.gypi » ('j') | third_party/WebKit/public/platform/ServiceRegistry.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

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

index 859bfe190c3aa6df30261356d8b3639571ea8661..76fced4d132c8fa1d18591c9df2b13167b5378b4 100644

--- a/third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

+++ b/third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

@@ -200,7 +200,7 @@ WebViewImpl* WebViewHelper::initializeWithOpener(WebFrame* opener, bool enableJa

m_settingOverrider->overrideSettings(m_webView->settings());

m_webView->setDeviceScaleFactor(webViewClient->screenInfo().deviceScaleFactor);

m_webView->setDefaultPageScaleLimits(1, 4);

- WebLocalFrame* frame = WebLocalFrameImpl::create(WebTreeScopeType::Document, webFrameClient, opener);

+ WebLocalFrame* frame = WebLocalFrameImpl::create(WebTreeScopeType::Document, webFrameClient, opener, nullptr);

m_webView->setMainFrame(frame);

// TODO(dcheng): The main frame widget currently has a special case.

// Eliminate this once WebView is no longer a WebWidget.