Source/core/rendering/shapes/ShapeInsideInfo.cpp - Issue 200633005: [CSS Shapes] Remove deprecated shapes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 200633005: [CSS Shapes] Remove deprecated shapes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix test expectations Created 6 years, 9 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 76bc0b7117787eff5b72f5768c1cf899facd232b..533dccc9ebd1355f7ca80f2ea59fefe8f1ca1d1f 100644

--- a/Source/core/rendering/shapes/ShapeInsideInfo.cpp

+++ b/Source/core/rendering/shapes/ShapeInsideInfo.cpp

@@ -49,7 +49,7 @@ bool ShapeInsideInfo::isEnabledFor(const RenderBlock& renderer)

switch (shapeValue->type()) {

case ShapeValue::Shape:

- return shapeValue->shape() && shapeValue->shape()->type() != BasicShape::BasicShapeInsetRectangleType && shapeValue->shape()->type() != BasicShape::BasicShapeInsetType;

+ return shapeValue->shape() && shapeValue->shape()->type() != BasicShape::BasicShapeInsetType;

case ShapeValue::Image:

return shapeValue->isImageValid() && checkShapeImageOrigin(renderer.document(), *(shapeValue->image()->cachedImage()));

case ShapeValue::Box:

« no previous file with comments | « Source/core/rendering/shapes/Shape.cpp ('k') | Source/core/rendering/style/BasicShapes.h » ('j') | no next file with comments »