Diff
Modified: trunk/Source/WebCore/ChangeLog (156382 => 156383)
--- trunk/Source/WebCore/ChangeLog 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/ChangeLog 2013-09-25 05:22:59 UTC (rev 156383)
@@ -1,3 +1,27 @@
+2013-09-24 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r156379.
+ http://trac.webkit.org/changeset/156379
+ https://bugs.webkit.org/show_bug.cgi?id=121894
+
+ Caused many assertion failures (Requested by ap on #webkit).
+
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::destroy):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax):
+ (WebCore::StyleResolver::createFilterOperations):
+ * css/TransformFunctions.cpp:
+ (WebCore::transformsForValue):
+ * css/WebKitCSSArrayFunctionValue.h:
+ * css/WebKitCSSFilterValue.h:
+ * css/WebKitCSSMatFunctionValue.h:
+ * css/WebKitCSSMixFunctionValue.h:
+ * css/WebKitCSSSVGDocumentValue.h:
+ * css/WebKitCSSShaderValue.h:
+ (WebCore::toWebKitCSSShaderValue):
+ * css/WebKitCSSTransformValue.h:
+
2013-09-24 Ryosuke Niwa <[email protected]>
Crash in Document::setFocusedElement
Modified: trunk/Source/WebCore/css/CSSValue.cpp (156382 => 156383)
--- trunk/Source/WebCore/css/CSSValue.cpp 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2013-09-25 05:22:59 UTC (rev 156383)
@@ -446,7 +446,7 @@
delete static_cast<CSSValueList*>(this);
return;
case WebKitCSSTransformClass:
- delete toWebKitCSSTransformValue(this);
+ delete static_cast<WebKitCSSTransformValue*>(this);
return;
case LineBoxContainClass:
delete static_cast<CSSLineBoxContainValue*>(this);
@@ -464,17 +464,17 @@
delete static_cast<CSSFilterImageValue*>(this);
return;
case WebKitCSSFilterClass:
- delete toWebKitCSSFilterValue(this);
+ delete static_cast<WebKitCSSFilterValue*>(this);
return;
#if ENABLE(CSS_SHADERS)
case WebKitCSSArrayFunctionValueClass:
- delete toWebKitCSSArrayFunctionValue(this);
+ delete static_cast<WebKitCSSArrayFunctionValue*>(this);
return;
case WebKitCSSMatFunctionValueClass:
- delete toWebKitCSSMatFunctionValue(this);
+ delete static_cast<WebKitCSSMatFunctionValue*>(this);
return;
case WebKitCSSMixFunctionValueClass:
- delete toWebKitCSSMixFunctionValue(this);
+ delete static_cast<WebKitCSSMixFunctionValue*>(this);
return;
case WebKitCSSShaderClass:
delete static_cast<WebKitCSSShaderValue*>(this);
@@ -494,7 +494,7 @@
delete static_cast<SVGPaint*>(this);
return;
case WebKitCSSSVGDocumentClass:
- delete toWebKitCSSSVGDocumentValue(this);
+ delete static_cast<WebKitCSSSVGDocumentValue*>(this);
return;
#endif
}
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (156382 => 156383)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-09-25 05:22:59 UTC (rev 156383)
@@ -3631,7 +3631,7 @@
if (shadersListLength > 1) {
CSSValue* fragmentShaderOrMixFunction = shadersList->itemWithoutBoundsCheck(1);
if (fragmentShaderOrMixFunction->isWebKitCSSMixFunctionValue()) {
- WebKitCSSMixFunctionValue* mixFunction = toWebKitCSSMixFunctionValue(fragmentShaderOrMixFunction);
+ WebKitCSSMixFunctionValue* mixFunction = static_cast<WebKitCSSMixFunctionValue*>(fragmentShaderOrMixFunction);
CSSValueListIterator iterator(mixFunction);
ASSERT(mixFunction->length());
@@ -3752,7 +3752,7 @@
if (!currValue->isWebKitCSSFilterValue())
continue;
- WebKitCSSFilterValue* filterValue = toWebKitCSSFilterValue(i.value());
+ WebKitCSSFilterValue* filterValue = static_cast<WebKitCSSFilterValue*>(i.value());
FilterOperation::OperationType operationType = filterOperationForType(filterValue->operationType());
#if ENABLE(CSS_SHADERS)
@@ -3779,7 +3779,7 @@
if (!argument->isWebKitCSSSVGDocumentValue())
continue;
- WebKitCSSSVGDocumentValue* svgDocumentValue = toWebKitCSSSVGDocumentValue(argument);
+ WebKitCSSSVGDocumentValue* svgDocumentValue = static_cast<WebKitCSSSVGDocumentValue*>(argument);
KURL url = ""
RefPtr<ReferenceFilterOperation> operation = ReferenceFilterOperation::create(svgDocumentValue->url(), url.fragmentIdentifier(), operationType);
Modified: trunk/Source/WebCore/css/TransformFunctions.cpp (156382 => 156383)
--- trunk/Source/WebCore/css/TransformFunctions.cpp 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/TransformFunctions.cpp 2013-09-25 05:22:59 UTC (rev 156383)
@@ -96,7 +96,7 @@
if (!currValue->isWebKitCSSTransformValue())
continue;
- WebKitCSSTransformValue* transformValue = toWebKitCSSTransformValue(i.value());
+ WebKitCSSTransformValue* transformValue = static_cast<WebKitCSSTransformValue*>(i.value());
if (!transformValue->length())
continue;
Modified: trunk/Source/WebCore/css/WebKitCSSArrayFunctionValue.h (156382 => 156383)
--- trunk/Source/WebCore/css/WebKitCSSArrayFunctionValue.h 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/WebKitCSSArrayFunctionValue.h 2013-09-25 05:22:59 UTC (rev 156383)
@@ -55,12 +55,6 @@
WebKitCSSArrayFunctionValue(const WebKitCSSArrayFunctionValue& cloneFrom);
};
-inline WebKitCSSArrayFunctionValue* toWebKitCSSArrayFunctionValue(CSSValue* value)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSArrayFunctionValue());
- return static_cast<WebKitCSSArrayFunctionValue*>(value);
-}
-
} // namespace WebCore
#endif // ENABLE(CSS_SHADERS)
Modified: trunk/Source/WebCore/css/WebKitCSSFilterValue.h (156382 => 156383)
--- trunk/Source/WebCore/css/WebKitCSSFilterValue.h 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/WebKitCSSFilterValue.h 2013-09-25 05:22:59 UTC (rev 156383)
@@ -77,14 +77,8 @@
FilterOperationType m_type;
};
-inline WebKitCSSFilterValue* toWebKitCSSFilterValue(CSSValue* value)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSFilterValue());
- return static_cast<WebKitCSSFilterValue*>(value);
}
-}
-
#endif // ENABLE(CSS_FILTERS)
#endif
Modified: trunk/Source/WebCore/css/WebKitCSSMatFunctionValue.h (156382 => 156383)
--- trunk/Source/WebCore/css/WebKitCSSMatFunctionValue.h 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/WebKitCSSMatFunctionValue.h 2013-09-25 05:22:59 UTC (rev 156383)
@@ -55,12 +55,6 @@
WebKitCSSMatFunctionValue(const WebKitCSSMatFunctionValue& cloneFrom);
};
-inline WebKitCSSMatFunctionValue* toWebKitCSSMatFunctionValue(CSSValue* value)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSMatFunctionValue());
- return static_cast<WebKitCSSMatFunctionValue*>(value);
-}
-
} // namespace WebCore
#endif // ENABLE(CSS_SHADERS)
Modified: trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.h (156382 => 156383)
--- trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.h 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.h 2013-09-25 05:22:59 UTC (rev 156383)
@@ -54,12 +54,6 @@
WebKitCSSMixFunctionValue();
WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionValue& cloneFrom);
};
-
-inline WebKitCSSMixFunctionValue* toWebKitCSSMixFunctionValue(CSSValue* value)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSMixFunctionValue());
- return static_cast<WebKitCSSMixFunctionValue*>(value);
-}
} // namespace WebCore
Modified: trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h (156382 => 156383)
--- trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h 2013-09-25 05:22:59 UTC (rev 156383)
@@ -54,12 +54,6 @@
bool m_loadRequested;
};
-inline WebKitCSSSVGDocumentValue* toWebKitCSSSVGDocumentValue(CSSValue* value)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSSVGDocumentValue());
- return static_cast<WebKitCSSSVGDocumentValue*>(value);
-}
-
} // namespace WebCore
#endif // WebKitCSSSVGDocumentValue_h
Modified: trunk/Source/WebCore/css/WebKitCSSShaderValue.h (156382 => 156383)
--- trunk/Source/WebCore/css/WebKitCSSShaderValue.h 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/WebKitCSSShaderValue.h 2013-09-25 05:22:59 UTC (rev 156383)
@@ -71,7 +71,6 @@
inline WebKitCSSShaderValue* toWebKitCSSShaderValue(CSSValue* value)
{
- ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSShaderValue());
return value->isWebKitCSSShaderValue() ? static_cast<WebKitCSSShaderValue*>(value) : 0;
}
Modified: trunk/Source/WebCore/css/WebKitCSSTransformValue.h (156382 => 156383)
--- trunk/Source/WebCore/css/WebKitCSSTransformValue.h 2013-09-25 03:34:56 UTC (rev 156382)
+++ trunk/Source/WebCore/css/WebKitCSSTransformValue.h 2013-09-25 05:22:59 UTC (rev 156383)
@@ -82,12 +82,6 @@
TransformOperationType m_type;
};
-inline WebKitCSSTransformValue* toWebKitCSSTransformValue(CSSValue* value)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSTransformValue());
- return static_cast<WebKitCSSTransformValue*>(value);
}
-}
-
#endif
