Rename VisualViewport properties to match updated spec

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

 /*
  * Copyright (C) 2013 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
@@ skipping 60 matching lines @@
 
 VisualViewport::~VisualViewport() {
   SendUMAMetrics();
 }
 
 DEFINE_TRACE(VisualViewport) {
   visitor->Trace(page_);
   ScrollableArea::Trace(visitor);
 }
 
-void VisualViewport::UpdateStyleAndLayoutIgnorePendingStylesheets() {
+void VisualViewport::UpdateStyleAndLayoutIgnorePendingStylesheets() const {
   if (!MainFrame())
     return;
 
   if (Document* document = MainFrame()->GetDocument())
     document->UpdateStyleAndLayoutIgnorePendingStylesheets();
 }
 
 void VisualViewport::EnqueueScrollEvent() {
   if (!RuntimeEnabledFeatures::visualViewportAPIEnabled())
     return;
@@ skipping 91 matching lines @@
 }
 
 void VisualViewport::Move(const ScrollOffset& delta) {
   SetLocation(FloatPoint(offset_ + delta));
 }
 
 void VisualViewport::SetScale(float scale) {
   SetScaleAndLocation(scale, FloatPoint(offset_));
 }
 
-double VisualViewport::ScrollLeft() {
+double VisualViewport::OffsetLeft() const {
   if (!MainFrame())
     return 0;
 
   UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   return AdjustScrollForAbsoluteZoom(VisibleRect().X(),
                                      MainFrame()->PageZoomFactor());
 }
 
-double VisualViewport::ScrollTop() {
+double VisualViewport::OffsetTop() const {
   if (!MainFrame())
     return 0;
 
   UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   return AdjustScrollForAbsoluteZoom(VisibleRect().Y(),
                                      MainFrame()->PageZoomFactor());
 }
 
-double VisualViewport::ClientWidth() {
+double VisualViewport::Width() const {
   if (!MainFrame())
     return 0;
 
   UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   float width = AdjustScrollForAbsoluteZoom(VisibleSize().Width(),
                                             MainFrame()->PageZoomFactor());
   return width - MainFrame()->View()->VerticalScrollbarWidth() / scale_;
 }
 
-double VisualViewport::ClientHeight() {
+double VisualViewport::Height() const {
   if (!MainFrame())
     return 0;
 
   UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   float height = AdjustScrollForAbsoluteZoom(VisibleSize().Height(),
                                              MainFrame()->PageZoomFactor());
   return height - MainFrame()->View()->HorizontalScrollbarHeight() / scale_;
 }
 
-double VisualViewport::PageScale() {
-  UpdateStyleAndLayoutIgnorePendingStylesheets();
-
-  return scale_;
+double VisualViewport::ScaleForVisualViewport() const {
+  return Scale();
 }
 
 void VisualViewport::SetScaleAndLocation(float scale,
                                          const FloatPoint& location) {
   if (DidSetScaleOrLocation(scale, location))
     NotifyRootFrameViewport();
 }
 
 bool VisualViewport::DidSetScaleOrLocation(float scale,
                                            const FloatPoint& location) {
@@ skipping 609 matching lines @@
   } else if (graphics_layer == root_transform_layer_.get()) {
     name = "Root Transform Layer";
   } else {
     NOTREACHED();
   }
 
   return name;
 }
 
 }  // namespace blink