Normalize top controls offset to (0, 1), Blink-side.

Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 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 102 matching lines @@
     virtual void themeChanged() override;
     virtual bool handleInputEvent(const WebInputEvent&) override;
     virtual void setCursorVisibilityState(bool isVisible) override;
     virtual bool hasTouchEventHandlersAt(const WebPoint&) override;
 
     // FIXME(bokan): Old pinch path only - This should be removed once old pinch
     // is removed.
     virtual void applyViewportDeltas(
         const WebSize& scrollDelta,
         float pageScaleDelta,
-        float topControlsDelta) override;
+        float topControlsShownRatioDelta) override;
     virtual void applyViewportDeltas(
         const WebSize& pinchViewportDelta,
         const WebSize& mainFrameDelta,
         const WebFloatSize& elasticOverscrollDelta,
         float pageScaleDelta,
-        float topControlsDelta) override;
+        float topControlsShownRatioDelta) override;
     virtual void applyViewportDeltas(
         const WebFloatSize& pinchViewportDelta,
         const WebFloatSize& mainFrameDelta,
         const WebFloatSize& elasticOverscrollDelta,
         float pageScaleDelta,
-        float topControlsDelta) override;
+        float topControlsShownRatioDelta) override;
     virtual void mouseCaptureLost() override;
     virtual void setFocus(bool enable) override;
     virtual bool setComposition(
         const WebString& text,
         const WebVector<WebCompositionUnderline>& underlines,
         int selectionStart,
         int selectionEnd) override;
     virtual bool confirmComposition() override;
     virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) override;
     virtual bool confirmComposition(const WebString& text) override;
@@ skipping 362 matching lines @@
     // Exposed for tests.
     WebVector<WebCompositionUnderline> compositionUnderlines() const;
 
     WebLayerTreeView* layerTreeView() const { return m_layerTreeView; }
 
     bool pinchVirtualViewportEnabled() const;
 
     bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_matchesHeuristicsForGpuRasterization; }
 
     virtual void setTopControlsLayoutHeight(float) override;
+    virtual void setTopControlsHeight(float height, bool topControlsShrinkLayoutSize) override;
 
     virtual void forceNextWebGLContextCreationToFail() override;
 
     IntSize mainFrameSize();
 
 private:
     void didUpdateTopControls();
-    void setTopControlsContentOffset(float);
+    void setTopControlsShownRatio(float);
 
     // TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made private to
     // prevent external usage
     virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) override;
     void setPageScaleFactorAndLocation(float, const FloatPoint&);
 
     void scrollAndRescaleViewports(float scaleFactor, const IntPoint& mainFrameOrigin, const FloatPoint& pinchViewportOrigin);
 
     IntRect visibleRectInDocument() const;
 
@@ skipping 213 matching lines @@
     bool m_showPaintRects;
     bool m_showDebugBorders;
     bool m_continuousPaintingEnabled;
     bool m_showScrollBottleneckRects;
     WebColor m_baseBackgroundColor;
     WebColor m_backgroundColorOverride;
     float m_zoomFactorOverride;
 
     bool m_userGestureObserved;
 
-    // The top controls offset since the last compositor commit.
-    float m_topControlsContentOffset;
+    // The top controls shown amount (normalized from 0 to 1) since the last
+    // compositor commit.
+    float m_topControlsShownRatio;
 
-    // The top controls offset at the time of the last Resize event. This is the
-    // amount that the viewport was shrunk by to accomodate the top controls.
-    float m_topControlsLayoutHeight;
+    float m_topControlsHeight;
+    // If this is true, then the embedder shrunk the WebView size by the top
+    // controls height.
+    bool m_topControlsShrinkLayoutSize;
+
+    // If true, then top controls is normalized between 0 and 1; if false,
+    // then it's an absolute value.
+    // TODO(aelias): Delete this after Blink roll.
+    bool m_topControlsOffsetIsNormalized;
 };
 
 DEFINE_TYPE_CASTS(WebViewImpl, WebWidget, widget, widget->isWebView(), widget.isWebView());
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 } // namespace blink
 
 #endif