Commit 788c86bf authored by Fredrik Söderqvist's avatar Fredrik Söderqvist Committed by Commit Bot

Drop unused arguments from SVGImage::DrawInternal

The RespectImageOrientationEnum and ImageClampingMode arguments are not
used, so there's no need to pass them to this function. Drop them at the
callsites and simplify.

Also fix the Draw() declaration to mirror the definition for the names
of some arguments. Ditto for DrawInternal().

Change-Id: Ie705162d9b984e2a9cc32628a109a7e1dc091bb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2549922
Commit-Queue: Stephen Chenney <schenney@chromium.org>
Auto-Submit: Fredrik Söderquist <fs@opera.com>
Reviewed-by: default avatarStephen Chenney <schenney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829212}
parent cf0f8e90
......@@ -406,8 +406,7 @@ void SVGImage::DrawForContainer(cc::PaintCanvas* canvas,
adjusted_src_size.Scale(residual_scale.Width(), residual_scale.Height());
scaled_src.SetSize(adjusted_src_size);
DrawInternal(canvas, flags, dst_rect, scaled_src, kRespectImageOrientation,
kClampImageToSourceRect, url);
DrawInternal(canvas, flags, dst_rect, scaled_src, url);
});
}
......@@ -549,19 +548,16 @@ bool SVGImage::ApplyShaderForContainer(const FloatSize& container_size,
return result;
}
void SVGImage::Draw(
cc::PaintCanvas* canvas,
const PaintFlags& flags,
const FloatRect& dst_rect,
const FloatRect& src_rect,
RespectImageOrientationEnum should_respect_image_orientation,
ImageClampingMode clamp_mode,
ImageDecodingMode) {
void SVGImage::Draw(cc::PaintCanvas* canvas,
const PaintFlags& flags,
const FloatRect& dst_rect,
const FloatRect& src_rect,
RespectImageOrientationEnum,
ImageClampingMode,
ImageDecodingMode) {
if (!page_)
return;
DrawInternal(canvas, flags, dst_rect, src_rect,
should_respect_image_orientation, clamp_mode, NullURL());
DrawInternal(canvas, flags, dst_rect, src_rect, NullURL());
}
sk_sp<PaintRecord> SVGImage::PaintRecordForCurrentFrame(const KURL& url) {
......@@ -597,8 +593,6 @@ void SVGImage::DrawInternal(cc::PaintCanvas* canvas,
const PaintFlags& flags,
const FloatRect& dst_rect,
const FloatRect& src_rect,
RespectImageOrientationEnum,
ImageClampingMode,
const KURL& url) {
{
PaintCanvasAutoRestore ar(canvas, false);
......
......@@ -146,8 +146,8 @@ class CORE_EXPORT SVGImage final : public Image {
void Draw(cc::PaintCanvas*,
const cc::PaintFlags&,
const FloatRect& from_rect,
const FloatRect& to_rect,
const FloatRect& dst_rect,
const FloatRect& src_rect,
RespectImageOrientationEnum,
ImageClampingMode,
ImageDecodingMode) override;
......@@ -179,10 +179,8 @@ class CORE_EXPORT SVGImage final : public Image {
void DrawInternal(cc::PaintCanvas*,
const cc::PaintFlags&,
const FloatRect& from_rect,
const FloatRect& to_rect,
RespectImageOrientationEnum,
ImageClampingMode,
const FloatRect& dst_rect,
const FloatRect& src_rect,
const KURL&);
template <typename Func>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment