| Index: third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp b/third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp
|
| index 62f03220359eb7eb5d4f655febe15fea91304f11..d880bbb21fd665622fa150b895c5de024d61fb17 100644
|
| --- a/third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp
|
| @@ -54,29 +54,29 @@ ExecutionContext* DOMVisualViewport::GetExecutionContext() const {
|
| return window_->GetExecutionContext();
|
| }
|
|
|
| -float DOMVisualViewport::scrollLeft() {
|
| +float DOMVisualViewport::offsetLeft() {
|
| LocalFrame* frame = window_->GetFrame();
|
| if (!frame || !frame->IsMainFrame())
|
| return 0;
|
|
|
| if (Page* page = frame->GetPage())
|
| - return page->GetVisualViewport().ScrollLeft();
|
| + return page->GetVisualViewport().OffsetLeft();
|
|
|
| return 0;
|
| }
|
|
|
| -float DOMVisualViewport::scrollTop() {
|
| +float DOMVisualViewport::offsetTop() {
|
| LocalFrame* frame = window_->GetFrame();
|
| if (!frame || !frame->IsMainFrame())
|
| return 0;
|
|
|
| if (Page* page = frame->GetPage())
|
| - return page->GetVisualViewport().ScrollTop();
|
| + return page->GetVisualViewport().OffsetTop();
|
|
|
| return 0;
|
| }
|
|
|
| -float DOMVisualViewport::pageX() {
|
| +float DOMVisualViewport::pageLeft() {
|
| LocalFrame* frame = window_->GetFrame();
|
| if (!frame)
|
| return 0;
|
| @@ -90,7 +90,7 @@ float DOMVisualViewport::pageX() {
|
| return AdjustScrollForAbsoluteZoom(viewport_x, frame->PageZoomFactor());
|
| }
|
|
|
| -float DOMVisualViewport::pageY() {
|
| +float DOMVisualViewport::pageTop() {
|
| LocalFrame* frame = window_->GetFrame();
|
| if (!frame)
|
| return 0;
|
| @@ -104,7 +104,7 @@ float DOMVisualViewport::pageY() {
|
| return AdjustScrollForAbsoluteZoom(viewport_y, frame->PageZoomFactor());
|
| }
|
|
|
| -double DOMVisualViewport::clientWidth() {
|
| +double DOMVisualViewport::width() {
|
| LocalFrame* frame = window_->GetFrame();
|
| if (!frame)
|
| return 0;
|
| @@ -116,12 +116,12 @@ double DOMVisualViewport::clientWidth() {
|
| }
|
|
|
| if (Page* page = frame->GetPage())
|
| - return page->GetVisualViewport().ClientWidth();
|
| + return page->GetVisualViewport().Width();
|
|
|
| return 0;
|
| }
|
|
|
| -double DOMVisualViewport::clientHeight() {
|
| +double DOMVisualViewport::height() {
|
| LocalFrame* frame = window_->GetFrame();
|
| if (!frame)
|
| return 0;
|
| @@ -133,7 +133,7 @@ double DOMVisualViewport::clientHeight() {
|
| }
|
|
|
| if (Page* page = frame->GetPage())
|
| - return page->GetVisualViewport().ClientHeight();
|
| + return page->GetVisualViewport().Height();
|
|
|
| return 0;
|
| }
|
| @@ -147,7 +147,7 @@ double DOMVisualViewport::scale() {
|
| return 1;
|
|
|
| if (Page* page = window_->GetFrame()->GetPage())
|
| - return page->GetVisualViewport().PageScale();
|
| + return page->GetVisualViewport().ScaleForVisualViewport();
|
|
|
| return 0;
|
| }
|
|
|