Chromium Code Reviews| Index: cc/layers/layer.cc |
| diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc |
| index 1a22d9254a9b5bded9b1560c4769760efa57779d..cf949419890f581d28c00ca2056abf61b09f2bcd 100644 |
| --- a/cc/layers/layer.cc |
| +++ b/cc/layers/layer.cc |
| @@ -654,7 +654,7 @@ void Layer::RemoveClipChild(Layer* child) { |
| SetNeedsCommit(); |
| } |
| -void Layer::SetScrollOffset(gfx::Vector2d scroll_offset) { |
| +void Layer::SetScrollOffset(const gfx::ScrollOffset& scroll_offset) { |
| DCHECK(IsPropertyChangeAllowed()); |
| if (scroll_offset_ == scroll_offset) |
| @@ -663,7 +663,8 @@ void Layer::SetScrollOffset(gfx::Vector2d scroll_offset) { |
| SetNeedsCommit(); |
| } |
| -void Layer::SetScrollOffsetFromImplSide(const gfx::Vector2d& scroll_offset) { |
| +void Layer::SetScrollOffsetFromImplSide( |
| + const gfx::ScrollOffset& scroll_offset) { |
| DCHECK(IsPropertyChangeAllowed()); |
| // This function only gets called during a BeginMainFrame, so there |
| // is no need to call SetNeedsUpdate here. |
| @@ -963,8 +964,9 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { |
| layer->SetScrollOffset(scroll_offset_); |
| } else { |
| layer->SetScrollOffsetAndDelta( |
| - scroll_offset_, layer->ScrollDelta() - layer->sent_scroll_delta()); |
| - layer->SetSentScrollDelta(gfx::Vector2d()); |
| + scroll_offset_, |
| + layer->ScrollDelta() - layer->sent_scroll_delta());; |
|
danakj
2014/09/25 22:01:26
double;;
Yufeng Shen (Slow to review)
2014/09/26 20:19:07
Done.
|
| + layer->SetSentScrollDelta(gfx::Vector2dF()); |
| } |
| // Wrap the copy_requests_ in a PostTask to the main thread. |
| @@ -1093,7 +1095,7 @@ void Layer::ClearRenderSurfaceLayerList() { |
| draw_properties_.render_surface->layer_list().clear(); |
| } |
| -gfx::Vector2dF Layer::ScrollOffsetForAnimation() const { |
| +gfx::ScrollOffset Layer::ScrollOffsetForAnimation() const { |
| return TotalScrollOffset(); |
| } |