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/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_result_codes.h" | 8 #include "android_webview/browser/aw_result_codes.h" |
9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
10 #include "base/android/memory_pressure_listener_android.h" | 10 #include "base/android/memory_pressure_listener_android.h" |
| 11 #include "base/command_line.h" |
11 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
12 #include "base/path_service.h" | 13 #include "base/path_service.h" |
13 #include "content/public/browser/render_process_host.h" | 14 #include "content/public/browser/render_process_host.h" |
14 #include "content/public/common/content_client.h" | 15 #include "content/public/common/content_client.h" |
| 16 #include "content/public/common/content_switches.h" |
15 #include "content/public/common/result_codes.h" | 17 #include "content/public/common/result_codes.h" |
16 #include "content/public/common/url_utils.h" | 18 #include "content/public/common/url_utils.h" |
| 19 #include "gpu/command_buffer/service/mailbox_synchronizer.h" |
17 #include "net/android/network_change_notifier_factory_android.h" | 20 #include "net/android/network_change_notifier_factory_android.h" |
18 #include "net/base/network_change_notifier.h" | 21 #include "net/base/network_change_notifier.h" |
19 #include "ui/base/l10n/l10n_util_android.h" | 22 #include "ui/base/l10n/l10n_util_android.h" |
20 #include "ui/base/layout.h" | 23 #include "ui/base/layout.h" |
21 #include "ui/base/resource/resource_bundle.h" | 24 #include "ui/base/resource/resource_bundle.h" |
22 #include "ui/base/ui_base_paths.h" | 25 #include "ui/base/ui_base_paths.h" |
23 | 26 |
24 namespace android_webview { | 27 namespace android_webview { |
25 | 28 |
26 AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context) | 29 AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context) |
(...skipping 25 matching lines...) Expand all Loading... |
52 pak_path.AppendASCII("webviewchromium.pak"), | 55 pak_path.AppendASCII("webviewchromium.pak"), |
53 ui::SCALE_FACTOR_NONE); | 56 ui::SCALE_FACTOR_NONE); |
54 | 57 |
55 base::android::MemoryPressureListenerAndroid::RegisterSystemCallback( | 58 base::android::MemoryPressureListenerAndroid::RegisterSystemCallback( |
56 base::android::AttachCurrentThread()); | 59 base::android::AttachCurrentThread()); |
57 | 60 |
58 return content::RESULT_CODE_NORMAL_EXIT; | 61 return content::RESULT_CODE_NORMAL_EXIT; |
59 } | 62 } |
60 | 63 |
61 void AwBrowserMainParts::PreMainMessageLoopRun() { | 64 void AwBrowserMainParts::PreMainMessageLoopRun() { |
| 65 if (!gpu::gles2::MailboxSynchronizer::Initialize()) { |
| 66 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 67 switches::kDisableAccelerated2dCanvas); |
| 68 } |
| 69 |
62 browser_context_->PreMainMessageLoopRun(); | 70 browser_context_->PreMainMessageLoopRun(); |
63 // This is needed for WebView Classic backwards compatibility | 71 // This is needed for WebView Classic backwards compatibility |
64 // See crbug.com/298495 | 72 // See crbug.com/298495 |
65 content::SetMaxURLChars(20 * 1024 * 1024); | 73 content::SetMaxURLChars(20 * 1024 * 1024); |
66 } | 74 } |
67 | 75 |
68 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) { | 76 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) { |
69 // Android WebView does not use default MessageLoop. It has its own | 77 // Android WebView does not use default MessageLoop. It has its own |
70 // Android specific MessageLoop. | 78 // Android specific MessageLoop. |
71 return true; | 79 return true; |
72 } | 80 } |
73 | 81 |
74 } // namespace android_webview | 82 } // namespace android_webview |
OLD | NEW |