Index: cc/layer_tree_host_impl.cc |
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc |
index f314eabe9342e5f2e0f627a1226a624f95301aa9..065e830d44b2f4f2f066a2f7567a14f88ae3d8f9 100644 |
--- a/cc/layer_tree_host_impl.cc |
+++ b/cc/layer_tree_host_impl.cc |
@@ -771,7 +771,7 @@ CompositorFrameMetadata LayerTreeHostImpl::makeCompositorFrameMetadata() const |
{ |
CompositorFrameMetadata metadata; |
metadata.page_scale_factor = m_pinchZoomViewport.total_page_scale_factor(); |
- metadata.viewport_size = m_pinchZoomViewport.ZoomedViewport().size(); |
+ metadata.viewport_size = m_pinchZoomViewport.ZoomedViewportSizeInLayoutSpace(); |
metadata.root_layer_size = activeTree()->ScrollableSize(); |
metadata.min_page_scale_factor = m_pinchZoomViewport.min_page_scale_factor(); |
metadata.max_page_scale_factor = m_pinchZoomViewport.max_page_scale_factor(); |
@@ -1251,15 +1251,10 @@ static gfx::Vector2dF scrollLayerWithViewportSpaceDelta(PinchZoomViewport* viewp |
// Apply the scroll delta. |
gfx::Vector2dF previousDelta = layerImpl.scrollDelta(); |
- gfx::Vector2dF unscrolled = layerImpl.scrollBy(localEndPoint - localStartPoint); |
- gfx::Vector2dF scrollAmount = localEndPoint - localStartPoint; |
- |
- gfx::Vector2dF viewportAppliedPan; |
- if (viewport) |
- viewportAppliedPan = unscrolled - viewport->ApplyScroll(unscrolled); |
trchen
2013/01/24 23:05:31
This eliminated the use of viewport. Do we still n
|
+ layerImpl.scrollBy(localEndPoint - localStartPoint); |
// Get the end point in the layer's content space so we can apply its screenSpaceTransform. |
- gfx::PointF actualLocalEndPoint = localStartPoint + layerImpl.scrollDelta() + viewportAppliedPan - previousDelta; |
+ gfx::PointF actualLocalEndPoint = localStartPoint + layerImpl.scrollDelta() - previousDelta; |
gfx::PointF actualLocalContentEndPoint = gfx::ScalePoint(actualLocalEndPoint, 1 / widthScale, 1 / heightScale); |
// Calculate the applied scroll delta in viewport space coordinates. |
@@ -1379,8 +1374,7 @@ void LayerTreeHostImpl::pinchGestureUpdate(float magnifyDelta, gfx::Point anchor |
move.Scale(1 / m_pinchZoomViewport.page_scale_factor()); |
} |
- gfx::Vector2dF scrollOverflow = m_settings.pageScalePinchZoomEnabled ? m_pinchZoomViewport.ApplyScroll(move) : move; |
- rootScrollLayer()->scrollBy(scrollOverflow); |
+ rootScrollLayer()->scrollBy(move); |
if (rootScrollLayer()->scrollbarAnimationController()) |
rootScrollLayer()->scrollbarAnimationController()->didPinchGestureUpdate(base::TimeTicks::Now()); |
@@ -1460,8 +1454,8 @@ static void collectScrollDeltas(ScrollAndScaleSet* scrollInfo, LayerImpl* layerI |
if (!layerImpl) |
return; |
- if (!layerImpl->scrollDelta().IsZero()) { |
- gfx::Vector2d scrollDelta = gfx::ToFlooredVector2d(layerImpl->scrollDelta()); |
+ gfx::Vector2d scrollDelta = gfx::ToFlooredVector2d(layerImpl->scrollDelta()); |
+ if (!scrollDelta.IsZero()) { |
LayerTreeHostCommon::ScrollUpdateInfo scroll; |
scroll.layerId = layerImpl->id(); |
scroll.scrollDelta = scrollDelta; |
@@ -1477,12 +1471,10 @@ scoped_ptr<ScrollAndScaleSet> LayerTreeHostImpl::processScrollDeltas() |
{ |
scoped_ptr<ScrollAndScaleSet> scrollInfo(new ScrollAndScaleSet()); |
- if (m_pinchGestureActive || m_pageScaleAnimation) { |
+ if (!m_settings.pageScalePinchZoomEnabled && (m_pinchGestureActive || m_pageScaleAnimation)) { |
scrollInfo->pageScaleDelta = 1; |
m_pinchZoomViewport.set_sent_page_scale_delta(1); |
- // FIXME(aelias): Make pinch-zoom painting optimization compatible with |
- // compositor-side scaling. |
- if (!m_settings.pageScalePinchZoomEnabled && m_pinchGestureActive) |
+ if (m_pinchGestureActive) |
computePinchZoomDeltas(scrollInfo.get()); |
else if (m_pageScaleAnimation.get()) |
computeDoubleTapZoomDeltas(scrollInfo.get()); |