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

Unified Diff: Source/core/rendering/shapes/ShapeInsideInfo.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/ShapeInsideInfo.cpp
diff --git a/Source/core/rendering/shapes/ShapeInsideInfo.cpp b/Source/core/rendering/shapes/ShapeInsideInfo.cpp
index 13da8afc697b09d763166d9ed95dc812dead58bb..f912831f7f224878e5c5c969a600f00feed186cf 100644
--- a/Source/core/rendering/shapes/ShapeInsideInfo.cpp
+++ b/Source/core/rendering/shapes/ShapeInsideInfo.cpp
@@ -74,7 +74,7 @@ bool ShapeInsideInfo::updateSegmentsForLine(LayoutSize lineOffset, LayoutUnit li
bool ShapeInsideInfo::updateSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight)
{
ASSERT(lineHeight >= 0);
- m_shapeLineTop = lineTop - logicalTopOffset();
+ m_referenceBoxLineTop = lineTop - logicalTopOffset();
m_lineHeight = lineHeight;
m_segments.clear();
m_segmentRanges.clear();
@@ -92,9 +92,9 @@ bool ShapeInsideInfo::adjustLogicalLineTop(float minSegmentWidth)
return false;
LayoutUnit newLineTop;
- if (shape->firstIncludedIntervalLogicalTop(m_shapeLineTop, FloatSize(minSegmentWidth, m_lineHeight), newLineTop)) {
- if (newLineTop > m_shapeLineTop) {
- m_shapeLineTop = newLineTop;
+ if (shape->firstIncludedIntervalLogicalTop(m_referenceBoxLineTop, FloatSize(minSegmentWidth, m_lineHeight), newLineTop)) {
+ if (newLineTop > m_referenceBoxLineTop) {
+ m_referenceBoxLineTop = newLineTop;
return true;
}
}
@@ -113,7 +113,7 @@ LayoutUnit ShapeInsideInfo::computeFirstFitPositionForFloat(const FloatSize& flo
return 0;
LayoutUnit firstFitPosition = 0;
- if (computedShape()->firstIncludedIntervalLogicalTop(m_shapeLineTop, floatSize, firstFitPosition) && (m_shapeLineTop <= firstFitPosition))
+ if (computedShape()->firstIncludedIntervalLogicalTop(m_referenceBoxLineTop, floatSize, firstFitPosition) && (m_referenceBoxLineTop <= firstFitPosition))
return firstFitPosition;
return 0;

Powered by Google App Engine
This is Rietveld 408576698