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

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

Issue 112103012: Update default shape property value to 'none' (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merging with new ellipse code Created 6 years, 11 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/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index 9dbc105ded1afcddb878c15f79c4a0c5944431a9..14b1fb4dbe63ee44e7a4bde8a069af1dea325ffa 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -2641,7 +2641,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return cssValuePool().createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER);
case CSSPropertyShapeInside:
if (!style->shapeInside())
- return cssValuePool().createIdentifierValue(CSSValueAuto);
+ return cssValuePool().createIdentifierValue(CSSValueNone);
if (style->shapeInside()->type() == ShapeValue::Box)
return cssValuePool().createValue(style->shapeInside()->layoutBox());
if (style->shapeInside()->type() == ShapeValue::Outside)
@@ -2655,7 +2655,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return valueForBasicShape(*style, style->shapeInside()->shape());
case CSSPropertyShapeOutside:
if (!style->shapeOutside())
- return cssValuePool().createIdentifierValue(CSSValueAuto);
+ return cssValuePool().createIdentifierValue(CSSValueNone);
if (style->shapeOutside()->type() == ShapeValue::Box)
return cssValuePool().createValue(style->shapeOutside()->layoutBox());
if (style->shapeOutside()->type() == ShapeValue::Image) {

Powered by Google App Engine
This is Rietveld 408576698