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

Unified Diff: Source/core/rendering/RenderBlock.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/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 410ccea586f7631dfdd2cba1cb7633a9dbb0d37d..979271a14eba57ea6dd9e6773fb1b0768021536e 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -1401,7 +1401,7 @@ void RenderBlock::imageChanged(WrappedImagePtr image, const IntRect*)
ShapeValue* shapeValue = style()->shapeInside();
if (shapeValue && shapeValue->image() && shapeValue->image()->data() == image) {
ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo();
- shapeInsideInfo->dirtyShapeSize();
+ shapeInsideInfo->markShapeAsDirty();
markShapeInsideDescendantsForLayout();
}
}
@@ -1414,7 +1414,7 @@ void RenderBlock::updateShapeInsideInfoAfterStyleChange(const ShapeValue* shapeI
if (shapeInside) {
ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo();
- shapeInsideInfo->dirtyShapeSize();
+ shapeInsideInfo->markShapeAsDirty();
} else {
setShapeInsideInfo(nullptr);
markShapeInsideDescendantsForLayout();
@@ -1425,7 +1425,7 @@ static inline bool shapeInfoRequiresRelayout(const RenderBlock* block)
{
ShapeInsideInfo* info = block->shapeInsideInfo();
if (info)
- info->setNeedsLayout(info->shapeSizeDirty());
+ info->setNeedsLayout(info->isShapeDirty());
else
info = block->layoutShapeInsideInfo();
return info && info->needsLayout();
@@ -1463,7 +1463,7 @@ void RenderBlock::computeShapeSize()
return;
bool percentageLogicalHeightResolvable = percentageLogicalHeightIsResolvableFromBlock(this, false);
- shapeInsideInfo->setShapeSize(logicalWidth(), percentageLogicalHeightResolvable ? logicalHeight() : LayoutUnit());
+ shapeInsideInfo->setReferenceBoxLogicalSize(LayoutSize(logicalWidth(), percentageLogicalHeightResolvable ? logicalHeight() : LayoutUnit()));
leviw_travelin_and_unemployed 2014/03/03 23:07:20 So much better...
}
void RenderBlock::updateRegionsAndShapesAfterChildLayout(RenderFlowThread* flowThread, bool heightChanged)
@@ -1471,7 +1471,7 @@ void RenderBlock::updateRegionsAndShapesAfterChildLayout(RenderFlowThread* flowT
// A previous sibling has changed dimension, so we need to relayout the shape with the content
ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
if (heightChanged && shapeInsideInfo)
- shapeInsideInfo->dirtyShapeSize();
+ shapeInsideInfo->markShapeAsDirty();
computeRegionRangeForBlock(flowThread);
}

Powered by Google App Engine
This is Rietveld 408576698