<!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>[169779] trunk</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/169779">169779</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 16:13:20 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/167937">r167937</a>): Do not use effective zoom factor while resolving media query's min-, max-(device)width/height values.
https://bugs.webkit.org/show_bug.cgi?id=133681
Reviewed by Simon Fraser.
We lost the default multiplier(zoom) value of 1 with <a href="http://trac.webkit.org/projects/webkit/changeset/167937">r167937</a> at template<typename T> T computeLength().
Now MediaQueryEvaluator takes the current page zoom factor into account while resolving min-, max- width values.
This patch explicitly sets the multiplier value to 1 to ensure zoom independent media query value resolving.
Source/WebCore:
Test: fast/media/media-query-with-scaled-content.html
* css/CSSToLengthConversionData.cpp:
(WebCore::CSSToLengthConversionData::viewportWidthFactor):
(WebCore::CSSToLengthConversionData::viewportHeightFactor):
* css/CSSToLengthConversionData.h:
* css/MediaQueryEvaluator.cpp:
(WebCore::MediaQueryEvaluator::eval):
* testing/Internals.cpp:
(WebCore::Internals::setPageZoomFactor):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* fast/media/media-query-with-scaled-content-expected.html: Added.
* fast/media/media-query-with-scaled-content.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSToLengthConversionDatacpp">trunk/Source/WebCore/css/CSSToLengthConversionData.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSToLengthConversionDatah">trunk/Source/WebCore/css/CSSToLengthConversionData.h</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediamediaquerywithscaledcontentexpectedhtml">trunk/LayoutTests/fast/media/media-query-with-scaled-content-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmediamediaquerywithscaledcontenthtml">trunk/LayoutTests/fast/media/media-query-with-scaled-content.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/LayoutTests/ChangeLog 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-10 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (r167937): Do not use effective zoom factor while resolving media query's min-, max-(device)width/height values.
+ https://bugs.webkit.org/show_bug.cgi?id=133681
+
+ Reviewed by Simon Fraser.
+
+ We lost the default multiplier(zoom) value of 1 with r167937 at template<typename T> T computeLength().
+ Now MediaQueryEvaluator takes the current page zoom factor into account while resolving min-, max- width values.
+
+ This patch explicitly sets the multiplier value to 1 to ensure zoom independent media query value resolving.
+
+ * fast/media/media-query-with-scaled-content-expected.html: Added.
+ * fast/media/media-query-with-scaled-content.html: Added.
+
</ins><span class="cx"> 2014-06-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133694
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediamediaquerywithscaledcontentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/media/media-query-with-scaled-content-expected.html (0 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/media/media-query-with-scaled-content-expected.html (rev 0)
+++ trunk/LayoutTests/fast/media/media-query-with-scaled-content-expected.html 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that media query length computation works on scaled context.</title>
+<style>
+ div {
+ width: 40px;
+ height: 40px;
+ background-color: green;
+ }
+</style>
+</head>
+<body>
+ <div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediamediaquerywithscaledcontenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/media/media-query-with-scaled-content.html (0 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/media/media-query-with-scaled-content.html (rev 0)
+++ trunk/LayoutTests/fast/media/media-query-with-scaled-content.html 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that media query length computation works on scaled context.</title>
+<style>
+ div {
+ width: 40px;
+ height: 40px;
+ background-color: red;
+ }
+
+ @media only screen and (min-width: 700px) {
+ div {
+ background-color: green;
+ }
+ }
+</style>
+</head>
+<body>
+ <div></div>
+<script>
+ if (window.internals) {
+ internals.setPageZoomFactor(2.5);
+ document.body.offsetHeight;
+
+ internals.setPageZoomFactor(1);
+ document.body.offsetHeight;
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-06-10 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (r167937): Do not use effective zoom factor while resolving media query's min-, max-(device)width/height values.
+ https://bugs.webkit.org/show_bug.cgi?id=133681
+
+ Reviewed by Simon Fraser.
+
+ We lost the default multiplier(zoom) value of 1 with r167937 at template<typename T> T computeLength().
+ Now MediaQueryEvaluator takes the current page zoom factor into account while resolving min-, max- width values.
+
+ This patch explicitly sets the multiplier value to 1 to ensure zoom independent media query value resolving.
+
+ Test: fast/media/media-query-with-scaled-content.html
+
+ * css/CSSToLengthConversionData.cpp:
+ (WebCore::CSSToLengthConversionData::viewportWidthFactor):
+ (WebCore::CSSToLengthConversionData::viewportHeightFactor):
+ * css/CSSToLengthConversionData.h:
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::MediaQueryEvaluator::eval):
+ * testing/Internals.cpp:
+ (WebCore::Internals::setPageZoomFactor):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2014-06-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133694
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToLengthConversionDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToLengthConversionData.cpp (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSToLengthConversionData.cpp 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebCore/css/CSSToLengthConversionData.cpp 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -47,7 +47,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_style && !m_computingFontSize)
</span><span class="cx"> m_style->setHasViewportUnits();
</span><del>- return m_renderView ? m_renderView->viewportSizeForCSSViewportUnits().width() / 100.0 : 0.0;
</del><ins>+
+ if (!m_renderView)
+ return 0;
+
+ return m_renderView->viewportSizeForCSSViewportUnits().width() / 100.0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double CSSToLengthConversionData::viewportHeightFactor() const
</span><span class="lines">@@ -56,9 +60,9 @@
</span><span class="cx"> m_style->setHasViewportUnits();
</span><span class="cx">
</span><span class="cx"> if (!m_renderView)
</span><del>- return 0.0;
</del><ins>+ return 0;
</ins><span class="cx">
</span><del>- return m_renderView ? m_renderView->viewportSizeForCSSViewportUnits().height() / 100.0 : 0.0;
</del><ins>+ return m_renderView->viewportSizeForCSSViewportUnits().height() / 100.0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double CSSToLengthConversionData::viewportMinFactor() const
</span><span class="lines">@@ -67,7 +71,7 @@
</span><span class="cx"> m_style->setHasViewportUnits();
</span><span class="cx">
</span><span class="cx"> if (!m_renderView)
</span><del>- return 0.0;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> IntSize viewportSizeForCSSViewportUnits = m_renderView->viewportSizeForCSSViewportUnits();
</span><span class="cx"> return std::min(viewportSizeForCSSViewportUnits.width(), viewportSizeForCSSViewportUnits.height()) / 100.0;
</span><span class="lines">@@ -79,7 +83,7 @@
</span><span class="cx"> m_style->setHasViewportUnits();
</span><span class="cx">
</span><span class="cx"> if (!m_renderView)
</span><del>- return 0.0;
</del><ins>+ return 0;
</ins><span class="cx">
</span><span class="cx"> IntSize viewportSizeForCSSViewportUnits = m_renderView->viewportSizeForCSSViewportUnits();
</span><span class="cx"> return std::max(viewportSizeForCSSViewportUnits.width(), viewportSizeForCSSViewportUnits.height()) / 100.0;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToLengthConversionDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToLengthConversionData.h (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSToLengthConversionData.h 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebCore/css/CSSToLengthConversionData.h 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -51,14 +51,17 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(zoom > 0);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> CSSToLengthConversionData(RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, bool computingFontSize = false)
</span><span class="cx"> : m_style(style)
</span><span class="cx"> , m_rootStyle(rootStyle)
</span><span class="cx"> , m_renderView(renderView)
</span><ins>+ , m_zoom(1)
</ins><span class="cx"> , m_useEffectiveZoom(true)
</span><span class="cx"> , m_computingFontSize(computingFontSize)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> CSSToLengthConversionData()
</span><span class="cx"> : CSSToLengthConversionData(nullptr, nullptr, nullptr)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> if (func) {
</span><span class="cx"> CSSToLengthConversionData conversionData(m_style.get(),
</span><span class="cx"> m_frame->document()->documentElement()->renderStyle(),
</span><del>- m_frame->document()->renderView());
</del><ins>+ m_frame->document()->renderView(), 1, false);
</ins><span class="cx"> return func(expr->value(), conversionData, m_frame, NoPrefix);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -1780,6 +1780,17 @@
</span><span class="cx"> page->setPageScaleFactor(scaleFactor, IntPoint(x, y));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::setPageZoomFactor(float zoomFactor, ExceptionCode& ec)
+{
+ Document* document = contextDocument();
+ if (!document || !document->frame()) {
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+ Frame* frame = document->frame();
+ frame->setPageZoomFactor(zoomFactor);
+}
+
</ins><span class="cx"> void Internals::setHeaderHeight(float height)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebCore/testing/Internals.h 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -246,6 +246,7 @@
</span><span class="cx"> String pageSizeAndMarginsInPixels(int, int, int, int, int, int, int, ExceptionCode& = ASSERT_NO_EXCEPTION) const;
</span><span class="cx">
</span><span class="cx"> void setPageScaleFactor(float scaleFactor, int x, int y, ExceptionCode&);
</span><ins>+ void setPageZoomFactor(float zoomFactor, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void setHeaderHeight(float);
</span><span class="cx"> void setFooterHeight(float);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -203,6 +203,7 @@
</span><span class="cx"> [RaisesException] DOMString pageSizeAndMarginsInPixels(long pageIndex, long width, long height, long marginTop, long marginRight, long marginBottom, long marginLeft);
</span><span class="cx">
</span><span class="cx"> [RaisesException] void setPageScaleFactor(unrestricted float scaleFactor, long x, long y);
</span><ins>+ [RaisesException] void setPageZoomFactor(unrestricted float zoomFactor);
</ins><span class="cx">
</span><span class="cx"> void setHeaderHeight(unrestricted float height);
</span><span class="cx"> void setFooterHeight(unrestricted float height);
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (169778 => 169779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-06-10 22:50:56 UTC (rev 169778)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-06-10 23:13:20 UTC (rev 169779)
</span><span class="lines">@@ -290,6 +290,7 @@
</span><span class="cx"> ?setMockScrollbarsEnabled@Settings@WebCore@@SAX_N@Z
</span><span class="cx"> ?mockScrollbarsEnabled@Settings@WebCore@@SA_NXZ
</span><span class="cx"> ?setUsesOverlayScrollbars@Settings@WebCore@@SAX_N@Z
</span><ins>+ symbolWithPointer(?setPageZoomFactor@Frame@WebCore@@QAEXM@Z, ?setPageZoomFactor@Frame@WebCore@@QAEXM@Z)
</ins><span class="cx"> symbolWithPointer(?setPageScaleFactor@Page@WebCore@@QAEXMABVIntPoint@2@_N@Z, ?setPageScaleFactor@Page@WebCore@@QEAAXMAEBVIntPoint@2@_N@Z)
</span><span class="cx"> symbolWithPointer(?setPagination@Page@WebCore@@QAEXABUPagination@2@@Z, ?setPagination@Page@WebCore@@QEAAXAEBUPagination@2@@Z)
</span><span class="cx"> symbolWithPointer(?setPictographFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z, ?setPictographFontFamily@Settings@WebCore@@QEAAXAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
</span></span></pre>
</div>
</div>
</body>
</html>