Rename VisualViewport properties to match updated spec

third_party/WebKit/Source/core/frame/DOMVisualViewport.cpp

 /*
  * Copyright (C) 2016 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *  * Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *  * Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 36 matching lines @@
 }
 
 const AtomicString& DOMVisualViewport::InterfaceName() const {
   return EventTargetNames::DOMVisualViewport;
 }
 
 ExecutionContext* DOMVisualViewport::GetExecutionContext() const {
   return window_->GetExecutionContext();
 }
 
-float DOMVisualViewport::scrollLeft() {
+float DOMVisualViewport::offsetLeft() const {
   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() const {
   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() const {
   LocalFrame* frame = window_->GetFrame();
   if (!frame)
     return 0;
 
   FrameView* view = frame->View();
   if (!view)
     return 0;
 
   frame->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
   float viewport_x = view->GetScrollableArea()->GetScrollOffset().Width();
   return AdjustScrollForAbsoluteZoom(viewport_x, frame->PageZoomFactor());
 }
 
-float DOMVisualViewport::pageY() {
+float DOMVisualViewport::pageTop() const {
   LocalFrame* frame = window_->GetFrame();
   if (!frame)
     return 0;
 
   FrameView* view = frame->View();
   if (!view)
     return 0;
 
   frame->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
   float viewport_y = view->GetScrollableArea()->GetScrollOffset().Height();
   return AdjustScrollForAbsoluteZoom(viewport_y, frame->PageZoomFactor());
 }
 
-double DOMVisualViewport::clientWidth() {
+double DOMVisualViewport::width() const {
   LocalFrame* frame = window_->GetFrame();
   if (!frame)
     return 0;
 
   if (!frame->IsMainFrame()) {
     FloatSize viewport_size = window_->GetViewportSize(kExcludeScrollbars);
     return AdjustForAbsoluteZoom(ExpandedIntSize(viewport_size).Width(),
                                  frame->PageZoomFactor());
   }
 
   if (Page* page = frame->GetPage())
-    return page->GetVisualViewport().ClientWidth();
+    return page->GetVisualViewport().Width();
 
   return 0;
 }
 
-double DOMVisualViewport::clientHeight() {
+double DOMVisualViewport::height() const {
   LocalFrame* frame = window_->GetFrame();
   if (!frame)
     return 0;
 
   if (!frame->IsMainFrame()) {
     FloatSize viewport_size = window_->GetViewportSize(kExcludeScrollbars);
     return AdjustForAbsoluteZoom(ExpandedIntSize(viewport_size).Height(),
                                  frame->PageZoomFactor());
   }
 
   if (Page* page = frame->GetPage())
-    return page->GetVisualViewport().ClientHeight();
+    return page->GetVisualViewport().Height();
 
   return 0;
 }
 
-double DOMVisualViewport::scale() {
+double DOMVisualViewport::scale() const {
   LocalFrame* frame = window_->GetFrame();
   if (!frame)
     return 0;
 
   if (!frame->IsMainFrame())
     return 1;
 
   if (Page* page = window_->GetFrame()->GetPage())
-    return page->GetVisualViewport().PageScale();
+    return page->GetVisualViewport().ScaleForVisualViewport();
 
   return 0;
 }
 
 }  // namespace blink