Index: Source/core/rendering/RenderBox.cpp |
=================================================================== |
--- Source/core/rendering/RenderBox.cpp (revision 184800) |
+++ Source/core/rendering/RenderBox.cpp (working copy) |
@@ -1265,7 +1265,7 @@ |
} |
ShapeValue* shapeOutsideValue = style()->shapeOutside(); |
- if (isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) { |
+ if (!frameView()->isInPerformLayout() && isFloating() && shapeOutsideValue && shapeOutsideValue->image() && shapeOutsideValue->image()->data() == image) { |
ShapeOutsideInfo& info = ShapeOutsideInfo::ensureInfo(*this); |
if (!info.isComputingShape()) { |
info.markShapeAsDirty(); |