| OLD | NEW |
| 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/in_process_renderer/in_process_renderer_client
.h" | 8 #include "android_webview/browser/in_process_renderer/in_process_renderer_client
.h" |
| 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" | 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" |
| 10 #include "android_webview/common/aw_switches.h" | 10 #include "android_webview/common/aw_switches.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl | 55 webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl |
| 56 ::EnableVirtualizedContext(); | 56 ::EnableVirtualizedContext(); |
| 57 | 57 |
| 58 CommandLine* cl = CommandLine::ForCurrentProcess(); | 58 CommandLine* cl = CommandLine::ForCurrentProcess(); |
| 59 if (UIAndRendererCompositorThreadsNotMerged()) { | 59 if (UIAndRendererCompositorThreadsNotMerged()) { |
| 60 cl->AppendSwitch(cc::switches::kEnableCompositorFrameMessage); | 60 cl->AppendSwitch(cc::switches::kEnableCompositorFrameMessage); |
| 61 cl->AppendSwitch(switches::kEnableWebViewSynchronousAPIs); | 61 cl->AppendSwitch(switches::kEnableWebViewSynchronousAPIs); |
| 62 } else { | 62 } else { |
| 63 cl->AppendSwitch(switches::kEnableSynchronousRendererCompositor); | 63 cl->AppendSwitch(switches::kEnableSynchronousRendererCompositor); |
| 64 cl->AppendSwitch(switches::kEnableVsyncNotification); | 64 cl->AppendSwitch(switches::kEnableVsyncNotification); |
| 65 cl->AppendSwitch("testing-webview-gl-mode"); |
| 65 } | 66 } |
| 66 | 67 |
| 67 // WebView uses the existing Android View edge effect for overscroll glow. | 68 // WebView uses the existing Android View edge effect for overscroll glow. |
| 68 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); | 69 cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); |
| 69 | 70 |
| 70 return false; | 71 return false; |
| 71 } | 72 } |
| 72 | 73 |
| 73 void AwMainDelegate::PreSandboxStartup() { | 74 void AwMainDelegate::PreSandboxStartup() { |
| 74 // TODO(torne): When we have a separate renderer process, we need to handle | 75 // TODO(torne): When we have a separate renderer process, we need to handle |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 AwBrowserContext* browser_context) { | 145 AwBrowserContext* browser_context) { |
| 145 return AwGeolocationPermissionContext::Create(browser_context); | 146 return AwGeolocationPermissionContext::Create(browser_context); |
| 146 } | 147 } |
| 147 | 148 |
| 148 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( | 149 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( |
| 149 content::WebContents* web_contents) { | 150 content::WebContents* web_contents) { |
| 150 return AwWebContentsViewDelegate::Create(web_contents); | 151 return AwWebContentsViewDelegate::Create(web_contents); |
| 151 } | 152 } |
| 152 | 153 |
| 153 } // namespace android_webview | 154 } // namespace android_webview |
| OLD | NEW |