Changeset 156383 in webkit
- Timestamp:
- Sep 24, 2013 10:22:59 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r156382 r156383 1 2013-09-24 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r156379. 4 http://trac.webkit.org/changeset/156379 5 https://bugs.webkit.org/show_bug.cgi?id=121894 6 7 Caused many assertion failures (Requested by ap on #webkit). 8 9 * css/CSSValue.cpp: 10 (WebCore::CSSValue::destroy): 11 * css/StyleResolver.cpp: 12 (WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax): 13 (WebCore::StyleResolver::createFilterOperations): 14 * css/TransformFunctions.cpp: 15 (WebCore::transformsForValue): 16 * css/WebKitCSSArrayFunctionValue.h: 17 * css/WebKitCSSFilterValue.h: 18 * css/WebKitCSSMatFunctionValue.h: 19 * css/WebKitCSSMixFunctionValue.h: 20 * css/WebKitCSSSVGDocumentValue.h: 21 * css/WebKitCSSShaderValue.h: 22 (WebCore::toWebKitCSSShaderValue): 23 * css/WebKitCSSTransformValue.h: 24 1 25 2013-09-24 Ryosuke Niwa <rniwa@webkit.org> 2 26 -
trunk/Source/WebCore/css/CSSValue.cpp
r156379 r156383 447 447 return; 448 448 case WebKitCSSTransformClass: 449 delete toWebKitCSSTransformValue(this);449 delete static_cast<WebKitCSSTransformValue*>(this); 450 450 return; 451 451 case LineBoxContainClass: … … 465 465 return; 466 466 case WebKitCSSFilterClass: 467 delete toWebKitCSSFilterValue(this);467 delete static_cast<WebKitCSSFilterValue*>(this); 468 468 return; 469 469 #if ENABLE(CSS_SHADERS) 470 470 case WebKitCSSArrayFunctionValueClass: 471 delete toWebKitCSSArrayFunctionValue(this);471 delete static_cast<WebKitCSSArrayFunctionValue*>(this); 472 472 return; 473 473 case WebKitCSSMatFunctionValueClass: 474 delete toWebKitCSSMatFunctionValue(this);474 delete static_cast<WebKitCSSMatFunctionValue*>(this); 475 475 return; 476 476 case WebKitCSSMixFunctionValueClass: 477 delete toWebKitCSSMixFunctionValue(this);477 delete static_cast<WebKitCSSMixFunctionValue*>(this); 478 478 return; 479 479 case WebKitCSSShaderClass: … … 495 495 return; 496 496 case WebKitCSSSVGDocumentClass: 497 delete toWebKitCSSSVGDocumentValue(this);497 delete static_cast<WebKitCSSSVGDocumentValue*>(this); 498 498 return; 499 499 #endif -
trunk/Source/WebCore/css/StyleResolver.cpp
r156379 r156383 3632 3632 CSSValue* fragmentShaderOrMixFunction = shadersList->itemWithoutBoundsCheck(1); 3633 3633 if (fragmentShaderOrMixFunction->isWebKitCSSMixFunctionValue()) { 3634 WebKitCSSMixFunctionValue* mixFunction = toWebKitCSSMixFunctionValue(fragmentShaderOrMixFunction);3634 WebKitCSSMixFunctionValue* mixFunction = static_cast<WebKitCSSMixFunctionValue*>(fragmentShaderOrMixFunction); 3635 3635 CSSValueListIterator iterator(mixFunction); 3636 3636 … … 3753 3753 continue; 3754 3754 3755 WebKitCSSFilterValue* filterValue = toWebKitCSSFilterValue(i.value());3755 WebKitCSSFilterValue* filterValue = static_cast<WebKitCSSFilterValue*>(i.value()); 3756 3756 FilterOperation::OperationType operationType = filterOperationForType(filterValue->operationType()); 3757 3757 … … 3780 3780 continue; 3781 3781 3782 WebKitCSSSVGDocumentValue* svgDocumentValue = toWebKitCSSSVGDocumentValue(argument);3782 WebKitCSSSVGDocumentValue* svgDocumentValue = static_cast<WebKitCSSSVGDocumentValue*>(argument); 3783 3783 KURL url = m_state.document().completeURL(svgDocumentValue->url()); 3784 3784 -
trunk/Source/WebCore/css/TransformFunctions.cpp
r156379 r156383 97 97 continue; 98 98 99 WebKitCSSTransformValue* transformValue = toWebKitCSSTransformValue(i.value());99 WebKitCSSTransformValue* transformValue = static_cast<WebKitCSSTransformValue*>(i.value()); 100 100 if (!transformValue->length()) 101 101 continue; -
trunk/Source/WebCore/css/WebKitCSSArrayFunctionValue.h
r156379 r156383 56 56 }; 57 57 58 inline WebKitCSSArrayFunctionValue* toWebKitCSSArrayFunctionValue(CSSValue* value)59 {60 ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSArrayFunctionValue());61 return static_cast<WebKitCSSArrayFunctionValue*>(value);62 }63 64 58 } // namespace WebCore 65 59 -
trunk/Source/WebCore/css/WebKitCSSFilterValue.h
r156379 r156383 78 78 }; 79 79 80 inline WebKitCSSFilterValue* toWebKitCSSFilterValue(CSSValue* value)81 {82 ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSFilterValue());83 return static_cast<WebKitCSSFilterValue*>(value);84 }85 86 80 } 87 81 -
trunk/Source/WebCore/css/WebKitCSSMatFunctionValue.h
r156379 r156383 56 56 }; 57 57 58 inline WebKitCSSMatFunctionValue* toWebKitCSSMatFunctionValue(CSSValue* value)59 {60 ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSMatFunctionValue());61 return static_cast<WebKitCSSMatFunctionValue*>(value);62 }63 64 58 } // namespace WebCore 65 59 -
trunk/Source/WebCore/css/WebKitCSSMixFunctionValue.h
r156379 r156383 55 55 WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionValue& cloneFrom); 56 56 }; 57 58 inline WebKitCSSMixFunctionValue* toWebKitCSSMixFunctionValue(CSSValue* value)59 {60 ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSMixFunctionValue());61 return static_cast<WebKitCSSMixFunctionValue*>(value);62 }63 57 64 58 } // namespace WebCore -
trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h
r156379 r156383 55 55 }; 56 56 57 inline WebKitCSSSVGDocumentValue* toWebKitCSSSVGDocumentValue(CSSValue* value)58 {59 ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSSVGDocumentValue());60 return static_cast<WebKitCSSSVGDocumentValue*>(value);61 }62 63 57 } // namespace WebCore 64 58 -
trunk/Source/WebCore/css/WebKitCSSShaderValue.h
r156379 r156383 72 72 inline WebKitCSSShaderValue* toWebKitCSSShaderValue(CSSValue* value) 73 73 { 74 ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSShaderValue());75 74 return value->isWebKitCSSShaderValue() ? static_cast<WebKitCSSShaderValue*>(value) : 0; 76 75 } -
trunk/Source/WebCore/css/WebKitCSSTransformValue.h
r156379 r156383 83 83 }; 84 84 85 inline WebKitCSSTransformValue* toWebKitCSSTransformValue(CSSValue* value)86 {87 ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isWebKitCSSTransformValue());88 return static_cast<WebKitCSSTransformValue*>(value);89 }90 91 85 } 92 86
Note: See TracChangeset
for help on using the changeset viewer.