Commit b3da5225 authored by Mike Klein's avatar Mike Klein Committed by Commit Bot

SkRect::MakeFromIRect(SkIRect) -> SkRect::Make(SkIRect)

These two routines do the same thing, so let's kill one off.

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I3bb6d19f0acf325f4921b54740b86d794cb4d314
Reviewed-on: https://chromium-review.googlesource.com/c/1261818Reviewed-by: default avatarenne <enne@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596749}
parent ae26a2e4
......@@ -203,8 +203,8 @@ void PaintOpBufferSerializer::ClearForOpaqueRaster(
// clear inside of that rect if needed.
if (device_column.intersect(playback_device_rect)) {
Save(options, params);
ClipRectOp clip_op(SkRect::MakeFromIRect(device_column),
SkClipOp::kIntersect, false);
ClipRectOp clip_op(SkRect::Make(device_column), SkClipOp::kIntersect,
false);
SerializeOp(&clip_op, options, params);
DrawColorOp clear_op(preamble.background_color, SkBlendMode::kSrc);
SerializeOp(&clear_op, options, params);
......@@ -212,8 +212,7 @@ void PaintOpBufferSerializer::ClearForOpaqueRaster(
}
if (device_row.intersect(playback_device_rect)) {
Save(options, params);
ClipRectOp clip_op(SkRect::MakeFromIRect(device_row), SkClipOp::kIntersect,
false);
ClipRectOp clip_op(SkRect::Make(device_row), SkClipOp::kIntersect, false);
SerializeOp(&clip_op, options, params);
DrawColorOp clear_op(preamble.background_color, SkBlendMode::kSrc);
SerializeOp(&clear_op, options, params);
......
......@@ -94,16 +94,16 @@ void RasterSource::ClearForOpaqueRaster(
if (device_column.intersect(playback_device_rect)) {
clear_type = RasterSourceClearType::kBorder;
raster_canvas->save();
raster_canvas->clipRect(SkRect::MakeFromIRect(device_column),
SkClipOp::kIntersect, false);
raster_canvas->clipRect(SkRect::Make(device_column), SkClipOp::kIntersect,
false);
raster_canvas->drawColor(background_color_, SkBlendMode::kSrc);
raster_canvas->restore();
}
if (device_row.intersect(playback_device_rect)) {
clear_type = RasterSourceClearType::kBorder;
raster_canvas->save();
raster_canvas->clipRect(SkRect::MakeFromIRect(device_row),
SkClipOp::kIntersect, false);
raster_canvas->clipRect(SkRect::Make(device_row), SkClipOp::kIntersect,
false);
raster_canvas->drawColor(background_color_, SkBlendMode::kSrc);
raster_canvas->restore();
}
......@@ -154,7 +154,7 @@ void RasterSource::PlaybackToCanvas(
raster_canvas->save();
raster_canvas->translate(-canvas_bitmap_rect.x(), -canvas_bitmap_rect.y());
raster_canvas->clipRect(SkRect::MakeFromIRect(raster_bounds));
raster_canvas->clipRect(SkRect::Make(raster_bounds));
raster_canvas->translate(raster_transform.translation().x(),
raster_transform.translation().y());
raster_canvas->scale(raster_transform.scale() / recording_scale_factor_,
......
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