Attachment 342624 Details for Bug 186585 – Patch

[patch] Patch

bug-186585-20180612204839.patch (text/plain), 9.21 KB, created by zalan on 2018-06-12 20:48:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-06-12 20:48:40 PDT

Size: 9.21 KB

patch

obsolete

>Subversion Revision: 232784
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 67cebe5055b80264c13a060ce6dd583717b866ea..2522eeaf15d56b97727f2d8b5dd05b9fc6c66f69 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2018-06-12  Zalan Bujtas  <zalan@apple.com>
>+
>+        [Mail] Use the Mail Viewer width as the base for resolving horizontal viewport units
>+        https://bugs.webkit.org/show_bug.cgi?id=186585
>+        <rdar://problem/30685325>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the existing "override viewport size for viewport units" mechanism to compute the preferred
>+        viewport unit values for the Mail Viewer html content. 
>+
>+        Test: fast/dynamic/mail-autosize-viewport-unit.html
>+
>+        * page/FrameView.cpp:
>+        (WebCore::FrameView::FrameView):
>+        (WebCore::FrameView::enableAutoSizeMode):
>+        (WebCore::FrameView::clearViewportSizeOverrideForCSSViewportUnits):
>+        (WebCore::FrameView::setViewportSizeForCSSViewportUnits):
>+        (WebCore::FrameView::overrideViewportSizeForCSSViewportUnits):
>+        (WebCore::FrameView::viewportSizeForCSSViewportUnits const):
>+        * page/FrameView.h:
>+
> 2018-06-12  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r232774.
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index e80df81311561d9dfcc753dc27cf4c481e8a938b..eb7e814dd66bbee30a3fd9ad8de7b2372cfb8cfd 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -190,7 +190,6 @@ FrameView::FrameView(Frame& frame)
>     , m_useCustomFixedPositionLayoutRect(false)
>     , m_useCustomSizeForResizeEvent(false)
> #endif
>-    , m_hasOverrideViewportSize(false)
>     , m_shouldAutoSize(false)
>     , m_inAutoSize(false)
>     , m_didRunAutosize(false)
>@@ -4375,9 +4374,13 @@ void FrameView::enableAutoSizeMode(bool enable, const IntSize& minSize, const In
> 
>     setNeedsLayout();
>     layoutContext().scheduleLayout();
>-    if (m_shouldAutoSize)
>+    if (m_shouldAutoSize) {
>+        // Only override the width of the viewport.
>+        overrideViewportSizeForCSSViewportUnits({ minSize.width(), std::nullopt });
>         return;
>+    }
> 
>+    clearViewportSizeOverrideForCSSViewportUnits();
>     // Since autosize mode forces the scrollbar mode, change them to being auto.
>     setVerticalScrollbarLock(false);
>     setHorizontalScrollbarLock(false);
>@@ -5088,30 +5091,57 @@ void FrameView::setViewExposedRect(std::optional<FloatRect> viewExposedRect)
>     if (auto* page = frame().page())
>         page->pageOverlayController().didChangeViewExposedRect();
> }
>-    
>+
>+void FrameView::clearViewportSizeOverrideForCSSViewportUnits()
>+{
>+    if (!m_overrideViewportSize)
>+        return;
>+
>+    m_overrideViewportSize = std::nullopt;
>+    if (auto* document = frame().document())
>+        document->styleScope().didChangeStyleSheetEnvironment();
>+}
>+
> void FrameView::setViewportSizeForCSSViewportUnits(IntSize size)
> {
>-    if (m_hasOverrideViewportSize && m_overrideViewportSize == size)
>+    overrideViewportSizeForCSSViewportUnits({ size.width(), size.height() });
>+}
>+
>+void FrameView::overrideViewportSizeForCSSViewportUnits(OverrideViewportSize size)
>+{
>+    if (m_overrideViewportSize && *m_overrideViewportSize == size)
>         return;
>-    
>+
>     m_overrideViewportSize = size;
>-    m_hasOverrideViewportSize = true;
>-    
>-    if (Document* document = frame().document())
>+
>+    if (auto* document = frame().document())
>         document->styleScope().didChangeStyleSheetEnvironment();
> }
>-    
>+
> IntSize FrameView::viewportSizeForCSSViewportUnits() const
> {
>-    if (m_hasOverrideViewportSize)
>-        return m_overrideViewportSize;
>+    OverrideViewportSize viewportSize;
> 
>-    if (useFixedLayout())
>-        return fixedLayoutSize();
>+    if (m_overrideViewportSize) {
>+        viewportSize = *m_overrideViewportSize;
>+        // auto-size overrides the width only, so we can't always bail out early here.
>+        if (viewportSize.width && viewportSize.height)
>+            return viewportSize;
>+    }
>+
>+    if (useFixedLayout()) {
>+        auto fixedLayoutSize = this->fixedLayoutSize();
>+        viewportSize.width = viewportSize.width.value_or(fixedLayoutSize.width());
>+        viewportSize.height = viewportSize.height.value_or(fixedLayoutSize.height());
>+        return viewportSize;
>+    }
>     
>     // FIXME: the value returned should take into account the value of the overflow
>     // property on the root element.
>-    return visibleContentRectIncludingScrollbars().size();
>+    auto visibleContentSizeIncludingScrollbars = visibleContentRectIncludingScrollbars().size();
>+    viewportSize.width = viewportSize.width.value_or(visibleContentSizeIncludingScrollbars.width());
>+    viewportSize.height = viewportSize.height.value_or(visibleContentSizeIncludingScrollbars.height());
>+    return viewportSize;
> }
> 
> bool FrameView::shouldPlaceBlockDirectionScrollbarOnLeft() const
>diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h
>index 8f60e7cdb275fbef0876bd10dc7382af634b9bda..2ef35e606834ec7feab281bc54e65078ccb2d01f 100644
>--- a/Source/WebCore/page/FrameView.h
>+++ b/Source/WebCore/page/FrameView.h
>@@ -211,7 +211,9 @@ public:
>     WEBCORE_EXPORT void adjustViewSize();
> 
>     WEBCORE_EXPORT void setViewportSizeForCSSViewportUnits(IntSize);
>+    void clearViewportSizeOverrideForCSSViewportUnits();
>     IntSize viewportSizeForCSSViewportUnits() const;
>+
>     
>     IntRect windowClipRect() const final;
>     WEBCORE_EXPORT IntRect windowClipRectForFrameOwner(const HTMLFrameOwnerElement*, bool clipToLayerContents) const;
>@@ -782,6 +784,20 @@ private:
>     void willDoLayout(WeakPtr<RenderElement> layoutRoot);
>     void didLayout(WeakPtr<RenderElement> layoutRoot);
> 
>+    struct OverrideViewportSize {
>+        std::optional<int> width;
>+        std::optional<int> height;
>+
>+        bool operator==(const OverrideViewportSize& rhs) const { return rhs.width == width && rhs.height == height; }
>+        operator IntSize() const
>+        {
>+            ASSERT(width);
>+            ASSERT(height);
>+            return { *width, *height };
>+        }
>+    };
>+    void overrideViewportSizeForCSSViewportUnits(OverrideViewportSize);
>+
>     HashSet<Widget*> m_widgetsInRenderTree;
> 
>     static MonotonicTime sCurrentPaintTimeStamp; // used for detecting decoded resource thrash in the cache
>@@ -867,8 +883,7 @@ private:
>     IntSize m_customSizeForResizeEvent;
> #endif
> 
>-    IntSize m_overrideViewportSize;
>-    bool m_hasOverrideViewportSize;
>+    std::optional<OverrideViewportSize> m_overrideViewportSize;
> 
>     // If true, automatically resize the frame view around its content.
>     bool m_shouldAutoSize;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 9898df8d32c7f34ada5a085955d99e7ad5cb880c..036da927b32efcdc79545f6c895f500c878044e2 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-12  Zalan Bujtas  <zalan@apple.com>
>+
>+        [Mail] Use the Mail Viewer width as the base for resolving horizontal viewport units
>+        https://bugs.webkit.org/show_bug.cgi?id=186585
>+        <rdar://problem/30685325>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/dynamic/mail-autosize-viewport-unit-expected.txt: Added.
>+        * fast/dynamic/mail-autosize-viewport-unit.html: Added.
>+
> 2018-06-12  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r232774.
>diff --git a/LayoutTests/fast/dynamic/mail-autosize-viewport-unit-expected.txt b/LayoutTests/fast/dynamic/mail-autosize-viewport-unit-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..165145db57104cb366022745029a92a3fa8b106e
>--- /dev/null
>+++ b/LayoutTests/fast/dynamic/mail-autosize-viewport-unit-expected.txt
>@@ -0,0 +1,2 @@
>+
>+2000px 1000px 200px 0px
>diff --git a/LayoutTests/fast/dynamic/mail-autosize-viewport-unit.html b/LayoutTests/fast/dynamic/mail-autosize-viewport-unit.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..c26cf22b4de4b443566bedd87fb11555b166f6f8
>--- /dev/null
>+++ b/LayoutTests/fast/dynamic/mail-autosize-viewport-unit.html
>@@ -0,0 +1,55 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<title>This tests that autosize uses the min-width as the base for resolving viewport unit values</title>
>+<style>
>+#w100 {
>+    width: 100vw;
>+    height: 10px;
>+}
>+
>+#w50 {
>+    width: 50vw;
>+    height: 10px;
>+}
>+
>+#w10 {
>+    width: 10vw;
>+    height: 10px;
>+}
>+
>+#w0 {
>+    width: 0vw;
>+    height: 10px;
>+}
>+</style>
>+</head>
>+<body>
>+<div id=w100></div>
>+<div id=w50></div>
>+<div id=w10></div>
>+<div id=w0></div>
>+<img src="notfound.jpg" width=3000px height=100px>
>+<pre id=result></pre>
>+<script>
>+if (window.internals)
>+    internals.enableAutoSizeMode(true, 2000, 600, 4000, 1000);
>+
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
>+}
>+
>+setTimeout(function() {
>+	document.body.offsetWidth;
>+	result.textContent = window.getComputedStyle(w100, null).getPropertyValue("width") + " "
>+	    + window.getComputedStyle(w50, null).getPropertyValue("width") + " "
>+	    + window.getComputedStyle(w10, null).getPropertyValue("width") + " "  
>+	    + window.getComputedStyle(w0, null).getPropertyValue("width");  
>+    if (window.testRunner) {
>+        testRunner.notifyDone();
>+    }
>+}, 0);
>+</script>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 186585: 342624 | 342663 | 342665 | 342669 | 342680 | 342689 | 342694 | 343446