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

Unified Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.cpp
diff --git a/sky/engine/core/rendering/RenderBox.cpp b/sky/engine/core/rendering/RenderBox.cpp
index dda0464f398ed4c21de24df19e178373f40cad06..4c7a16ef4386f92b555172205ccfb58147673a73 100644
--- a/sky/engine/core/rendering/RenderBox.cpp
+++ b/sky/engine/core/rendering/RenderBox.cpp
@@ -82,8 +82,6 @@ void RenderBox::willBeDestroyed()
RenderBlock::removePercentHeightDescendantIfNeeded(this);
- ShapeOutsideInfo::removeInfo(*this);
-
RenderBoxModelObject::willBeDestroyed();
}
@@ -153,29 +151,6 @@ void RenderBox::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle
parentToInvalidate = parentToInvalidate->parent();
}
}
-
- updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle);
-}
-
-void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle)
-{
- const ShapeValue* shapeOutside = style.shapeOutside();
- const ShapeValue* oldShapeOutside = oldStyle ? oldStyle->shapeOutside() : RenderStyle::initialShapeOutside();
-
- Length shapeMargin = style.shapeMargin();
- Length oldShapeMargin = oldStyle ? oldStyle->shapeMargin() : RenderStyle::initialShapeMargin();
-
- float shapeImageThreshold = style.shapeImageThreshold();
- float oldShapeImageThreshold = oldStyle ? oldStyle->shapeImageThreshold() : RenderStyle::initialShapeImageThreshold();
-
- // FIXME: A future optimization would do a deep comparison for equality. (bug 100811)
- if (shapeOutside == oldShapeOutside && shapeMargin == oldShapeMargin && shapeImageThreshold == oldShapeImageThreshold)
- return;
-
- if (!shapeOutside)
- ShapeOutsideInfo::removeInfo(*this);
- else
- ShapeOutsideInfo::ensureInfo(*this).markShapeAsDirty();
}
void RenderBox::updateFromStyle()
@@ -980,8 +955,6 @@ static bool isCandidateForOpaquenessTest(RenderBox* childBox)
RenderStyle* childStyle = childBox->style();
if (childStyle->position() != StaticPosition && childBox->containingBlock() != childBox->parent())
return false;
- if (childStyle->shapeOutside())
- return false;
if (!childBox->width() || !childBox->height())
return false;
if (RenderLayer* childLayer = childBox->layer()) {
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698