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

Unified Diff: Source/core/layout/LayoutView.cpp

Issue 1162623007: Removed redundant rect methods on FrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 months 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/layout/LayoutBox.cpp ('k') | Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutView.cpp
diff --git a/Source/core/layout/LayoutView.cpp b/Source/core/layout/LayoutView.cpp
index a8c768da00bac6053fd17a489776fd7988b7dab0..420970ec29130aae75e4a59fb122f13e96c79aa8 100644
--- a/Source/core/layout/LayoutView.cpp
+++ b/Source/core/layout/LayoutView.cpp
@@ -290,7 +290,7 @@ void LayoutView::mapLocalToContainer(const LayoutBoxModelObject* paintInvalidati
}
if ((mode & IsFixed) && m_frameView) {
- transformState.move(m_frameView->scrollOffsetForViewportConstrainedObjects());
+ transformState.move(toIntSize(m_frameView->scrollPosition()));
if (hasOverflowClip())
transformState.move(scrolledContentOffset());
// IsFixed flag is only applicable within this LayoutView.
@@ -318,7 +318,7 @@ const LayoutObject* LayoutView::pushMappingToContainer(const LayoutBoxModelObjec
LayoutObject* container = 0;
if (m_frameView) {
- offsetForFixedPosition = LayoutSize(m_frameView->scrollOffsetForViewportConstrainedObjects());
+ offsetForFixedPosition = LayoutSize(toIntSize(m_frameView->scrollPosition()));
if (hasOverflowClip())
offsetForFixedPosition = LayoutSize(scrolledContentOffset());
}
@@ -349,7 +349,7 @@ const LayoutObject* LayoutView::pushMappingToContainer(const LayoutBoxModelObjec
void LayoutView::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
{
if (mode & IsFixed && m_frameView)
- transformState.move(m_frameView->scrollOffsetForViewportConstrainedObjects());
+ transformState.move(toIntSize(m_frameView->scrollPosition()));
if (mode & UseTransforms && shouldUseTransformFromContainer(0)) {
TransformationMatrix t;
@@ -473,7 +473,7 @@ void LayoutView::adjustViewportConstrainedOffset(LayoutRect& rect, ViewportConst
return;
if (m_frameView) {
- rect.move(m_frameView->scrollOffsetForViewportConstrainedObjects());
+ rect.move(toIntSize(m_frameView->scrollPosition()));
if (hasOverflowClip())
rect.move(scrolledContentOffset());
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698