gpu: Remove in-process GPU service support for CHROMIUM_image.

android_webview/lib/main/aw_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/browser_view_renderer.h"
-#include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
 #include "android_webview/native/aw_media_url_interceptor.h"
 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
 #include "android_webview/native/aw_web_contents_view_delegate.h"
 #include "android_webview/native/aw_web_preferences_populater_impl.h"
 #include "android_webview/native/external_video_surface_container_impl.h"
 #include "android_webview/renderer/aw_content_renderer_client.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
@@ skipping 13 matching lines @@
 
 namespace {
 
 // TODO(boliu): Remove this global Allow once the underlying issues are
 // resolved - http://crbug.com/240453. See AwMainDelegate::RunProcess below.
 base::LazyInstance<scoped_ptr<ScopedAllowWaitForLegacyWebViewApi> >
     g_allow_wait_in_ui_thread = LAZY_INSTANCE_INITIALIZER;
 
 }
 
-AwMainDelegate::AwMainDelegate()
-    : gpu_memory_buffer_factory_(new GpuMemoryBufferFactoryImpl) {
+AwMainDelegate::AwMainDelegate() {
 }
 
 AwMainDelegate::~AwMainDelegate() {
 }
 
 bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   content::SetContentClient(&content_client_);
 
-  CommandLine* cl = CommandLine::ForCurrentProcess();

[boliu, 2014/09/29 15:47:18]

Still need cl to be defined.

[reveman, 2014/09/29 18:32:09]

Done.

-  bool zero_copy_disabled_by_switch = cl->HasSwitch(switches::kDisableZeroCopy);
-  bool use_zero_copy = !zero_copy_disabled_by_switch &&
-                       cl->HasSwitch(switches::kEnableZeroCopy) &&
-                       gpu_memory_buffer_factory_.get()->Initialize();
-
-  if (use_zero_copy) {
-    cl->AppendSwitch(switches::kEnableZeroCopy);
-  } else if (!zero_copy_disabled_by_switch) {
-    cl->AppendSwitch(switches::kDisableZeroCopy);
-  }
-
   content::BrowserMediaPlayerManager::RegisterMediaUrlInterceptor(
       new AwMediaUrlInterceptor());
 
   BrowserViewRenderer::CalculateTileMemoryPolicy(use_zero_copy);

[boliu, 2014/09/29 15:47:18]

Clean this up and remove the use_zero_copy branch in that function.

[reveman, 2014/09/29 18:32:09]

Done.

 
   cl->AppendSwitch(switches::kEnableBeginFrameScheduling);
   cl->AppendSwitch(switches::kEnableImplSidePainting);
 
   // WebView uses the Android system's scrollbars and overscroll glow.
   cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect);
 
   // Not yet supported in single-process mode.
   cl->AppendSwitch(switches::kDisableSharedWorkers);
 
@@ skipping 86 matching lines @@
 
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwMainDelegate::CreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return new ExternalVideoSurfaceContainerImpl(web_contents);
 }
 #endif
 
 }  // namespace android_webview