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

Side by Side Diff: cc/layers/layer_impl.cc

Issue 23533051: [android_webview] Use a fraction to calculate scroll offset. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert changes from previous patch set as they break AwSettings tests Created 7 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 | Annotate | Revision Log
« no previous file with comments | « cc/input/layer_scroll_offset_delegate.h ('k') | cc/layers/layer_impl_unittest.cc » ('j') | 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/layers/layer_impl.h" 5 #include "cc/layers/layer_impl.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "cc/animation/animation_registrar.h" 9 #include "cc/animation/animation_registrar.h"
10 #include "cc/animation/scrollbar_animation_controller.h" 10 #include "cc/animation/scrollbar_animation_controller.h"
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 void LayerImpl::SetScrollOffsetDelegate( 994 void LayerImpl::SetScrollOffsetDelegate(
995 LayerScrollOffsetDelegate* scroll_offset_delegate) { 995 LayerScrollOffsetDelegate* scroll_offset_delegate) {
996 // Having both a scroll parent and a scroll offset delegate is unsupported. 996 // Having both a scroll parent and a scroll offset delegate is unsupported.
997 DCHECK(!scroll_parent_); 997 DCHECK(!scroll_parent_);
998 if (!scroll_offset_delegate && scroll_offset_delegate_) { 998 if (!scroll_offset_delegate && scroll_offset_delegate_) {
999 scroll_delta_ = 999 scroll_delta_ =
1000 scroll_offset_delegate_->GetTotalScrollOffset() - scroll_offset_; 1000 scroll_offset_delegate_->GetTotalScrollOffset() - scroll_offset_;
1001 } 1001 }
1002 gfx::Vector2dF total_offset = TotalScrollOffset(); 1002 gfx::Vector2dF total_offset = TotalScrollOffset();
1003 scroll_offset_delegate_ = scroll_offset_delegate; 1003 scroll_offset_delegate_ = scroll_offset_delegate;
1004 if (scroll_offset_delegate_) 1004 if (scroll_offset_delegate_) {
1005 scroll_offset_delegate_->SetMaxScrollOffset(max_scroll_offset_);
1005 scroll_offset_delegate_->SetTotalScrollOffset(total_offset); 1006 scroll_offset_delegate_->SetTotalScrollOffset(total_offset);
1007 }
1006 } 1008 }
1007 1009
1008 void LayerImpl::SetScrollOffset(gfx::Vector2d scroll_offset) { 1010 void LayerImpl::SetScrollOffset(gfx::Vector2d scroll_offset) {
1009 SetScrollOffsetAndDelta(scroll_offset, ScrollDelta()); 1011 SetScrollOffsetAndDelta(scroll_offset, ScrollDelta());
1010 } 1012 }
1011 1013
1012 void LayerImpl::SetScrollOffsetAndDelta(gfx::Vector2d scroll_offset, 1014 void LayerImpl::SetScrollOffsetAndDelta(gfx::Vector2d scroll_offset,
1013 gfx::Vector2dF scroll_delta) { 1015 gfx::Vector2dF scroll_delta) {
1014 bool changed = false; 1016 bool changed = false;
1015 1017
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 1083
1082 void LayerImpl::DidBeginTracing() {} 1084 void LayerImpl::DidBeginTracing() {}
1083 1085
1084 void LayerImpl::DidLoseOutputSurface() {} 1086 void LayerImpl::DidLoseOutputSurface() {}
1085 1087
1086 void LayerImpl::SetMaxScrollOffset(gfx::Vector2d max_scroll_offset) { 1088 void LayerImpl::SetMaxScrollOffset(gfx::Vector2d max_scroll_offset) {
1087 if (max_scroll_offset_ == max_scroll_offset) 1089 if (max_scroll_offset_ == max_scroll_offset)
1088 return; 1090 return;
1089 max_scroll_offset_ = max_scroll_offset; 1091 max_scroll_offset_ = max_scroll_offset;
1090 1092
1093 if (scroll_offset_delegate_)
1094 scroll_offset_delegate_->SetMaxScrollOffset(max_scroll_offset_);
1095
1091 layer_tree_impl()->set_needs_update_draw_properties(); 1096 layer_tree_impl()->set_needs_update_draw_properties();
1092 UpdateScrollbarPositions(); 1097 UpdateScrollbarPositions();
1093 } 1098 }
1094 1099
1095 void LayerImpl::DidBecomeActive() { 1100 void LayerImpl::DidBecomeActive() {
1096 if (layer_tree_impl_->settings().scrollbar_animator == 1101 if (layer_tree_impl_->settings().scrollbar_animator ==
1097 LayerTreeSettings::NoAnimator) { 1102 LayerTreeSettings::NoAnimator) {
1098 return; 1103 return;
1099 } 1104 }
1100 1105
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 1324
1320 size_t LayerImpl::GPUMemoryUsageInBytes() const { return 0; } 1325 size_t LayerImpl::GPUMemoryUsageInBytes() const { return 0; }
1321 1326
1322 scoped_ptr<base::Value> LayerImpl::AsValue() const { 1327 scoped_ptr<base::Value> LayerImpl::AsValue() const {
1323 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); 1328 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
1324 AsValueInto(state.get()); 1329 AsValueInto(state.get());
1325 return state.PassAs<base::Value>(); 1330 return state.PassAs<base::Value>();
1326 } 1331 }
1327 1332
1328 } // namespace cc 1333 } // namespace cc
OLDNEW
« no previous file with comments | « cc/input/layer_scroll_offset_delegate.h ('k') | cc/layers/layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698