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

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

Patch Set: Fix unused variable 'styleImage' in release Created 4 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:

Index: third_party/WebKit/Source/core/layout/LayoutListMarker.cpp

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

index 94d94ecf1cc97e9e353f2323f7f8f170d7d458b4..5fef29e61580f757ae8d3a9f923952a8974ea964 100644

--- a/third_party/WebKit/Source/core/layout/LayoutListMarker.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutListMarker.cpp

@@ -72,8 +72,7 @@ LayoutSize LayoutListMarker::imageBulletSize() const

// become particularly useful until we support the CSS3 marker pseudoclass to allow control over

// the width and height of the marker box.

LayoutUnit bulletWidth = style()->fontMetrics().ascent() / LayoutUnit(2);

- LayoutSize defaultBulletSize(bulletWidth, bulletWidth);

- return calculateImageIntrinsicDimensions(m_image.get(), defaultBulletSize, DoNotScaleByEffectiveZoom);

+ return m_image->imageSize(this, style()->effectiveZoom(), LayoutSize(bulletWidth, bulletWidth));

}

void LayoutListMarker::styleWillChange(StyleDifference diff, const ComputedStyle& newStyle)