<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167738] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167738">167738</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-23 19:37:05 -0700 (Wed, 23 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167737 => 167738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-24 02:25:08 UTC (rev 167737)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-24 02:37:05 UTC (rev 167738)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-04-23 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [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>
+
</ins><span class="cx"> [iOS][WK2] Fix a few mistakes affecting the initial layout and the initial unobscured rect
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132093
</span><span class="cx"> <rdar://problem/16703237>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167737 => 167738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-24 02:25:08 UTC (rev 167737)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-24 02:37:05 UTC (rev 167738)
</span><span class="lines">@@ -4254,14 +4254,7 @@
</span><span class="cx">
</span><span class="cx"> WebProcess::shared().eventDispatcher().clearQueuedTouchEventsForPage(*this);
</span><span class="cx">
</span><del>- 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());
-
</del><ins>+ resetViewportDefaultConfiguration(frame);
</ins><span class="cx"> m_viewportConfiguration.setViewportArguments(ViewportArguments());
</span><span class="cx"> m_viewportConfiguration.setContentsSize(IntSize());
</span><span class="cx"> viewportConfigurationChanged();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (167737 => 167738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-24 02:25:08 UTC (rev 167737)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-24 02:37:05 UTC (rev 167738)
</span><span class="lines">@@ -698,7 +698,6 @@
</span><span class="cx"> void setViewportConfigurationMinimumLayoutSize(const WebCore::FloatSize&);
</span><span class="cx"> void setMinimumLayoutSizeForMinimalUI(const WebCore::FloatSize&);
</span><span class="cx"> void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, double scale);
</span><del>- void viewportConfigurationChanged();
</del><span class="cx"> void updateVisibleContentRects(const VisibleContentRectUpdateInfo&);
</span><span class="cx"> bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
</span><span class="cx"> void willStartUserTriggeredZooming();
</span><span class="lines">@@ -802,6 +801,9 @@
</span><span class="cx"> void didReceiveSyncWebPageMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ void resetViewportDefaultConfiguration(WebFrame* mainFrame);
+ void viewportConfigurationChanged();
+
</ins><span class="cx"> static void convertSelectionRectsToRootView(WebCore::FrameView*, Vector<WebCore::SelectionRect>&);
</span><span class="cx"> PassRefPtr<WebCore::Range> rangeForWebSelectionAtPosition(const WebCore::IntPoint&, const WebCore::VisiblePosition&, SelectionFlags&);
</span><span class="cx"> PassRefPtr<WebCore::Range> rangeForBlockAtPoint(const WebCore::IntPoint&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (167737 => 167738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-04-24 02:25:08 UTC (rev 167737)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-04-24 02:37:05 UTC (rev 167738)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> if (isMobileDoctype)
</span><span class="cx"> m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::xhtmlMobileParameters());
</span><span class="cx"> else
</span><del>- m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::webpageParameters());
</del><ins>+ resetViewportDefaultConfiguration(m_mainFrame.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double WebPage::minimumPageScaleFactor() const
</span><span class="lines">@@ -1919,6 +1919,22 @@
</span><span class="cx"> send(Messages::WebPageProxy::DynamicViewportUpdateChangedTarget(scale, roundedUnobscuredContentRect.location()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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());
+}
+
</ins><span class="cx"> void WebPage::viewportConfigurationChanged()
</span><span class="cx"> {
</span><span class="cx"> setFixedLayoutSize(m_viewportConfiguration.layoutSize());
</span></span></pre>
</div>
</div>
</body>
</html>