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

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 389973005: Merge 280970 "Add switch to disable recording whole document" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2062/src/
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « android_webview/common/aw_switches.cc ('k') | cc/layers/picture_layer.cc » ('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/lib/main/aw_main_delegate.h" 5 #include "android_webview/lib/main/aw_main_delegate.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/browser/browser_view_renderer.h" 8 #include "android_webview/browser/browser_view_renderer.h"
9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
11 #include "android_webview/common/aw_switches.h"
11 #include "android_webview/lib/aw_browser_dependency_factory_impl.h" 12 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
12 #include "android_webview/native/aw_quota_manager_bridge_impl.h" 13 #include "android_webview/native/aw_quota_manager_bridge_impl.h"
13 #include "android_webview/native/aw_web_contents_view_delegate.h" 14 #include "android_webview/native/aw_web_contents_view_delegate.h"
14 #include "android_webview/native/aw_web_preferences_populater_impl.h" 15 #include "android_webview/native/aw_web_preferences_populater_impl.h"
15 #include "android_webview/native/external_video_surface_container_impl.h" 16 #include "android_webview/native/external_video_surface_container_impl.h"
16 #include "android_webview/renderer/aw_content_renderer_client.h" 17 #include "android_webview/renderer/aw_content_renderer_client.h"
17 #include "base/command_line.h" 18 #include "base/command_line.h"
18 #include "base/cpu.h" 19 #include "base/cpu.h"
19 #include "base/lazy_instance.h" 20 #include "base/lazy_instance.h"
20 #include "base/logging.h" 21 #include "base/logging.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // Fullscreen video with subtitle is not yet supported. 72 // Fullscreen video with subtitle is not yet supported.
72 cl->AppendSwitch(switches::kDisableOverlayFullscreenVideoSubtitle); 73 cl->AppendSwitch(switches::kDisableOverlayFullscreenVideoSubtitle);
73 74
74 #if defined(VIDEO_HOLE) 75 #if defined(VIDEO_HOLE)
75 // Support EME/L1 with hole-punching. 76 // Support EME/L1 with hole-punching.
76 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); 77 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing);
77 #endif 78 #endif
78 79
79 // WebRTC hardware decoding is not supported, internal bug 15075307 80 // WebRTC hardware decoding is not supported, internal bug 15075307
80 cl->AppendSwitch(switches::kDisableWebRtcHWDecoding); 81 cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
82
83 if (cl->HasSwitch(switches::kDisableRecordDocumentWorkaround))
84 content::SynchronousCompositor::DisableRecordFullLayer();
85
81 return false; 86 return false;
82 } 87 }
83 88
84 void AwMainDelegate::PreSandboxStartup() { 89 void AwMainDelegate::PreSandboxStartup() {
85 // TODO(torne): When we have a separate renderer process, we need to handle 90 // TODO(torne): When we have a separate renderer process, we need to handle
86 // being passed open FDs for the resource paks here. 91 // being passed open FDs for the resource paks here.
87 #if defined(ARCH_CPU_ARM_FAMILY) 92 #if defined(ARCH_CPU_ARM_FAMILY)
88 // Create an instance of the CPU class to parse /proc/cpuinfo and cache 93 // Create an instance of the CPU class to parse /proc/cpuinfo and cache
89 // cpu_brand info. 94 // cpu_brand info.
90 base::CPU cpu_info; 95 base::CPU cpu_info;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 155
151 #if defined(VIDEO_HOLE) 156 #if defined(VIDEO_HOLE)
152 content::ExternalVideoSurfaceContainer* 157 content::ExternalVideoSurfaceContainer*
153 AwMainDelegate::CreateExternalVideoSurfaceContainer( 158 AwMainDelegate::CreateExternalVideoSurfaceContainer(
154 content::WebContents* web_contents) { 159 content::WebContents* web_contents) {
155 return new ExternalVideoSurfaceContainerImpl(web_contents); 160 return new ExternalVideoSurfaceContainerImpl(web_contents);
156 } 161 }
157 #endif 162 #endif
158 163
159 } // namespace android_webview 164 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/common/aw_switches.cc ('k') | cc/layers/picture_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698