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

Unified Diff: Source/core/css/resolver/CSSToStyleMap.cpp

Issue 1304993002: Change Rect and Quad to be CSSValues (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_counter_out_attempt_3
Patch Set: 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
Index: Source/core/css/resolver/CSSToStyleMap.cpp
diff --git a/Source/core/css/resolver/CSSToStyleMap.cpp b/Source/core/css/resolver/CSSToStyleMap.cpp
index 00482ebd63dab58ec9aa046889d64f5a859cf68c..e56bfe4f8d88a8d4a59f093b7d08d7b13aad873a 100644
--- a/Source/core/css/resolver/CSSToStyleMap.cpp
+++ b/Source/core/css/resolver/CSSToStyleMap.cpp
@@ -33,9 +33,9 @@
#include "core/css/CSSBorderImageSliceValue.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSPrimitiveValueMappings.h"
+#include "core/css/CSSQuadValue.h"
#include "core/css/CSSTimingFunctionValue.h"
#include "core/css/Pair.h"
-#include "core/css/Rect.h"
#include "core/css/resolver/StyleBuilderConverter.h"
#include "core/css/resolver/StyleResolverState.h"
#include "core/style/BorderImageLengthBox.h"
@@ -494,7 +494,7 @@ void CSSToStyleMap::mapNinePieceImageSlice(StyleResolverState&, CSSValue* value,
// Set up a length box to represent our image slices.
LengthBox box;
- Quad* slices = borderImageSlice->slices();
+ CSSQuadValue* slices = borderImageSlice->slices();
if (slices->top()->isPercentage())
box.m_top = Length(slices->top()->getDoubleValue(), Percent);
else
@@ -530,10 +530,10 @@ static BorderImageLength toBorderImageLength(CSSPrimitiveValue& value, const CSS
BorderImageLengthBox CSSToStyleMap::mapNinePieceImageQuad(StyleResolverState& state, CSSValue* value)
{
- if (!value || !value->isPrimitiveValue())
+ if (!value || !value->isQuadValue())
return BorderImageLengthBox(Length(Auto));
- Quad* slices = toCSSPrimitiveValue(value)->getQuadValue();
+ RefPtrWillBeRawPtr<CSSQuadValue> slices = toCSSQuadValue(value);
// Set up a border image length box to represent our image slices.
return BorderImageLengthBox(

Powered by Google App Engine
This is Rietveld 408576698