<!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>[198284] 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/198284">198284</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-03-16 09:46:12 -0700 (Wed, 16 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't invalidate style unnecessarily when setting inline style cssText
https://bugs.webkit.org/show_bug.cgi?id=155541
rdar://problem/23318893
Reviewed by Simon Fraser.
Source/WebCore:
We currently invalidate style when cssText is set whether the style declaration changed or not.
Based on a patch by Simon.
Test: fast/css/style-invalidation-inline-csstext.html
* css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::PropertySetCSSStyleDeclaration::cssText):
(WebCore::PropertySetCSSStyleDeclaration::setCssText):
Invalidate only if the parsed style changed.
* css/StyleProperties.cpp:
(WebCore::MutableStyleProperties::parseDeclaration):
Compare the original and new style after parsing, return result.
* css/StyleProperties.h:
LayoutTests:
* fast/css/style-invalidation-inline-csstext-expected.txt: Added.
* fast/css/style-invalidation-inline-csstext.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="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiesh">trunk/Source/WebCore/css/StyleProperties.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssstyleinvalidationinlinecsstextexpectedtxt">trunk/LayoutTests/fast/css/style-invalidation-inline-csstext-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleinvalidationinlinecsstexthtml">trunk/LayoutTests/fast/css/style-invalidation-inline-csstext.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198283 => 198284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-16 16:26:22 UTC (rev 198283)
+++ trunk/LayoutTests/ChangeLog 2016-03-16 16:46:12 UTC (rev 198284)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-16 Antti Koivisto <antti@apple.com>
+
+ Don't invalidate style unnecessarily when setting inline style cssText
+ https://bugs.webkit.org/show_bug.cgi?id=155541
+ rdar://problem/23318893
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/style-invalidation-inline-csstext-expected.txt: Added.
+ * fast/css/style-invalidation-inline-csstext.html: Added.
+
</ins><span class="cx"> 2016-03-16 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline fast/css/getPropertyValue-webkit-marquee.html after r198255
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleinvalidationinlinecsstextexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-invalidation-inline-csstext-expected.txt (0 => 198284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-invalidation-inline-csstext-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/style-invalidation-inline-csstext-expected.txt 2016-03-16 16:46:12 UTC (rev 198284)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+
+PASS Setting cssText invalidates style
+PASS Adding more properties to cssText invalidates style
+PASS Changing a property value invalidates style
+PASS Changing another property value invalidates style
+PASS Setting cssText without changing it doesn't invalidate style
+PASS Non-semantic change to cssText doesn't invalidate style
+PASS Removing a property invalidates style
+PASS Clearing cssText invalidates style
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleinvalidationinlinecsstexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-invalidation-inline-csstext.html (0 => 198284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-invalidation-inline-csstext.html (rev 0)
+++ trunk/LayoutTests/fast/css/style-invalidation-inline-csstext.html 2016-03-16 16:46:12 UTC (rev 198284)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+
+<div id=test><div></div></div>
+
+<script>
+var testDiv = document.querySelector('#test');
+var testDivChild = testDiv.firstChild;
+
+function testInvalidation(cssText, shouldInvalidate, name)
+{
+ test(() => {
+ internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
+
+ testDiv.style.cssText = cssText;
+
+ assert_equals(internals.styleChangeType(testDiv), shouldInvalidate ? "InlineStyleChange" : "NoStyleChange");
+ assert_equals(internals.styleChangeType(testDivChild), "NoStyleChange");
+ }, name);
+}
+
+testInvalidation("color:red", true, "Setting cssText invalidates style");
+testInvalidation("color:red; transform: scale3d(0, 0, 1);", true, "Adding more properties to cssText invalidates style");
+testInvalidation("color:blue; transform: scale3d(0, 0, 1);", true, "Changing a property value invalidates style");
+testInvalidation("color:blue; transform: scale3d(0, 1, 1);", true, "Changing another property value invalidates style");
+testInvalidation("color:blue; transform: scale3d(0, 1, 1);", false, "Setting cssText without changing it doesn't invalidate style");
+testInvalidation(" color:blue; transform: scale3d(0,1,1)", false, "Non-semantic change to cssText doesn't invalidate style");
+testInvalidation("transform: scale3d(0,1,1)", true, "Removing a property invalidates style");
+testInvalidation("", true, "Clearing cssText invalidates style");
+
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198283 => 198284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-16 16:26:22 UTC (rev 198283)
+++ trunk/Source/WebCore/ChangeLog 2016-03-16 16:46:12 UTC (rev 198284)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-16 Antti Koivisto <antti@apple.com>
+
+ Don't invalidate style unnecessarily when setting inline style cssText
+ https://bugs.webkit.org/show_bug.cgi?id=155541
+ rdar://problem/23318893
+
+ Reviewed by Simon Fraser.
+
+ We currently invalidate style when cssText is set whether the style declaration changed or not.
+
+ Based on a patch by Simon.
+
+ Test: fast/css/style-invalidation-inline-csstext.html
+
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ (WebCore::PropertySetCSSStyleDeclaration::cssText):
+ (WebCore::PropertySetCSSStyleDeclaration::setCssText):
+
+ Invalidate only if the parsed style changed.
+
+ * css/StyleProperties.cpp:
+ (WebCore::MutableStyleProperties::parseDeclaration):
+
+ Compare the original and new style after parsing, return result.
+
+ * css/StyleProperties.h:
+
</ins><span class="cx"> 2016-03-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r195661): [GTK] very slow scrolling
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (198283 => 198284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-03-16 16:26:22 UTC (rev 198283)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-03-16 16:46:12 UTC (rev 198284)
</span><span class="lines">@@ -145,18 +145,16 @@
</span><span class="cx"> {
</span><span class="cx"> return m_propertySet->asText();
</span><span class="cx"> }
</span><del>-
-void PropertySetCSSStyleDeclaration::setCssText(const String& text, ExceptionCode& ec)
</del><ins>+
+void PropertySetCSSStyleDeclaration::setCssText(const String& text, ExceptionCode&)
</ins><span class="cx"> {
</span><span class="cx"> StyleAttributeMutationScope mutationScope(this);
</span><span class="cx"> if (!willMutate())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ec = 0;
- // FIXME: Detect syntax errors and set ec.
- m_propertySet->parseDeclaration(text, contextStyleSheet());
</del><ins>+ bool changed = m_propertySet->parseDeclaration(text, contextStyleSheet());
</ins><span class="cx">
</span><del>- didMutate(PropertyChanged);
</del><ins>+ didMutate(changed ? PropertyChanged : NoChanges);
</ins><span class="cx">
</span><span class="cx"> mutationScope.enqueueMutationRecord();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (198283 => 198284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2016-03-16 16:26:22 UTC (rev 198283)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2016-03-16 16:46:12 UTC (rev 198284)
</span><span class="lines">@@ -843,8 +843,9 @@
</span><span class="cx"> return setProperty(CSSProperty(propertyID, CSSValuePool::singleton().createIdentifierValue(identifier), important));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MutableStyleProperties::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
</del><ins>+bool MutableStyleProperties::parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet)
</ins><span class="cx"> {
</span><ins>+ auto oldProperties = WTFMove(m_propertyVector);
</ins><span class="cx"> m_propertyVector.clear();
</span><span class="cx">
</span><span class="cx"> CSSParserContext context(cssParserMode());
</span><span class="lines">@@ -854,6 +855,9 @@
</span><span class="cx"> }
</span><span class="cx"> CSSParser parser(context);
</span><span class="cx"> parser.parseDeclaration(this, styleDeclaration, 0, contextStyleSheet);
</span><ins>+
+ // We could do better. Just changing property order does not require style invalidation.
+ return oldProperties != m_propertyVector;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MutableStyleProperties::addParsedProperties(const CSSParser::ParsedPropertyVector& properties)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.h (198283 => 198284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.h 2016-03-16 16:26:22 UTC (rev 198283)
+++ trunk/Source/WebCore/css/StyleProperties.h 2016-03-16 16:46:12 UTC (rev 198284)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> void mergeAndOverrideOnConflict(const StyleProperties&);
</span><span class="cx">
</span><span class="cx"> void clear();
</span><del>- void parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
</del><ins>+ bool parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT CSSStyleDeclaration* ensureCSSStyleDeclaration();
</span><span class="cx"> CSSStyleDeclaration* ensureInlineCSSStyleDeclaration(StyledElement* parentElement);
</span></span></pre>
</div>
</div>
</body>
</html>