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

Side by Side Diff: android_webview/browser/aw_browser_main_parts.cc

Issue 1380663004: Revert "aw: Disable ipc command buffer by default" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | android_webview/common/aw_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/browser/aw_browser_main_parts.h" 5 #include "android_webview/browser/aw_browser_main_parts.h"
6 6
7 #include "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_dev_tools_discovery_provider.h" 8 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
9 #include "android_webview/browser/aw_media_client_android.h" 9 #include "android_webview/browser/aw_media_client_android.h"
10 #include "android_webview/browser/aw_result_codes.h" 10 #include "android_webview/browser/aw_result_codes.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 void AwBrowserMainParts::PreMainMessageLoopRun() { 83 void AwBrowserMainParts::PreMainMessageLoopRun() {
84 browser_context_->PreMainMessageLoopRun(); 84 browser_context_->PreMainMessageLoopRun();
85 85
86 AwDevToolsDiscoveryProvider::Install(); 86 AwDevToolsDiscoveryProvider::Install();
87 87
88 media::SetMediaClientAndroid( 88 media::SetMediaClientAndroid(
89 new AwMediaClientAndroid(AwResource::GetConfigKeySystemUuidMapping())); 89 new AwMediaClientAndroid(AwResource::GetConfigKeySystemUuidMapping()));
90 90
91 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 91 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
92 switches::kUseIpcCommandBuffer)) { 92 switches::kUseInProcCommandBuffer)) {
93 gfx::GLSurface::InitializeOneOff();
94 } else {
93 content::SynchronousCompositor::SetUseIpcCommandBuffer(); 95 content::SynchronousCompositor::SetUseIpcCommandBuffer();
94 } else {
95 gfx::GLSurface::InitializeOneOff();
96 } 96 }
97 97
98 content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView(); 98 content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
99 99
100 // This is needed for WebView Classic backwards compatibility 100 // This is needed for WebView Classic backwards compatibility
101 // See crbug.com/298495. Also see crbug.com/525697 on why it is currently 101 // See crbug.com/298495. Also see crbug.com/525697 on why it is currently
102 // for single process mode only. 102 // for single process mode only.
103 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 103 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
104 switches::kSingleProcess)) { 104 switches::kSingleProcess)) {
105 content::SetMaxURLChars(20 * 1024 * 1024); 105 content::SetMaxURLChars(20 * 1024 * 1024);
106 } 106 }
107 } 107 }
108 108
109 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) { 109 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
110 // Android WebView does not use default MessageLoop. It has its own 110 // Android WebView does not use default MessageLoop. It has its own
111 // Android specific MessageLoop. 111 // Android specific MessageLoop.
112 return true; 112 return true;
113 } 113 }
114 114
115 } // namespace android_webview 115 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | android_webview/common/aw_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698