Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1371)

Unified Diff: Source/core/rendering/RenderView.cpp

Issue 751573002: Use viewportConstrainedVisibleContentRect() to get the scrolling offset (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed the 'DEPRECATED' comment Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayerClipper.cpp ('k') | Source/web/FindInPageCoordinates.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index c9c2ed349f0efea14cf424698cb400a4f1bcab85..0dcae4607a3c578a27789f2552dfcdf1e4b1f9b3 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -244,7 +244,7 @@ void RenderView::mapLocalToContainer(const RenderLayerModelObject* paintInvalida
}
if ((mode & IsFixed) && m_frameView) {
- transformState.move(m_frameView->scrollOffsetForFixedPosition());
+ transformState.move(m_frameView->scrollOffsetForViewportConstrainedObjects());
// IsFixed flag is only applicable within this RenderView.
mode &= ~IsFixed;
}
@@ -270,7 +270,7 @@ const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObj
RenderObject* container = 0;
if (m_frameView)
- offsetForFixedPosition = LayoutSize(m_frameView->scrollOffsetForFixedPosition());
+ offsetForFixedPosition = LayoutSize(m_frameView->scrollOffsetForViewportConstrainedObjects());
if (geometryMap.mapCoordinatesFlags() & TraverseDocumentBoundaries) {
if (RenderPart* parentDocRenderer = frame()->ownerRenderer()) {
@@ -298,7 +298,7 @@ const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObj
void RenderView::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
{
if (mode & IsFixed && m_frameView)
- transformState.move(m_frameView->scrollOffsetForFixedPosition());
+ transformState.move(m_frameView->scrollOffsetForViewportConstrainedObjects());
if (mode & UseTransforms && shouldUseTransformFromContainer(0)) {
TransformationMatrix t;
@@ -420,7 +420,7 @@ void RenderView::adjustViewportConstrainedOffset(LayoutRect& rect, ViewportConst
return;
if (m_frameView) {
- rect.move(m_frameView->scrollOffsetForFixedPosition());
+ rect.move(m_frameView->scrollOffsetForViewportConstrainedObjects());
// FIXME: Paint invalidation should happen after scroll updates, so there should be no pending scroll delta.
// However, we still have paint invalidation during layout, so we can't ASSERT for now. crbug.com/434950.
« no previous file with comments | « Source/core/rendering/RenderLayerClipper.cpp ('k') | Source/web/FindInPageCoordinates.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698