<!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>[211289] 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/211289">211289</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-27 10:58:13 -0800 (Fri, 27 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Styles should not show background-repeat-x/y, or -webkit-mask-repeat-x/y
https://bugs.webkit.org/show_bug.cgi?id=167255
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2017-01-27
Reviewed by Joseph Pecoraro.
Source/WebCore:
Test: inspector/css/css-property.html
* css/makeprop.pl:
(addProperty):
Add a generated function `isInternalCSSProperty` that checks the given CSSPropertyID against
a derived list of properties from CSSProperties.json with "internal-only".
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::getSupportedCSSProperties):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyle::styleWithProperties):
Only pass CSS property payloads to the frontend if they are not internal.
LayoutTests:
Checks that internal-only CSS properties are marked as invalid when passed to WebInspector.
* inspector/css/css-property-expected.txt: Added.
* inspector/css/css-property.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="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorcsscsspropertyexpectedtxt">trunk/LayoutTests/inspector/css/css-property-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorcsscsspropertyhtml">trunk/LayoutTests/inspector/css/css-property.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211288 => 211289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-27 18:44:18 UTC (rev 211288)
+++ trunk/LayoutTests/ChangeLog 2017-01-27 18:58:13 UTC (rev 211289)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-27 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Styles should not show background-repeat-x/y, or -webkit-mask-repeat-x/y
+ https://bugs.webkit.org/show_bug.cgi?id=167255
+
+ Reviewed by Joseph Pecoraro.
+
+ Checks that internal-only CSS properties are marked as invalid when passed to WebInspector.
+
+ * inspector/css/css-property-expected.txt: Added.
+ * inspector/css/css-property.html: Added.
+
</ins><span class="cx"> 2017-01-27 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement Cache-control: immutable
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorcsscsspropertyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/css/css-property-expected.txt (0 => 211289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/css/css-property-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/css/css-property-expected.txt 2017-01-27 18:58:13 UTC (rev 211289)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+Testing methods of CSSProperty.
+
+
+== Running test suite: CSSProperty
+-- Running test case: CSSProperty.prototype.get valid
+PASS: "background-repeat" is a valid property.
+PASS: "background-repeat-x" is an invalid property.
+PASS: "background-repeat-invalid" is an invalid property.
+PASS: "background-repeat-y" is an invalid property.
+
+-- Running test case: CSSProperty.prototype.get anonymous
+PASS: "background-repeat" is not an anonymous CSS property.
+PASS: "background-repeat-x" is not an anonymous CSS property.
+PASS: "background-repeat-invalid" is not an anonymous CSS property.
+PASS: "background-repeat-y" is an anonymous CSS property.
+
+-- Running test case: CSSProperty.prototype.get implicit
+PASS: "background-repeat" is not an implicit CSS property.
+PASS: "background-repeat-x" is not an implicit CSS property.
+PASS: "background-repeat-invalid" is not an implicit CSS property.
+PASS: "background-repeat-y" is an implicit CSS property.
+
+-- Running test case: CSSProperty.prototype.get value
+PASS: "background-repeat" has the value "repeat".
+PASS: "background-repeat-x" has the value "repeat".
+PASS: "background-repeat-invalid" has the value "repeat".
+PASS: "background-repeat-y" has the value "repeat".
+
+-- Running test case: CSSProperty.prototype.get text
+PASS: "background-repeat" has the text "background-repeat: repeat;".
+PASS: "background-repeat" has the _text (private) "background-repeat: repeat;".
+PASS: "background-repeat-x" has the text "background-repeat-x: repeat;".
+PASS: "background-repeat-x" has the _text (private) "background-repeat-x: repeat;".
+PASS: "background-repeat-invalid" has the text "background-repeat-invalid: repeat;".
+PASS: "background-repeat-invalid" has the _text (private) "background-repeat-invalid: repeat;".
+PASS: "background-repeat-y" has the text "background-repeat-y: repeat;".
+PASS: "background-repeat-y" has the _text (private) "".
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorcsscsspropertyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/css/css-property.html (0 => 211289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/css/css-property.html (rev 0)
+++ trunk/LayoutTests/inspector/css/css-property.html 2017-01-27 18:58:13 UTC (rev 211289)
</span><span class="lines">@@ -0,0 +1,184 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test() {
+ let nodeStyles = null;
+
+ let suite = InspectorTest.createAsyncSuite("CSSProperty");
+
+ suite.addTestCase({
+ name: "CSSProperty.prototype.get valid",
+ description: "Ensure valid, invalid, and internal-only have correct valid state.",
+ test(resolve, reject) {
+ for (let rule of nodeStyles.matchedRules) {
+ if (rule.selectorText !== "div#x")
+ continue;
+
+ for (let property of rule.style.properties) {
+ switch (property.name) {
+ case "background-repeat":
+ InspectorTest.expectThat(property.valid, `"${property.name}" is a valid property.`);
+ break;
+ case "background-repeat-x":
+ case "background-repeat-y":
+ case "background-repeat-invalid":
+ InspectorTest.expectFalse(property.valid, `"${property.name}" is an invalid property.`);
+ break;
+ }
+ }
+ }
+
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "CSSProperty.prototype.get anonymous",
+ description: "Ensure valid, invalid, and internal-only have correct anonymous state.",
+ test(resolve, reject) {
+ for (let rule of nodeStyles.matchedRules) {
+ if (rule.selectorText !== "div#x")
+ continue;
+
+ for (let property of rule.style.properties) {
+ switch (property.name) {
+ case "background-repeat":
+ case "background-repeat-x":
+ case "background-repeat-invalid":
+ InspectorTest.expectFalse(property.anonymous, `"${property.name}" is not an anonymous CSS property.`);
+ break;
+ case "background-repeat-y":
+ InspectorTest.expectThat(property.anonymous, `"${property.name}" is an anonymous CSS property.`);
+ break;
+ }
+ }
+ }
+
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "CSSProperty.prototype.get implicit",
+ description: "Ensure valid, invalid, and internal-only have correct implicit state.",
+ test(resolve, reject) {
+ for (let rule of nodeStyles.matchedRules) {
+ if (rule.selectorText !== "div#x")
+ continue;
+
+ for (let property of rule.style.properties) {
+ switch (property.name) {
+ case "background-repeat":
+ case "background-repeat-x":
+ case "background-repeat-invalid":
+ InspectorTest.expectFalse(property.implicit, `"${property.name}" is not an implicit CSS property.`);
+ break;
+ case "background-repeat-y":
+ InspectorTest.expectThat(property.implicit, `"${property.name}" is an implicit CSS property.`);
+ break;
+ }
+ }
+ }
+
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "CSSProperty.prototype.get value",
+ description: "Ensure valid, invalid, and internal-only have correct value.",
+ test(resolve, reject) {
+ for (let rule of nodeStyles.matchedRules) {
+ if (rule.selectorText !== "div#x")
+ continue;
+
+ for (let property of rule.style.properties) {
+ switch (property.name) {
+ case "background-repeat":
+ case "background-repeat-x":
+ case "background-repeat-y":
+ case "background-repeat-invalid":
+ InspectorTest.expectEqual(property.value, "repeat", `"${property.name}" has the value "repeat".`);
+ break;
+ }
+ }
+ }
+
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "CSSProperty.prototype.get text",
+ description: "Ensure valid, invalid, and internal-only have correct text.",
+ test(resolve, reject) {
+ for (let rule of nodeStyles.matchedRules) {
+ if (rule.selectorText !== "div#x")
+ continue;
+
+ // It is necessary to use "_text" because the public "text" getter will attempt to
+ // synthesize a value for the CSSProperty if it is falsy. This is used for cases
+ // where a shorthand property is written in the style, since the longhand properties
+ // (with corresponding values) are still sent to the frontend.
+ for (let property of rule.style.properties) {
+ switch (property.name) {
+ case "background-repeat":
+ InspectorTest.expectEqual(property.text, "background-repeat: repeat;", `"${property.name}" has the text "background-repeat: repeat;".`);
+ InspectorTest.expectEqual(property._text, "background-repeat: repeat;", `"${property.name}" has the _text (private) "background-repeat: repeat;".`);
+ break;
+ case "background-repeat-x":
+ InspectorTest.expectEqual(property.text, "background-repeat-x: repeat;", `"${property.name}" has the text "background-repeat-x: repeat;".`);
+ InspectorTest.expectEqual(property._text, "background-repeat-x: repeat;", `"${property.name}" has the _text (private) "background-repeat-x: repeat;".`);
+ break;
+ case "background-repeat-y":
+ InspectorTest.expectEqual(property.text, "background-repeat-y: repeat;", `"${property.name}" has the text "background-repeat-y: repeat;".`);
+ InspectorTest.expectEqual(property._text, "", `"${property.name}" has the _text (private) "".`);
+ break;
+ case "background-repeat-invalid":
+ InspectorTest.expectEqual(property.text, "background-repeat-invalid: repeat;", `"${property.name}" has the text "background-repeat-invalid: repeat;".`);
+ InspectorTest.expectEqual(property._text, "background-repeat-invalid: repeat;", `"${property.name}" has the _text (private) "background-repeat-invalid: repeat;".`);
+ break;
+ }
+ }
+ }
+
+ resolve();
+ }
+ });
+
+ WebInspector.domTreeManager.requestDocument((documentNode) => {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "div#x", (contentNodeId) => {
+ if (contentNodeId) {
+ let domNode = WebInspector.domTreeManager.nodeForId(contentNodeId);
+ nodeStyles = WebInspector.cssStyleManager.stylesForNode(domNode);
+
+ if (nodeStyles.needsRefresh) {
+ nodeStyles.singleFireEventListener(WebInspector.DOMNodeStyles.Event.Refreshed, (event) => {
+ suite.runTestCasesAndFinish()
+ });
+ } else
+ suite.runTestCasesAndFinish();
+ } else {
+ InspectorTest.fail("DOM node not found.");
+ InspectorTest.completeTest();
+ }
+ });
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Testing methods of CSSProperty.</p>
+
+ <style>
+ div#x {
+ background-repeat: repeat;
+ background-repeat-x: repeat;
+ background-repeat-invalid: repeat;
+ }
+ </style>
+ <div id="x"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211288 => 211289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-27 18:44:18 UTC (rev 211288)
+++ trunk/Source/WebCore/ChangeLog 2017-01-27 18:58:13 UTC (rev 211289)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-27 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Styles should not show background-repeat-x/y, or -webkit-mask-repeat-x/y
+ https://bugs.webkit.org/show_bug.cgi?id=167255
+
+ Reviewed by Joseph Pecoraro.
+
+ Test: inspector/css/css-property.html
+
+ * css/makeprop.pl:
+ (addProperty):
+ Add a generated function `isInternalCSSProperty` that checks the given CSSPropertyID against
+ a derived list of properties from CSSProperties.json with "internal-only".
+
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::getSupportedCSSProperties):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyle::styleWithProperties):
+ Only pass CSS property payloads to the frontend if they are not internal.
+
</ins><span class="cx"> 2017-01-27 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement Cache-control: immutable
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (211288 => 211289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2017-01-27 18:44:18 UTC (rev 211288)
+++ trunk/Source/WebCore/css/makeprop.pl 2017-01-27 18:58:13 UTC (rev 211289)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> my %defines = map { $_ => 1 } split(/ /, $defines);
</span><span class="cx">
</span><span class="cx"> my @names;
</span><ins>+my @internalProprerties;
</ins><span class="cx"> my $numPredefinedProperties = 2;
</span><span class="cx"> my %nameIsInherited;
</span><span class="cx"> my %nameIsHighPriority;
</span><span class="lines">@@ -140,7 +141,8 @@
</span><span class="cx"> } elsif ($styleBuilderOptions{$codegenOptionName}) {
</span><span class="cx"> $propertiesWithStyleBuilderOptions{$name}{$codegenOptionName} = $codegenProperties->{$codegenOptionName};
</span><span class="cx"> } elsif ($codegenOptionName eq "internal-only") {
</span><del>- # internal-only properties exist to make it easier to parse compound properties (e.g. background-repeat) as if they were shorthands. This doesn't currently affect codegen.
</del><ins>+ # internal-only properties exist to make it easier to parse compound properties (e.g. background-repeat) as if they were shorthands.
+ push @internalProprerties, $name
</ins><span class="cx"> } else {
</span><span class="cx"> die "Unrecognized codegen property \"$optionName\" for $name property.";
</span><span class="cx"> }
</span><span class="lines">@@ -242,7 +244,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-print GPERF<< "EOF";
</del><ins>+print GPERF << "EOF";
</ins><span class="cx"> %%
</span><span class="cx"> const Property* findProperty(const char* str, unsigned int len)
</span><span class="cx"> {
</span><span class="lines">@@ -249,6 +251,22 @@
</span><span class="cx"> return CSSPropertyNamesHash::findPropertyImpl(str, len);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool isInternalCSSProperty(const CSSPropertyID id)
+{
+ switch (id) {
+EOF
+
+foreach my $name (@internalProprerties) {
+ print GPERF " case CSSPropertyID::CSSProperty" . $nameToId{$name} . ":\n";
+}
+
+print GPERF << "EOF";
+ return true;
+ default:
+ return false;
+ }
+}
+
</ins><span class="cx"> const char* getPropertyName(CSSPropertyID id)
</span><span class="cx"> {
</span><span class="cx"> if (id < firstCSSProperty)
</span><span class="lines">@@ -380,6 +398,7 @@
</span><span class="cx">
</span><span class="cx"> print HEADER << "EOF";
</span><span class="cx">
</span><ins>+bool isInternalCSSProperty(const CSSPropertyID);
</ins><span class="cx"> const char* getPropertyName(CSSPropertyID);
</span><span class="cx"> const WTF::AtomicString& getPropertyNameAtomicString(CSSPropertyID id);
</span><span class="cx"> WTF::String getPropertyNameString(CSSPropertyID id);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (211288 => 211289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2017-01-27 18:44:18 UTC (rev 211288)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2017-01-27 18:58:13 UTC (rev 211289)
</span><span class="lines">@@ -845,6 +845,9 @@
</span><span class="cx"> auto properties = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>::create();
</span><span class="cx"> for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) {
</span><span class="cx"> CSSPropertyID id = convertToCSSPropertyID(i);
</span><ins>+ if (isInternalCSSProperty(id))
+ continue;
+
</ins><span class="cx"> auto property = Inspector::Protocol::CSS::CSSPropertyInfo::create()
</span><span class="cx"> .setName(getPropertyNameString(id))
</span><span class="cx"> .release();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (211288 => 211289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2017-01-27 18:44:18 UTC (rev 211288)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2017-01-27 18:58:13 UTC (rev 211289)
</span><span class="lines">@@ -654,8 +654,10 @@
</span><span class="cx">
</span><span class="cx"> propertiesObject->addItem(property.copyRef());
</span><span class="cx">
</span><ins>+ CSSPropertyID propertyId = cssPropertyID(name);
+
</ins><span class="cx"> // Default "parsedOk" == true.
</span><del>- if (!propertyEntry.parsedOk)
</del><ins>+ if (!propertyEntry.parsedOk || isInternalCSSProperty(propertyId))
</ins><span class="cx"> property->setParsedOk(false);
</span><span class="cx"> if (it->hasRawText())
</span><span class="cx"> property->setText(it->rawText);
</span><span class="lines">@@ -678,7 +680,7 @@
</span><span class="cx"> // Parsed property overrides any property with the same name. Non-parsed property overrides
</span><span class="cx"> // previous non-parsed property with the same name (if any).
</span><span class="cx"> bool shouldInactivate = false;
</span><del>- CSSPropertyID propertyId = cssPropertyID(name);
</del><ins>+
</ins><span class="cx"> // Canonicalize property names to treat non-prefixed and vendor-prefixed property names the same (opacity vs. -webkit-opacity).
</span><span class="cx"> String canonicalPropertyName = propertyId ? getPropertyNameString(propertyId) : name;
</span><span class="cx"> HashMap<String, RefPtr<Inspector::Protocol::CSS::CSSProperty>>::iterator activeIt = propertyNameToPreviousActiveProperty.find(canonicalPropertyName);
</span></span></pre>
</div>
</div>
</body>
</html>