diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/ext/analysis_canvas.cc | 1 | ||||
| -rw-r--r-- | skia/ext/analysis_canvas.h | 1 | ||||
| -rw-r--r-- | skia/ext/lazy_pixel_ref_utils.cc | 3 | ||||
| -rw-r--r-- | skia/ext/vector_platform_device_emf_win.cc | 3 | ||||
| -rw-r--r-- | skia/ext/vector_platform_device_emf_win.h | 1 |
6 files changed, 3 insertions, 8 deletions
@@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "245a8c0cdfdd5ab3da9045089661017e9ddd8d0e", "sfntly_revision": "134", - "skia_revision": "10338", + "skia_revision": "10377", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc index 29f5adb..a2d397c 100644 --- a/skia/ext/analysis_canvas.cc +++ b/skia/ext/analysis_canvas.cc @@ -193,7 +193,6 @@ void AnalysisDevice::drawPath(const SkDraw& draw, void AnalysisDevice::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, - const SkIRect* src_rect_or_null, const SkMatrix& matrix, const SkPaint& paint) { is_solid_color_ = false; diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h index 93e3da3..5db1540 100644 --- a/skia/ext/analysis_canvas.h +++ b/skia/ext/analysis_canvas.h @@ -91,7 +91,6 @@ class SK_API AnalysisDevice : public SkDevice { bool path_is_mutable = false) OVERRIDE; virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, - const SkIRect* src_rect_or_null, const SkMatrix& matrix, const SkPaint& paint) OVERRIDE; virtual void drawSprite(const SkDraw& draw, diff --git a/skia/ext/lazy_pixel_ref_utils.cc b/skia/ext/lazy_pixel_ref_utils.cc index 523a54f..ad2be7d 100644 --- a/skia/ext/lazy_pixel_ref_utils.cc +++ b/skia/ext/lazy_pixel_ref_utils.cc @@ -136,7 +136,6 @@ class GatherPixelRefDevice : public SkDevice { } virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, - const SkIRect* src_rect_or_null, const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE { SkMatrix total_matrix; @@ -159,7 +158,7 @@ class GatherPixelRefDevice : public SkDevice { SkRect bitmap_rect = SkRect::MakeWH(bitmap.width(), bitmap.height()); SkMatrix matrix; matrix.setRectToRect(bitmap_rect, dst, SkMatrix::kFill_ScaleToFit); - GatherPixelRefDevice::drawBitmap(draw, bitmap, NULL, matrix, paint); + GatherPixelRefDevice::drawBitmap(draw, bitmap, matrix, paint); } virtual void drawSprite(const SkDraw& draw, const SkBitmap& bitmap, diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc index 5c58dc1..958ff8f 100644 --- a/skia/ext/vector_platform_device_emf_win.cc +++ b/skia/ext/vector_platform_device_emf_win.cc @@ -315,12 +315,11 @@ void VectorPlatformDeviceEmf::drawBitmapRect(const SkDraw& draw, matrix.preTranslate(dx, dy); } } - this->drawBitmap(draw, *bitmapPtr, NULL, matrix, paint); + this->drawBitmap(draw, *bitmapPtr, matrix, paint); } void VectorPlatformDeviceEmf::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, - const SkIRect* srcRectOrNull, const SkMatrix& matrix, const SkPaint& paint) { // Load the temporary matrix. This is what will translate, rotate and resize diff --git a/skia/ext/vector_platform_device_emf_win.h b/skia/ext/vector_platform_device_emf_win.h index 461dddc..c0deeec 100644 --- a/skia/ext/vector_platform_device_emf_win.h +++ b/skia/ext/vector_platform_device_emf_win.h @@ -48,7 +48,6 @@ class VectorPlatformDeviceEmf : public SkDevice, public PlatformDevice { const SkRect* src, const SkRect& dst, const SkPaint& paint) SK_OVERRIDE; virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, - const SkIRect* srcRectOrNull, const SkMatrix& matrix, const SkPaint& paint) OVERRIDE; virtual void drawSprite(const SkDraw& draw, const SkBitmap& bitmap, |