diff options
| author | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 13:54:04 +0000 |
|---|---|---|
| committer | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 13:54:04 +0000 |
| commit | 0723af168d54504a5cd24d01910c8616d9d751e5 (patch) | |
| tree | 9fcf4e0c8757712c42ed65760cc15d547633b02b /cc/trees/layer_tree_impl.h | |
| parent | a3e111e7b3f38ce2d9aa3e55c3e6adb8e8f48fec (diff) | |
| download | chromium_src-0723af168d54504a5cd24d01910c8616d9d751e5.zip chromium_src-0723af168d54504a5cd24d01910c8616d9d751e5.tar.gz chromium_src-0723af168d54504a5cd24d01910c8616d9d751e5.tar.bz2 | |
Revert "Plumb PinchVirtualViewport layers into CC."
This reverts commit 4c136fe1ecbb55ba5b4b05c1f811c20b77f29beb.
This CL was causing some layout tests to fail, so reverting until it is fixed.
TBR=abarth@chromium.org
BUG=
Review URL: https://codereview.chromium.org/23483044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_impl.h')
| -rw-r--r-- | cc/trees/layer_tree_impl.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h index 9464d95..de59c12 100644 --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h @@ -118,10 +118,6 @@ class CC_EXPORT LayerTreeImpl { void FindRootScrollLayer(); void UpdateMaxScrollOffset(); - void SetViewportLayersFromIds(int page_scale_layer_id, - int inner_viewport_scroll_layer_id, - int outer_viewport_scroll_layer_id); - void ClearViewportLayers(); void ApplySentScrollAndScaleDeltasFromAbortedCommit(); void ApplyScrollDeltasSinceBeginFrame(); @@ -231,10 +227,6 @@ class CC_EXPORT LayerTreeImpl { SkColor background_color_; bool has_transparent_background_; - LayerImpl* page_scale_layer_; - LayerImpl* inner_viewport_scroll_layer_; - LayerImpl* outer_viewport_scroll_layer_; - float page_scale_factor_; float page_scale_delta_; float sent_page_scale_delta_; |