Attachment 212538 Details for Bug 121894 – ROLLOUT of r156379

[patch] ROLLOUT of r156379

bug-121894-20130924221859.patch (text/plain), 10.33 KB, created by WebKit Commit Bot on 2013-09-24 22:19:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2013-09-24 22:19:00 PDT

Size: 10.33 KB

patch

obsolete

>Subversion Revision: 156382
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 17002424be2ced4317400c84ba02dd520ed15942..f9e786d4013a24f168f0ae2284043185ba364130 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2013-09-24  Commit Queue  <commit-queue@webkit.org>
>+
>+        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  <rniwa@webkit.org>
> 
>         Crash in Document::setFocusedElement
>diff --git a/Source/WebCore/css/CSSValue.cpp b/Source/WebCore/css/CSSValue.cpp
>index eba937cc688f1b3926aeb8e898b3e39edee80683..b36990d8913ae84741a51bd40e098e580f5e072d 100644
>--- a/Source/WebCore/css/CSSValue.cpp
>+++ b/Source/WebCore/css/CSSValue.cpp
>@@ -446,7 +446,7 @@ void CSSValue::destroy()
>         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 @@ void CSSValue::destroy()
>         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 @@ void CSSValue::destroy()
>         delete static_cast<SVGPaint*>(this);
>         return;
>     case WebKitCSSSVGDocumentClass:
>-        delete toWebKitCSSSVGDocumentValue(this);
>+        delete static_cast<WebKitCSSSVGDocumentValue*>(this);
>         return;
> #endif
>     }
>diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
>index b9ec2a3f394f08b274a3aad4662d1ba25c8b689c..9a225ec95a14b8b3adea05fae8988f1db7e52e6c 100644
>--- a/Source/WebCore/css/StyleResolver.cpp
>+++ b/Source/WebCore/css/StyleResolver.cpp
>@@ -3631,7 +3631,7 @@ PassRefPtr<CustomFilterOperation> StyleResolver::createCustomFilterOperationWith
>     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 @@ bool StyleResolver::createFilterOperations(CSSValue* inValue, FilterOperations&
>         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 @@ bool StyleResolver::createFilterOperations(CSSValue* inValue, FilterOperations&
>             if (!argument->isWebKitCSSSVGDocumentValue())
>                 continue;
> 
>-            WebKitCSSSVGDocumentValue* svgDocumentValue = toWebKitCSSSVGDocumentValue(argument);
>+            WebKitCSSSVGDocumentValue* svgDocumentValue = static_cast<WebKitCSSSVGDocumentValue*>(argument);
>             KURL url = m_state.document().completeURL(svgDocumentValue->url());
> 
>             RefPtr<ReferenceFilterOperation> operation = ReferenceFilterOperation::create(svgDocumentValue->url(), url.fragmentIdentifier(), operationType);
>diff --git a/Source/WebCore/css/TransformFunctions.cpp b/Source/WebCore/css/TransformFunctions.cpp
>index 23aff492d1188ba2426716308d480f1330c0af7c..4725f862a08d1c30854a89a89c0cb6753d835367 100644
>--- a/Source/WebCore/css/TransformFunctions.cpp
>+++ b/Source/WebCore/css/TransformFunctions.cpp
>@@ -96,7 +96,7 @@ bool transformsForValue(const RenderStyle* style, const RenderStyle* rootStyle,
>         if (!currValue->isWebKitCSSTransformValue())
>             continue;
> 
>-        WebKitCSSTransformValue* transformValue = toWebKitCSSTransformValue(i.value());
>+        WebKitCSSTransformValue* transformValue = static_cast<WebKitCSSTransformValue*>(i.value());
>         if (!transformValue->length())
>             continue;
> 
>diff --git a/Source/WebCore/css/WebKitCSSArrayFunctionValue.h b/Source/WebCore/css/WebKitCSSArrayFunctionValue.h
>index 34f21ac5649d0c8833d14846b49373f2c4f44ef7..c1c9e2a3843cd4228ff12ed3f81596b08ca8e360 100644
>--- a/Source/WebCore/css/WebKitCSSArrayFunctionValue.h
>+++ b/Source/WebCore/css/WebKitCSSArrayFunctionValue.h
>@@ -55,12 +55,6 @@ private:
>     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)
>diff --git a/Source/WebCore/css/WebKitCSSFilterValue.h b/Source/WebCore/css/WebKitCSSFilterValue.h
>index 86a25527c56403d8b8d4f742b51fa21554d2a58f..d6df3c8c997a880053a3f749a993a0d96cbb4d82 100644
>--- a/Source/WebCore/css/WebKitCSSFilterValue.h
>+++ b/Source/WebCore/css/WebKitCSSFilterValue.h
>@@ -77,12 +77,6 @@ private:
>     FilterOperationType m_type;
> };
> 
>-inline WebKitCSSFilterValue* toWebKitCSSFilterValue(CSSValue* value)
>-{
>-    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSFilterValue());
>-    return static_cast<WebKitCSSFilterValue*>(value);
>-}
>-
> }
> 
> #endif // ENABLE(CSS_FILTERS)
>diff --git a/Source/WebCore/css/WebKitCSSMatFunctionValue.h b/Source/WebCore/css/WebKitCSSMatFunctionValue.h
>index 39dac9ac0c2435bbd161b9d73c6b33cfaffe9bcb..530bb2341b1767d3584e9b03a10f1829f3b24fd6 100644
>--- a/Source/WebCore/css/WebKitCSSMatFunctionValue.h
>+++ b/Source/WebCore/css/WebKitCSSMatFunctionValue.h
>@@ -55,12 +55,6 @@ private:
>     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)
>diff --git a/Source/WebCore/css/WebKitCSSMixFunctionValue.h b/Source/WebCore/css/WebKitCSSMixFunctionValue.h
>index f57fc06da0350fb58d0bddb6c7dcc417e439acb7..f8f40e25d133fab43c3eb87d982c49f549a8f215 100644
>--- a/Source/WebCore/css/WebKitCSSMixFunctionValue.h
>+++ b/Source/WebCore/css/WebKitCSSMixFunctionValue.h
>@@ -54,12 +54,6 @@ private:
>     WebKitCSSMixFunctionValue();
>     WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionValue& cloneFrom);
> };
>-
>-inline WebKitCSSMixFunctionValue* toWebKitCSSMixFunctionValue(CSSValue* value)
>-{
>-    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSMixFunctionValue());
>-    return static_cast<WebKitCSSMixFunctionValue*>(value);
>-}
>     
> } // namespace WebCore
> 
>diff --git a/Source/WebCore/css/WebKitCSSSVGDocumentValue.h b/Source/WebCore/css/WebKitCSSSVGDocumentValue.h
>index 30f71f9f206f861c7c546f06a7f69f3586f6bef6..4f2a0535f63a5fea329130509ba2078516704a4a 100644
>--- a/Source/WebCore/css/WebKitCSSSVGDocumentValue.h
>+++ b/Source/WebCore/css/WebKitCSSSVGDocumentValue.h
>@@ -54,12 +54,6 @@ private:
>     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
>diff --git a/Source/WebCore/css/WebKitCSSShaderValue.h b/Source/WebCore/css/WebKitCSSShaderValue.h
>index 80038323877a7106a20c52debc861a27be021fe0..69be516fa25fcb685d4af4d18806dec739b73685 100644
>--- a/Source/WebCore/css/WebKitCSSShaderValue.h
>+++ b/Source/WebCore/css/WebKitCSSShaderValue.h
>@@ -71,7 +71,6 @@ WebKitCSSShaderValue* toWebKitCSSShaderValue(const WebKitCSSShaderValue*);
> 
> inline WebKitCSSShaderValue* toWebKitCSSShaderValue(CSSValue* value)
> {
>-    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSShaderValue());
>     return value->isWebKitCSSShaderValue() ? static_cast<WebKitCSSShaderValue*>(value) : 0;
> }
> 
>diff --git a/Source/WebCore/css/WebKitCSSTransformValue.h b/Source/WebCore/css/WebKitCSSTransformValue.h
>index ff344246321b28b8e62149e9533dfdb20565a90f..ec092a8ae981deb22c7f1cde2cd0b440364d5eb4 100644
>--- a/Source/WebCore/css/WebKitCSSTransformValue.h
>+++ b/Source/WebCore/css/WebKitCSSTransformValue.h
>@@ -82,12 +82,6 @@ private:
>     TransformOperationType m_type;
> };
> 
>-inline WebKitCSSTransformValue* toWebKitCSSTransformValue(CSSValue* value)
>-{
>-    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSTransformValue());
>-    return static_cast<WebKitCSSTransformValue*>(value);
>-}
>-
> }
> 
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 121894: 212538