| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "base/trace_event/trace_event_argument.h" | 10 #include "base/trace_event/trace_event_argument.h" |
| (...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1081 } | 1081 } |
| 1082 | 1082 |
| 1083 void LayerImpl::PushScrollOffsetFromMainThreadAndClobberActiveValue( | 1083 void LayerImpl::PushScrollOffsetFromMainThreadAndClobberActiveValue( |
| 1084 const gfx::ScrollOffset& scroll_offset) { | 1084 const gfx::ScrollOffset& scroll_offset) { |
| 1085 scroll_offset_->set_clobber_active_value(); | 1085 scroll_offset_->set_clobber_active_value(); |
| 1086 PushScrollOffset(&scroll_offset); | 1086 PushScrollOffset(&scroll_offset); |
| 1087 } | 1087 } |
| 1088 | 1088 |
| 1089 gfx::ScrollOffset LayerImpl::PullDeltaForMainThread() { | 1089 gfx::ScrollOffset LayerImpl::PullDeltaForMainThread() { |
| 1090 RefreshFromScrollDelegate(); | 1090 RefreshFromScrollDelegate(); |
| 1091 | 1091 return scroll_offset_->PullDeltaForMainThread(); |
| 1092 // TODO(aelias, miletus): Remove all this temporary flooring machinery when | |
| 1093 // Blink fully supports fractional scrolls. | |
| 1094 gfx::ScrollOffset current_offset = CurrentScrollOffset(); | |
| 1095 gfx::Vector2dF current_delta = ScrollDelta(); | |
| 1096 gfx::Vector2dF floored_delta(floor(current_delta.x()), | |
| 1097 floor(current_delta.y())); | |
| 1098 gfx::Vector2dF diff_delta = floored_delta - current_delta; | |
| 1099 gfx::ScrollOffset tmp_offset = ScrollOffsetWithDelta(current_offset, | |
| 1100 diff_delta); | |
| 1101 scroll_offset_->SetCurrent(tmp_offset); | |
| 1102 gfx::ScrollOffset delta = scroll_offset_->PullDeltaForMainThread(); | |
| 1103 scroll_offset_->SetCurrent(current_offset); | |
| 1104 return delta; | |
| 1105 } | 1092 } |
| 1106 | 1093 |
| 1107 void LayerImpl::RefreshFromScrollDelegate() { | 1094 void LayerImpl::RefreshFromScrollDelegate() { |
| 1108 if (scroll_offset_delegate_) { | 1095 if (scroll_offset_delegate_) { |
| 1109 SetCurrentScrollOffset( | 1096 SetCurrentScrollOffset( |
| 1110 gfx::ScrollOffset(scroll_offset_delegate_->GetCurrentScrollOffset())); | 1097 gfx::ScrollOffset(scroll_offset_delegate_->GetCurrentScrollOffset())); |
| 1111 } | 1098 } |
| 1112 } | 1099 } |
| 1113 | 1100 |
| 1114 gfx::ScrollOffset LayerImpl::CurrentScrollOffset() const { | 1101 gfx::ScrollOffset LayerImpl::CurrentScrollOffset() const { |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1542 SetNeedsPushProperties(); | 1529 SetNeedsPushProperties(); |
| 1543 layer_tree_impl()->set_needs_update_draw_properties(); | 1530 layer_tree_impl()->set_needs_update_draw_properties(); |
| 1544 if (should_have_render_surface) { | 1531 if (should_have_render_surface) { |
| 1545 render_surface_ = make_scoped_ptr(new RenderSurfaceImpl(this)); | 1532 render_surface_ = make_scoped_ptr(new RenderSurfaceImpl(this)); |
| 1546 return; | 1533 return; |
| 1547 } | 1534 } |
| 1548 render_surface_.reset(); | 1535 render_surface_.reset(); |
| 1549 } | 1536 } |
| 1550 | 1537 |
| 1551 } // namespace cc | 1538 } // namespace cc |
| OLD | NEW |