summaryrefslogtreecommitdiffstats
path: root/cc/layer_impl.h
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-20 07:56:16 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-20 07:56:16 +0000
commitcaa567da1b933394359aa0a2853a6aa52d5fa6a6 (patch)
tree095259fa3d5e5343303987493f6c30f6cb96a646 /cc/layer_impl.h
parent0531715857e74e3d5e1d6e23b71c3516cd0ee4f5 (diff)
downloadchromium_src-caa567da1b933394359aa0a2853a6aa52d5fa6a6.zip
chromium_src-caa567da1b933394359aa0a2853a6aa52d5fa6a6.tar.gz
chromium_src-caa567da1b933394359aa0a2853a6aa52d5fa6a6.tar.bz2
cc: Update max scroll offset for pending tree
This patch moves UpdateMaxScrollOffset and ContentSize to LayerTreeImpl so it can be called on both threads. This fixes the scrolling issues from adding the pending tree, since now the pending tree has a non-zero max scroll offset and can be scrolled. Additionally, two scrolling functions on LayerImpl (scrollBy / setSentScrollDelta) are updated to update their pending twin when called. This keeps the two layer trees in sync during scrolling operations. BUG=155209 Review URL: https://chromiumcodereview.appspot.com/11636026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl.h')
-rw-r--r--cc/layer_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 59937ba9..4b98f76 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -211,7 +211,7 @@ public:
void setImplTransform(const gfx::Transform& transform);
const gfx::Vector2d& sentScrollDelta() const { return m_sentScrollDelta; }
- void setSentScrollDelta(const gfx::Vector2d& sentScrollDelta) { m_sentScrollDelta = sentScrollDelta; }
+ void setSentScrollDelta(const gfx::Vector2d& sentScrollDelta);
// Returns the delta of the scroll that was outside of the bounds of the initial scroll
gfx::Vector2dF scrollBy(const gfx::Vector2dF& scroll);