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

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

Issue 183943002: Re-enable compositor touch hit testing in Android WebView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « no previous file | no next file » | 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/gpu_memory_buffer_factory_impl.h" 8 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
9 #include "android_webview/browser/hardware_renderer.h" 9 #include "android_webview/browser/hardware_renderer.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"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 cl->AppendSwitch(switches::kDisableSharedWorkers); 68 cl->AppendSwitch(switches::kDisableSharedWorkers);
69 69
70 // Ganesh backed 2D-Canvas integration is being implemented but not ready to 70 // Ganesh backed 2D-Canvas integration is being implemented but not ready to
71 // be turned on by default yet. 71 // be turned on by default yet.
72 if (!cl->HasSwitch(switches::kEnableAccelerated2dCanvas)) 72 if (!cl->HasSwitch(switches::kEnableAccelerated2dCanvas))
73 cl->AppendSwitch(switches::kDisableAccelerated2dCanvas); 73 cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
74 74
75 // File system API not supported (requires some new API; internal bug 6930981) 75 // File system API not supported (requires some new API; internal bug 6930981)
76 cl->AppendSwitch(switches::kDisableFileSystem); 76 cl->AppendSwitch(switches::kDisableFileSystem);
77 77
78 // Disable compositor touch hit testing for now to mitigate risk of bugs.
79 cl->AppendSwitch(cc::switches::kDisableCompositorTouchHitTesting);
80
81 #if defined(VIDEO_HOLE) 78 #if defined(VIDEO_HOLE)
82 // Support EME/L1 with hole-punching. 79 // Support EME/L1 with hole-punching.
83 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); 80 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing);
84 #endif 81 #endif
85 return false; 82 return false;
86 } 83 }
87 84
88 void AwMainDelegate::PreSandboxStartup() { 85 void AwMainDelegate::PreSandboxStartup() {
89 // TODO(torne): When we have a separate renderer process, we need to handle 86 // TODO(torne): When we have a separate renderer process, we need to handle
90 // being passed open FDs for the resource paks here. 87 // being passed open FDs for the resource paks here.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( 144 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
148 content::WebContents* web_contents) { 145 content::WebContents* web_contents) {
149 return AwWebContentsViewDelegate::Create(web_contents); 146 return AwWebContentsViewDelegate::Create(web_contents);
150 } 147 }
151 148
152 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { 149 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() {
153 return new AwWebPreferencesPopulaterImpl(); 150 return new AwWebPreferencesPopulaterImpl();
154 } 151 }
155 152
156 } // namespace android_webview 153 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698