third_party/WebKit/Source/platform/graphics/Image.cpp - Issue 1447273003: Make the FloatSize constructor from an IntSize explicit.

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/platform/graphics/Image.cpp

Issue 1447273003: Make the FloatSize constructor from an IntSize explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp ('k') | third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/Image.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/Image.cpp b/third_party/WebKit/Source/platform/graphics/Image.cpp

index 2214f5b3c41df078ed9c1744751d162c543a48da..e06cf388b158dacdb761e8cd8c8d2473160bf96d 100644

--- a/third_party/WebKit/Source/platform/graphics/Image.cpp

+++ b/third_party/WebKit/Source/platform/graphics/Image.cpp

@@ -98,7 +98,7 @@ bool Image::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)

void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, SkXfermode::Mode op, const IntSize& repeatSpacing)

{

- FloatSize intrinsicTileSize = size();

+ FloatSize intrinsicTileSize = FloatSize(size());

if (hasRelativeWidth())

intrinsicTileSize.setWidth(scaledTileSize.width());

if (hasRelativeHeight())

@@ -262,7 +262,7 @@ void Image::drawPattern(GraphicsContext* context, const FloatRect& floatSrcRect,

void Image::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)

{

- intrinsicRatio = size();

+ intrinsicRatio = FloatSize(size());

intrinsicWidth = Length(intrinsicRatio.width(), Fixed);

intrinsicHeight = Length(intrinsicRatio.height(), Fixed);

}