Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: cc/trees/layer_tree_impl.cc

Issue 642113004: cc: Damage layer on delegated scroll (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DidScroll Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_impl.h" 5 #include "cc/trees/layer_tree_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <set> 8 #include <set>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 outer_viewport_scroll_delegate_proxy_ = make_scoped_ptr( 921 outer_viewport_scroll_delegate_proxy_ = make_scoped_ptr(
922 new LayerScrollOffsetDelegateProxy(OuterViewportScrollLayer(), 922 new LayerScrollOffsetDelegateProxy(OuterViewportScrollLayer(),
923 root_layer_scroll_offset_delegate_, 923 root_layer_scroll_offset_delegate_,
924 this)); 924 this));
925 outer_viewport_scroll_layer_->SetScrollOffsetDelegate( 925 outer_viewport_scroll_layer_->SetScrollOffsetDelegate(
926 outer_viewport_scroll_delegate_proxy_.get()); 926 outer_viewport_scroll_delegate_proxy_.get());
927 } 927 }
928 } 928 }
929 } 929 }
930 930
931 void LayerTreeImpl::OnRootLayerDelegatedScrollOffsetChanged() {
932 DCHECK(root_layer_scroll_offset_delegate_);
933 if (inner_viewport_scroll_layer_) {
934 inner_viewport_scroll_layer_->DidScroll();
935 }
936 if (outer_viewport_scroll_layer_) {
937 outer_viewport_scroll_layer_->DidScroll();
938 }
939 }
940
931 void LayerTreeImpl::UpdateScrollOffsetDelegate() { 941 void LayerTreeImpl::UpdateScrollOffsetDelegate() {
932 DCHECK(InnerViewportScrollLayer()); 942 DCHECK(InnerViewportScrollLayer());
933 DCHECK(root_layer_scroll_offset_delegate_); 943 DCHECK(root_layer_scroll_offset_delegate_);
934 944
935 gfx::ScrollOffset offset = 945 gfx::ScrollOffset offset =
936 inner_viewport_scroll_delegate_proxy_->last_set_scroll_offset(); 946 inner_viewport_scroll_delegate_proxy_->last_set_scroll_offset();
937 947
938 if (OuterViewportScrollLayer()) 948 if (OuterViewportScrollLayer())
939 offset += outer_viewport_scroll_delegate_proxy_->last_set_scroll_offset(); 949 offset += outer_viewport_scroll_delegate_proxy_->last_set_scroll_offset();
940 950
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 page_scale, 1510 page_scale,
1501 duration.InSecondsF()); 1511 duration.InSecondsF());
1502 } 1512 }
1503 } 1513 }
1504 1514
1505 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { 1515 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() {
1506 return page_scale_animation_.Pass(); 1516 return page_scale_animation_.Pass();
1507 } 1517 }
1508 1518
1509 } // namespace cc 1519 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698