diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 20:31:49 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 20:31:49 +0000 |
| commit | 9d075e8097f475380f58501de057dadc6db72e1d (patch) | |
| tree | 50d521a75937f02f99d0e27c943b4cec12b005fa /cc | |
| parent | 05081364f30fa845d1408124b636ddd470d8ccaa (diff) | |
| download | chromium_src-9d075e8097f475380f58501de057dadc6db72e1d.zip chromium_src-9d075e8097f475380f58501de057dadc6db72e1d.tar.gz chromium_src-9d075e8097f475380f58501de057dadc6db72e1d.tar.bz2 | |
Merge 280970 "Add switch to disable recording whole document"
> Add switch to disable recording whole document
>
> Add an android webview switch to disable the workaround to record the
> whole document on in each commit. The setting is plumbed through
> SynchronousCompositorFactory.
>
> BUG=390702
>
> Review URL: https://codereview.chromium.org/361073002
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/389973005
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@283008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/layers/picture_layer.cc | 2 | ||||
| -rw-r--r-- | cc/trees/layer_tree_settings.cc | 3 | ||||
| -rw-r--r-- | cc/trees/layer_tree_settings.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc index 61dce74..5d54574 100644 --- a/cc/layers/picture_layer.cc +++ b/cc/layers/picture_layer.cc @@ -116,7 +116,7 @@ bool PictureLayer::Update(ResourceUpdateQueue* queue, pending_invalidation_.Swap(&pile_invalidation_); pending_invalidation_.Clear(); - if (layer_tree_host()->settings().using_synchronous_renderer_compositor) { + if (layer_tree_host()->settings().record_full_layer) { // Workaround for http://crbug.com/235910 - to retain backwards compat // the full page content must always be provided in the picture layer. visible_layer_rect = gfx::Rect(bounds()); diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc index 629b4e2..1465325 100644 --- a/cc/trees/layer_tree_settings.cc +++ b/cc/trees/layer_tree_settings.cc @@ -63,7 +63,8 @@ LayerTreeSettings::LayerTreeSettings() ignore_root_layer_flings(false), use_rgba_4444_textures(false), touch_hit_testing(true), - texture_id_allocation_chunk_size(64) { + texture_id_allocation_chunk_size(64), + record_full_layer(false) { } LayerTreeSettings::~LayerTreeSettings() {} diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index 8192b3d..ba39e3c 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -79,6 +79,7 @@ class CC_EXPORT LayerTreeSettings { bool use_rgba_4444_textures; bool touch_hit_testing; size_t texture_id_allocation_chunk_size; + bool record_full_layer; LayerTreeDebugState initial_debug_state; }; |