Index: third_party/WebKit/Source/core/frame/VisualViewport.cpp |
diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.cpp b/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
index f7f132272e8b9a4fc5cf457f4a3f4206fc52a6ef..22ad99791751532fa986f17f4849f64aca9c9604 100644 |
--- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
+++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
@@ -190,7 +190,7 @@ void VisualViewport::SetScale(float scale) { |
SetScaleAndLocation(scale, FloatPoint(offset_)); |
} |
-double VisualViewport::ScrollLeft() { |
+double VisualViewport::OffsetLeft() { |
if (!MainFrame()) |
return 0; |
@@ -200,7 +200,7 @@ double VisualViewport::ScrollLeft() { |
MainFrame()->PageZoomFactor()); |
} |
-double VisualViewport::ScrollTop() { |
+double VisualViewport::OffsetTop() { |
if (!MainFrame()) |
return 0; |
@@ -210,7 +210,7 @@ double VisualViewport::ScrollTop() { |
MainFrame()->PageZoomFactor()); |
} |
-double VisualViewport::ClientWidth() { |
+double VisualViewport::Width() { |
if (!MainFrame()) |
return 0; |
@@ -221,7 +221,7 @@ double VisualViewport::ClientWidth() { |
return width - MainFrame()->View()->VerticalScrollbarWidth() / scale_; |
} |
-double VisualViewport::ClientHeight() { |
+double VisualViewport::Height() { |
if (!MainFrame()) |
return 0; |
@@ -232,10 +232,8 @@ double VisualViewport::ClientHeight() { |
return height - MainFrame()->View()->HorizontalScrollbarHeight() / scale_; |
} |
-double VisualViewport::PageScale() { |
- UpdateStyleAndLayoutIgnorePendingStylesheets(); |
- |
- return scale_; |
+double VisualViewport::ScaleForVisualViewport() { |
+ return Scale(); |
} |
void VisualViewport::SetScaleAndLocation(float scale, |