android_webview/browser/renderer_host/view_renderer_host.cc - Issue 13907007: Replace merge-ui-and-compositor-threads flag with no-merge-ui-and-compositor-threads flag

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: android_webview/browser/renderer_host/view_renderer_host.cc

Issue 13907007: Replace merge-ui-and-compositor-threads flag with no-merge-ui-and-compositor-threads flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync Created 7 years, 7 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

Index: android_webview/browser/renderer_host/view_renderer_host.cc

diff --git a/android_webview/browser/renderer_host/view_renderer_host.cc b/android_webview/browser/renderer_host/view_renderer_host.cc

index 1a21b04fd97d2ac3f9d2bf37b635999fa518e9f6..49227ecd64031586019a8f83fa303705f2106db6 100644

--- a/android_webview/browser/renderer_host/view_renderer_host.cc

+++ b/android_webview/browser/renderer_host/view_renderer_host.cc

@@ -48,8 +48,8 @@ void ViewRendererHost::OnPictureUpdated() {

void ViewRendererHost::OnDidActivateAcceleratedCompositing(

int input_handler_id) {

- if (!CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kMergeUIAndRendererCompositorThreads)) {

+ if (CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kNoMergeUIAndRendererCompositorThreads)) {

return;

}

« no previous file with comments | « android_webview/browser/browser_view_renderer_impl.cc ('k') | android_webview/common/aw_switches.h » ('j') | no next file with comments »