diff options
| author | thestig <thestig@chromium.org> | 2014-12-04 23:18:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-05 07:18:33 +0000 |
| commit | d5ce8e26cdd0fbaff95b79115d7d159aac83488a (patch) | |
| tree | b1183ab8d5504028f278c81c46291a5c75f95127 /cc/trees/layer_tree_host_common.h | |
| parent | 8d7db928ac1f3deea4eb851ab7c1a17d1272b8f0 (diff) | |
| download | chromium_src-d5ce8e26cdd0fbaff95b79115d7d159aac83488a.zip chromium_src-d5ce8e26cdd0fbaff95b79115d7d159aac83488a.tar.gz chromium_src-d5ce8e26cdd0fbaff95b79115d7d159aac83488a.tar.bz2 | |
Revert of Translate the overscroll elasticity layer by the overscroll amount (patchset #4 id:60001 of https://codereview.chromium.org/776923004/)
Reason for revert:
Broke MSAN bots with uninitialized value in layer_tree_host_common.cc with the layer == globals.elastic_overscroll_application_layer check.
http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20MSan%20Browser%20%281%29/builds/3355
Original issue's description:
> Translate the overscroll elasticity layer by the overscroll amount
>
> Add a synced property, elastic_overscroll, similar to page_scale_factor.
>
> Use this property to translate the overscroll elasticity layer.
>
> With this in place, the overscroll effect works most of the time,
> when using impl-thread events.
>
> BUG=133097
>
> Committed: https://crrev.com/f3488b0d6f26b000335cb72ceb210c3d77accb7e
> Cr-Commit-Position: refs/heads/master@{#306991}
TBR=aelias@chromium.org,enne@chromium.org,ccameron@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=133097
Review URL: https://codereview.chromium.org/771793004
Cr-Commit-Position: refs/heads/master@{#306995}
Diffstat (limited to 'cc/trees/layer_tree_host_common.h')
| -rw-r--r-- | cc/trees/layer_tree_host_common.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h index 81aca55..349b341 100644 --- a/cc/trees/layer_tree_host_common.h +++ b/cc/trees/layer_tree_host_common.h @@ -38,8 +38,6 @@ class CC_EXPORT LayerTreeHostCommon { float device_scale_factor, float page_scale_factor, const LayerType* page_scale_application_layer, - const gfx::Vector2dF& elastic_overscroll, - const LayerType* elastic_overscroll_application_layer, int max_texture_size, bool can_use_lcd_text, bool layers_always_allowed_lcd_text, @@ -53,9 +51,6 @@ class CC_EXPORT LayerTreeHostCommon { device_scale_factor(device_scale_factor), page_scale_factor(page_scale_factor), page_scale_application_layer(page_scale_application_layer), - elastic_overscroll(elastic_overscroll), - elastic_overscroll_application_layer( - elastic_overscroll_application_layer), max_texture_size(max_texture_size), can_use_lcd_text(can_use_lcd_text), layers_always_allowed_lcd_text(layers_always_allowed_lcd_text), @@ -71,8 +66,6 @@ class CC_EXPORT LayerTreeHostCommon { float device_scale_factor; float page_scale_factor; const LayerType* page_scale_application_layer; - gfx::Vector2dF elastic_overscroll; - const LayerType* elastic_overscroll_application_layer; int max_texture_size; bool can_use_lcd_text; bool layers_always_allowed_lcd_text; @@ -152,7 +145,6 @@ struct CC_EXPORT ScrollAndScaleSet { std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; float page_scale_delta; - gfx::Vector2dF elastic_overscroll_delta; float top_controls_delta; ScopedPtrVector<SwapPromise> swap_promises; }; @@ -231,8 +223,6 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType, 1.f, 1.f, NULL, - gfx::Vector2dF(), - NULL, std::numeric_limits<int>::max() / 2, false, false, @@ -258,8 +248,6 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType, 1.f, 1.f, NULL, - gfx::Vector2dF(), - NULL, std::numeric_limits<int>::max() / 2, false, false, |