| Index: Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| index ad9baf3a8a5c10161d961f71ddb065d20987cd9e..2659731829df4e6a37b3368a2ca21872da8519f1 100644
|
| --- a/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| +++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| @@ -36,13 +36,13 @@
|
| #include "core/css/CSSGridTemplateAreasValue.h"
|
| #include "core/css/CSSPathValue.h"
|
| #include "core/css/CSSPrimitiveValueMappings.h"
|
| +#include "core/css/CSSQuadValue.h"
|
| #include "core/css/CSSReflectValue.h"
|
| #include "core/css/CSSShadowValue.h"
|
| #include "core/css/CSSTimingFunctionValue.h"
|
| #include "core/css/CSSValueList.h"
|
| #include "core/css/CSSValuePool.h"
|
| #include "core/css/Pair.h"
|
| -#include "core/css/Rect.h"
|
| #include "core/layout/LayoutBlock.h"
|
| #include "core/layout/LayoutBox.h"
|
| #include "core/layout/LayoutGrid.h"
|
| @@ -238,16 +238,10 @@ static PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> valueForNinePieceImageSl
|
| }
|
| }
|
|
|
| - RefPtrWillBeRawPtr<Quad> quad = Quad::create();
|
| - quad->setTop(top);
|
| - quad->setRight(right);
|
| - quad->setBottom(bottom);
|
| - quad->setLeft(left);
|
| -
|
| - return CSSBorderImageSliceValue::create(cssValuePool().createValue(quad.release()), image.fill());
|
| + return CSSBorderImageSliceValue::create(CSSQuadValue::createQuad(top, right, bottom, left), image.fill());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const BorderImageLengthBox& box, const ComputedStyle& style)
|
| +static PassRefPtrWillBeRawPtr<CSSQuadValue> valueForNinePieceImageQuad(const BorderImageLengthBox& box, const ComputedStyle& style)
|
| {
|
| // Create the slices.
|
| RefPtrWillBeRawPtr<CSSPrimitiveValue> top = nullptr;
|
| @@ -290,13 +284,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(cons
|
| }
|
| }
|
|
|
| - RefPtrWillBeRawPtr<Quad> quad = Quad::create();
|
| - quad->setTop(top);
|
| - quad->setRight(right);
|
| - quad->setBottom(bottom);
|
| - quad->setLeft(left);
|
| -
|
| - return cssValuePool().createValue(quad.release());
|
| + return CSSQuadValue::createQuad(top, right, bottom, left);
|
| }
|
|
|
| static CSSValueID valueForRepeatRule(int rule)
|
| @@ -2256,12 +2244,11 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyClip: {
|
| if (style.hasAutoClip())
|
| return cssValuePool().createIdentifierValue(CSSValueAuto);
|
| - RefPtrWillBeRawPtr<Rect> rect = Rect::create();
|
| - rect->setTop(zoomAdjustedPixelValue(style.clip().top().value(), style));
|
| - rect->setRight(zoomAdjustedPixelValue(style.clip().right().value(), style));
|
| - rect->setBottom(zoomAdjustedPixelValue(style.clip().bottom().value(), style));
|
| - rect->setLeft(zoomAdjustedPixelValue(style.clip().left().value(), style));
|
| - return cssValuePool().createValue(rect.release());
|
| + RefPtrWillBeRawPtr<CSSPrimitiveValue> top = zoomAdjustedPixelValue(style.clip().top().value(), style);
|
| + RefPtrWillBeRawPtr<CSSPrimitiveValue> right = zoomAdjustedPixelValue(style.clip().right().value(), style);
|
| + RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom = zoomAdjustedPixelValue(style.clip().bottom().value(), style);
|
| + RefPtrWillBeRawPtr<CSSPrimitiveValue> left = zoomAdjustedPixelValue(style.clip().left().value(), style);
|
| + return CSSQuadValue::createRect(top, right, bottom, left);
|
| }
|
| case CSSPropertySpeak:
|
| return cssValuePool().createValue(style.speak());
|
|
|