third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp - Issue 1756763004: Merge image sizing algorithms

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/paint/NinePieceImagePainter.cpp

Issue 1756763004: Merge image sizing algorithms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Drop calculate prefix from concreteObjectSize member function Created 4 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:

Index: third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp b/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp

index 9eed86d02b541b99be1b3cdd22ad4ae6e603c2e2..bd25169d32ef3a923c286bba96677e9aebc48075 100644

--- a/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp

+++ b/third_party/WebKit/Source/core/paint/NinePieceImagePainter.cpp

@@ -49,8 +49,7 @@ bool NinePieceImagePainter::paint(GraphicsContext& graphicsContext, const Layout

rectWithOutsets.expand(style.imageOutsets(ninePieceImage));

LayoutRect borderImageRect = rectWithOutsets;

- IntSize imageSize = roundedIntSize(m_layoutObject.calculateImageIntrinsicDimensions(styleImage, borderImageRect.size(),

- LayoutBoxModelObject::DoNotScaleByEffectiveZoom));

+ IntSize imageSize = roundedIntSize(styleImage->imageSize(&m_layoutObject, 1, borderImageRect.size()));

IntRectOutsets borderWidths(style.borderTopWidth(), style.borderRightWidth(),

style.borderBottomWidth(), style.borderLeftWidth());