diff options
| author | Bo Liu <boliu@chromium.org> | 2016-02-12 10:26:23 -0800 |
|---|---|---|
| committer | Bo Liu <boliu@chromium.org> | 2016-02-12 18:28:41 +0000 |
| commit | 7f0582702d0e67b2dffa3d5d8dffd508cb798c49 (patch) | |
| tree | 8f7203e065ec0a2d566ebb2b8c63582c4e19ab7b /content/public | |
| parent | 59e29d78bd78a2f1bf68c9240ce67c6407d1ac42 (diff) | |
| download | chromium_src-7f0582702d0e67b2dffa3d5d8dffd508cb798c49.zip chromium_src-7f0582702d0e67b2dffa3d5d8dffd508cb798c49.tar.gz chromium_src-7f0582702d0e67b2dffa3d5d8dffd508cb798c49.tar.bz2 | |
[Merge M49] Disable canvas 2d COW optimization on adreno 4xx
This avoids a crash in Android WebView due to driver bugs. See bug for
details.
Note this should be a no-op change on all chrome platforms except
Android WebView since only webview uses
kEnableThreadedTextureMailboxes.
BUG=585250
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1685013002
Cr-Commit-Position: refs/heads/master@{#375016}
(cherry picked from commit cfcae41e2e3f8efb14aeb1d49d5e49bbf3afbe79)
Review URL: https://codereview.chromium.org/1696823002 .
Cr-Commit-Position: refs/branch-heads/2623@{#381}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/common/common_param_traits_macros.h | 1 | ||||
| -rw-r--r-- | content/public/common/web_preferences.cc | 1 | ||||
| -rw-r--r-- | content/public/common/web_preferences.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h index a9811c4..e3efceb 100644 --- a/content/public/common/common_param_traits_macros.h +++ b/content/public/common/common_param_traits_macros.h @@ -157,6 +157,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) IPC_STRUCT_TRAITS_MEMBER(unified_textchecker_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_2d_canvas_enabled) IPC_STRUCT_TRAITS_MEMBER(minimum_accelerated_2d_canvas_size) + IPC_STRUCT_TRAITS_MEMBER(disable_2d_canvas_copy_on_write) IPC_STRUCT_TRAITS_MEMBER(antialiased_2d_canvas_disabled) IPC_STRUCT_TRAITS_MEMBER(antialiased_clips_2d_canvas_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_2d_canvas_msaa_sample_count) diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc index 4a83a70..8ec979c 100644 --- a/content/public/common/web_preferences.cc +++ b/content/public/common/web_preferences.cc @@ -112,6 +112,7 @@ WebPreferences::WebPreferences() unified_textchecker_enabled(false), accelerated_2d_canvas_enabled(false), minimum_accelerated_2d_canvas_size(257 * 256), + disable_2d_canvas_copy_on_write(false), antialiased_2d_canvas_disabled(false), antialiased_clips_2d_canvas_enabled(false), accelerated_2d_canvas_msaa_sample_count(0), diff --git a/content/public/common/web_preferences.h b/content/public/common/web_preferences.h index de5a3c5..9926fc6 100644 --- a/content/public/common/web_preferences.h +++ b/content/public/common/web_preferences.h @@ -120,6 +120,7 @@ struct CONTENT_EXPORT WebPreferences { bool unified_textchecker_enabled; bool accelerated_2d_canvas_enabled; int minimum_accelerated_2d_canvas_size; + bool disable_2d_canvas_copy_on_write; bool antialiased_2d_canvas_disabled; bool antialiased_clips_2d_canvas_enabled; int accelerated_2d_canvas_msaa_sample_count; |