Changeset 156253 in webkit for trunk/Source/WebCore/css/StyleResolver.cpp
- Timestamp:
- Sep 22, 2013, 6:20:19 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/css/StyleResolver.cpp
r155938 r156253 1926 1926 return false; 1927 1927 1928 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);1928 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 1929 1929 Pair* minMaxTrackBreadth = primitiveValue->getPairValue(); 1930 1930 if (!minMaxTrackBreadth) { … … 1950 1950 // Handle 'none'. 1951 1951 if (value->isPrimitiveValue()) { 1952 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);1952 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 1953 1953 return primitiveValue->getValueID() == CSSValueNone; 1954 1954 } … … 1961 1961 CSSValue* currValue = i.value(); 1962 1962 if (currValue->isPrimitiveValue()) { 1963 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(currValue);1963 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(currValue); 1964 1964 if (primitiveValue->isString()) { 1965 1965 NamedGridLinesMap::AddResult result = namedGridLines.add(primitiveValue->getStringValue(), Vector<size_t>()); … … 1989 1989 if (value->isPrimitiveValue()) { 1990 1990 #if !ASSERT_DISABLED 1991 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value); 1992 ASSERT(primitiveValue->getValueID() == CSSValueAuto); 1991 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueAuto); 1993 1992 #endif 1994 1993 return true; … … 2005 2004 2006 2005 CSSValueListIterator it = values; 2007 CSSPrimitiveValue* currentValue = static_cast<CSSPrimitiveValue*>(it.value());2006 CSSPrimitiveValue* currentValue = toCSSPrimitiveValue(it.value()); 2008 2007 if (currentValue->getValueID() == CSSValueSpan) { 2009 2008 isSpanPosition = true; 2010 2009 it.advance(); 2011 currentValue = it.hasMore() ? static_cast<CSSPrimitiveValue*>(it.value()) : 0;2010 currentValue = it.hasMore() ? toCSSPrimitiveValue(it.value()) : 0; 2012 2011 } 2013 2012 … … 2015 2014 gridLineNumber = currentValue->getIntValue(); 2016 2015 it.advance(); 2017 currentValue = it.hasMore() ? static_cast<CSSPrimitiveValue*>(it.value()) : 0;2016 currentValue = it.hasMore() ? toCSSPrimitiveValue(it.value()) : 0; 2018 2017 } 2019 2018 … … 2035 2034 static bool hasVariableReference(CSSValue* value) 2036 2035 { 2037 if (value->isPrimitiveValue()) { 2038 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value); 2039 return primitiveValue->hasVariableReference(); 2040 } 2041 2042 if (value->isCalculationValue()) 2043 return static_cast<CSSCalcValue*>(value)->hasVariableReference(); 2036 if (value->isPrimitiveValue()) 2037 return toCSSPrimitiveValue(value)->hasVariableReference(); 2038 2039 if (value->isCalcValue()) 2040 return toCSSCalcValue(value)->hasVariableReference(); 2044 2041 2045 2042 if (value->isReflectValue()) { … … 2134 2131 } 2135 2132 2136 CSSPrimitiveValue* primitiveValue = value->isPrimitiveValue() ? static_cast<CSSPrimitiveValue*>(value) : 0;2133 CSSPrimitiveValue* primitiveValue = value->isPrimitiveValue() ? toCSSPrimitiveValue(value) : 0; 2137 2134 2138 2135 float zoomFactor = state.style()->effectiveZoom(); … … 2161 2158 if (item->isImageGeneratorValue()) { 2162 2159 if (item->isGradientValue()) 2163 state.style()->setContent(StyleGeneratedImage::create( static_cast<CSSGradientValue*>(item)->gradientWithStylesResolved(this).get()), didSet);2160 state.style()->setContent(StyleGeneratedImage::create(toCSSGradientValue(item)->gradientWithStylesResolved(this).get()), didSet); 2164 2161 else 2165 state.style()->setContent(StyleGeneratedImage::create( static_cast<CSSImageGeneratorValue*>(item)), didSet);2162 state.style()->setContent(StyleGeneratedImage::create(toCSSImageGeneratorValue(item)), didSet); 2166 2163 didSet = true; 2167 2164 #if ENABLE(CSS_IMAGE_SET) 2168 2165 } else if (item->isImageSetValue()) { 2169 state.style()->setContent(setOrPendingFromValue(CSSPropertyContent, static_cast<CSSImageSetValue*>(item)), didSet);2166 state.style()->setContent(setOrPendingFromValue(CSSPropertyContent, toCSSImageSetValue(item)), didSet); 2170 2167 didSet = true; 2171 2168 #endif … … 2173 2170 2174 2171 if (item->isImageValue()) { 2175 state.style()->setContent(cachedOrPendingFromValue(CSSPropertyContent, static_cast<CSSImageValue*>(item)), didSet);2172 state.style()->setContent(cachedOrPendingFromValue(CSSPropertyContent, toCSSImageValue(item)), didSet); 2176 2173 didSet = true; 2177 2174 continue; … … 2181 2178 continue; 2182 2179 2183 CSSPrimitiveValue* contentValue = static_cast<CSSPrimitiveValue*>(item);2180 CSSPrimitiveValue* contentValue = toCSSPrimitiveValue(item); 2184 2181 2185 2182 if (contentValue->isString()) { … … 2255 2252 ASSERT_WITH_SECURITY_IMPLICATION(first->isPrimitiveValue()); 2256 2253 ASSERT_WITH_SECURITY_IMPLICATION(second->isPrimitiveValue()); 2257 String startQuote = static_cast<CSSPrimitiveValue*>(first)->getStringValue();2258 String endQuote = static_cast<CSSPrimitiveValue*>(second)->getStringValue();2254 String startQuote = toCSSPrimitiveValue(first)->getStringValue(); 2255 String endQuote = toCSSPrimitiveValue(second)->getStringValue(); 2259 2256 quotes.append(std::make_pair(startQuote, endQuote)); 2260 2257 } … … 2677 2674 } 2678 2675 2679 if (!value->is CSSLineBoxContainValue())2676 if (!value->isLineBoxContainValue()) 2680 2677 return; 2681 2678 2682 CSSLineBoxContainValue* lineBoxContainValue = static_cast<CSSLineBoxContainValue*>(value);2679 CSSLineBoxContainValue* lineBoxContainValue = toCSSLineBoxContainValue(value); 2683 2680 state.style()->setLineBoxContain(lineBoxContainValue->value()); 2684 2681 return; … … 3076 3073 { 3077 3074 if (value->isImageValue()) 3078 return cachedOrPendingFromValue(property, static_cast<CSSImageValue*>(value));3075 return cachedOrPendingFromValue(property, toCSSImageValue(value)); 3079 3076 3080 3077 if (value->isImageGeneratorValue()) { 3081 3078 if (value->isGradientValue()) 3082 return generatedOrPendingFromValue(property, static_cast<CSSGradientValue*>(value)->gradientWithStylesResolved(this).get());3083 return generatedOrPendingFromValue(property, static_cast<CSSImageGeneratorValue*>(value));3079 return generatedOrPendingFromValue(property, toCSSGradientValue(value)->gradientWithStylesResolved(this).get()); 3080 return generatedOrPendingFromValue(property, toCSSImageGeneratorValue(value)); 3084 3081 } 3085 3082 3086 3083 #if ENABLE(CSS_IMAGE_SET) 3087 3084 if (value->isImageSetValue()) 3088 return setOrPendingFromValue(property, static_cast<CSSImageSetValue*>(value));3085 return setOrPendingFromValue(property, toCSSImageSetValue(value)); 3089 3086 #endif 3090 3087 3091 3088 if (value->isCursorImageValue()) 3092 return cursorOrPendingFromValue(property, static_cast<CSSCursorImageValue*>(value));3089 return cursorOrPendingFromValue(property, toCSSCursorImageValue(value)); 3093 3090 3094 3091 return 0; … … 3108 3105 if (value->isFilterImageValue()) { 3109 3106 // FilterImage needs to calculate FilterOperations. 3110 static_cast<CSSFilterImageValue*>(value)->createFilterOperations(this);3107 toCSSFilterImageValue(value)->createFilterOperations(this); 3111 3108 } 3112 3109 #endif … … 3387 3384 { 3388 3385 if (value->isWebKitCSSShaderValue()) 3389 return cachedOrPendingStyleShaderFromValue( static_cast<WebKitCSSShaderValue*>(value));3386 return cachedOrPendingStyleShaderFromValue(toWebKitCSSShaderValue(value)); 3390 3387 return 0; 3391 3388 } … … 3470 3467 if (!value->isPrimitiveValue()) 3471 3468 return 0; 3472 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);3469 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 3473 3470 if (primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_NUMBER) 3474 3471 return 0; … … 3481 3478 { 3482 3479 ASSERT(values->length()); 3483 CSSPrimitiveValue* firstPrimitiveValue = static_cast<CSSPrimitiveValue*>(values->itemWithoutBoundsCheck(0));3480 CSSPrimitiveValue* firstPrimitiveValue = toCSSPrimitiveValue(values->itemWithoutBoundsCheck(0)); 3484 3481 RefPtr<CustomFilterColorParameter> colorParameter = CustomFilterColorParameter::create(name); 3485 3482 colorParameter->setColor(Color(firstPrimitiveValue->getRGBA32Value())); … … 3494 3491 if (!value->isPrimitiveValue()) 3495 3492 return 0; 3496 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);3493 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 3497 3494 if (primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_NUMBER) 3498 3495 return 0; … … 3543 3540 return 0; 3544 3541 3545 CSSPrimitiveValue* firstPrimitiveValue = static_cast<CSSPrimitiveValue*>(values->itemWithoutBoundsCheck(0));3542 CSSPrimitiveValue* firstPrimitiveValue = toCSSPrimitiveValue(values->itemWithoutBoundsCheck(0)); 3546 3543 if (firstPrimitiveValue->primitiveType() == CSSPrimitiveValue::CSS_NUMBER) 3547 3544 return parseCustomFilterNumberParameter(name, values); … … 3563 3560 if (!iterator.isPrimitiveValue()) 3564 3561 return false; 3565 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(iterator.value());3562 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(iterator.value()); 3566 3563 if (primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_STRING) 3567 3564 return false; … … 3623 3620 ASSERT(mixFunction->length() <= 3); 3624 3621 while (iterator.hasMore()) { 3625 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(iterator.value());3622 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(iterator.value()); 3626 3623 if (CSSParser::isBlendMode(primitiveValue->getValueID())) 3627 3624 mixSettings.blendMode = *primitiveValue; … … 3655 3652 3656 3653 if (iterator.hasMore() && iterator.isPrimitiveValue()) { 3657 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(iterator.value());3654 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(iterator.value()); 3658 3655 if (primitiveValue->isNumber()) { 3659 3656 // If only one integer value is specified, it will set both … … 3664 3661 // Try to match another number for the rows. 3665 3662 if (iterator.hasMore() && iterator.isPrimitiveValue()) { 3666 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(iterator.value());3663 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(iterator.value()); 3667 3664 if (primitiveValue->isNumber()) { 3668 3665 meshRows = primitiveValue->getIntValue(); … … 3674 3671 3675 3672 if (iterator.hasMore() && iterator.isPrimitiveValue()) { 3676 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(iterator.value()); 3677 if (primitiveValue->getValueID() == CSSValueDetached) { 3673 if (toCSSPrimitiveValue(iterator.value())->getValueID() == CSSValueDetached) { 3678 3674 meshType = MeshTypeDetached; 3679 3675 iterator.advance(); … … 3720 3716 3721 3717 if (inValue->isPrimitiveValue()) { 3722 CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(inValue); 3723 if (primitiveValue->getValueID() == CSSValueNone) 3718 if (toCSSPrimitiveValue(inValue)->getValueID() == CSSValueNone) 3724 3719 return true; 3725 3720 } … … 3791 3786 } 3792 3787 3793 CSSPrimitiveValue* firstValue = filterValue->length() ? static_cast<CSSPrimitiveValue*>(filterValue->itemWithoutBoundsCheck(0)) : 0;3788 CSSPrimitiveValue* firstValue = filterValue->length() ? toCSSPrimitiveValue(filterValue->itemWithoutBoundsCheck(0)) : 0; 3794 3789 switch (filterValue->operationType()) { 3795 3790 case WebKitCSSFilterValue::GrayscaleFilterOperation:
Note:
See TracChangeset
for help on using the changeset viewer.