Changeset 109288 in webkit

Timestamp:

Feb 29, 2012, 5:29:56 PM (15 years ago)

Author:

levin@chromium.org

Message:

[chromium] Add the ability to turn off autoresize.
​https://bugs.webkit.org/show_bug.cgi?id=77452

Reviewed by Darin Fisher.

Source/WebCore:

Test: fast/autoresize/turn-off-autoresize.html

• page/FrameView.cpp:

(WebCore::FrameView::enableAutoSizeMode): Fix the code
path for turning off autoresize to set the scrollbars to auto.

Source/WebKit/chromium:

• public/WebView.h:

(WebKit::WebViewImpl::enableAutoResizeMode): Cleaned up the api.
(WebKit::WebViewImpl::disableAutoResizeMode): Added the ability to disable auto-resize.
(WebKit::WebViewImpl::enableAutoResizeMode): Deprecated it.

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::enableAutoResizeMode): Adjust for new api.
(WebKit::WebViewImpl::disableAutoResizeMode): Allow turning off autoresize.
(WebKit::WebViewImpl::enableAutoResizeMode): Call the other two apis, but
this api will be deleted shortly.
(WebKit::WebViewImpl::configureAutoResizeMode): Common code.

• src/WebViewImpl.h:

(WebViewImpl): Adjust to new public api.

Tools:

• DumpRenderTree/chromium/LayoutTestController.cpp:

(LayoutTestController::LayoutTestController): Expose a way to turn off auto-resize.
(LayoutTestController::enableAutoResizeMode): Ditto and adjust to new WebKit api.
(LayoutTestController::disableAutoResizeMode): Ditto.

• DumpRenderTree/chromium/LayoutTestController.h: Ditto.

LayoutTests:

• fast/autoresize/turn-off-autoresize-expected.txt: Added.
• fast/autoresize/turn-off-autoresize.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/autoresize/turn-off-autoresize-expected.txt (added)
• LayoutTests/fast/autoresize/turn-off-autoresize.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebView.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)
• Source/WebKit/chromium/src/WebViewImpl.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/LayoutTestController.cpp (modified) (2 diffs)
• Tools/DumpRenderTree/chromium/LayoutTestController.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-29  David Levin  <levin@chromium.org>
+
+        [chromium] Add the ability to turn off autoresize.
+        https://bugs.webkit.org/show_bug.cgi?id=77452
+
+        Reviewed by Darin Fisher.
+
+        * fast/autoresize/turn-off-autoresize-expected.txt: Added.
+        * fast/autoresize/turn-off-autoresize.html: Added.
+
 2012-02-29  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  David Levin  <levin@chromium.org>
+
+        [chromium] Add the ability to turn off autoresize.
+        https://bugs.webkit.org/show_bug.cgi?id=77452
+
+        Reviewed by Darin Fisher.
+
+        Test: fast/autoresize/turn-off-autoresize.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::enableAutoSizeMode): Fix the code
+        path for turning off autoresize to set the scrollbars to auto.
+
 2012-02-29  David Barton  <dbarton@mathscribe.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -3025 +3025 @@
     m_maxAutoSize = maxSize;
 
-    if (!m_shouldAutoSize)
-        return;
-
     setNeedsLayout();
     scheduleRelayout();
+    if (m_shouldAutoSize)
+        return;
+
+    // Since autosize mode forces the scrollbar mode, change them to being auto.
+    setVerticalScrollbarLock(false);
+    setHorizontalScrollbarLock(false);
+    setScrollbarModes(ScrollbarAuto, ScrollbarAuto);
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-29  David Levin  <levin@chromium.org>
+
+        [chromium] Add the ability to turn off autoresize.
+        https://bugs.webkit.org/show_bug.cgi?id=77452
+
+        Reviewed by Darin Fisher.
+
+        * public/WebView.h:
+        (WebKit::WebViewImpl::enableAutoResizeMode): Cleaned up the api.
+        (WebKit::WebViewImpl::disableAutoResizeMode): Added the ability to disable auto-resize.
+        (WebKit::WebViewImpl::enableAutoResizeMode): Deprecated it.
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::enableAutoResizeMode): Adjust for new api.
+        (WebKit::WebViewImpl::disableAutoResizeMode): Allow turning off autoresize.
+        (WebKit::WebViewImpl::enableAutoResizeMode): Call the other two apis, but
+        this api will be deleted shortly.
+        (WebKit::WebViewImpl::configureAutoResizeMode): Common code.
+        * src/WebViewImpl.h:
+        (WebViewImpl): Adjust to new public api.
+
 2012-02-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/public/WebView.h

@@ -261 +261 @@
     // content within the given bounds.
     virtual void enableAutoResizeMode(
+        const WebSize& minSize,
+        const WebSize& maxSize) = 0;
+
+    // Turn off auto-resize.
+    virtual void disableAutoResizeMode() = 0;
+
+    // DEPRECATED
+    virtual void enableAutoResizeMode(
         bool enable,
         const WebSize& minSize,
         const WebSize& maxSize) = 0;
-
 
     // Media ---------------------------------------------------------------

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -2265 +2265 @@
 }
 
-void WebViewImpl::enableAutoResizeMode(bool enable, const WebSize& minSize, const WebSize& maxSize)
-{
-    m_shouldAutoResize = enable;
+
+void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, const WebSize& maxSize)
+{
+    m_shouldAutoResize = true;
     m_minAutoSize = minSize;
     m_maxAutoSize = maxSize;
-    if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame()->view())
-        return;
-
-    mainFrameImpl()->frame()->view()->enableAutoSizeMode(m_shouldAutoResize, m_minAutoSize, m_maxAutoSize);
+    configureAutoResizeMode();
+}
+
+void WebViewImpl::disableAutoResizeMode()
+{
+    m_shouldAutoResize = false;
+    configureAutoResizeMode();
+}
+
+void WebViewImpl::enableAutoResizeMode(bool enable, const WebSize& minSize, const WebSize& maxSize)
+{
+    if (enable)
+        enableAutoResizeMode(enable, minSize, maxSize);
+    else
+        disableAutoResizeMode();
 }
 
@@ -2586 +2598 @@
 }
 
+void WebViewImpl::configureAutoResizeMode()
+{
+    if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame()->view())
+        return;
+
+    mainFrameImpl()->frame()->view()->enableAutoSizeMode(m_shouldAutoResize, m_minAutoSize, m_maxAutoSize);
+}
+
 unsigned long WebViewImpl::createUniqueIdentifierForRequest()
 {

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -188 +188 @@
     virtual WebSize fixedLayoutSize() const;
     virtual void setFixedLayoutSize(const WebSize&);
+    virtual void enableAutoResizeMode(
+        const WebSize& minSize,
+        const WebSize& maxSize);
+    virtual void disableAutoResizeMode();
     virtual void enableAutoResizeMode(
         bool enable,
@@ -535 +539 @@
 
     void sendResizeEventAndRepaint();
+    void configureAutoResizeMode();
 
 #if USE(ACCELERATED_COMPOSITING)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-29  David Levin  <levin@chromium.org>
+
+        [chromium] Add the ability to turn off autoresize.
+        https://bugs.webkit.org/show_bug.cgi?id=77452
+
+        Reviewed by Darin Fisher.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController): Expose a way to turn off auto-resize.
+        (LayoutTestController::enableAutoResizeMode): Ditto and adjust to new WebKit api.
+        (LayoutTestController::disableAutoResizeMode):  Ditto.
+        * DumpRenderTree/chromium/LayoutTestController.h: Ditto.
+
 2012-02-29  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@ -105 +105 @@
     bindMethod("didLosePointerLock", &LayoutTestController::didLosePointerLock);
 #endif
+    bindMethod("disableAutoResizeMode", &LayoutTestController::disableAutoResizeMode);
     bindMethod("disableImageLoading", &LayoutTestController::disableImageLoading);
     bindMethod("display", &LayoutTestController::display);
@@ -1130 +1131 @@
     WebKit::WebSize maxSize(maxWidth, maxHeight);
 
-    m_shell->webView()->enableAutoResizeMode(true, minSize, maxSize);
+    m_shell->webView()->enableAutoResizeMode(minSize, maxSize);
+    result->set(true);
+}
+
+void LayoutTestController::disableAutoResizeMode(const CppArgumentList& arguments, CppVariant* result)
+{
+    if (arguments.size() !=2) {
+        result->set(false);
+        return;
+    }
+    int newWidth = cppVariantToInt32(arguments[0]);
+    int newHeight = cppVariantToInt32(arguments[1]);
+    WebKit::WebSize newSize(newWidth, newHeight);
+
+    m_shell->webViewHost()->setWindowRect(WebRect(0, 0, newSize.width, newSize.height));
+    m_shell->webView()->disableAutoResizeMode();
+    m_shell->webView()->resize(newSize);
     result->set(true);
 }

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

@@ -242 +242 @@
     void elementDoesAutoCompleteForElementWithId(const CppArgumentList&, CppVariant*);
     void enableAutoResizeMode(const CppArgumentList&, CppVariant*);
+    void disableAutoResizeMode(const CppArgumentList&, CppVariant*);
     void numberOfActiveAnimations(const CppArgumentList&, CppVariant*);
     void suspendAnimations(const CppArgumentList&, CppVariant*);