<!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>[181400] trunk/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/181400">181400</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-03-11 12:16:20 -0700 (Wed, 11 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it possible to zoom on pages that claim to lay out to device size and then fail to do so
https://bugs.webkit.org/show_bug.cgi?id=142549
Reviewed by Simon Fraser.
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::ViewportConfiguration):
Rename m_ignoreScalingConstraints to m_canIgnoreScalingConstraints,
because it being true does not guarantee that we will ignore scaling constraints,
but it being false does guarantee that we won't.
(WebCore::ViewportConfiguration::shouldIgnoreScalingConstraints):
Ignore scaling constraints if the page:
a) claimed to want to lay out to device-width and then laid out too wide
b) claimed to want to lay out to device-height and then laid out too tall
c) claimed to want to lay out with initialScale=1 and then laid out too wide
(WebCore::ViewportConfiguration::initialScale):
(WebCore::ViewportConfiguration::minimumScale):
(WebCore::ViewportConfiguration::allowsUserScaling):
Call shouldIgnoreScalingConstraints() instead of looking at the local, so we can
have some more logic here (as above).
(WebCore::ViewportConfiguration::description):
Dump whether we're ignoring scaling constraints.
(WebCore::ViewportConfiguration::dump):
Use WTFLogAlways so that the output goes to various other logging mechanisms
instead of just stderr.
* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::setCanIgnoreScalingConstraints):
(WebCore::ViewportConfiguration::setIgnoreScalingConstraints): Deleted.
* Shared/WebPreferencesDefinitions.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Flip the pref on by default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationcpp">trunk/Source/WebCore/page/ViewportConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationh">trunk/Source/WebCore/page/ViewportConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181399 => 181400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebCore/ChangeLog 2015-03-11 19:16:20 UTC (rev 181400)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2015-03-11 Timothy Horton <timothy_horton@apple.com>
+
+ Make it possible to zoom on pages that claim to lay out to device size and then fail to do so
+ https://bugs.webkit.org/show_bug.cgi?id=142549
+
+ Reviewed by Simon Fraser.
+
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::ViewportConfiguration):
+ Rename m_ignoreScalingConstraints to m_canIgnoreScalingConstraints,
+ because it being true does not guarantee that we will ignore scaling constraints,
+ but it being false does guarantee that we won't.
+
+ (WebCore::ViewportConfiguration::shouldIgnoreScalingConstraints):
+ Ignore scaling constraints if the page:
+ a) claimed to want to lay out to device-width and then laid out too wide
+ b) claimed to want to lay out to device-height and then laid out too tall
+ c) claimed to want to lay out with initialScale=1 and then laid out too wide
+
+ (WebCore::ViewportConfiguration::initialScale):
+ (WebCore::ViewportConfiguration::minimumScale):
+ (WebCore::ViewportConfiguration::allowsUserScaling):
+ Call shouldIgnoreScalingConstraints() instead of looking at the local, so we can
+ have some more logic here (as above).
+
+ (WebCore::ViewportConfiguration::description):
+ Dump whether we're ignoring scaling constraints.
+
+ (WebCore::ViewportConfiguration::dump):
+ Use WTFLogAlways so that the output goes to various other logging mechanisms
+ instead of just stderr.
+
+ * page/ViewportConfiguration.h:
+ (WebCore::ViewportConfiguration::setCanIgnoreScalingConstraints):
+ (WebCore::ViewportConfiguration::setIgnoreScalingConstraints): Deleted.
+
</ins><span class="cx"> 2015-03-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Use out-of-band messaging for RenderBox::firstLineBaseline() and RenderBox::inlineBlockBaseline()
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (181399 => 181400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2015-03-11 19:16:20 UTC (rev 181400)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> ViewportConfiguration::ViewportConfiguration()
</span><span class="cx"> : m_minimumLayoutSize(1024, 768)
</span><del>- , m_ignoreScalingConstraints(false)
</del><ins>+ , m_canIgnoreScalingConstraints(false)
</ins><span class="cx"> {
</span><span class="cx"> // Setup a reasonable default configuration to avoid computing infinite scale/sizes.
</span><span class="cx"> // Those are the original iPhone configuration.
</span><span class="lines">@@ -97,13 +97,32 @@
</span><span class="cx"> return IntSize(layoutWidth(), layoutHeight());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ViewportConfiguration::shouldIgnoreScalingConstraints() const
+{
+ if (!m_canIgnoreScalingConstraints)
+ return false;
+
+ bool laidOutWiderThanViewport = m_contentSize.width() > layoutWidth();
+ if (m_viewportArguments.width == ViewportArguments::ValueDeviceWidth)
+ return laidOutWiderThanViewport;
+
+ bool laidOutTallerThanViewport = m_contentSize.height() > layoutHeight();
+ if (m_viewportArguments.height == ViewportArguments::ValueDeviceHeight)
+ return laidOutTallerThanViewport;
+
+ if (m_configuration.initialScaleIsSet && m_configuration.initialScale == 1)
+ return laidOutWiderThanViewport;
+
+ return false;
+}
+
</ins><span class="cx"> double ViewportConfiguration::initialScale() const
</span><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 && !m_ignoreScalingConstraints)
</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="lines">@@ -118,13 +137,13 @@
</span><span class="cx"> double height = m_contentSize.height() > 0 ? m_contentSize.height() : layoutHeight();
</span><span class="cx"> if (height > 0 && height * initialScale < minimumLayoutSize.height())
</span><span class="cx"> initialScale = minimumLayoutSize.height() / height;
</span><del>- return std::min(std::max(initialScale, m_ignoreScalingConstraints ? 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><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><del>- if (!m_configuration.initialScaleIsSet || m_ignoreScalingConstraints)
</del><ins>+ if (!m_configuration.initialScaleIsSet || shouldIgnoreScalingConstraints())
</ins><span class="cx"> return initialScale();
</span><span class="cx">
</span><span class="cx"> // If not, we still need to sanity check our value.
</span><span class="lines">@@ -146,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> bool ViewportConfiguration::allowsUserScaling() const
</span><span class="cx"> {
</span><del>- return m_ignoreScalingConstraints || m_configuration.allowsUserScaling;
</del><ins>+ return shouldIgnoreScalingConstraints() || m_configuration.allowsUserScaling;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ViewportConfiguration::Parameters ViewportConfiguration::webpageParameters()
</span><span class="lines">@@ -469,7 +488,9 @@
</span><span class="cx"> ts.writeIndent();
</span><span class="cx"> ts << "(computed minimum scale " << minimumScale() << ")\n";
</span><span class="cx"> ts.writeIndent();
</span><del>- ts << "(computed layout size " << layoutSize() << ")";
</del><ins>+ ts << "(computed layout size " << layoutSize() << ")\n";
+ ts.writeIndent();
+ ts << "(ignoring scaling constraints " << (shouldIgnoreScalingConstraints() ? "true" : "false") << ")";
</ins><span class="cx"> ts.decreaseIndent();
</span><span class="cx">
</span><span class="cx"> ts << ")\n";
</span><span class="lines">@@ -479,7 +500,7 @@
</span><span class="cx">
</span><span class="cx"> void ViewportConfiguration::dump() const
</span><span class="cx"> {
</span><del>- fprintf(stderr, "%s", description().data());
</del><ins>+ WTFLogAlways("%s", description().data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (181399 => 181400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2015-03-11 19:16:20 UTC (rev 181400)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> const ViewportArguments& viewportArguments() const { return m_viewportArguments; }
</span><span class="cx"> WEBCORE_EXPORT void setViewportArguments(const ViewportArguments&);
</span><span class="cx">
</span><del>- void setIgnoreScalingConstraints(bool ignoreScalingConstraints) {m_ignoreScalingConstraints = ignoreScalingConstraints; }
</del><ins>+ void setCanIgnoreScalingConstraints(bool canIgnoreScalingConstraints) { m_canIgnoreScalingConstraints = canIgnoreScalingConstraints; }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT IntSize layoutSize() const;
</span><span class="cx"> WEBCORE_EXPORT double initialScale() const;
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> double viewportArgumentsLength(double length) const;
</span><span class="cx"> int layoutWidth() const;
</span><span class="cx"> int layoutHeight() const;
</span><ins>+ bool shouldIgnoreScalingConstraints() const;
</ins><span class="cx">
</span><span class="cx"> Parameters m_configuration;
</span><span class="cx"> Parameters m_defaultConfiguration;
</span><span class="lines">@@ -108,7 +109,7 @@
</span><span class="cx"> FloatSize m_minimumLayoutSize;
</span><span class="cx"> ViewportArguments m_viewportArguments;
</span><span class="cx">
</span><del>- bool m_ignoreScalingConstraints;
</del><ins>+ bool m_canIgnoreScalingConstraints;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181399 => 181400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-11 19:16:20 UTC (rev 181400)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-03-11 Timothy Horton <timothy_horton@apple.com>
+
+ Make it possible to zoom on pages that claim to lay out to device size and then fail to do so
+ https://bugs.webkit.org/show_bug.cgi?id=142549
+
+ Reviewed by Simon Fraser.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ Flip the pref on by default.
+
</ins><span class="cx"> 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Do not look for child processes in the UI process binary path
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (181399 => 181400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-03-11 19:16:20 UTC (rev 181400)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> macro(SimpleLineLayoutDebugBordersEnabled, simpleLineLayoutDebugBordersEnabled, Bool, bool, false) \
</span><span class="cx"> macro(DeveloperExtrasEnabled, developerExtrasEnabled, Bool, bool, false) \
</span><span class="cx"> macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \
</span><del>- macro(IgnoreViewportScalingConstraints, ignoreViewportScalingConstraints, Bool, bool, false) \
</del><ins>+ macro(IgnoreViewportScalingConstraints, ignoreViewportScalingConstraints, Bool, bool, true) \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DEBUG_UINT32_PREFERENCE(macro) \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (181399 => 181400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-11 19:16:20 UTC (rev 181400)
</span><span class="lines">@@ -2853,7 +2853,7 @@
</span><span class="cx"> m_drawingArea->updatePreferences(store);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- m_viewportConfiguration.setIgnoreScalingConstraints(store.getBoolValueForKey(WebPreferencesKey::ignoreViewportScalingConstraintsKey()));
</del><ins>+ m_viewportConfiguration.setCanIgnoreScalingConstraints(store.getBoolValueForKey(WebPreferencesKey::ignoreViewportScalingConstraintsKey()));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>