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

Unified Diff: Source/core/rendering/shapes/ShapeInfo.cpp

Issue 185393015: Rename shapeSize and others to make ShapeInfo and friends easier to understand (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/rendering/shapes/ShapeInfo.cpp
diff --git a/Source/core/rendering/shapes/ShapeInfo.cpp b/Source/core/rendering/shapes/ShapeInfo.cpp
index 72020e607148ecee1b8ea2eb0464cd1d8c6ce93f..4824738b65fbc9bf25838ce139a4baad3bd0f153 100644
--- a/Source/core/rendering/shapes/ShapeInfo.cpp
+++ b/Source/core/rendering/shapes/ShapeInfo.cpp
@@ -73,16 +73,16 @@ const Shape* ShapeInfo<RenderType>::computedShape() const
switch (shapeValue->type()) {
case ShapeValue::Shape:
ASSERT(shapeValue->shape());
- m_shape = Shape::createShape(shapeValue->shape(), m_shapeLogicalSize, writingMode, margin, padding);
+ m_shape = Shape::createShape(shapeValue->shape(), m_referenceBoxLogicalSize, writingMode, margin, padding);
break;
case ShapeValue::Image: {
ASSERT(shapeValue->image());
const StyleImage& styleImage = *(shapeValue->image());
- m_shape = Shape::createRasterShape(styleImage, shapeImageThreshold, getShapeImageRect(styleImage, m_renderer), m_shapeLogicalSize, writingMode, margin, padding);
+ m_shape = Shape::createRasterShape(styleImage, shapeImageThreshold, getShapeImageRect(styleImage, m_renderer), m_referenceBoxLogicalSize, writingMode, margin, padding);
break;
}
case ShapeValue::Box: {
- const RoundedRect& shapeRect = m_renderer->style()->getRoundedBorderFor(LayoutRect(LayoutPoint(), m_shapeLogicalSize), m_renderer->view());
+ const RoundedRect& shapeRect = m_renderer->style()->getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer->view());
m_shape = Shape::createLayoutBoxShape(shapeRect, writingMode, margin, padding);
break;
}

Powered by Google App Engine
This is Rietveld 408576698