[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [197343] releases/WebKitGTK/webkit-2.12
From: carlosgc () webkit ! org
Date: 2016-02-29 11:31:55
Message-ID: 20160229113156.18E8F3610E9 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[197343] releases/WebKitGTK/webkit-2.12</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/197343">197343</a></dd> \
<dt>Author</dt> <dd>carlosgc@webkit.org</dd> <dt>Date</dt> <dd>2016-02-29 03:31:55 \
-0800 (Mon, 29 Feb 2016)</dd> </dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197300">r197300</a> \
- Variables can resolve to the wrong value when elements differ in nothing but \
inherited variable value https://bugs.webkit.org/show_bug.cgi?id=154785
Reviewed by Antti Koivisto.
Source/WebCore:
Test: fast/css/variables/avoid-matched-property-cache.html
* css/StyleResolver.cpp:
(WebCore::StyleResolver::MatchResult::addMatchedProperties):
Disable the matched property cache when a value is variable-dependent, because
they can resolve to inherited values, and the matched property cache could
end up copying the wrong value from another similarly-styled element.
LayoutTests:
* fast/css/variables/avoid-matched-property-cache-expected.html: Added.
* fast/css/variables/avoid-matched-property-cache.html: Added.
Add a test. The non-standard element is necessary because the resolved property
cache is already disabled when using the "simple" default style sheet, and
it seems better to use a totally non-standard element than one that might
end up in the "simple" default style sheet in the future and would silently
invalidate the test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorecssStyleResolvercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssvariablesavoidmatchedpropert \
ycacheexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssvariablesavoidmatchedproper \
tycachehtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: \
releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (197342 => 197343)</h4> <pre \
class="diff"><span> <span class="info">--- \
releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-02-29 11:30:47 UTC (rev \
197342)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-02-29 11:31:55 UTC (rev \
197343) </span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-28 Tim Horton <timothy_horton@apple.com>
+
+ Variables can resolve to the wrong value when elements differ in nothing but \
inherited variable value + https://bugs.webkit.org/show_bug.cgi?id=154785
+
+ Reviewed by Antti Koivisto.
+
+ * fast/css/variables/avoid-matched-property-cache-expected.html: Added.
+ * fast/css/variables/avoid-matched-property-cache.html: Added.
+ Add a test. The non-standard element is necessary because the resolved \
property + cache is already disabled when using the "simple" default \
style sheet, and + it seems better to use a totally non-standard element than \
one that might + end up in the "simple" default style sheet in the \
future and would silently + invalidate the test.
+
</ins><span class="cx"> 2016-02-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Prevent cross-origin access to Location.assign() / \
Location.reload() </span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssvariablesavoidmatchedpropertycacheexpectedhtml"></a>
<div class="addfile"><h4>Added: \
releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache-expected.html \
(0 => 197343)</h4> <pre class="diff"><span>
<span class="info">--- \
releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache-expected.html \
(rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache-expected.html 2016-02-29 \
11:31:55 UTC (rev 197343) </span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<html>
+<style>
+body {
+ margin: 0;
+}
+</style>
+<body>
+<div style="background-color: green; width: 100px; height: \
100px;"></div> +</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssvariablesavoidmatchedpropertycachehtml"></a>
<div class="addfile"><h4>Added: \
releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache.html \
(0 => 197343)</h4> <pre class="diff"><span>
<span class="info">--- \
releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache.html \
(rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/variables/avoid-matched-property-cache.html 2016-02-29 \
11:31:55 UTC (rev 197343) </span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<html>
+<style>
+body {
+ margin: -100px 0 0 0;
+}
+
+.inner {
+ background-color: var(--backgroundColor);
+ height: 100px;
+ width: 100px;
+}
+</style>
+<body>
+<asdfasdf></asdfasdf>
+<div style="--backgroundColor: red;">
+ <div class="inner" id="a"></div>
+</div>
+<div style="--backgroundColor: green;">
+ <div class="inner" id="b"></div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: \
releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197342 => 197343)</h4> <pre \
class="diff"><span> <span class="info">--- \
releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-29 11:30:47 UTC (rev \
197342)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-29 11:31:55 UTC \
(rev 197343) </span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-28 Tim Horton <timothy_horton@apple.com>
+
+ Variables can resolve to the wrong value when elements differ in nothing but \
inherited variable value + https://bugs.webkit.org/show_bug.cgi?id=154785
+
+ Reviewed by Antti Koivisto.
+
+ Test: fast/css/variables/avoid-matched-property-cache.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::MatchResult::addMatchedProperties):
+ Disable the matched property cache when a value is variable-dependent, \
because + they can resolve to inherited values, and the matched property cache \
could + end up copying the wrong value from another similarly-styled element.
+
</ins><span class="cx"> 2016-02-28 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> SVGToOTFFontConversion.cpp does not compile with \
libstdc++ 4.8 </span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: \
releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleResolver.cpp (197342 => \
197343)</h4> <pre class="diff"><span>
<span class="info">--- \
releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleResolver.cpp 2016-02-29 \
11:30:47 UTC (rev 197342)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleResolver.cpp 2016-02-29 \
11:31:55 UTC (rev 197343) </span><span class="lines">@@ -225,11 +225,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The value currentColor has implicitely \
the same side effect. It depends on the value of color, </span><del>- \
// which is an inherited value, making the non-inherited property implicitely \
inherited. </del><ins>+ // which is an inherited value, making the \
non-inherited property implicitly inherited. </ins><span class="cx"> \
if (is<CSSPrimitiveValue>(value) && \
downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueCurrentcolor) { \
</span><span class="cx"> isCacheable = false; </span><span \
class="cx"> break; </span><span class="cx"> }
</span><ins>+
+ if (value.isVariableDependentValue()) {
+ isCacheable = false;
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic