| Index: cc/layers/layer_impl.cc
|
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
|
| index 50501a9cf1b3c21c60a98d80cdc5966beeb0fcad..ebe21580a04abb226e8c32d0c81991bbf10f0147 100644
|
| --- a/cc/layers/layer_impl.cc
|
| +++ b/cc/layers/layer_impl.cc
|
| @@ -1088,20 +1088,7 @@ void LayerImpl::PushScrollOffsetFromMainThreadAndClobberActiveValue(
|
|
|
| gfx::ScrollOffset LayerImpl::PullDeltaForMainThread() {
|
| RefreshFromScrollDelegate();
|
| -
|
| - // TODO(aelias, miletus): Remove all this temporary flooring machinery when
|
| - // Blink fully supports fractional scrolls.
|
| - gfx::ScrollOffset current_offset = CurrentScrollOffset();
|
| - gfx::Vector2dF current_delta = ScrollDelta();
|
| - gfx::Vector2dF floored_delta(floor(current_delta.x()),
|
| - floor(current_delta.y()));
|
| - gfx::Vector2dF diff_delta = floored_delta - current_delta;
|
| - gfx::ScrollOffset tmp_offset = ScrollOffsetWithDelta(current_offset,
|
| - diff_delta);
|
| - scroll_offset_->SetCurrent(tmp_offset);
|
| - gfx::ScrollOffset delta = scroll_offset_->PullDeltaForMainThread();
|
| - scroll_offset_->SetCurrent(current_offset);
|
| - return delta;
|
| + return scroll_offset_->PullDeltaForMainThread();
|
| }
|
|
|
| void LayerImpl::RefreshFromScrollDelegate() {
|
|
|