Ignore:
Timestamp:
Sep 22, 2013, 11:33:13 PM (12 years ago)
Author:
[email protected]
Message:

Unreviewed, rolling out r156253.
​http://trac.webkit.org/changeset/156253
​https://bugs.webkit.org/show_bug.cgi?id=121778

Caused >20 tests to crash with assertion failures (Requested
by ap on #webkit).

  • css/CSSAspectRatioValue.h:
  • css/CSSBorderImageSliceValue.h:
  • css/CSSCalculationValue.cpp:

(WebCore::CSSCalcExpressionNodeParser::parseValue):

  • css/CSSCalculationValue.h:
  • css/CSSCrossfadeValue.cpp:

(WebCore::subimageKnownToBeOpaque):

  • css/CSSCrossfadeValue.h:

(WebCore::toCSSCrossfadeValue):

  • css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::~CSSCursorImageValue):
(WebCore::CSSCursorImageValue::updateIfSVGCursorIsUsed):
(WebCore::CSSCursorImageValue::cachedImage):
(WebCore::CSSCursorImageValue::cachedOrPendingImage):
(WebCore::CSSCursorImageValue::isSVGCursor):

  • css/CSSCursorImageValue.h:
  • css/CSSFilterImageValue.h:

(WebCore::toCSSFilterImageValue):

  • css/CSSFontSelector.cpp:

(WebCore::CSSFontSelector::addFontFaceRule):

  • css/CSSGradientValue.h:
  • css/CSSImageGeneratorValue.cpp:

(WebCore::CSSImageGeneratorValue::image):
(WebCore::CSSImageGeneratorValue::fixedSize):
(WebCore::CSSImageGeneratorValue::loadSubimages):
(WebCore::CSSImageGeneratorValue::subimageIsPending):
(WebCore::CSSImageGeneratorValue::cachedImageForCSSValue):

  • css/CSSImageGeneratorValue.h:
  • css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::fillImageSet):

  • css/CSSImageSetValue.h:
  • css/CSSImageValue.h:
  • css/CSSInheritedValue.h:
  • css/CSSInitialValue.h:
  • css/CSSLineBoxContainValue.h:
  • css/CSSParser.cpp:

(WebCore::CSSParser::parseColor):
(WebCore::CSSParser::addProperty):
(WebCore::CSSParser::parse3ValuesFillPosition):
(WebCore::CSSParser::parseFillPosition):
(WebCore::CSSParser::parseFillRepeat):
(WebCore::CSSParser::parseDeprecatedRadialGradient):
(WebCore::CSSParser::parseRadialGradient):

  • css/CSSPrimitiveValue.h:
  • css/CSSReflectValue.h:
  • css/CSSToStyleMap.cpp:

(WebCore::CSSToStyleMap::mapFillAttachment):
(WebCore::CSSToStyleMap::mapFillClip):
(WebCore::CSSToStyleMap::mapFillComposite):
(WebCore::CSSToStyleMap::mapFillBlendMode):
(WebCore::CSSToStyleMap::mapFillOrigin):
(WebCore::CSSToStyleMap::mapFillRepeatX):
(WebCore::CSSToStyleMap::mapFillRepeatY):
(WebCore::CSSToStyleMap::mapFillSize):
(WebCore::CSSToStyleMap::mapFillXPosition):
(WebCore::CSSToStyleMap::mapFillYPosition):
(WebCore::CSSToStyleMap::mapFillMaskSourceType):
(WebCore::CSSToStyleMap::mapAnimationDelay):
(WebCore::CSSToStyleMap::mapAnimationDirection):
(WebCore::CSSToStyleMap::mapAnimationDuration):
(WebCore::CSSToStyleMap::mapAnimationFillMode):
(WebCore::CSSToStyleMap::mapAnimationIterationCount):
(WebCore::CSSToStyleMap::mapAnimationName):
(WebCore::CSSToStyleMap::mapAnimationPlayState):
(WebCore::CSSToStyleMap::mapAnimationProperty):
(WebCore::CSSToStyleMap::mapAnimationTimingFunction):
(WebCore::CSSToStyleMap::mapNinePieceImageSlice):
(WebCore::CSSToStyleMap::mapNinePieceImageQuad):
(WebCore::CSSToStyleMap::mapNinePieceImageRepeat):

  • css/CSSValue.cpp:

(WebCore::CSSValue::destroy):

  • css/CSSValue.h:

(WebCore::CSSValue::isCSSLineBoxContainValue):
(WebCore::CSSValue::isCalculationValue):

  • css/CSSValueList.h:
  • css/CSSVariableValue.h:
  • css/DeprecatedStyleBuilder.cpp:

(WebCore::ApplyPropertyDefault::applyValue):
(WebCore::ApplyPropertyNumber::applyValue):
(WebCore::ApplyPropertyAuto::applyValue):
(WebCore::ApplyPropertyClip::applyValue):
(WebCore::ApplyPropertyColor::applyValue):
(WebCore::ApplyPropertyLength::applyValue):
(WebCore::ApplyPropertyString::applyValue):
(WebCore::ApplyPropertyBorderRadius::applyValue):
(WebCore::ApplyPropertyComputeLength::applyValue):
(WebCore::ApplyPropertyFont::applyValue):
(WebCore::ApplyPropertyFontFamily::applyValue):
(WebCore::ApplyPropertyFontSize::applyValue):
(WebCore::ApplyPropertyFontWeight::applyValue):
(WebCore::ApplyPropertyFontVariantLigatures::applyValue):
(WebCore::ApplyPropertyCounter::applyValue):
(WebCore::ApplyPropertyCursor::applyValue):
(WebCore::ApplyPropertyTextAlign::applyValue):
(WebCore::ApplyPropertyTextDecoration::applyValue):
(WebCore::ApplyPropertyMarqueeIncrement::applyValue):
(WebCore::ApplyPropertyMarqueeRepetition::applyValue):
(WebCore::ApplyPropertyMarqueeSpeed::applyValue):
(WebCore::ApplyPropertyTextUnderlinePosition::applyValue):
(WebCore::ApplyPropertyLineHeight::applyValue):
(WebCore::ApplyPropertyLineHeightForIOSTextAutosizing::applyValue):
(WebCore::ApplyPropertyPageSize::applyValue):
(WebCore::ApplyPropertyTextEmphasisStyle::applyValue):
(WebCore::ApplyPropertyResize::applyValue):
(WebCore::ApplyPropertyVerticalAlign::applyValue):
(WebCore::ApplyPropertyAspectRatio::applyValue):
(WebCore::ApplyPropertyZoom::applyValue):
(WebCore::ApplyPropertyDisplay::applyValue):
(WebCore::ApplyPropertyClipPath::applyValue):
(WebCore::ApplyPropertyShape::applyValue):
(WebCore::ApplyPropertyImageResolution::applyValue):
(WebCore::ApplyPropertyTextIndent::applyValue):

  • css/FontFeatureValue.h:
  • css/FontValue.h:
  • css/MediaList.cpp:

(WebCore::reportMediaQueryWarningIfNeeded):

  • css/MediaQueryEvaluator.cpp:

(WebCore::compareAspectRatioValue):
(WebCore::numberValue):
(WebCore::orientationMediaFeatureEval):
(WebCore::evalResolution):
(WebCore::device_pixel_ratioMediaFeatureEval):
(WebCore::resolutionMediaFeatureEval):
(WebCore::computeLength):
(WebCore::view_modeMediaFeatureEval):
(WebCore::pointerMediaFeatureEval):

  • css/SVGCSSStyleSelector.cpp:

(WebCore::StyleResolver::applySVGProperty):

  • css/ShadowValue.h:
  • css/StylePropertySet.cpp:

(WebCore::StylePropertySet::getLayeredShorthandValue):

  • css/StyleResolver.cpp:

(WebCore::createGridTrackSize):
(WebCore::createGridTrackList):
(WebCore::createGridPosition):
(WebCore::hasVariableReference):
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::styleImage):
(WebCore::StyleResolver::generatedOrPendingFromValue):
(WebCore::StyleResolver::styleShader):
(WebCore::StyleResolver::parseCustomFilterArrayParameter):
(WebCore::StyleResolver::parseCustomFilterColorParameter):
(WebCore::StyleResolver::parseCustomFilterNumberParameter):
(WebCore::StyleResolver::parseCustomFilterParameter):
(WebCore::StyleResolver::parseCustomFilterParameterList):
(WebCore::StyleResolver::createCustomFilterOperationWithInlineSyntax):
(WebCore::StyleResolver::createFilterOperations):

  • css/TransformFunctions.cpp:

(WebCore::transformsForValue):

  • css/ViewportStyleResolver.cpp:

(WebCore::ViewportStyleResolver::getViewportArgumentValue):

  • css/WebKitCSSMatrix.cpp:

(WebCore::WebKitCSSMatrix::setMatrixValue):

  • editing/ApplyStyleCommand.cpp:

(WebCore::ApplyStyleCommand::computedFontSize):

  • editing/EditingStyle.cpp:

(WebCore::identifierForStyleProperty):
(WebCore::HTMLElementEquivalent::valueIsPresentInStyle):
(WebCore::cssValueToRGBA):
(WebCore::EditingStyle::extractFontSizeDelta):
(WebCore::EditingStyle::textDirection):
(WebCore::EditingStyle::prepareToApplyAt):
(WebCore::EditingStyle::mergeStyleFromRulesForSerialization):
(WebCore::EditingStyle::legacyFontSize):
(WebCore::EditingStyle::textDirectionForSelection):
(WebCore::StyleChange::extractTextStyles):
(WebCore::fontWeightIsBold):
(WebCore::isTransparentColorValue):

  • editing/markup.cpp:

(WebCore::propertyMissingOrEqualToNone):

  • page/PageSerializer.cpp:

(WebCore::PageSerializer::retrieveResourcesForProperties):

  • rendering/style/StylePendingImage.h:

(WebCore::StylePendingImage::data):
(WebCore::StylePendingImage::cssImageValue):
(WebCore::StylePendingImage::cssImageGeneratorValue):
(WebCore::StylePendingImage::cssCursorImageValue):
(WebCore::StylePendingImage::cssImageSetValue):

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r156253 r156260  
    151151    {
    152152        if (value->isPrimitiveValue())
    153             setValue(styleResolver->style(), *toCSSPrimitiveValue(value));
     153            setValue(styleResolver->style(), *static_cast<CSSPrimitiveValue*>(value));
    154154    }
    155155    static PropertyHandler createHandler()
    … …  
    169169            return;
    170170
    171         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     171        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    172172        if (primitiveValue->getValueID() == idMapsToMinusOne)
    173173            setValue(styleResolver->style(), -1);
    … …  
    217217            return;
    218218
    219         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     219        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    220220        if (primitiveValue->getValueID() == autoIdentity)
    221221            setAuto(styleResolver->style());
    … …  
    256256            return;
    257257
    258         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     258        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    259259
    260260        if (Rect* rect = primitiveValue->getRectValue()) {
    … …  
    302302            return;
    303303
    304         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     304        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    305305        if (inheritColorFromParent && primitiveValue->getValueID() == CSSValueCurrentcolor)
    306306            applyInheritValue(propertyID, styleResolver);
    … …  
    363363            return;
    364364
    365         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     365        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    366366        if (noneEnabled && primitiveValue->getValueID() == CSSValueNone) {
    367367            if (noneUndefined)
    … …  
    417417        if (!value->isPrimitiveValue())
    418418            return;
    419         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     419        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    420420        if ((identBehavior == MapNoneToNull && primitiveValue->getValueID() == CSSValueNone)
    421421            || (identBehavior == MapAutoToNull && primitiveValue->getValueID() == CSSValueAuto))
    … …  
    440440            return;
    441441
    442         Pair* pair = toCSSPrimitiveValue(value)->getPairValue();
     442        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
     443        Pair* pair = primitiveValue->getPairValue();
    443444        if (!pair || !pair->first() || !pair->second())
    444445            return;
    … …  
    602603            return;
    603604
    604         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     605        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    605606
    606607        CSSValueID ident = primitiveValue->getValueID();
    … …  
    672673        if (!value->isPrimitiveValue())
    673674            return;
     675        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    674676        FontDescription fontDescription = styleResolver->fontDescription();
    675         (fontDescription.*setterFunction)(*toCSSPrimitiveValue(value));
     677        (fontDescription.*setterFunction)(*primitiveValue);
    676678        styleResolver->setFontDescription(fontDescription);
    677679    }
    … …  
    725727            if (!item->isPrimitiveValue())
    726728                continue;
    727             CSSPrimitiveValue* contentValue = toCSSPrimitiveValue(item);
     729            CSSPrimitiveValue* contentValue = static_cast<CSSPrimitiveValue*>(item);
    728730            AtomicString face;
    729731            if (contentValue->isString())
    … …  
    835837            return;
    836838
    837         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     839        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    838840
    839841        FontDescription fontDescription = styleResolver->style()->fontDescription();
    … …  
    848850        }
    849851
    850         if (CSSValueID ident = toCSSPrimitiveValue(value)->getValueID()) {
     852        if (CSSValueID ident = primitiveValue->getValueID()) {
    851853            // Keywords are being used.
    852854            switch (ident) {
    … …  
    909911        if (!value->isPrimitiveValue())
    910912            return;
    911         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     913        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    912914        FontDescription fontDescription = styleResolver->fontDescription();
    913915        switch (primitiveValue->getValueID()) {
    … …  
    970972                ASSERT(item->isPrimitiveValue());
    971973                if (item->isPrimitiveValue()) {
    972                     switch (toCSSPrimitiveValue(item)->getValueID()) {
     974                    CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(item);
     975                    switch (primitiveValue->getValueID()) {
    973976                    case CSSValueNoCommonLigatures:
    974977                        commonLigaturesState = FontDescription::DisabledLigaturesState;
    … …  
    9991002        else {
    10001003            ASSERT_WITH_SECURITY_IMPLICATION(value->isPrimitiveValue());
    1001             ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNormal);
     1004            ASSERT(static_cast<CSSPrimitiveValue*>(value)->getValueID() == CSSValueNormal);
    10021005        }
    10031006#endif
    … …  
    11471150    static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
    11481151    {
    1149         bool setCounterIncrementToNone = counterBehavior == Increment && value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone;
     1152        bool setCounterIncrementToNone = counterBehavior == Increment && value->isPrimitiveValue() && static_cast<CSSPrimitiveValue*>(value)->getValueID() == CSSValueNone;
    11501153
    11511154        if (!value->isValueList() && !setCounterIncrementToNone)
    … …  
    11721175                continue;
    11731176
    1174             Pair* pair = toCSSPrimitiveValue(currValue)->getPairValue();
     1177            Pair* pair = static_cast<CSSPrimitiveValue*>(currValue)->getPairValue();
    11751178            if (!pair || !pair->first() || !pair->second())
    11761179                continue;
    … …  
    12141217                CSSValue* item = list->itemWithoutBoundsCheck(i);
    12151218                if (item->isCursorImageValue()) {
    1216                     CSSCursorImageValue* image = toCSSCursorImageValue(item);
     1219                    CSSCursorImageValue* image = static_cast<CSSCursorImageValue*>(item);
    12171220                    if (image->updateIfSVGCursorIsUsed(styleResolver->element())) // Elements with SVG cursors are not allowed to share style.
    12181221                        styleResolver->style()->setUnique();
    12191222                    styleResolver->style()->addCursor(styleResolver->styleImage(CSSPropertyCursor, image), image->hotSpot());
    12201223                } else if (item->isPrimitiveValue()) {
    1221                     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(item);
     1224                    CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(item);
    12221225                    if (primitiveValue->isValueID())
    12231226                        styleResolver->style()->setCursor(*primitiveValue);
    … …  
    12251228            }
    12261229        } else if (value->isPrimitiveValue()) {
    1227             CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1230            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    12281231            if (primitiveValue->isValueID() && styleResolver->style()->cursor() != ECursor(*primitiveValue))
    12291232                styleResolver->style()->setCursor(*primitiveValue);
    … …  
    12411244            return;
    12421245
    1243         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1246        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    12441247        ASSERT(primitiveValue->isValueID());
    12451248
    … …  
    12681271            CSSValue* item = i.value();
    12691272            ASSERT_WITH_SECURITY_IMPLICATION(item->isPrimitiveValue());
    1270             t |= *toCSSPrimitiveValue(item);
     1273            t |= *static_cast<CSSPrimitiveValue*>(item);
    12711274        }
    12721275        styleResolver->style()->setTextDecoration(t);
    … …  
    12861289            return;
    12871290
    1288         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1291        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    12891292        if (primitiveValue->getValueID()) {
    12901293            switch (primitiveValue->getValueID()) {
    … …  
    13211324            return;
    13221325
    1323         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1326        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    13241327        if (primitiveValue->getValueID() == CSSValueInfinite)
    13251328            styleResolver->style()->setMarqueeLoopCount(-1); // -1 means repeat forever.
    … …  
    13411344            return;
    13421345
    1343         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1346        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    13441347        if (CSSValueID ident = primitiveValue->getValueID()) {
    13451348            switch (ident) {
    … …  
    13751378        // This is true if value is 'auto' or 'alphabetic'.
    13761379        if (value->isPrimitiveValue()) {
    1377             TextUnderlinePosition t = *toCSSPrimitiveValue(value);
     1380            TextUnderlinePosition t = *static_cast<CSSPrimitiveValue*>(value);
    13781381            styleResolver->style()->setTextUnderlinePosition(t);
    13791382            return;
    … …  
    14041407            return;
    14051408
    1406         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1409        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    14071410        Length lineHeight;
    14081411
    … …  
    14421445            return;
    14431446
    1444         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1447        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    14451448        Length lineHeight;
    14461449
    … …  
    15841587            if (!inspector.first()->isPrimitiveValue() || !inspector.second()->isPrimitiveValue())
    15851588                return;
    1586             CSSPrimitiveValue* first = toCSSPrimitiveValue(inspector.first());
    1587             CSSPrimitiveValue* second = toCSSPrimitiveValue(inspector.second());
     1589            CSSPrimitiveValue* first = static_cast<CSSPrimitiveValue*>(inspector.first());
     1590            CSSPrimitiveValue* second = static_cast<CSSPrimitiveValue*>(inspector.second());
    15881591            if (first->isLength()) {
    15891592                // <length>{2}
    … …  
    16051608            if (!inspector.first()->isPrimitiveValue())
    16061609                return;
    1607             CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(inspector.first());
     1610            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(inspector.first());
    16081611            if (primitiveValue->isLength()) {
    16091612                // <length>
    … …  
    16691672                    continue;
    16701673
    1671                 CSSPrimitiveValue* value = toCSSPrimitiveValue(item);
     1674                CSSPrimitiveValue* value = static_cast<CSSPrimitiveValue*>(item);
    16721675                if (value->getValueID() == CSSValueFilled || value->getValueID() == CSSValueOpen)
    16731676                    styleResolver->style()->setTextEmphasisFill(*value);
    … …  
    16811684        if (!value->isPrimitiveValue())
    16821685            return;
    1683         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1686        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    16841687
    16851688        if (primitiveValue->isString()) {
    … …  
    18101813            return;
    18111814
    1812         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1815        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    18131816
    18141817        EResize r = RESIZE_NONE;
    … …  
    18401843            return;
    18411844
    1842         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1845        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    18431846
    18441847        if (primitiveValue->getValueID())
    … …  
    18791882            return;
    18801883        }
    1881         CSSAspectRatioValue* aspectRatioValue = toCSSAspectRatioValue(value);
     1884        CSSAspectRatioValue* aspectRatioValue = static_cast<CSSAspectRatioValue*>(value);
    18821885        styleResolver->style()->setHasAspectRatio(true);
    18831886        styleResolver->style()->setAspectRatioDenominator(aspectRatioValue->denominatorValue());
    … …  
    19151918    {
    19161919        ASSERT_WITH_SECURITY_IMPLICATION(value->isPrimitiveValue());
    1917         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     1920        CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    19181921
    19191922        if (primitiveValue->getValueID() == CSSValueNormal) {
    … …  
    19761979            return;
    19771980
    1978         EDisplay display = *toCSSPrimitiveValue(value);
     1981        EDisplay display = *static_cast<CSSPrimitiveValue*>(value);
    19791982
    19801983        if (!isValidDisplayValue(styleResolver, display))
    … …  
    19972000    {
    19982001        if (value->isPrimitiveValue()) {
    1999             CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     2002            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    20002003            if (primitiveValue->getValueID() == CSSValueNone)
    20012004                setValue(styleResolver->style(), 0);
    … …  
    20282031    {
    20292032        if (value->isPrimitiveValue()) {
    2030             CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     2033            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
    20312034            if (primitiveValue->getValueID() == CSSValueAuto)
    20322035                setValue(styleResolver->style(), 0);
    … …  
    20812084            if (!item->isPrimitiveValue())
    20822085                continue;
    2083             CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(item);
     2086            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(item);
    20842087            if (primitiveValue->getValueID() == CSSValueFromImage)
    20852088                source = ImageResolutionFromImage;
    … …  
    21372140                continue;
    21382141
    2139             CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(item);
     2142            CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(item);
    21402143            if (!primitiveValue->getValueID())
    21412144                lengthOrPercentageValue = primitiveValue->convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion | ViewportPercentageConversion>(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom());
Note: See TracChangeset for help on using the changeset viewer.