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

Unified Diff: Source/web/ViewportAnchor.cpp

Issue 648913002: Clean up vestiges of ScrollView. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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/web/PopupListBox.cpp ('k') | Source/web/WebPluginScrollbarImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ViewportAnchor.cpp
diff --git a/Source/web/ViewportAnchor.cpp b/Source/web/ViewportAnchor.cpp
index 837cb25b060106b5731368db64dafb6a0d452c16..e70f295d646f95c7668dd87e32261e580f65ea95 100644
--- a/Source/web/ViewportAnchor.cpp
+++ b/Source/web/ViewportAnchor.cpp
@@ -148,10 +148,10 @@ void ViewportAnchor::setAnchor(const IntRect& outerViewRect, const IntRect& inne
m_anchorInNodeCoords.scale(1.f / m_anchorNodeBounds.width(), 1.f / m_anchorNodeBounds.height());
}
-void ViewportAnchor::computeOrigins(const FrameView& scrollView, const FloatSize& innerSize,
+void ViewportAnchor::computeOrigins(const FrameView& frameView, const FloatSize& innerSize,
IntPoint& mainFrameOffset, FloatPoint& pinchViewportOffset) const
{
- IntSize outerSize = scrollView.visibleContentRect().size();
+ IntSize outerSize = frameView.visibleContentRect().size();
// Compute the viewport origins in CSS pixels relative to the document.
FloatSize absPinchViewportOffset = m_normalizedPinchViewportOffset;
@@ -165,7 +165,7 @@ void ViewportAnchor::computeOrigins(const FrameView& scrollView, const FloatSize
moveToEncloseRect(outerRect, innerRect);
- outerRect.setLocation(scrollView.adjustScrollPositionWithinRange(outerRect.location()));
+ outerRect.setLocation(frameView.adjustScrollPositionWithinRange(outerRect.location()));
moveIntoRect(innerRect, outerRect);
« no previous file with comments | « Source/web/PopupListBox.cpp ('k') | Source/web/WebPluginScrollbarImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698