diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 14:41:23 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 14:41:23 +0000 |
| commit | d133cd7972fb749e9de6de844b20c4c07720e77a (patch) | |
| tree | f970fa3c7e786e92a07c70366080ee2b2a85b89e /skia/ext | |
| parent | 52398f0fd3126cb8f3068e2be455ecc89704476b (diff) | |
| download | chromium_src-d133cd7972fb749e9de6de844b20c4c07720e77a.zip chromium_src-d133cd7972fb749e9de6de844b20c4c07720e77a.tar.gz chromium_src-d133cd7972fb749e9de6de844b20c4c07720e77a.tar.bz2 | |
Roll Skia DEPS to r10765
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/22993003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
| -rw-r--r-- | skia/ext/analysis_canvas.cc | 3 | ||||
| -rw-r--r-- | skia/ext/analysis_canvas.h | 3 | ||||
| -rw-r--r-- | skia/ext/benchmarking_canvas.cc | 5 | ||||
| -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 | 3 |
6 files changed, 13 insertions, 7 deletions
diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc index a2d397c..d710fb6 100644 --- a/skia/ext/analysis_canvas.cc +++ b/skia/ext/analysis_canvas.cc @@ -212,7 +212,8 @@ void AnalysisDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap, const SkRect* src_or_null, const SkRect& dst, - const SkPaint& paint) { + const SkPaint& paint, + SkCanvas::DrawBitmapRectFlags flags) { // Call drawRect to determine transparency, // but reset solid color to false. drawRect(draw, dst, paint); diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h index 5db1540..b257b9f 100644 --- a/skia/ext/analysis_canvas.h +++ b/skia/ext/analysis_canvas.h @@ -102,7 +102,8 @@ class SK_API AnalysisDevice : public SkDevice { const SkBitmap& bitmap, const SkRect* src_or_null, const SkRect& dst, - const SkPaint& paint) OVERRIDE; + const SkPaint& paint, + SkCanvas::DrawBitmapRectFlags flags) OVERRIDE; virtual void drawText(const SkDraw& draw, const void* text, size_t len, diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc index d83252b..fbd2eb1 100644 --- a/skia/ext/benchmarking_canvas.cc +++ b/skia/ext/benchmarking_canvas.cc @@ -122,9 +122,10 @@ public: virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint* paint = NULL) OVERRIDE { + const SkPaint* paint, + DrawBitmapRectFlags flags) OVERRIDE { AutoStamper stamper(this); - SkProxyCanvas::drawBitmapRectToRect(bitmap, src, dst, paint); + SkProxyCanvas::drawBitmapRectToRect(bitmap, src, dst, paint, flags); } virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, diff --git a/skia/ext/lazy_pixel_ref_utils.cc b/skia/ext/lazy_pixel_ref_utils.cc index 67371c9..f0caef2 100644 --- a/skia/ext/lazy_pixel_ref_utils.cc +++ b/skia/ext/lazy_pixel_ref_utils.cc @@ -153,7 +153,8 @@ class GatherPixelRefDevice : public SkDevice { const SkBitmap& bitmap, const SkRect* src_or_null, const SkRect& dst, - const SkPaint& paint) SK_OVERRIDE { + const SkPaint& paint, + SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE { SkRect bitmap_rect = SkRect::MakeWH(bitmap.width(), bitmap.height()); SkMatrix matrix; matrix.setRectToRect(bitmap_rect, dst, SkMatrix::kFill_ScaleToFit); diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc index 958ff8f..16d0844 100644 --- a/skia/ext/vector_platform_device_emf_win.cc +++ b/skia/ext/vector_platform_device_emf_win.cc @@ -265,7 +265,8 @@ void VectorPlatformDeviceEmf::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint& paint) { + const SkPaint& paint, + SkCanvas::DrawBitmapRectFlags flags) { SkMatrix matrix; SkRect bitmapBounds, tmpSrc, tmpDst; SkBitmap tmpBitmap; diff --git a/skia/ext/vector_platform_device_emf_win.h b/skia/ext/vector_platform_device_emf_win.h index c0deeec..9baee32 100644 --- a/skia/ext/vector_platform_device_emf_win.h +++ b/skia/ext/vector_platform_device_emf_win.h @@ -46,7 +46,8 @@ class VectorPlatformDeviceEmf : public SkDevice, public PlatformDevice { bool pathIsMutable = false) OVERRIDE; virtual void drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint, + SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE; virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, const SkMatrix& matrix, const SkPaint& paint) OVERRIDE; |