Changeset 167738 in webkit

Timestamp:

Apr 23, 2014 7:37:05 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

[iOS][WK2] Image and text documents sometime gets the webpage viewport configuration
​https://bugs.webkit.org/show_bug.cgi?id=132099

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-04-23
Reviewed by Tim Horton.

When didReceiveMobileDocType(), if the doctype was not XHTML mobile, we were setting
the viewport configuration to webpageParameters(). This is obviously not correct for
Image and Text documents.

This patch moves the code deciding the default configuration out of WebPage::didCommitLoad()
and use it from WebPage::didCommitLoad() and WebPage::didReceiveMobileDocType().

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didCommitLoad):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::didReceiveMobileDocType):
(WebKit::WebPage::resetViewportDefaultConfiguration):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-23  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS][WK2] Image and text documents sometime gets the webpage viewport configuration
+        https://bugs.webkit.org/show_bug.cgi?id=132099
+
+        Reviewed by Tim Horton.
+
+        When didReceiveMobileDocType(), if the doctype was not XHTML mobile, we were setting
+        the viewport configuration to webpageParameters(). This is obviously not correct for
+        Image and Text documents.
+
+        This patch moves the code deciding the default configuration out of WebPage::didCommitLoad()
+        and use it from WebPage::didCommitLoad() and WebPage::didReceiveMobileDocType().
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didCommitLoad):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::didReceiveMobileDocType):
+        (WebKit::WebPage::resetViewportDefaultConfiguration):
+
 2014-04-23  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4255 +4255 @@
     WebProcess::shared().eventDispatcher().clearQueuedTouchEventsForPage(*this);
 
-    Document* document = frame->coreFrame()->document();
-    if (document->isImageDocument())
-        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::imageDocumentParameters());
-    else if (document->isTextDocument())
-        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::textDocumentParameters());
-    else
-        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::webpageParameters());
-
+    resetViewportDefaultConfiguration(frame);
     m_viewportConfiguration.setViewportArguments(ViewportArguments());
     m_viewportConfiguration.setContentsSize(IntSize());

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -699 +699 @@
     void setMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize&);
     void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, double scale);
-    void viewportConfigurationChanged();
     void updateVisibleContentRects(const VisibleContentRectUpdateInfo&);
     bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
@@ -803 +802 @@
 
 #if PLATFORM(IOS)
+    void resetViewportDefaultConfiguration(WebFrame* mainFrame);
+    void viewportConfigurationChanged();
+
     static void convertSelectionRectsToRootView(WebCore::FrameView*, Vector<WebCore::SelectionRect>&);
     PassRefPtr<WebCore::Range> rangeForWebSelectionAtPosition(const WebCore::IntPoint&, const WebCore::VisiblePosition&, SelectionFlags&);

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

@@ -135 +135 @@
         m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::xhtmlMobileParameters());
     else
-        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::webpageParameters());
+        resetViewportDefaultConfiguration(m_mainFrame.get());
 }
 
@@ -1920 +1920 @@
 }
 
+void WebPage::resetViewportDefaultConfiguration(WebFrame* frame)
+{
+    if (!frame) {
+        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::webpageParameters());
+        return;
+    }
+
+    Document* document = frame->coreFrame()->document();
+    if (document->isImageDocument())
+        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::imageDocumentParameters());
+    else if (document->isTextDocument())
+        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::textDocumentParameters());
+    else
+        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::webpageParameters());
+}
+
 void WebPage::viewportConfigurationChanged()
 {