third_party/WebKit/Source/core/paint/ThemePainterMac.mm - 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/core/paint/ThemePainterMac.mm

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/core/paint/MediaControlsPainter.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/ThemePainterMac.mm

diff --git a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm

index 681dcf653f1534ec380de0faf3a0c7edd40b9ab6..3ce77203793a69f3b3c955c602351d0777f5e711 100644

--- a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm

+++ b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm

@@ -252,7 +252,7 @@ bool ThemePainterMac::paintProgressBar(const LayoutObject& layoutObject, const P

}

if (!paintInfo.context->contextDisabled())

- imageBuffer->draw(paintInfo.context, FloatRect(inflatedRect.location(), imageBuffer->size()), nullptr, SkXfermode::kSrcOver_Mode);

+ imageBuffer->draw(paintInfo.context, FloatRect(inflatedRect.location(), FloatSize(imageBuffer->size())), nullptr, SkXfermode::kSrcOver_Mode);

return false;

}

@@ -341,9 +341,9 @@ bool ThemePainterMac::paintSliderTrack(const LayoutObject& o, const PaintInfo& p

bool isVerticalSlider = o.styleRef().appearance() == SliderVerticalPart;

- int fillRadiusSize = (LayoutThemeMac::sliderTrackWidth - LayoutThemeMac::sliderTrackBorderWidth) / 2;

- IntSize fillRadius(fillRadiusSize, fillRadiusSize);

- IntRect fillBounds = enclosedIntRect(unzoomedRect);

+ float fillRadiusSize = (LayoutThemeMac::sliderTrackWidth - LayoutThemeMac::sliderTrackBorderWidth) / 2;

+ FloatSize fillRadius(fillRadiusSize, fillRadiusSize);

+ FloatRect fillBounds(enclosedIntRect(unzoomedRect));

FloatRoundedRect fillRect(fillBounds, fillRadius, fillRadius, fillRadius, fillRadius);

paintInfo.context->fillRoundedRect(fillRect, fillColor);