Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 1317523002: Changed Pair to be a CSSValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@add_const_to_primvalue
Patch Set: Rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSValuePair.cpp ('k') | Source/core/css/Pair.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/ComputedStyleCSSValueMapping.cpp
diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp
index d0d4167725d87d34ddc0a0316e80381dce581b13..c33bce02d0d2e2b7af87dda9f427835802a35984 100644
--- a/Source/core/css/ComputedStyleCSSValueMapping.cpp
+++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -41,8 +41,8 @@
#include "core/css/CSSShadowValue.h"
#include "core/css/CSSTimingFunctionValue.h"
#include "core/css/CSSValueList.h"
+#include "core/css/CSSValuePair.h"
#include "core/css/CSSValuePool.h"
-#include "core/css/Pair.h"
#include "core/layout/LayoutBlock.h"
#include "core/layout/LayoutBox.h"
#include "core/layout/LayoutGrid.h"
@@ -311,7 +311,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForNinePieceImageRepeat(const NineP
verticalRepeat = horizontalRepeat;
else
verticalRepeat = cssValuePool().createIdentifierValue(valueForRepeatRule(image.verticalRule()));
- return cssValuePool().createValue(Pair::create(horizontalRepeat.release(), verticalRepeat.release(), Pair::DropIdenticalValues));
+ return CSSValuePair::create(horizontalRepeat.release(), verticalRepeat.release(), CSSValuePair::DropIdenticalValues);
}
static PassRefPtrWillBeRawPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image, const ComputedStyle& style)
@@ -1819,11 +1819,10 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
case CSSPropertyObjectFit:
return cssValuePool().createValue(style.objectFit());
case CSSPropertyObjectPosition:
- return cssValuePool().createValue(
- Pair::create(
- zoomAdjustedPixelValueForLength(style.objectPosition().x(), style),
- zoomAdjustedPixelValueForLength(style.objectPosition().y(), style),
- Pair::KeepIdenticalValues));
+ return CSSValuePair::create(
+ zoomAdjustedPixelValueForLength(style.objectPosition().x(), style),
+ zoomAdjustedPixelValueForLength(style.objectPosition().y(), style),
+ CSSValuePair::KeepIdenticalValues);
case CSSPropertyOpacity:
return cssValuePool().createValue(style.opacity(), CSSPrimitiveValue::UnitType::Number);
case CSSPropertyOrphans:
« no previous file with comments | « Source/core/css/CSSValuePair.cpp ('k') | Source/core/css/Pair.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698