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

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 394 matching lines @@
     , m_fullscreenController(FullscreenController::create(this))
     , m_showFPSCounter(false)
     , m_showPaintRects(false)
     , m_showDebugBorders(false)
     , m_continuousPaintingEnabled(false)
     , m_showScrollBottleneckRects(false)
     , m_baseBackgroundColor(Color::white)
     , m_backgroundColorOverride(Color::transparent)
     , m_zoomFactorOverride(0)
     , m_userGestureObserved(false)
-    , m_topControlsContentOffset(0)
-    , m_topControlsLayoutHeight(0)
+    , m_topControlsShownRatio(0)
+    , m_topControlsHeight(0)
+    , m_topControlsShrinkLayoutSize(true)
+    , m_topControlsOffsetIsNormalized(true)
 {
     Page::PageClients pageClients;
     pageClients.chromeClient = &m_chromeClientImpl;
     pageClients.contextMenuClient = &m_contextMenuClientImpl;
     pageClients.editorClient = &m_editorClientImpl;
     pageClients.dragClient = &m_dragClientImpl;
     pageClients.inspectorClient = &m_inspectorClientImpl;
     pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
 
     m_page = adoptPtrWillBeNoop(new Page(pageClients));
@@ skipping 1283 matching lines @@
     // and thus will not be invalidated in |FrameView::performPreLayoutTasks|.
     // Therefore we should force explicit media queries invalidation here.
     if (page()->inspectorController().deviceEmulationEnabled()) {
         if (Document* document = localFrameRootTemporary()->frame()->document()) {
             document->styleResolverChanged();
             document->mediaQueryAffectingValueChanged();
         }
     }
 }
 
-void WebViewImpl::setTopControlsContentOffset(float offset)
+void WebViewImpl::setTopControlsShownRatio(float offset)
 {
-    m_topControlsContentOffset = offset;
+    m_topControlsShownRatio = offset;
+    // TODO(aelias): Rename this to ShownRatio after CC side lands.
     m_layerTreeView->setTopControlsContentOffset(offset);
     didUpdateTopControls();
 }
 
 void WebViewImpl::setTopControlsLayoutHeight(float height)
 {
-    m_topControlsLayoutHeight = height;
+    m_topControlsOffsetIsNormalized = false;
+    setTopControlsHeight(height, true);
+}
+
+void WebViewImpl::setTopControlsHeight(float height, bool topControlsShrinkLayoutSize)
+{
+    if (m_topControlsHeight == height && m_topControlsShrinkLayoutSize == topControlsShrinkLayoutSize)
+        return;
+
+    m_topControlsHeight = height;
+    m_topControlsShrinkLayoutSize = topControlsShrinkLayoutSize;
     didUpdateTopControls();
 }
 
 void WebViewImpl::didUpdateTopControls()
 {
     WebLocalFrameImpl* localFrameRoot = localFrameRootTemporary();
     if (!localFrameRoot)
         return;
 
     FrameView* view = localFrameRoot->frameView();
     if (!view)
         return;
 
-    float topControlsViewportAdjustment = m_topControlsLayoutHeight - m_topControlsContentOffset;
+    float topControlsViewportAdjustment = 0;
+    if (m_topControlsShrinkLayoutSize)
+        topControlsViewportAdjustment += m_topControlsHeight;
+    topControlsViewportAdjustment -= m_topControlsShownRatio * (m_topControlsOffsetIsNormalized ? m_topControlsHeight : 1);
+
     if (!pinchVirtualViewportEnabled()) {
         // The viewport bounds were adjusted on the compositor by this much due to top controls. Tell
         // the FrameView about it so it can make correct scroll offset clamping decisions during compositor
         // commits.
         view->setTopControlsViewportAdjustment(topControlsViewportAdjustment);
     } else {
         PinchViewport& pinchViewport = page()->frameHost().pinchViewport();
 
         if (pinchViewport.visibleRect().isEmpty())
             return;
 
         pinchViewport.setTopControlsAdjustment(topControlsViewportAdjustment);
 
 // On ChromeOS the pinch viewport can change size independent of the layout viewport due to the
 // on screen keyboard so we should only set the FrameView adjustment on Android.
-#if OS(ANDROID)
-        // Shrink the FrameView by the amount that will maintain the aspect-ratio with the PinchViewport.
-        float aspectRatio = pinchViewport.visibleRect().width() / pinchViewport.visibleRect().height();
-        float newHeight = view->unscaledVisibleContentSize(ExcludeScrollbars).width() / aspectRatio;
-        float adjustment = newHeight - view->unscaledVisibleContentSize(ExcludeScrollbars).height();
-        view->setTopControlsViewportAdjustment(adjustment);
-#endif
+        if (settings() && settings()->mainFrameResizesAreOrientationChanges()) {
+            // Shrink the FrameView by the amount that will maintain the aspect-ratio with the PinchViewport.
+            float aspectRatio = pinchViewport.visibleRect().width() / pinchViewport.visibleRect().height();
+            float newHeight = view->unscaledVisibleContentSize(ExcludeScrollbars).width() / aspectRatio;
+            float adjustment = newHeight - view->unscaledVisibleContentSize(ExcludeScrollbars).height();
+            view->setTopControlsViewportAdjustment(adjustment);
+        }
     }
 }
 
 void WebViewImpl::resize(const WebSize& newSize)
 {
     if (m_shouldAutoResize || m_size == newSize)
         return;
 
     WebLocalFrameImpl* localFrameRoot = localFrameRootTemporary();
     if (!localFrameRoot)
@@ skipping 2605 matching lines @@
     frameView->setInProgrammaticScroll(programmaticScroll);
     scrollableArea->notifyScrollPositionChanged(scrollPosition);
     frameView->setInProgrammaticScroll(oldProgrammaticScroll);
 }
 
 void WebViewImpl::applyViewportDeltas(
     const WebSize& pinchViewportDelta,
     const WebSize& outerViewportDelta,
     const WebFloatSize& elasticOverscrollDelta,
     float pageScaleDelta,
-    float topControlsDelta)
+    float topControlsShownRatioDelta)
 {
     applyViewportDeltas(
         WebFloatSize(pinchViewportDelta.width, pinchViewportDelta.height),
         WebFloatSize(outerViewportDelta.width, outerViewportDelta.height),
         elasticOverscrollDelta,
         pageScaleDelta,
-        topControlsDelta);
+        topControlsShownRatioDelta);
 }
 
 void WebViewImpl::applyViewportDeltas(
     const WebFloatSize& pinchViewportDelta,
     const WebFloatSize& outerViewportDelta,
     const WebFloatSize& elasticOverscrollDelta,
     float pageScaleDelta,
-    float topControlsDelta)
+    float topControlsShownRatioDelta)
 {
     ASSERT(pinchVirtualViewportEnabled());
 
     if (!mainFrameImpl())
         return;
     FrameView* frameView = mainFrameImpl()->frameView();
     if (!frameView)
         return;
 
-    setTopControlsContentOffset(m_topControlsContentOffset + topControlsDelta);
+    setTopControlsShownRatio(m_topControlsShownRatio + topControlsShownRatioDelta);
 
     FloatPoint pinchViewportOffset = page()->frameHost().pinchViewport().visibleRect().location();
     pinchViewportOffset.move(pinchViewportDelta.width, pinchViewportDelta.height);
     setPageScaleFactorAndLocation(pageScaleFactor() * pageScaleDelta, pinchViewportOffset);
 
     if (pageScaleDelta != 1)
         m_doubleTapZoomPending = false;
 
     frameView->setElasticOverscroll(elasticOverscrollDelta + frameView->elasticOverscroll());
 
     updateMainFrameScrollPosition(frameView->scrollableArea()->scrollPositionDouble() +
         DoubleSize(outerViewportDelta.width, outerViewportDelta.height), /* programmaticScroll */ false);
 }
 
-void WebViewImpl::applyViewportDeltas(const WebSize& scrollDelta, float pageScaleDelta, float topControlsDelta)
+void WebViewImpl::applyViewportDeltas(const WebSize& scrollDelta, float pageScaleDelta, float topControlsShownRatioDelta)
 {
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return;
 
-    setTopControlsContentOffset(m_topControlsContentOffset + topControlsDelta);
+    setTopControlsShownRatio(m_topControlsShownRatio + topControlsShownRatioDelta);
 
     if (pageScaleDelta == 1) {
         TRACE_EVENT_INSTANT2("blink", "WebViewImpl::applyScrollAndScale::scrollBy", "x", scrollDelta.width, "y", scrollDelta.height);
         WebSize webScrollOffset = mainFrame()->scrollOffset();
         IntPoint scrollOffset(webScrollOffset.width + scrollDelta.width, webScrollOffset.height + scrollDelta.height);
         updateMainFrameScrollPosition(scrollOffset, false);
     } else {
         // The page scale changed, so apply a scale and scroll in a single
         // operation.
         WebSize scrollOffset = mainFrame()->scrollOffset();
@@ skipping 159 matching lines @@
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 } // namespace blink