9 files changed, 9 insertions, 17 deletions
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index 000d83a7..47096b2 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -456,7 +456,7 @@ void SoftwareRenderer::DrawTextureQuad(const DrawingFrame* frame,
     paint.setShader(shader.get());
     current_canvas_->drawRect(quad_rect, paint);
   } else {
-    current_canvas_->drawBitmapRect(*bitmap, &sk_uv_rect, quad_rect,
+    current_canvas_->drawBitmapRect(*bitmap, sk_uv_rect, quad_rect,
                                     &current_paint_);
   }
 
@@ -485,7 +485,7 @@ void SoftwareRenderer::DrawTileQuad(const DrawingFrame* frame,
   SkRect uv_rect = gfx::RectFToSkRect(visible_tex_coord_rect);
   current_paint_.setFilterQuality(
       quad->nearest_neighbor ? kNone_SkFilterQuality : kLow_SkFilterQuality);
-  current_canvas_->drawBitmapRect(*lock.sk_bitmap(), &uv_rect,
+  current_canvas_->drawBitmapRect(*lock.sk_bitmap(), uv_rect,
                                   gfx::RectFToSkRect(visible_quad_vertex_rect),
                                   &current_paint_);
 }
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 4584d3c..7101bd7 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -488,7 +488,7 @@ SkBitmap CreateLowQualityResizedBitmap(const SkBitmap& source_bitmap,
   SkRect scaled_bounds = RectToSkRect(gfx::Rect(scaled_size));
   // Note(oshima): The following scaling code doesn't work with
   // a mask image.
-  canvas.drawBitmapRect(source_bitmap, scaled_bounds);
+  canvas.drawBitmapRect(source_bitmap, scaled_bounds, NULL);
   return scaled_bitmap;
 }
 
diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc
index 3f1196e..c176740 100644
--- a/components/favicon_base/favicon_util.cc
+++ b/components/favicon_base/favicon_util.cc
@@ -123,7 +123,7 @@ SkBitmap ResizeBitmapByDownsamplingIfPossible(
 
     SkCanvas canvas(bitmap);
     canvas.drawBitmapRect(
-        best_bitmap, SkRect::MakeIWH(desired_size, desired_size));
+        best_bitmap, SkRect::MakeIWH(desired_size, desired_size), NULL);
     return bitmap;
   }
   return skia::ImageOperations::Resize(best_bitmap,
diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc
index f53e839..52eb6f6 100644
--- a/components/favicon_base/select_favicon_frames.cc
+++ b/components/favicon_base/select_favicon_frames.cc
@@ -42,7 +42,7 @@ SkBitmap SampleNearestNeighbor(const SkBitmap& contents, int desired_size) {
   {
     SkCanvas canvas(bitmap);
     canvas.drawBitmapRect(
-        contents, SkRect::MakeIWH(desired_size, desired_size));
+        contents, SkRect::MakeIWH(desired_size, desired_size), NULL);
   }
 
   return bitmap;
diff --git a/content/browser/devtools/protocol/color_picker.cc b/content/browser/devtools/protocol/color_picker.cc
index 22cf273..d298927 100644
--- a/content/browser/devtools/protocol/color_picker.cc
+++ b/content/browser/devtools/protocol/color_picker.cc
@@ -217,7 +217,7 @@ void ColorPicker::UpdateCursor() {
                                      last_cursor_y_ - pixel_count / 2,
                                      pixel_count, pixel_count);
   SkRect dst_rect = SkRect::MakeXYWH(padding, padding, kDiameter, kDiameter);
-  canvas.drawBitmapRect(frame_, &src_rect, dst_rect, NULL);
+  canvas.drawBitmapRect(frame_, src_rect, dst_rect, NULL);
 
   // Paint grid.
   paint.setStrokeWidth(1);
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc
index 141dd23..0f9768e 100644
--- a/content/renderer/npapi/webplugin_delegate_proxy.cc
+++ b/content/renderer/npapi/webplugin_delegate_proxy.cc
@@ -699,7 +699,7 @@ void WebPluginDelegateProxy::Paint(SkCanvas* canvas,
       transparent_ ? SkXfermode::kSrcATop_Mode : SkXfermode::kSrc_Mode);
   SkRect src_rect = gfx::RectToSkRect(offset_rect);
   canvas->drawBitmapRect(bitmap,
-                         &src_rect,
+                         src_rect,
                          gfx::RectToSkRect(rect),
                          &paint);
 
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 368c321..ed1c971 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -222,14 +222,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 #   define SK_IGNORE_GPU_DITHER
 #endif
 
-#ifndef    SK_SUPPORT_LEGACY_SIMPLE_DRAWIMAGERECT
-#   define SK_SUPPORT_LEGACY_SIMPLE_DRAWIMAGERECT
-#endif
-
-#ifndef    SK_SUPPORT_LEGACY_SRCPTR_DRAWIMAGERECT
-#   define SK_SUPPORT_LEGACY_SRCPTR_DRAWIMAGERECT
-#endif
-
 ///////////////////////// Imported from BUILD.gn and skia_common.gypi
 
 /* In some places Skia can use static initializers for global initialization,
diff --git a/ui/ozone/platform/drm/gpu/drm_surface.cc b/ui/ozone/platform/drm/gpu/drm_surface.cc
index f55c925..f3780ff 100644
--- a/ui/ozone/platform/drm/gpu/drm_surface.cc
+++ b/ui/ozone/platform/drm/gpu/drm_surface.cc
@@ -89,7 +89,7 @@ void DrmSurface::SchedulePageFlip() {
       RectToSkRect(UnionRects(pending_image_damage_, last_damage_));
 
   // Copy damage region.
-  canvas->drawImageRect(pending_image_.get(), &real_damage, real_damage, NULL);
+  canvas->drawImageRect(pending_image_.get(), real_damage, real_damage, NULL);
   last_damage_ = pending_image_damage_;
 
   pending_image_ = nullptr;
diff --git a/ui/ozone/platform/drm/gpu/drm_window.cc b/ui/ozone/platform/drm/gpu/drm_window.cc
index 3e92f40..a777d49 100644
--- a/ui/ozone/platform/drm/gpu/drm_window.cc
+++ b/ui/ozone/platform/drm/gpu/drm_window.cc
@@ -42,7 +42,7 @@ void UpdateCursorImage(DrmBuffer* cursor, const SkBitmap& image) {
   clip.set(0, 0, canvas->getDeviceSize().width(),
            canvas->getDeviceSize().height());
   canvas->clipRect(clip, SkRegion::kReplace_Op);
-  canvas->drawBitmapRect(image, damage);
+  canvas->drawBitmapRect(image, damage, NULL);
 }
 
 }  // namespace