Changeset 244998 in webkit

Timestamp:

May 6, 2019 6:03:01 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

_overrideViewportWithArguments does not work when called before loading
​https://bugs.webkit.org/show_bug.cgi?id=197638
<rdar://problem/50505111>

Reviewed by Wenson Hsieh.

Source/WebCore:

• dom/Document.cpp:

(WebCore::Document::viewportArguments const):
(WebCore::Document::updateViewportArguments):
(WebCore::Document::setOverrideViewportArguments): Deleted.

• dom/Document.h:

(WebCore::Document::viewportArguments const): Deleted.

• page/Page.cpp:

(WebCore::Page::setOverrideViewportArguments):

• page/Page.h:

(WebCore::Page::overrideViewportArguments const):

• page/ViewportConfiguration.cpp:

(WebCore::ViewportConfiguration::setViewportArguments):
Move overrideViewportArguments to Page, since it is view-global in the API.

Source/WebKit:

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::setOverrideViewportArguments):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/OverrideViewportArguments.mm:

(TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/dom/Document.h (modified) (2 diffs)
• Source/WebCore/page/Page.cpp (modified) (1 diff)
• Source/WebCore/page/Page.h (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/OverrideViewportArguments.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-06  Tim Horton  <timothy_horton@apple.com>
+
+        _overrideViewportWithArguments does not work when called before loading
+        https://bugs.webkit.org/show_bug.cgi?id=197638
+        <rdar://problem/50505111>
+
+        Reviewed by Wenson Hsieh.
+
+        * dom/Document.cpp:
+        (WebCore::Document::viewportArguments const):
+        (WebCore::Document::updateViewportArguments):
+        (WebCore::Document::setOverrideViewportArguments): Deleted.
+        * dom/Document.h:
+        (WebCore::Document::viewportArguments const): Deleted.
+        * page/Page.cpp:
+        (WebCore::Page::setOverrideViewportArguments):
+        * page/Page.h:
+        (WebCore::Page::overrideViewportArguments const):
+        * page/ViewportConfiguration.cpp:
+        (WebCore::ViewportConfiguration::setViewportArguments):
+        Move overrideViewportArguments to Page, since it is view-global in the API.
+
 2019-05-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3555 +3555 @@
 }
 
-void Document::setOverrideViewportArguments(const Optional<ViewportArguments>& viewportArguments)
-{
-    if (viewportArguments == m_overrideViewportArguments)
-        return;
-
-    m_overrideViewportArguments = viewportArguments;
-    updateViewportArguments();
-}
-
 void Document::processViewport(const String& features, ViewportArguments::Type origin)
 {
@@ -3582 +3573 @@
 
     updateViewportArguments();
+}
+
+ViewportArguments Document::viewportArguments() const
+{
+    auto* page = this->page();
+    if (!page)
+        return m_viewportArguments;
+    return page->overrideViewportArguments().valueOr(m_viewportArguments);
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -412 +412 @@
 
     void setViewportArguments(const ViewportArguments& viewportArguments) { m_viewportArguments = viewportArguments; }
-    ViewportArguments viewportArguments() const { return m_overrideViewportArguments.valueOr(m_viewportArguments); }
-
-    WEBCORE_EXPORT void setOverrideViewportArguments(const Optional<ViewportArguments>&);
+    WEBCORE_EXPORT ViewportArguments viewportArguments() const;
 
     OptionSet<DisabledAdaptations> disabledAdaptations() const { return m_disabledAdaptations; }
@@ -1831 +1829 @@
 
     ViewportArguments m_viewportArguments;
-    Optional<ViewportArguments> m_overrideViewportArguments;
     OptionSet<DisabledAdaptations> m_disabledAdaptations;
 

trunk/Source/WebCore/page/Page.cpp

@@ -401 +401 @@
 }
 
+void Page::setOverrideViewportArguments(const Optional<ViewportArguments>& viewportArguments)
+{
+    if (viewportArguments == m_overrideViewportArguments)
+        return;
+
+    m_overrideViewportArguments = viewportArguments;
+    if (auto* document = mainFrame().document())
+        document->updateViewportArguments();
+}
+
 ScrollingCoordinator* Page::scrollingCoordinator()
 {

trunk/Source/WebCore/page/Page.h

@@ -194 +194 @@
     WEBCORE_EXPORT ViewportArguments viewportArguments() const;
 
+    const Optional<ViewportArguments>& overrideViewportArguments() const { return m_overrideViewportArguments; }
+    WEBCORE_EXPORT void setOverrideViewportArguments(const Optional<ViewportArguments>&);
+
     static void refreshPlugins(bool reload);
     WEBCORE_EXPORT PluginData& pluginData();
@@ -979 +982 @@
 #endif
 
+    Optional<ViewportArguments> m_overrideViewportArguments;
+
     bool m_shouldEnableICECandidateFilteringByDefault { true };
     bool m_mediaPlaybackIsSuspended { false };

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-06  Tim Horton  <timothy_horton@apple.com>
+
+        _overrideViewportWithArguments does not work when called before loading
+        https://bugs.webkit.org/show_bug.cgi?id=197638
+        <rdar://problem/50505111>
+
+        Reviewed by Wenson Hsieh.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::setOverrideViewportArguments):
+
 2019-05-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2830 +2830 @@
 void WebPage::setOverrideViewportArguments(const Optional<WebCore::ViewportArguments>& arguments)
 {
-    if (auto* document = m_page->mainFrame().document())
-        document->setOverrideViewportArguments(arguments);
+    m_page->setOverrideViewportArguments(arguments);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-06  Tim Horton  <timothy_horton@apple.com>
+
+        _overrideViewportWithArguments does not work when called before loading
+        https://bugs.webkit.org/show_bug.cgi?id=197638
+        <rdar://problem/50505111>
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/OverrideViewportArguments.mm:
+        (TEST):
+
 2019-05-04  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/OverrideViewportArguments.mm

@@ -76 +76 @@
     setViewport(@{ @"width" : @"500", @"initial-scale": @"1", @"garbage": @"nonsense" });
     EXPECT_WK_STREQ("500", bodyWidth());
+
+    // Call overrideViewportWithArguments before loading anything in the
+    // view and ensure it is respected.
+    webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 20, 20)]);
+    setViewport(@{ @"width" : @"1000", @"initial-scale": @"1" });
+    [webView synchronouslyLoadHTMLString:@"<meta name='viewport' content='initial-scale=1'><div id='divWithViewportUnits' style='width: 100vw;'></div>"];
+    EXPECT_WK_STREQ("1000", bodyWidth());
+    EXPECT_EQ(1., [webView scrollView].zoomScale);
 }