Add autoresize capability for Chromium.

Source/WebKit/chromium/src/WebViewImpl.cpp

 /*
  * Copyright (C) 2011 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 38 matching lines @@
 #include "DocumentLoader.h"
 #include "DragController.h"
 #include "DragData.h"
 #include "DragScrollTimer.h"
 #include "DragSession.h"
 #include "Editor.h"
 #include "EventHandler.h"
 #include "Extensions3D.h"
 #include "FocusController.h"
 #include "FontDescription.h"
+#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameSelection.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GeolocationClientProxy.h"
 #include "GraphicsContext.h"
 #include "GraphicsContext3D.h"
 #include "GraphicsContext3DPrivate.h"
 #include "HTMLInputElement.h"
 #include "HTMLMediaElement.h"
@@ skipping 258 matching lines @@
 WebViewImpl::WebViewImpl(WebViewClient* client)
     : m_client(client)
     , m_autofillClient(0)
     , m_permissionClient(0)
     , m_spellCheckClient(0)
     , m_chromeClientImpl(this)
     , m_contextMenuClientImpl(this)
     , m_dragClientImpl(this)
     , m_editorClientImpl(this)
     , m_inspectorClientImpl(this)
+    , m_shouldAutoSize(false)
     , m_observedNewNavigation(false)
 #ifndef NDEBUG
     , m_newNavigationLoader(0)
 #endif
     , m_zoomLevel(0)
     , m_minimumZoomLevel(zoomFactorToZoomLevel(minTextSizeMultiplier))
     , m_maximumZoomLevel(zoomFactorToZoomLevel(maxTextSizeMultiplier))
     , m_minimumPageScaleFactor(minPageScaleFactor)
     , m_maximumPageScaleFactor(maxPageScaleFactor)
     , m_contextMenuAllowed(false)
@@ skipping 687 matching lines @@
         mainFrameImpl()->frameView()->willStartLiveResize();
 
     Frame* frame = mainFrameImpl()->frame();
     WebPluginContainerImpl* pluginContainer = WebFrameImpl::pluginContainerFromFrame(frame);
     if (pluginContainer)
         pluginContainer->willStartLiveResize();
 }
 
 void WebViewImpl::resize(const WebSize& newSize)
 {
+    ASSERT(!m_shouldAutoSize);
     if (m_size == newSize)
         return;
     m_size = newSize;
 
     if (mainFrameImpl()->frameView()) {
         mainFrameImpl()->frameView()->resize(m_size.width, m_size.height);
         mainFrameImpl()->frame()->eventHandler()->sendResizeEvent();
     }
 
     if (m_client) {
@@ skipping 989 matching lines @@
 
 #if USE(ACCELERATED_COMPOSITING)
     // Also notify the base layer, which RenderLayerCompositor does not see.
     if (m_nonCompositedContentHost) {
         m_nonCompositedContentHost->topLevelRootLayer()->deviceOrPageScaleFactorChanged();
         updateLayerTreeViewport();
     }
 #endif
 }
 
+void WebViewImpl::enableAutoSizeMode(bool enable, const WebSize& minSize, const WebSize& maxSize)
+{
+    m_shouldAutoSize = enable;
+    m_minAutoSize = minSize;
+    m_maxAutoSize = maxSize;
+    if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame()->view())
+        return;
+
+    mainFrameImpl()->frame()->view()->enableAutoSizeMode(m_shouldAutoSize, m_minAutoSize, m_maxAutoSize);
+}
+
 void WebViewImpl::setPageScaleFactorLimits(float minPageScale, float maxPageScale)
 {
     m_minimumPageScaleFactor = min(max(minPageScale, minPageScaleFactor), maxPageScaleFactor) * deviceScaleFactor();
     m_maximumPageScaleFactor = max(min(maxPageScale, maxPageScaleFactor), minPageScaleFactor) * deviceScaleFactor();
 
     if (m_size.width && mainFrame() && mainFrame()->contentsSize().width) {
         // Limit page scaling down to the document width.
         int viewWidth = m_size.width;
         int unscaledContentWidth = mainFrame()->contentsSize().width / pageScaleFactor();
         m_minimumPageScaleFactor = max(m_minimumPageScaleFactor, static_cast<float>(viewWidth) / unscaledContentWidth);
@@ skipping 478 matching lines @@
     m_newNavigationLoader = 0;
 #endif
     m_observedNewNavigation = false;
 }
 
 void WebViewImpl::layoutUpdated(WebFrameImpl* webframe)
 {
     if (!m_client || webframe != mainFrameImpl())
         return;
 
+    if (m_shouldAutoSize && mainFrameImpl()->frame() && mainFrameImpl()->frame()->view()) {
+        WebSize frameSize = mainFrameImpl()->frame()->view()->frameRect().size();
+        if (frameSize != m_size) {
+            m_size = frameSize;
+            m_client->setSize(m_size);
+            // TODO: move to higher level?? this is sync in after the layout code??

[darin (slow to review), 2011/11/30 23:29:05]

making this async could also introduce problems as you could have other tasks in
the queue that will care about the current value of m_size.

maybe the solution should simply defer this work until the last possible moment.
 i'm not clear on what the callstack looks like leading to here, but maybe there
is a spot further up the stack where we can notify the embedder about the size
change?

[levin, 2011/12/01 20:23:45]

After looking at this code further, I realized that it basically is async (the
resize event gets queued up and painting is async).

I didn't to anything to make sure that a resize event doesn't trigger another
queue up another resize event. I don't have a way to know that a resize event it
being handled (and it wasn't critical to handle this issue -- just a nice to
have).

+            // TODO: Before checking in make this async (to avoid unexpected recursion in js code)

[levin, 2011/11/30 12:03:47]

This needs to be fixed up still and possibly consolidated with code from
WebViewImpl::resize. 

+            // and don't allow this resize event to trigger another resize event.
+            mainFrameImpl()->frame()->eventHandler()->sendResizeEvent();
+
+            // Should this just call void WebViewImpl::resize(const WebSize& newSize)?

[darin (slow to review), 2011/11/30 23:29:05]

probably should factor out some common code into a helper function

[levin, 2011/12/01 20:23:45]

Done.

+            if (isAcceleratedCompositingActive()) {
+#if USE(ACCELERATED_COMPOSITING)
+                updateLayerTreeViewport();
+#endif
+            } else {
+                WebRect damagedRect(0, 0, m_size.width, m_size.height);
+                m_client->didInvalidateRect(damagedRect);
+            }
+        }
+    }
+
     m_client->didUpdateLayout();
 }
 
 bool WebViewImpl::useExternalPopupMenus()
 {
     return shouldUseExternalPopupMenus;
 }
 
 bool WebViewImpl::navigationPolicyFromMouseEvent(unsigned short button,
                                                  bool ctrl, bool shift,
@@ skipping 463 matching lines @@
 }
 
 #if ENABLE(GESTURE_RECOGNIZER)
 void WebViewImpl::resetGestureRecognizer()
 {
     m_gestureRecognizer->reset();
 }
 #endif
 
 } // namespace WebKit