| Index: sky/engine/core/rendering/RenderView.cpp
|
| diff --git a/sky/engine/core/rendering/RenderView.cpp b/sky/engine/core/rendering/RenderView.cpp
|
| index 8f5a7dd127c4577ff3aae2fb25c20b94b3263a3a..945d22aebc36711dc2b9e1601d0e095f32573e36 100644
|
| --- a/sky/engine/core/rendering/RenderView.cpp
|
| +++ b/sky/engine/core/rendering/RenderView.cpp
|
| @@ -200,23 +200,15 @@ void RenderView::mapLocalToContainer(const RenderLayerModelObject* paintInvalida
|
| getTransformFromContainer(0, LayoutSize(), t);
|
| transformState.applyTransform(t);
|
| }
|
| -
|
| - if (mode & IsFixed && m_frameView)
|
| - transformState.move(m_frameView->scrollOffsetForFixedPosition());
|
| -
|
| - if (paintInvalidationContainer == this)
|
| - return;
|
| }
|
|
|
| const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
|
| {
|
| + // FIXME(sky): Can we remove offsetForFixedPosition?
|
| LayoutSize offsetForFixedPosition;
|
| LayoutSize offset;
|
| RenderObject* container = 0;
|
|
|
| - if (m_frameView)
|
| - offsetForFixedPosition = m_frameView->scrollOffsetForFixedPosition();
|
| -
|
| // If a container was specified, and was not 0 or the RenderView, then we
|
| // should have found it by now unless we're traversing to a parent document.
|
| ASSERT_ARG(ancestorToStopAt, !ancestorToStopAt || ancestorToStopAt == this || container);
|
| @@ -234,9 +226,6 @@ const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObj
|
|
|
| void RenderView::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
|
| {
|
| - if (mode & IsFixed && m_frameView)
|
| - transformState.move(m_frameView->scrollOffsetForFixedPosition());
|
| -
|
| if (mode & UseTransforms && shouldUseTransformFromContainer(0)) {
|
| TransformationMatrix t;
|
| getTransformFromContainer(0, LayoutSize(), t);
|
| @@ -360,12 +349,7 @@ void RenderView::invalidatePaintForViewAndCompositedLayers()
|
| compositor()->fullyInvalidatePaint();
|
| }
|
|
|
| -void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* invalidationState) const
|
| -{
|
| - mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, IsNotFixedPosition, invalidationState);
|
| -}
|
| -
|
| -void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, ViewportConstrainedPosition viewportConstraint, const PaintInvalidationState* state) const
|
| +void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* state) const
|
| {
|
| if (style()->isFlippedBlocksWritingMode()) {
|
| // We have to flip by hand since the view's logical height has not been determined. We
|
| @@ -376,10 +360,6 @@ void RenderView::mapRectToPaintInvalidationBacking(const RenderLayerModelObject*
|
| rect.setX(viewWidth() - rect.maxX());
|
| }
|
|
|
| - if (viewportConstraint == IsFixedPosition && m_frameView) {
|
| - rect.move(m_frameView->scrollOffsetForFixedPosition());
|
| - }
|
| -
|
| // Apply our transform if we have one (because of full page zooming).
|
| if (!paintInvalidationContainer && layer() && layer()->transform())
|
| rect = layer()->transform()->mapRect(rect);
|
|
|