Title: [193504] branches/safari-601-branch/Source/WebCore
- Revision
- 193504
- Author
- matthew_han...@apple.com
- Date
- 2015-12-04 17:48:52 -0800 (Fri, 04 Dec 2015)
Log Message
Merge r191825. rdar://problem/23732363
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193503 => 193504)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 01:48:48 UTC (rev 193503)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 01:48:52 UTC (rev 193504)
@@ -1,5 +1,20 @@
2015-12-04 Matthew Hanson <matthew_han...@apple.com>
+ Merge r191825. rdar://problem/23732363
+
+ 2015-10-30 Joseph Pecoraro <pecor...@apple.com>
+
+ CSSParserVariable leaks seen on leaks bots
+ https://bugs.webkit.org/show_bug.cgi?id=150724
+
+ Reviewed by Darin Adler.
+
+ * css/CSSParserValues.cpp:
+ (WebCore::destroy):
+ Cleanup variable CSSParserValues.
+
+2015-12-04 Matthew Hanson <matthew_han...@apple.com>
+
Merge r191128. rdar://problem/23732363
2015-10-14 David Hyatt <hy...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/css/CSSGrammar.y.in (193503 => 193504)
--- branches/safari-601-branch/Source/WebCore/css/CSSGrammar.y.in 2015-12-05 01:48:48 UTC (rev 193503)
+++ branches/safari-601-branch/Source/WebCore/css/CSSGrammar.y.in 2015-12-05 01:48:52 UTC (rev 193504)
@@ -106,7 +106,7 @@
#if ENABLE_CSS_GRID_LAYOUT
%expect 39
#else
-%expect 37
+%expect 38
#endif
%nonassoc LOWEST_PREC
Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193503 => 193504)
--- branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-05 01:48:48 UTC (rev 193503)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-05 01:48:52 UTC (rev 193504)
@@ -4154,12 +4154,11 @@
if (m_customPropertyName.isEmpty() || !m_valueList)
return false;
- auto& cssValuePool = CSSValuePool::singleton();
RefPtr<CSSValue> value;
if (id == CSSValueInherit)
- value = cssValuePool.createInheritedValue();
+ value = cssValuePool().createInheritedValue();
else if (id == CSSValueInitial)
- value = cssValuePool.createExplicitInitialValue();
+ value = cssValuePool().createExplicitInitialValue();
else {
RefPtr<CSSValueList> valueList = CSSValueList::createFromParserValueList(*m_valueList);
if (m_valueList->containsVariables())
Modified: branches/safari-601-branch/Source/WebCore/css/CSSParserValues.cpp (193503 => 193504)
--- branches/safari-601-branch/Source/WebCore/css/CSSParserValues.cpp 2015-12-05 01:48:48 UTC (rev 193503)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParserValues.cpp 2015-12-05 01:48:52 UTC (rev 193504)
@@ -40,6 +40,8 @@
delete value.function;
else if (value.unit == CSSParserValue::ValueList)
delete value.valueList;
+ else if (value.unit == CSSParserValue::Variable)
+ delete value.variable;
}
CSSParserValueList::~CSSParserValueList()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
