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

Unified Diff: Source/core/rendering/RenderBoxModelObject.cpp

Issue 55783002: Introduce BorderImageLength and BorderImageLengthBox (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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/rendering/RenderBoxModelObject.cpp
diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
index 072a4cfce33699283c81cfc7dc0389d869201c0a..9e654e778417e3ae3bd2c5fc5a34044bd2142fce 100644
--- a/Source/core/rendering/RenderBoxModelObject.cpp
+++ b/Source/core/rendering/RenderBoxModelObject.cpp
@@ -1148,13 +1148,13 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* fil
geometry.setDestOrigin(geometry.destRect().location());
}
-static LayoutUnit computeBorderImageSide(Length borderSlice, LayoutUnit borderSide, LayoutUnit imageSide, LayoutUnit boxExtent, RenderView* renderView)
+static LayoutUnit computeBorderImageSide(LengthOrNumber borderSlice, LayoutUnit borderSide, LayoutUnit imageSide, LayoutUnit boxExtent, RenderView* renderView)
Julien - ping for review 2013/11/01 18:27:11 const LengthOrNumber& to avoid a copy.
davve 2013/11/04 12:42:54 OK.
{
- if (borderSlice.isRelative())
- return borderSlice.value() * borderSide;
- if (borderSlice.isAuto())
+ if (borderSlice.isNumber())
+ return borderSlice.number() * borderSide;
+ if (borderSlice.length().isAuto())
return imageSide;
- return valueForLength(borderSlice, boxExtent, renderView);
+ return valueForLength(borderSlice.length(), boxExtent, renderView);
}
bool RenderBoxModelObject::paintNinePieceImage(GraphicsContext* graphicsContext, const LayoutRect& rect, const RenderStyle* style,

Powered by Google App Engine
This is Rietveld 408576698