<!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>[171692] 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/171692">171692</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-07-28 13:44:50 -0700 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/160806">r160806</a>): CSS zoom property doesn't work on anything inside anchors.
<https://webkit.org/b/135344>
<rdar://problem/17759577>
Source/WebCore:
When DeprecatedStyleBuilder applies the CSS zoom property (ApplyPropertyZoom)
it first resets the "effective zoom" by calling RenderStyle::setEffectiveZoom().
This mechanism was not resistent to being called multiple times, due to the
optimization in RenderStyle::setZoom() to avoid copy-on-writing the shared data
when setting some property to the already-set value.
The bug would happen in this sequence:
ApplyPropertyZoom:
- setEffectiveZoom(1);
- setZoom(2); // this updates the effective zoom
ApplyPropertyZoom:
- setEffectiveZoom(1);
- setZoom(2); // this doesn't update the effective zoom
When we run the second setZoom(2); call, the RenderStyle's zoom value is 2
already and we'll early return without updating the effective zoom.
This change moves the updating of the effective zoom in setZoom() to take place
before the early return due to overwriting with the same value.
Note: the fact that we're apply the zoom property twice is an inefficiency that
we should figure out a way to avoid in the future.
Reviewed by Simon Fraser.
Test: fast/css/zoom-inside-link.html
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::setZoom):
LayoutTests:
Reviewed by Simon Fraser.
* fast/css/zoom-inside-link-expected.html: Added.
* fast/css/zoom-inside-link.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="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsszoominsidelinkexpectedhtml">trunk/LayoutTests/fast/css/zoom-inside-link-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcsszoominsidelinkhtml">trunk/LayoutTests/fast/css/zoom-inside-link.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171691 => 171692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-28 20:43:57 UTC (rev 171691)
+++ trunk/LayoutTests/ChangeLog 2014-07-28 20:44:50 UTC (rev 171692)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-07-28 Andreas Kling <akling@apple.com>
+
+ REGRESSION (r160806): CSS zoom property doesn't work on anything inside anchors.
+ <https://webkit.org/b/135344>
+ <rdar://problem/17759577>
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/zoom-inside-link-expected.html: Added.
+ * fast/css/zoom-inside-link.html: Added.
+
</ins><span class="cx"> 2014-07-28 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS3-Text] Update text-expectations after r171677
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsszoominsidelinkexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/zoom-inside-link-expected.html (0 => 171692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/zoom-inside-link-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/zoom-inside-link-expected.html 2014-07-28 20:44:50 UTC (rev 171692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+a, p { color: black; text-decoration: none; }
+</style>
+</head>
+<body>
+<p>This is unzoomed.</p>
+<p style="zoom: 2">This is zoomed.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsszoominsidelinkhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/zoom-inside-link.html (0 => 171692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/zoom-inside-link.html (rev 0)
+++ trunk/LayoutTests/fast/css/zoom-inside-link.html 2014-07-28 20:44:50 UTC (rev 171692)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+a, p { color: black; text-decoration: none; }
+</style>
+</head>
+<body>
+<a href="#">
+<p>This is unzoomed.</p>
+<p style="zoom: 2">This is zoomed.</p>
+</a>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171691 => 171692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-28 20:43:57 UTC (rev 171691)
+++ trunk/Source/WebCore/ChangeLog 2014-07-28 20:44:50 UTC (rev 171692)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-07-28 Andreas Kling <akling@apple.com>
+
+ REGRESSION (r160806): CSS zoom property doesn't work on anything inside anchors.
+ <https://webkit.org/b/135344>
+ <rdar://problem/17759577>
+
+ When DeprecatedStyleBuilder applies the CSS zoom property (ApplyPropertyZoom)
+ it first resets the "effective zoom" by calling RenderStyle::setEffectiveZoom().
+
+ This mechanism was not resistent to being called multiple times, due to the
+ optimization in RenderStyle::setZoom() to avoid copy-on-writing the shared data
+ when setting some property to the already-set value.
+
+ The bug would happen in this sequence:
+
+ ApplyPropertyZoom:
+ - setEffectiveZoom(1);
+ - setZoom(2); // this updates the effective zoom
+ ApplyPropertyZoom:
+ - setEffectiveZoom(1);
+ - setZoom(2); // this doesn't update the effective zoom
+
+ When we run the second setZoom(2); call, the RenderStyle's zoom value is 2
+ already and we'll early return without updating the effective zoom.
+
+ This change moves the updating of the effective zoom in setZoom() to take place
+ before the early return due to overwriting with the same value.
+
+ Note: the fact that we're apply the zoom property twice is an inefficiency that
+ we should figure out a way to avoid in the future.
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/css/zoom-inside-link.html
+
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::setZoom):
+
</ins><span class="cx"> 2014-07-28 Bear Travis <betravis@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Font Loading] Update Font Loading Code
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (171691 => 171692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-07-28 20:43:57 UTC (rev 171691)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-07-28 20:44:50 UTC (rev 171692)
</span><span class="lines">@@ -2080,10 +2080,10 @@
</span><span class="cx">
</span><span class="cx"> inline bool RenderStyle::setZoom(float f)
</span><span class="cx"> {
</span><ins>+ setEffectiveZoom(effectiveZoom() * f);
</ins><span class="cx"> if (compareEqual(visual->m_zoom, f))
</span><span class="cx"> return false;
</span><span class="cx"> visual.access()->m_zoom = f;
</span><del>- setEffectiveZoom(effectiveZoom() * zoom());
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>