don't use deprecated helper methods on SkCanvas

cc/playback/display_item_list_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/playback/display_item_list.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 44 matching lines @@
                                          const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 3.f);
   PaintRecorder recorder;
 
   PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
 
   PaintCanvas* canvas = recorder.beginRecording(SkRect::MakeXYWH(
       offset.x(), offset.y(), layer_size.width(), layer_size.height()));
   canvas->translate(offset.x(), offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint);
+  canvas->drawRect(SkRect::MakeWH(4, 4), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 }  // namespace
 
 TEST(DisplayItemListTest, SingleDrawingItem) {
   gfx::Rect layer_rect(100, 100);
   PaintRecorder recorder;
   PaintFlags blue_flags;
   blue_flags.setColor(SK_ColorBLUE);
   PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
   PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(recording_rect));
   canvas->translate(offset.x(), offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
-  canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_flags);
+  canvas->drawRect(SkRect::MakeLTRB(0.f, 0.f, 60.f, 60.f), red_paint);
+  canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   list->Finalize();
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   PaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
-  expected_canvas.drawRectCoords(0.f + offset.x(), 0.f + offset.y(),
-                                 60.f + offset.x(), 60.f + offset.y(),
-                                 red_paint);
-  expected_canvas.drawRectCoords(50.f + offset.x(), 50.f + offset.y(),
-                                 75.f + offset.x(), 75.f + offset.y(),
-                                 blue_flags);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(0.f + offset.x(), 0.f + offset.y(), 60.f + offset.x(),
+                       60.f + offset.y()),
+      red_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(50.f + offset.x(), 50.f + offset.y(), 75.f + offset.x(),
+                       75.f + offset.y()),
+      blue_flags);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, ClipItem) {
   gfx::Rect layer_rect(100, 100);
   PaintRecorder recorder;
   PaintFlags blue_flags;
   blue_flags.setColor(SK_ColorBLUE);
   PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
   canvas->translate(first_offset.x(), first_offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
+  canvas->drawRect(SkRect::MakeWH(60, 60), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Rect clip_rect(60, 60, 10, 10);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_rect, std::vector<SkRRect>(), true);
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
   canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
   canvas->translate(second_offset.x(), second_offset.y());
-  canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_flags);
+  canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   PaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
-  expected_canvas.drawRectCoords(0.f + first_offset.x(), 0.f + first_offset.y(),
-                                 60.f + first_offset.x(),
-                                 60.f + first_offset.y(), red_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(0.f + first_offset.x(), 0.f + first_offset.y(),
+                       60.f + first_offset.x(), 60.f + first_offset.y()),
+      red_paint);
   expected_canvas.clipRect(gfx::RectToSkRect(clip_rect));
-  expected_canvas.drawRectCoords(
-      50.f + second_offset.x(), 50.f + second_offset.y(),
-      75.f + second_offset.x(), 75.f + second_offset.y(), blue_flags);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(50.f + second_offset.x(), 50.f + second_offset.y(),
+                       75.f + second_offset.x(), 75.f + second_offset.y()),
+      blue_flags);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, TransformItem) {
   gfx::Rect layer_rect(100, 100);
   PaintRecorder recorder;
   PaintFlags blue_flags;
   blue_flags.setColor(SK_ColorBLUE);
   PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
   canvas->translate(first_offset.x(), first_offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
+  canvas->drawRect(SkRect::MakeWH(60, 60), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Transform transform;
   transform.Rotate(45.0);
   list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(transform);
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
   canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
   canvas->translate(second_offset.x(), second_offset.y());
-  canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_flags);
+  canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   PaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
-  expected_canvas.drawRectCoords(0.f + first_offset.x(), 0.f + first_offset.y(),
-                                 60.f + first_offset.x(),
-                                 60.f + first_offset.y(), red_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(0.f + first_offset.x(), 0.f + first_offset.y(),
+                       60.f + first_offset.x(), 60.f + first_offset.y()),
+      red_paint);
   expected_canvas.setMatrix(transform.matrix());
-  expected_canvas.drawRectCoords(
-      50.f + second_offset.x(), 50.f + second_offset.y(),
-      75.f + second_offset.x(), 75.f + second_offset.y(), blue_flags);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(50.f + second_offset.x(), 50.f + second_offset.y(),
+                       75.f + second_offset.x(), 75.f + second_offset.y()),
+      blue_flags);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, FilterItem) {
   gfx::Rect layer_rect(100, 100);
   FilterOperations filters;
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
@@ skipping 22 matching lines @@
 
   // Include a rect drawing so that filter is actually applied to something.
   {
     PaintRecorder recorder;
 
     PaintFlags red_paint;
     red_paint.setColor(SK_ColorRED);
 
     PaintCanvas* canvas = recorder.beginRecording(
         SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height()));
-    canvas->drawRectCoords(filter_bounds.x(), filter_bounds.y(),
-                           filter_bounds.right(), filter_bounds.bottom(),
-                           red_paint);
+    canvas->drawRect(
+        SkRect::MakeLTRB(filter_bounds.x(), filter_bounds.y(),
+                         filter_bounds.right(), filter_bounds.bottom()),
+        red_paint);
     list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         ToNearestRect(filter_bounds), recorder.finishRecordingAsPicture());
   }
 
   list->CreateAndAppendPairedEndItem<EndFilterDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
@@ skipping 390 matching lines @@
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(4u, list->size());
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(2));
   EXPECT_RECT_EQ(filter_bounds, list->VisualRectForTesting(3));
 }
 
 }  // namespace cc