<!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>[207971] releases/WebKitGTK/webkit-2.14</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/207971">207971</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-27 02:54:57 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/207471">r207471</a> - SVGCSSParser: m_implicitShorthand value is not reset after adding the shorthand property
https://bugs.webkit.org/show_bug.cgi?id=116470
Reviewed by Simon Fraser.
Source/WebCore:
When we encounter a shorthand css property, we set m_implicitShorthand
to true to tell addProperty() later that the individual properties are
all set through a short hand one. We need to make sure that setting
m_implicitShorthand to true will not be leaked after finishing parsing
the short hand property.
Test: fast/css/implicit-property-restore.html
* css/parser/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseFillShorthand):
(WebCore::CSSParser::parseShorthand):
(WebCore::CSSParser::parse4Values):
(WebCore::CSSParser::parseBorderRadius):
(WTF::ImplicitScope::ImplicitScope): Deleted.
(WTF::ImplicitScope::~ImplicitScope): Deleted.
Get rid of ImplicitScope and replace its calls by TemporaryChange<bool>.
* css/parser/SVGCSSParser.cpp:
(WebCore::CSSParser::parseSVGValue):
Restore m_implicitShorthand value after setting it temporarily to true.
Source/WTF:
* wtf/TemporaryChange.h:
(WTF::TemporaryChange::TemporaryChange):
Add a new constructor to make TemporaryChange work as a restorer. The
temporary change will happen after we construct the object.
LayoutTests:
* fast/css/implicit-property-restore-expected.txt: Added.
* fast/css/implicit-property-restore.html: Added.
* fast/css/remove-shorthand-expected.txt:
Rebase-line the test expected results because of fixing the leak of
m_implicitShorthand. The bug was happening because "background: ..." property
comes immediately before the "list-style: ...." property.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastcssremoveshorthandexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/remove-shorthand-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWTFChangeLog">releases/WebKitGTK/webkit-2.14/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWTFwtfTemporaryChangeh">releases/WebKitGTK/webkit-2.14/Source/WTF/wtf/TemporaryChange.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorecssparserCSSParsercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorecssparserSVGCSSParsercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/SVGCSSParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastcssimplicitpropertyrestoreexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastcssimplicitpropertyrestorehtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (207970 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-27 09:45:00 UTC (rev 207970)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-18 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ SVGCSSParser: m_implicitShorthand value is not reset after adding the shorthand property
+ https://bugs.webkit.org/show_bug.cgi?id=116470
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/implicit-property-restore-expected.txt: Added.
+ * fast/css/implicit-property-restore.html: Added.
+
+ * fast/css/remove-shorthand-expected.txt:
+ Rebase-line the test expected results because of fixing the leak of
+ m_implicitShorthand. The bug was happening because "background: ..." property
+ comes immediately before the "list-style: ...." property.
+
</ins><span class="cx"> 2016-10-14 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> 100% CPU on homedepot.com page
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastcssimplicitpropertyrestoreexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore-expected.txt (0 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore-expected.txt 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+This test verifies the property implicit flag is reset after adding any css property.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS element1.style.isPropertyImplicit('padding-top') is false
+PASS removedProperties.length is 1
+PASS removedProperties[0] is "list-style"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastcssimplicitpropertyrestorehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore.html (0 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/implicit-property-restore.html 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <div id="element-1" style="background:url() 100% 100% repeat-y; padding-top: 0px;"></div>
+ <div id="element-2" style="background:url() 100% 100% repeat-y; list-style:square outside url();"></div>
+ <script>
+ description("This test verifies the property implicit flag is reset after adding any css property.");
+
+ var element1 = document.getElementById("element-1");
+ var element2 = document.getElementById("element-2");
+
+ shouldBe("element1.style.isPropertyImplicit('padding-top')", "false");
+
+ var allProperties = element2.style.cssText.concat(" ").split("; ");
+ element2.style.removeProperty("list-style");
+
+ var remainingProperties = element2.style.cssText.concat(" ").split("; ");
+ var removedProperties = [];
+
+ for (i in allProperties) {
+ if (remainingProperties.indexOf(allProperties[i]) < 0)
+ removedProperties.push(allProperties[i].replace(/\:.*/,""));
+ }
+
+ shouldBe("removedProperties.length", "1");
+ shouldBeEqualToString("removedProperties[0]", "list-style");
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastcssremoveshorthandexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/remove-shorthand-expected.txt (207970 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/remove-shorthand-expected.txt 2016-10-27 09:45:00 UTC (rev 207970)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css/remove-shorthand-expected.txt 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> removes "column-rule-width, column-rule-style, column-rule-color"
</span><span class="cx"> and adds "".
</span><span class="cx"> Removing list-style
</span><del>-removes "list-style-type, list-style-position, list-style-image"
</del><ins>+removes "list-style"
</ins><span class="cx"> and adds "".
</span><span class="cx"> Removing margin
</span><span class="cx"> removes "margin"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WTF/ChangeLog (207970 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WTF/ChangeLog 2016-10-27 09:45:00 UTC (rev 207970)
+++ releases/WebKitGTK/webkit-2.14/Source/WTF/ChangeLog 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-18 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ SVGCSSParser: m_implicitShorthand value is not reset after adding the shorthand property
+ https://bugs.webkit.org/show_bug.cgi?id=116470
+
+ Reviewed by Simon Fraser.
+
+ * wtf/TemporaryChange.h:
+ (WTF::TemporaryChange::TemporaryChange):
+ Add a new constructor to make TemporaryChange work as a restorer. The
+ temporary change will happen after we construct the object.
+
</ins><span class="cx"> 2016-09-26 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> std::unique_ptr deleter functions should not check if pointer is null
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWTFwtfTemporaryChangeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WTF/wtf/TemporaryChange.h (207970 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WTF/wtf/TemporaryChange.h 2016-10-27 09:45:00 UTC (rev 207970)
+++ releases/WebKitGTK/webkit-2.14/Source/WTF/wtf/TemporaryChange.h 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -43,10 +43,14 @@
</span><span class="cx"> class TemporaryChange {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(TemporaryChange);
</span><span class="cx"> public:
</span><del>- TemporaryChange(T& scopedVariable, T newValue)
</del><ins>+ TemporaryChange(T& scopedVariable)
</ins><span class="cx"> : m_scopedVariable(scopedVariable)
</span><span class="cx"> , m_originalValue(scopedVariable)
</span><span class="cx"> {
</span><ins>+ }
+ TemporaryChange(T& scopedVariable, T newValue)
+ : TemporaryChange(scopedVariable)
+ {
</ins><span class="cx"> m_scopedVariable = newValue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -55,7 +59,6 @@
</span><span class="cx"> m_scopedVariable = m_originalValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> private:
</span><span class="cx"> T& m_scopedVariable;
</span><span class="cx"> T m_originalValue;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207970 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 09:45:00 UTC (rev 207970)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-10-18 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ SVGCSSParser: m_implicitShorthand value is not reset after adding the shorthand property
+ https://bugs.webkit.org/show_bug.cgi?id=116470
+
+ Reviewed by Simon Fraser.
+
+ When we encounter a shorthand css property, we set m_implicitShorthand
+ to true to tell addProperty() later that the individual properties are
+ all set through a short hand one. We need to make sure that setting
+ m_implicitShorthand to true will not be leaked after finishing parsing
+ the short hand property.
+
+ Test: fast/css/implicit-property-restore.html
+
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseFillShorthand):
+ (WebCore::CSSParser::parseShorthand):
+ (WebCore::CSSParser::parse4Values):
+ (WebCore::CSSParser::parseBorderRadius):
+ (WTF::ImplicitScope::ImplicitScope): Deleted.
+ (WTF::ImplicitScope::~ImplicitScope): Deleted.
+ Get rid of ImplicitScope and replace its calls by TemporaryChange<bool>.
+
+ * css/parser/SVGCSSParser.cpp:
+ (WebCore::CSSParser::parseSVGValue):
+ Restore m_implicitShorthand value after setting it temporarily to true.
+
</ins><span class="cx"> 2016-10-17 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] gobject-introspection on package build with webkit2gtk fails without active X session
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp (207970 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp 2016-10-27 09:45:00 UTC (rev 207970)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/CSSParser.cpp 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><ins>+#include <wtf/TemporaryChange.h>
</ins><span class="cx"> #include <wtf/dtoa.h>
</span><span class="cx"> #include <wtf/text/StringBuffer.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -135,33 +136,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WTF;
</span><span class="cx">
</span><del>-namespace {
-
-enum PropertyType {
- PropertyExplicit,
- PropertyImplicit
-};
-
-class ImplicitScope {
- WTF_MAKE_NONCOPYABLE(ImplicitScope);
-public:
- ImplicitScope(WebCore::CSSParser& parser, PropertyType propertyType)
- : m_parser(parser)
- {
- m_parser.m_implicitShorthand = propertyType == PropertyImplicit;
- }
-
- ~ImplicitScope()
- {
- m_parser.m_implicitShorthand = false;
- }
-
-private:
- WebCore::CSSParser& m_parser;
-};
-
-} // namespace
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> const unsigned CSSParser::invalidParsedPropertiesCount = std::numeric_limits<unsigned>::max();
</span><span class="lines">@@ -2229,7 +2203,6 @@
</span><span class="cx"> addProperty(propId2, val2.releaseNonNull(), important);
</span><span class="cx"> result = true;
</span><span class="cx"> }
</span><del>- m_implicitShorthand = false;
</del><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyListStyleImage: // <uri> | none | inherit
</span><span class="lines">@@ -3622,6 +3595,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ShorthandScope scope(this, propId);
</span><ins>+ TemporaryChange<bool> change(m_implicitShorthand);
</ins><span class="cx">
</span><span class="cx"> bool parsedProperty[cMaxFillProperties] = { false };
</span><span class="cx"> RefPtr<CSSValue> values[cMaxFillProperties];
</span><span class="lines">@@ -4036,7 +4010,7 @@
</span><span class="cx">
</span><span class="cx"> // Fill in any remaining properties with the initial value.
</span><span class="cx"> auto& cssValuePool = CSSValuePool::singleton();
</span><del>- ImplicitScope implicitScope(*this, PropertyImplicit);
</del><ins>+ TemporaryChange<bool> change(m_implicitShorthand, true);
</ins><span class="cx"> const StylePropertyShorthand* propertiesForInitialization = shorthand.propertiesForInitialization();
</span><span class="cx"> for (unsigned i = 0; i < shorthand.length(); ++i) {
</span><span class="cx"> if (propertyFound[i])
</span><span class="lines">@@ -4073,7 +4047,7 @@
</span><span class="cx"> if (!parseValue(properties[0], important))
</span><span class="cx"> return false;
</span><span class="cx"> CSSValue* value = m_parsedProperties.last().value();
</span><del>- ImplicitScope implicitScope(*this, PropertyImplicit);
</del><ins>+ TemporaryChange<bool> change(m_implicitShorthand, true);
</ins><span class="cx"> addProperty(properties[1], value, important);
</span><span class="cx"> addProperty(properties[2], value, important);
</span><span class="cx"> addProperty(properties[3], value, important);
</span><span class="lines">@@ -4083,7 +4057,7 @@
</span><span class="cx"> if (!parseValue(properties[0], important) || !parseValue(properties[1], important))
</span><span class="cx"> return false;
</span><span class="cx"> CSSValue* value = m_parsedProperties[m_parsedProperties.size() - 2].value();
</span><del>- ImplicitScope implicitScope(*this, PropertyImplicit);
</del><ins>+ TemporaryChange<bool> change(m_implicitShorthand, true);
</ins><span class="cx"> addProperty(properties[2], value, important);
</span><span class="cx"> value = m_parsedProperties[m_parsedProperties.size() - 2].value();
</span><span class="cx"> addProperty(properties[3], value, important);
</span><span class="lines">@@ -4093,7 +4067,7 @@
</span><span class="cx"> if (!parseValue(properties[0], important) || !parseValue(properties[1], important) || !parseValue(properties[2], important))
</span><span class="cx"> return false;
</span><span class="cx"> CSSValue* value = m_parsedProperties[m_parsedProperties.size() - 2].value();
</span><del>- ImplicitScope implicitScope(*this, PropertyImplicit);
</del><ins>+ TemporaryChange<bool> change(m_implicitShorthand, true);
</ins><span class="cx"> addProperty(properties[3], value, important);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -8730,7 +8704,7 @@
</span><span class="cx"> } else
</span><span class="cx"> completeBorderRadii(radii[1]);
</span><span class="cx">
</span><del>- ImplicitScope implicitScope(*this, PropertyImplicit);
</del><ins>+ TemporaryChange<bool> change(m_implicitShorthand, true);
</ins><span class="cx"> addProperty(CSSPropertyBorderTopLeftRadius, createPrimitiveValuePair(WTFMove(radii[0][0]), WTFMove(radii[1][0])), important);
</span><span class="cx"> addProperty(CSSPropertyBorderTopRightRadius, createPrimitiveValuePair(WTFMove(radii[0][1]), WTFMove(radii[1][1])), important);
</span><span class="cx"> addProperty(CSSPropertyBorderBottomRightRadius, createPrimitiveValuePair(WTFMove(radii[0][2]), WTFMove(radii[1][2])), important);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorecssparserSVGCSSParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/SVGCSSParser.cpp (207970 => 207971)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/SVGCSSParser.cpp 2016-10-27 09:45:00 UTC (rev 207970)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/parser/SVGCSSParser.cpp 2016-10-27 09:54:57 UTC (rev 207971)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "SVGPaint.h"
</span><span class="cx">
</span><ins>+#include <wtf/TemporaryChange.h>
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static bool isValidSystemControlColorValue(CSSValueID id)
</span><span class="lines">@@ -291,7 +293,7 @@
</span><span class="cx"> case CSSPropertyMarker:
</span><span class="cx"> {
</span><span class="cx"> ShorthandScope scope(this, propId);
</span><del>- m_implicitShorthand = true;
</del><ins>+ TemporaryChange<bool> change(m_implicitShorthand, true);
</ins><span class="cx"> if (!parseValue(CSSPropertyMarkerStart, important))
</span><span class="cx"> return false;
</span><span class="cx"> if (m_valueList->current()) {
</span><span class="lines">@@ -301,7 +303,6 @@
</span><span class="cx"> CSSValue* value = m_parsedProperties.last().value();
</span><span class="cx"> addProperty(CSSPropertyMarkerMid, value, important);
</span><span class="cx"> addProperty(CSSPropertyMarkerEnd, value, important);
</span><del>- m_implicitShorthand = false;
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyCx:
</span></span></pre>
</div>
</div>
</body>
</html>