Commit 49f61d06 authored by darin@apple.com's avatar darin@apple.com

Try to fix assertion failures seem on bots.

* css/StyleResolver.cpp:
(WebCore::StyleResolver::createFilterOperations): Rearrange code so this
won't try ot call toCSSPrimitiveValue on a non-primitive-value in the
DROP_SHADOW case.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156709 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6bca3489
2013-10-01 Darin Adler <darin@apple.com>
Try to fix assertion failures seem on bots.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::createFilterOperations): Rearrange code so this
won't try ot call toCSSPrimitiveValue on a non-primitive-value in the
DROP_SHADOW case.
2013-10-01 Gyuyoung Kim <gyuyoung.kim@samsung.com>
Generate toCSSFooValue for CSSPrimitiveValue
......@@ -3792,6 +3792,7 @@ bool StyleResolver::createFilterOperations(CSSValue* inValue, FilterOperations&
// Check that all parameters are primitive values, with the
// exception of drop shadow which has a ShadowValue parameter.
CSSPrimitiveValue* firstValue = nullptr;
if (operationType != FilterOperation::DROP_SHADOW) {
bool haveNonPrimitiveValue = false;
for (unsigned j = 0; j < filterValue->length(); ++j) {
......@@ -3802,9 +3803,10 @@ bool StyleResolver::createFilterOperations(CSSValue* inValue, FilterOperations&
}
if (haveNonPrimitiveValue)
continue;
if (filterValue->length())
firstValue = toCSSPrimitiveValue(filterValue->itemWithoutBoundsCheck(0));
}
CSSPrimitiveValue* firstValue = filterValue->length() ? toCSSPrimitiveValue(filterValue->itemWithoutBoundsCheck(0)) : 0;
switch (filterValue->operationType()) {
case WebKitCSSFilterValue::GrayscaleFilterOperation:
case WebKitCSSFilterValue::SepiaFilterOperation:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment