Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1745)

Unified Diff: android_webview/browser/browser_view_renderer_impl.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: Disable the video tests 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/browser_view_renderer_impl.cc
diff --git a/android_webview/browser/browser_view_renderer_impl.cc b/android_webview/browser/browser_view_renderer_impl.cc
index 94a59e18fb6e34446634220680f40ddf85fe507c..7dfeb6505e8e2009f83fb80c8565e51970f8ce62 100644
--- a/android_webview/browser/browser_view_renderer_impl.cc
+++ b/android_webview/browser/browser_view_renderer_impl.cc
@@ -122,11 +122,11 @@ BrowserViewRendererImpl* BrowserViewRendererImpl::Create(
BrowserViewRenderer::Client* client,
JavaHelper* java_helper) {
if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kMergeUIAndRendererCompositorThreads)) {
- return new InProcessViewRenderer(client, java_helper);
+ switches::kNoMergeUIAndRendererCompositorThreads)) {
+ return new BrowserViewRendererImpl(client, java_helper);
}
- return new BrowserViewRendererImpl(client, java_helper);
+ return new InProcessViewRenderer(client, java_helper);
}
// static

Powered by Google App Engine
This is Rietveld 408576698