Changeset 231915 in webkit

Timestamp:

May 17, 2018 12:20:28 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[Extra zoom mode] Disabled adaptations are not reset upon mainframe navigation
​https://bugs.webkit.org/show_bug.cgi?id=185735
<rdar://problem/40335311>

Reviewed by Tim Horton.

Source/WebCore:

When performing mainframe navigation, we currently don't update the Page's ViewportConfiguration's disabled
adaptations. This causes disabled adaptations from the previous main document to persist. To fix this, propagate
the new document's disabled adaptations to the client when it becomes the main document in the page.

Test: fast/viewport/extrazoom/viewport-adaptations-after-navigation.html

• dom/Document.cpp:

(WebCore::Document::didBecomeCurrentDocumentInFrame):
(WebCore::Document::processDisabledAdaptations):
(WebCore::Document::dispatchDisabledAdaptationsDidChangeForMainFrame):

• dom/Document.h:

LayoutTests:

Adds a new layout test that disables extra zoom mode adaptations, navigates to a new document, and checks that
the innerWidth and innerHeight are reset to their expected (default) values.

• fast/viewport/extrazoom/viewport-adaptations-after-navigation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/viewport/extrazoom/viewport-adaptations-after-navigation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/dom/Document.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-05-17  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Disabled adaptations are not reset upon mainframe navigation
+        https://bugs.webkit.org/show_bug.cgi?id=185735
+        <rdar://problem/40335311>
+
+        Reviewed by Tim Horton.
+
+        Adds a new layout test that disables extra zoom mode adaptations, navigates to a new document, and checks that
+        the innerWidth and innerHeight are reset to their expected (default) values.
+
+        * fast/viewport/extrazoom/viewport-adaptations-after-navigation.html: Added.
+
 2018-05-17  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-17  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Disabled adaptations are not reset upon mainframe navigation
+        https://bugs.webkit.org/show_bug.cgi?id=185735
+        <rdar://problem/40335311>
+
+        Reviewed by Tim Horton.
+
+        When performing mainframe navigation, we currently don't update the Page's ViewportConfiguration's disabled
+        adaptations. This causes disabled adaptations from the previous main document to persist. To fix this, propagate
+        the new document's disabled adaptations to the client when it becomes the main document in the page.
+
+        Test: fast/viewport/extrazoom/viewport-adaptations-after-navigation.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::didBecomeCurrentDocumentInFrame):
+        (WebCore::Document::processDisabledAdaptations):
+        (WebCore::Document::dispatchDisabledAdaptationsDidChangeForMainFrame):
+        * dom/Document.h:
+
 2018-05-17  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2230 +2230 @@
         createRenderTree();
 
+    dispatchDisabledAdaptationsDidChangeForMainFrame();
     updateViewportArguments();
 
@@ -3418 +3419 @@
 
     m_disabledAdaptations = disabledAdaptations;
-
-    if (page() && frame()->isMainFrame())
-        page()->chrome().dispatchDisabledAdaptationsDidChange(m_disabledAdaptations);
+    dispatchDisabledAdaptationsDidChangeForMainFrame();
+}
+
+void Document::dispatchDisabledAdaptationsDidChangeForMainFrame()
+{
+    if (!frame()->isMainFrame())
+        return;
+
+    if (!page())
+        return;
+
+    page()->chrome().dispatchDisabledAdaptationsDidChange(m_disabledAdaptations);
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -1507 +1507 @@
 #endif
 
+    void dispatchDisabledAdaptationsDidChangeForMainFrame();
+
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
     friend void setParserFeature(const String& key, const String& value, Document*, void* userData);