Change first() and second() in CSSPairValue to return const references

Source/core/css/resolver/CSSToStyleMap.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 176 matching lines @@
 
     if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value)->getValueID() == CSSValueContain || toCSSPrimitiveValue(value)->getValueID() == CSSValueCover)) {
         layer->setSizeLength(b);
         return;
     }
 
     Length firstLength;
     Length secondLength;
 
     if (value->isValuePair()) {
-        const CSSValuePair* pair = toCSSValuePair(value);
-        firstLength = StyleBuilderConverter::convertLengthOrAuto(state, pair->first());
-        secondLength = StyleBuilderConverter::convertLengthOrAuto(state, pair->second());
+        CSSValuePair* pair = toCSSValuePair(value);
+        firstLength = StyleBuilderConverter::convertLengthOrAuto(state, &pair->first());
+        secondLength = StyleBuilderConverter::convertLengthOrAuto(state, &pair->second());
     } else {
         ASSERT(value->isPrimitiveValue());
         firstLength = StyleBuilderConverter::convertLengthOrAuto(state, value);
         secondLength = Length();
     }
 
     b.setWidth(firstLength);
     b.setHeight(secondLength);
     layer->setSizeLength(b);
 }
 
 void CSSToStyleMap::mapFillXPosition(StyleResolverState& state, FillLayer* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
         layer->setXPosition(FillLayer::initialFillXPosition(layer->type()));
         return;
     }
 
     if (!value->isPrimitiveValue() && !value->isValuePair())
         return;
 
-    CSSPrimitiveValue* primitiveValue;
+    Length length;
     if (value->isValuePair())
-        primitiveValue = toCSSPrimitiveValue(toCSSValuePair(value)->second());
+        length = toCSSPrimitiveValue(toCSSValuePair(value)->second()).convertToLength(state.cssToLengthConversionData());
     else
-        primitiveValue = toCSSPrimitiveValue(value);
-
-    Length length = primitiveValue->convertToLength(state.cssToLengthConversionData());
+        length = toCSSPrimitiveValue(value)->convertToLength(state.cssToLengthConversionData());
 
     layer->setXPosition(length);
     if (value->isValuePair())
-        layer->setBackgroundXOrigin(*toCSSPrimitiveValue(toCSSValuePair(value)->first()));
+        layer->setBackgroundXOrigin(toCSSPrimitiveValue(toCSSValuePair(value)->first()));
 }
 
 void CSSToStyleMap::mapFillYPosition(StyleResolverState& state, FillLayer* layer, CSSValue* value)
 {
     if (value->isInitialValue()) {
         layer->setYPosition(FillLayer::initialFillYPosition(layer->type()));
         return;
     }
 
     if (!value->isPrimitiveValue() && !value->isValuePair())
         return;
 
     CSSPrimitiveValue* primitiveValue;
     if (value->isValuePair())
-        primitiveValue = toCSSPrimitiveValue(toCSSValuePair(value)->second());
+        primitiveValue = &toCSSPrimitiveValue(toCSSValuePair(value)->second());
     else
         primitiveValue = toCSSPrimitiveValue(value);
 
     Length length = primitiveValue->convertToLength(state.cssToLengthConversionData());
 
     layer->setYPosition(length);
     if (value->isValuePair())
-        layer->setBackgroundYOrigin(*toCSSPrimitiveValue(toCSSValuePair(value)->first()));
+        layer->setBackgroundYOrigin(toCSSPrimitiveValue(toCSSValuePair(value)->first()));
 }
 
 void CSSToStyleMap::mapFillMaskSourceType(StyleResolverState&, FillLayer* layer, CSSValue* value)
 {
     EMaskSourceType type = FillLayer::initialFillMaskSourceType(layer->type());
     if (value->isInitialValue()) {
         layer->setMaskSourceType(type);
         return;
     }
 
@@ skipping 277 matching lines @@
         toBorderImageLength(*slices->right(), state.cssToLengthConversionData()),
         toBorderImageLength(*slices->bottom(), state.cssToLengthConversionData()),
         toBorderImageLength(*slices->left(), state.cssToLengthConversionData()));
 }
 
 void CSSToStyleMap::mapNinePieceImageRepeat(StyleResolverState&, CSSValue* value, NinePieceImage& image)
 {
     if (!value || !value->isValuePair())
         return;
 
-    const CSSValuePair* pair = toCSSValuePair(value);
-    if (!pair || !pair->first() || !pair->second())
-        return;
-
-    CSSValueID firstIdentifier = toCSSPrimitiveValue(pair->first())->getValueID();
-    CSSValueID secondIdentifier = toCSSPrimitiveValue(pair->second())->getValueID();
+    const CSSValuePair& pair = toCSSValuePair(*value);
+    CSSValueID firstIdentifier = toCSSPrimitiveValue(pair.first()).getValueID();
+    CSSValueID secondIdentifier = toCSSPrimitiveValue(pair.second()).getValueID();
 
     ENinePieceImageRule horizontalRule;
     switch (firstIdentifier) {
     case CSSValueStretch:
         horizontalRule = StretchImageRule;
         break;
     case CSSValueRound:
         horizontalRule = RoundImageRule;
         break;
     case CSSValueSpace:
@@ skipping 17 matching lines @@
         verticalRule = SpaceImageRule;
         break;
     default: // CSSValueRepeat
         verticalRule = RepeatImageRule;
         break;
     }
     image.setVerticalRule(verticalRule);
 }
 
 };