<!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>[184704] branches/safari-601.1.32.2-branch/Source</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/184704">184704</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 23:39:27 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184681">r184681</a>. rdar://problem/20924495</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceWebCoreChangeLog">branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebCorepageViewportConfigurationcpp">branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebCorepageViewportConfigurationh">branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2ChangeLog">branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184703 => 184704)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-21 05:55:21 UTC (rev 184703)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-21 06:39:27 UTC (rev 184704)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r184681. rdar://problem/20924495
+
+ 2015-05-20 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Using CSS viewport units causes incorrect layout.
+ https://bugs.webkit.org/show_bug.cgi?id=145225
+ rdar://problem/20924495
+
+ Reviewed by Benjamin Poulain.
+
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::initialScaleFromSize):
+ (WebCore::ViewportConfiguration::initialScale):
+ (WebCore::ViewportConfiguration::initialScaleIgnoringContentSize):
+ * page/ViewportConfiguration.h:
+ (WebCore::ViewportConfiguration::initialScaleFromSize):
+ (WebCore::ViewportConfiguration::initialScaleIgnoringContentSize):
+
</ins><span class="cx"> 2015-05-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184611.
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.cpp (184703 => 184704)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.cpp 2015-05-21 05:55:21 UTC (rev 184703)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.cpp 2015-05-21 06:39:27 UTC (rev 184704)
</span><span class="lines">@@ -130,30 +130,38 @@
</span><span class="cx"> return shouldIgnoreHorizontalScalingConstraints() || shouldIgnoreVerticalScalingConstraints();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double ViewportConfiguration::initialScale() const
</del><ins>+double ViewportConfiguration::initialScaleFromSize(double width, double height, bool shouldIgnoreScalingConstraints) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!constraintsAreAllRelative(m_configuration));
</span><span class="cx">
</span><span class="cx"> // If the document has specified its own initial scale, use it regardless.
</span><span class="cx"> // This is guaranteed to be sanity checked already, so no need for MIN/MAX.
</span><del>- if (m_configuration.initialScaleIsSet && !shouldIgnoreScalingConstraints())
</del><ins>+ if (m_configuration.initialScaleIsSet && !shouldIgnoreScalingConstraints)
</ins><span class="cx"> return m_configuration.initialScale;
</span><span class="cx">
</span><span class="cx"> // If not, it is up to us to determine the initial scale.
</span><span class="cx"> // We want a scale small enough to fit the document width-wise.
</span><span class="cx"> const FloatSize& minimumLayoutSize = m_minimumLayoutSize;
</span><del>- double width = m_contentSize.width() > 0 ? m_contentSize.width() : layoutWidth();
</del><span class="cx"> double initialScale = 0;
</span><span class="cx"> if (width > 0 && !shouldIgnoreVerticalScalingConstraints())
</span><span class="cx"> initialScale = minimumLayoutSize.width() / width;
</span><span class="cx">
</span><span class="cx"> // Prevent the initial scale from shrinking to a height smaller than our view's minimum height.
</span><del>- double height = m_contentSize.height() > 0 ? m_contentSize.height() : layoutHeight();
</del><span class="cx"> if (height > 0 && height * initialScale < minimumLayoutSize.height() && !shouldIgnoreHorizontalScalingConstraints())
</span><span class="cx"> initialScale = minimumLayoutSize.height() / height;
</span><del>- return std::min(std::max(initialScale, shouldIgnoreScalingConstraints() ? m_defaultConfiguration.minimumScale : m_configuration.minimumScale), m_configuration.maximumScale);
</del><ins>+ return std::min(std::max(initialScale, shouldIgnoreScalingConstraints ? m_defaultConfiguration.minimumScale : m_configuration.minimumScale), m_configuration.maximumScale);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+double ViewportConfiguration::initialScale() const
+{
+ return initialScaleFromSize(m_contentSize.width() > 0 ? m_contentSize.width() : layoutWidth(), m_contentSize.height() > 0 ? m_contentSize.height() : layoutHeight(), shouldIgnoreScalingConstraints());
+}
+
+double ViewportConfiguration::initialScaleIgnoringContentSize() const
+{
+ return initialScaleFromSize(layoutWidth(), layoutHeight(), false);
+}
+
</ins><span class="cx"> double ViewportConfiguration::minimumScale() const
</span><span class="cx"> {
</span><span class="cx"> // If we scale to fit, then this is our minimum scale as well.
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.h (184703 => 184704)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.h 2015-05-21 05:55:21 UTC (rev 184703)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/page/ViewportConfiguration.h 2015-05-21 06:39:27 UTC (rev 184704)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT IntSize layoutSize() const;
</span><span class="cx"> WEBCORE_EXPORT double initialScale() const;
</span><ins>+ WEBCORE_EXPORT double initialScaleIgnoringContentSize() const;
</ins><span class="cx"> WEBCORE_EXPORT double minimumScale() const;
</span><span class="cx"> double maximumScale() const { return m_configuration.maximumScale; }
</span><span class="cx"> WEBCORE_EXPORT bool allowsUserScaling() const;
</span><span class="lines">@@ -100,6 +101,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void updateConfiguration();
</span><span class="cx"> double viewportArgumentsLength(double length) const;
</span><ins>+ double initialScaleFromSize(double width, double height, bool shouldIgnoreScalingConstraints) const;
</ins><span class="cx"> int layoutWidth() const;
</span><span class="cx"> int layoutHeight() const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184703 => 184704)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 05:55:21 UTC (rev 184703)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 06:39:27 UTC (rev 184704)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r184681. rdar://problem/20924495
+
+ 2015-05-20 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Using CSS viewport units causes incorrect layout.
+ https://bugs.webkit.org/show_bug.cgi?id=145225
+ rdar://problem/20924495
+
+ Reviewed by Benjamin Poulain.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateViewportSizeForCSSViewportUnits):
+
</ins><span class="cx"> 2015-05-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184596.
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (184703 => 184704)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-05-21 05:55:21 UTC (rev 184703)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-05-21 06:39:27 UTC (rev 184704)
</span><span class="lines">@@ -2710,7 +2710,7 @@
</span><span class="cx"> largestUnobscuredRect = m_viewportConfiguration.minimumLayoutSize();
</span><span class="cx">
</span><span class="cx"> FrameView& frameView = *mainFrameView();
</span><del>- largestUnobscuredRect.scale(1 / m_viewportConfiguration.initialScale());
</del><ins>+ largestUnobscuredRect.scale(1 / m_viewportConfiguration.initialScaleIgnoringContentSize());
</ins><span class="cx"> frameView.setViewportSizeForCSSViewportUnits(roundedIntSize(largestUnobscuredRect));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>