third_party/WebKit/Source/core/paint/BackgroundImageGeometry.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/BackgroundImageGeometry.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/paint/BackgroundImageGeometry.cpp

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

index 5de58bf6baff7f948809727fb61ab65e331606cb..06a82692c53aa2161a2e969f9ec117bc3054c14d 100644

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

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

@@ -53,8 +53,7 @@ LayoutSize calculateFillTileSize(const LayoutBoxModelObject& obj, const FillLaye

StyleImage* image = fillLayer.image();

EFillSizeType type = fillLayer.size().type;

- LayoutSize imageIntrinsicSize = obj.calculateImageIntrinsicDimensions(image, positioningAreaSize, LayoutBoxModelObject::ScaleByEffectiveZoom);

- imageIntrinsicSize.scale(1 / image->imageScaleFactor(), 1 / image->imageScaleFactor());

+ LayoutSize imageIntrinsicSize = image->imageSize(&obj, obj.style()->effectiveZoom(), positioningAreaSize);

switch (type) {

case SizeLength: {

LayoutSize tileSize(positioningAreaSize);