Changeset 143616 in webkit

Timestamp:

Feb 21, 2013 9:31:34 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Need to re-layout fixed position elements after scale when using settings()->fixedElementsLayoutRelativeToFrame()
​https://bugs.webkit.org/show_bug.cgi?id=105486

Patch by Tien-Ren Chen <​trchen@chromium.org> on 2013-02-21
Reviewed by James Robinson.

In settings()->fixedElementsLayoutRelativeToFrame() mode, fixed-position
elements are layout relative to the current visible viewport, which can
be different from the layout viewport when using fixed-layout mode.
We need to re-layout fixed-position elements in case of visible content
size changes.

The test is currently chromium-specific due to difficulties to make this
test works on Mac. The mac port seems to work very differently with
visible content size when a page is scaled. And there is no reliable way
to hide scrollbars in mac-wk1 that doesn't cause a side effect.

Source/WebCore:

Test: platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html

• page/FrameView.cpp:

(WebCore::FrameView::visibleContentsResized):

• page/FrameView.h:

(FrameView):

• page/Page.cpp:

(WebCore::Page::setPageScaleFactor):

LayoutTests:

• platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html: Added.
• platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html (added)
• LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Source/WebCore/page/FrameView.h (modified) (2 diffs)
• Source/WebCore/page/Page.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-21  Tien-Ren Chen  <trchen@chromium.org>
+
+        Need to re-layout fixed position elements after scale when using settings()->fixedElementsLayoutRelativeToFrame()
+        https://bugs.webkit.org/show_bug.cgi?id=105486
+
+        Reviewed by James Robinson.
+
+        In settings()->fixedElementsLayoutRelativeToFrame() mode, fixed-position
+        elements are layout relative to the current visible viewport, which can
+        be different from the layout viewport when using fixed-layout mode.
+        We need to re-layout fixed-position elements in case of visible content
+        size changes.
+
+        The test is currently chromium-specific due to difficulties to make this
+        test works on Mac. The mac port seems to work very differently with
+        visible content size when a page is scaled. And there is no reliable way
+        to hide scrollbars in mac-wk1 that doesn't cause a side effect.
+
+        * platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html: Added.
+        * platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html: Added.
+
 2013-02-21  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-21  Tien-Ren Chen  <trchen@chromium.org>
+
+        Need to re-layout fixed position elements after scale when using settings()->fixedElementsLayoutRelativeToFrame()
+        https://bugs.webkit.org/show_bug.cgi?id=105486
+
+        Reviewed by James Robinson.
+
+        In settings()->fixedElementsLayoutRelativeToFrame() mode, fixed-position
+        elements are layout relative to the current visible viewport, which can
+        be different from the layout viewport when using fixed-layout mode.
+        We need to re-layout fixed-position elements in case of visible content
+        size changes.
+
+        The test is currently chromium-specific due to difficulties to make this
+        test works on Mac. The mac port seems to work very differently with
+        visible content size when a page is scaled. And there is no reliable way
+        to hide scrollbars in mac-wk1 that doesn't cause a side effect.
+
+        Test: platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::visibleContentsResized):
+        * page/FrameView.h:
+        (FrameView):
+        * page/Page.cpp:
+        (WebCore::Page::setPageScaleFactor):
+
 2013-02-21  Xan Lopez  <xlopez@rim.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2050 +2050 @@
         return;
 
+    setViewportConstrainedObjectsNeedLayout();
+
     if (!useFixedLayout() && needsLayout())
         layout();

trunk/Source/WebCore/page/FrameView.h

@@ -112 +112 @@
     bool needsLayout() const;
     void setNeedsLayout();
+    void setViewportConstrainedObjectsNeedLayout();
 
     bool needsFullRepaint() const { return m_doFullRepaint; }
@@ -486 +487 @@
     bool doLayoutWithFrameFlattening(bool allowSubtree);
 
-    void setViewportConstrainedObjectsNeedLayout();
-
     virtual AXObjectCache* axObjectCache() const;
     void notifyWidgetsInAllFrames(WidgetNotification);

trunk/Source/WebCore/page/Page.cpp

@@ -749 +749 @@
 #endif
 
+    if (view)
+        view->setViewportConstrainedObjectsNeedLayout();
+
     if (view && view->scrollPosition() != origin) {
         if (!m_settings->applyPageScaleFactorInCompositor() && document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())