diff options
| author | bokan <bokan@chromium.org> | 2015-07-30 09:08:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-30 16:09:51 +0000 |
| commit | 1f86d8fcaa3462def9e92722c0097a7b38c8fe1d (patch) | |
| tree | 1b4d042fc90432b871d4890431368e79e8d477b7 /cc/layers | |
| parent | 3d44d0f1ab27508e2555b0bb7ce8e694103992b5 (diff) | |
| download | chromium_src-1f86d8fcaa3462def9e92722c0097a7b38c8fe1d.zip chromium_src-1f86d8fcaa3462def9e92722c0097a7b38c8fe1d.tar.gz chromium_src-1f86d8fcaa3462def9e92722c0097a7b38c8fe1d.tar.bz2 | |
Assume outer viewport always exists in Viewport::ScrollBy.
The outer viewport should always exist in the layer hierarchy but this
conditional exists because old unit tests were creating hierarchies from
pre-virtual-viewport days. This patch fixes these tests and removes the
check.
BUG=425102
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1268623003
Cr-Commit-Position: refs/heads/master@{#341128}
Diffstat (limited to 'cc/layers')
| -rw-r--r-- | cc/layers/viewport.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cc/layers/viewport.cc b/cc/layers/viewport.cc index 2b1a3e7..d9ae5f4 100644 --- a/cc/layers/viewport.cc +++ b/cc/layers/viewport.cc @@ -43,11 +43,9 @@ Viewport::ScrollResult Viewport::ScrollBy(const gfx::Vector2dF& delta, gfx::Vector2dF pending_content_delta = content_delta; - if (OuterScrollLayer()) { - pending_content_delta -= - host_impl_->ScrollLayer(OuterScrollLayer(), pending_content_delta, - viewport_point, is_direct_manipulation); - } + pending_content_delta -= + host_impl_->ScrollLayer(OuterScrollLayer(), pending_content_delta, + viewport_point, is_direct_manipulation); ScrollResult result; |