third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp - Issue 2941533002: Break StyleImage dependency on LayoutObject

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: third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp

Issue 2941533002: Break StyleImage dependency on LayoutObject (Closed)

Patch Set: Address reviewer comments Created 3 years, 6 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:

Index: third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp

diff --git a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp

index 77994ec559c40a7dba34b0cc86a9c298fd3455d9..2cf99987327ea9bd484a35b2923053764ac5c399 100644

--- a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp

+++ b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp

@@ -170,7 +170,8 @@ std::unique_ptr<Shape> ShapeOutsideInfo::CreateShapeForImage(

DCHECK(!style_image->IsPendingImage());

RefPtr<Image> image =

- style_image->GetImage(layout_box_, FlooredIntSize(image_size));

+ style_image->GetImage(layout_box_, layout_box_.GetDocument(),

+ layout_box_.StyleRef(), FlooredIntSize(image_size));

return Shape::CreateRasterShape(image.Get(), shape_image_threshold,

image_rect, margin_rect, writing_mode,