summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS1
-rw-r--r--skia/ext/SkDiscardableMemory_chrome.h6
-rw-r--r--skia/ext/analysis_canvas.h54
-rw-r--r--skia/ext/benchmarking_canvas.cc48
-rw-r--r--skia/ext/bitmap_platform_device_cairo.h8
-rw-r--r--skia/ext/bitmap_platform_device_mac.h8
-rw-r--r--skia/ext/bitmap_platform_device_skia.h6
-rw-r--r--skia/ext/bitmap_platform_device_win.h12
-rw-r--r--skia/ext/event_tracer_impl.cc8
-rw-r--r--skia/ext/opacity_draw_filter.h2
-rw-r--r--skia/ext/pixel_ref_utils.cc34
-rw-r--r--skia/ext/pixel_ref_utils_unittest.cc6
-rw-r--r--skia/ext/vector_platform_device_emf_win.h34
-rw-r--r--skia/ext/vector_platform_device_skia.h14
14 files changed, 121 insertions, 120 deletions
diff --git a/AUTHORS b/AUTHORS
index 868869b..d1f4add 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -493,6 +493,7 @@ Yongha Lee <yongha78.lee@samsung.com>
Yupei Wang <perryuwang@tencent.com>
Peng Hu <penghu@tencent.com>
WenSheng He <wensheng.he@samsung.com>
+Raghu Ram Nagaraj <r.nagaraj@samsung.com>
BlackBerry Limited <*@blackberry.com>
Code Aurora Forum <*@codeaurora.org>
diff --git a/skia/ext/SkDiscardableMemory_chrome.h b/skia/ext/SkDiscardableMemory_chrome.h
index b251dc4..18088c5 100644
--- a/skia/ext/SkDiscardableMemory_chrome.h
+++ b/skia/ext/SkDiscardableMemory_chrome.h
@@ -16,9 +16,9 @@ public:
virtual ~SkDiscardableMemoryChrome();
// SkDiscardableMemory:
- virtual bool lock() OVERRIDE;
- virtual void* data() OVERRIDE;
- virtual void unlock() OVERRIDE;
+ virtual bool lock() override;
+ virtual void* data() override;
+ virtual void unlock() override;
private:
friend class SkDiscardableMemory;
diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h
index 8cbd4d1..d3d3b80 100644
--- a/skia/ext/analysis_canvas.h
+++ b/skia/ext/analysis_canvas.h
@@ -27,37 +27,37 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
void SetForceNotTransparent(bool flag);
// SkDrawPictureCallback override.
- virtual bool abortDrawing() OVERRIDE;
+ virtual bool abortDrawing() override;
// SkCanvas overrides.
- virtual void clear(SkColor) OVERRIDE;
- virtual void drawPaint(const SkPaint& paint) OVERRIDE;
+ virtual void clear(SkColor) override;
+ virtual void drawPaint(const SkPaint& paint) override;
virtual void drawPoints(PointMode,
size_t count,
const SkPoint pts[],
- const SkPaint&) OVERRIDE;
- virtual void drawOval(const SkRect&, const SkPaint&) OVERRIDE;
- virtual void drawRect(const SkRect&, const SkPaint&) OVERRIDE;
- virtual void drawRRect(const SkRRect&, const SkPaint&) OVERRIDE;
- virtual void drawPath(const SkPath& path, const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
+ virtual void drawOval(const SkRect&, const SkPaint&) override;
+ virtual void drawRect(const SkRect&, const SkPaint&) override;
+ virtual void drawRRect(const SkRRect&, const SkPaint&) override;
+ virtual void drawPath(const SkPath& path, const SkPaint&) override;
virtual void drawBitmap(const SkBitmap&,
SkScalar left,
SkScalar top,
- const SkPaint* paint = NULL) OVERRIDE;
+ const SkPaint* paint = NULL) override;
virtual void drawBitmapRectToRect(const SkBitmap&,
const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
- DrawBitmapRectFlags flags) OVERRIDE;
+ DrawBitmapRectFlags flags) override;
virtual void drawBitmapMatrix(const SkBitmap&,
const SkMatrix&,
- const SkPaint* paint = NULL) OVERRIDE;
+ const SkPaint* paint = NULL) override;
virtual void drawBitmapNine(const SkBitmap& bitmap,
const SkIRect& center,
const SkRect& dst,
- const SkPaint* paint = NULL) OVERRIDE;
+ const SkPaint* paint = NULL) override;
virtual void drawSprite(const SkBitmap&, int left, int top,
- const SkPaint* paint = NULL) OVERRIDE;
+ const SkPaint* paint = NULL) override;
virtual void drawVertices(VertexMode,
int vertexCount,
const SkPoint vertices[],
@@ -66,53 +66,53 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback {
SkXfermode*,
const uint16_t indices[],
int indexCount,
- const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
protected:
- virtual void willSave() OVERRIDE;
+ virtual void willSave() override;
virtual SaveLayerStrategy willSaveLayer(const SkRect*,
const SkPaint*,
- SaveFlags) OVERRIDE;
- virtual void willRestore() OVERRIDE;
+ SaveFlags) override;
+ virtual void willRestore() override;
virtual void onClipRect(const SkRect& rect,
SkRegion::Op op,
- ClipEdgeStyle edge_style) OVERRIDE;
+ ClipEdgeStyle edge_style) override;
virtual void onClipRRect(const SkRRect& rrect,
SkRegion::Op op,
- ClipEdgeStyle edge_style) OVERRIDE;
+ ClipEdgeStyle edge_style) override;
virtual void onClipPath(const SkPath& path,
SkRegion::Op op,
- ClipEdgeStyle edge_style) OVERRIDE;
+ ClipEdgeStyle edge_style) override;
virtual void onClipRegion(const SkRegion& deviceRgn,
- SkRegion::Op op) OVERRIDE;
+ SkRegion::Op op) override;
virtual void onDrawText(const void* text,
size_t byteLength,
SkScalar x,
SkScalar y,
- const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
virtual void onDrawPosText(const void* text,
size_t byteLength,
const SkPoint pos[],
- const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
virtual void onDrawPosTextH(const void* text,
size_t byteLength,
const SkScalar xpos[],
SkScalar constY,
- const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
virtual void onDrawTextOnPath(const void* text,
size_t byteLength,
const SkPath& path,
const SkMatrix* matrix,
- const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
virtual void onDrawTextBlob(const SkTextBlob* blob,
SkScalar x,
SkScalar y,
- const SkPaint& paint) OVERRIDE;
+ const SkPaint& paint) override;
virtual void onDrawDRRect(const SkRRect& outer,
const SkRRect& inner,
- const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
void OnComplexClip();
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc
index 593e238..f3f8cc5 100644
--- a/skia/ext/benchmarking_canvas.cc
+++ b/skia/ext/benchmarking_canvas.cc
@@ -40,56 +40,56 @@ public:
}
// SkCanvas overrides.
- virtual void willSave() OVERRIDE {
+ virtual void willSave() override {
AutoStamper stamper(this);
SkProxyCanvas::willSave();
}
virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds,
const SkPaint* paint,
- SaveFlags flags) OVERRIDE {
+ SaveFlags flags) override {
AutoStamper stamper(this);
return SkProxyCanvas::willSaveLayer(bounds, paint, flags);
}
- virtual void willRestore() OVERRIDE {
+ virtual void willRestore() override {
AutoStamper stamper(this);
SkProxyCanvas::willRestore();
}
- virtual void drawPaint(const SkPaint& paint) OVERRIDE {
+ virtual void drawPaint(const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::drawPaint(paint);
}
virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
- const SkPaint& paint) OVERRIDE {
+ const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::drawPoints(mode, count, pts, paint);
}
- virtual void drawOval(const SkRect& rect, const SkPaint& paint) OVERRIDE {
+ virtual void drawOval(const SkRect& rect, const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::drawOval(rect, paint);
}
- virtual void drawRect(const SkRect& rect, const SkPaint& paint) OVERRIDE {
+ virtual void drawRect(const SkRect& rect, const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::drawRect(rect, paint);
}
- virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) OVERRIDE {
+ virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::drawRRect(rrect, paint);
}
- virtual void drawPath(const SkPath& path, const SkPaint& paint) OVERRIDE {
+ virtual void drawPath(const SkPath& path, const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::drawPath(path, paint);
}
virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
- const SkPaint* paint = NULL) OVERRIDE {
+ const SkPaint* paint = NULL) override {
AutoStamper stamper(this);
SkProxyCanvas::drawBitmap(bitmap, left, top, paint);
}
@@ -97,19 +97,19 @@ public:
virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
const SkRect& dst,
const SkPaint* paint,
- DrawBitmapRectFlags flags) OVERRIDE {
+ DrawBitmapRectFlags flags) override {
AutoStamper stamper(this);
SkProxyCanvas::drawBitmapRectToRect(bitmap, src, dst, paint, flags);
}
virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
- const SkPaint* paint = NULL) OVERRIDE {
+ const SkPaint* paint = NULL) override {
AutoStamper stamper(this);
SkProxyCanvas::drawBitmapMatrix(bitmap, m, paint);
}
virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
- const SkPaint* paint = NULL) OVERRIDE {
+ const SkPaint* paint = NULL) override {
AutoStamper stamper(this);
SkProxyCanvas::drawSprite(bitmap, left, top, paint);
}
@@ -118,71 +118,71 @@ public:
const SkPoint vertices[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
- const SkPaint& paint) OVERRIDE {
+ const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::drawVertices(vmode, vertexCount, vertices, texs, colors,
xmode, indices, indexCount, paint);
}
- virtual void drawData(const void* data, size_t length) OVERRIDE {
+ virtual void drawData(const void* data, size_t length) override {
AutoStamper stamper(this);
SkProxyCanvas::drawData(data, length);
}
protected:
virtual void onDrawText(const void* text, size_t byteLength, SkScalar x,
- SkScalar y, const SkPaint& paint) OVERRIDE {
+ SkScalar y, const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::onDrawText(text, byteLength, x, y, paint);
}
virtual void onDrawPosText(const void* text, size_t byteLength,
const SkPoint pos[],
- const SkPaint& paint) OVERRIDE {
+ const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::onDrawPosText(text, byteLength, pos, paint);
}
virtual void onDrawPosTextH(const void* text, size_t byteLength,
const SkScalar xpos[], SkScalar constY,
- const SkPaint& paint) OVERRIDE {
+ const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::onDrawPosTextH(text, byteLength, xpos, constY, paint);
}
virtual void onDrawTextOnPath(const void* text, size_t byteLength,
const SkPath& path, const SkMatrix* matrix,
- const SkPaint& paint) OVERRIDE {
+ const SkPaint& paint) override {
AutoStamper stamper(this);
SkProxyCanvas::onDrawTextOnPath(text, byteLength, path, matrix, paint);
}
virtual void onClipRect(const SkRect& rect, SkRegion::Op op,
- ClipEdgeStyle edge_style) OVERRIDE {
+ ClipEdgeStyle edge_style) override {
AutoStamper stamper(this);
SkProxyCanvas::onClipRect(rect, op, edge_style);
}
virtual void onClipRRect(const SkRRect& rrect, SkRegion::Op op,
- ClipEdgeStyle edge_style) OVERRIDE {
+ ClipEdgeStyle edge_style) override {
AutoStamper stamper(this);
SkProxyCanvas::onClipRRect(rrect, op, edge_style);
}
virtual void onClipPath(const SkPath& path, SkRegion::Op op,
- ClipEdgeStyle edge_style) OVERRIDE {
+ ClipEdgeStyle edge_style) override {
AutoStamper stamper(this);
SkProxyCanvas::onClipPath(path, op, edge_style);
}
virtual void onClipRegion(const SkRegion& region,
- SkRegion::Op op) OVERRIDE {
+ SkRegion::Op op) override {
AutoStamper stamper(this);
SkProxyCanvas::onClipRegion(region, op);
}
virtual void onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
- const SkPaint* paint) OVERRIDE {
+ const SkPaint* paint) override {
AutoStamper stamper(this);
SkProxyCanvas::onDrawPicture(picture, matrix, paint);
}
diff --git a/skia/ext/bitmap_platform_device_cairo.h b/skia/ext/bitmap_platform_device_cairo.h
index 6952e9a..2932111 100644
--- a/skia/ext/bitmap_platform_device_cairo.h
+++ b/skia/ext/bitmap_platform_device_cairo.h
@@ -85,16 +85,16 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
// Overridden from SkBaseDevice:
virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
- const SkClipStack&) OVERRIDE;
+ const SkClipStack&) override;
// Overridden from PlatformDevice:
- virtual cairo_t* BeginPlatformPaint() OVERRIDE;
+ virtual cairo_t* BeginPlatformPaint() override;
virtual void DrawToNativeContext(PlatformSurface surface, int x, int y,
- const PlatformRect* src_rect) OVERRIDE;
+ const PlatformRect* src_rect) override;
protected:
virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
- Usage usage) OVERRIDE;
+ Usage usage) override;
private:
static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h
index 665356f..eb142e2 100644
--- a/skia/ext/bitmap_platform_device_mac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -51,20 +51,20 @@ class SK_API BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice
virtual ~BitmapPlatformDevice();
// PlatformDevice overrides
- virtual CGContextRef GetBitmapContext() OVERRIDE;
+ virtual CGContextRef GetBitmapContext() override;
virtual void DrawToNativeContext(CGContextRef context, int x, int y,
- const CGRect* src_rect) OVERRIDE;
+ const CGRect* src_rect) override;
// SkBaseDevice overrides
virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
- const SkClipStack&) OVERRIDE;
+ const SkClipStack&) override;
protected:
BitmapPlatformDevice(CGContextRef context,
const SkBitmap& bitmap);
virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
- Usage usage) OVERRIDE;
+ Usage usage) override;
private:
void ReleaseBitmapContext();
diff --git a/skia/ext/bitmap_platform_device_skia.h b/skia/ext/bitmap_platform_device_skia.h
index f1bb375..f670dea 100644
--- a/skia/ext/bitmap_platform_device_skia.h
+++ b/skia/ext/bitmap_platform_device_skia.h
@@ -42,13 +42,13 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
explicit BitmapPlatformDevice(const SkBitmap& other);
virtual ~BitmapPlatformDevice();
- virtual PlatformSurface BeginPlatformPaint() OVERRIDE;
+ virtual PlatformSurface BeginPlatformPaint() override;
virtual void DrawToNativeContext(PlatformSurface surface, int x, int y,
- const PlatformRect* src_rect) OVERRIDE;
+ const PlatformRect* src_rect) override;
protected:
virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
- Usage usage) OVERRIDE;
+ Usage usage) override;
private:
DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index 78f801e..a8b7d839 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -51,25 +51,25 @@ class SK_API BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice
// PlatformDevice overrides
// Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
// bitmap DC is lazy created.
- virtual PlatformSurface BeginPlatformPaint() OVERRIDE;
- virtual void EndPlatformPaint() OVERRIDE;
+ virtual PlatformSurface BeginPlatformPaint() override;
+ virtual void EndPlatformPaint() override;
virtual void DrawToNativeContext(HDC dc, int x, int y,
- const RECT* src_rect) OVERRIDE;
+ const RECT* src_rect) override;
// Loads the given transform and clipping region into the HDC. This is
// overridden from SkBaseDevice.
virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
- const SkClipStack&) OVERRIDE;
+ const SkClipStack&) override;
protected:
// Flushes the Windows device context so that the pixel data can be accessed
// directly by Skia. Overridden from SkBaseDevice, this is called when Skia
// starts accessing pixel data.
- virtual const SkBitmap& onAccessBitmap() OVERRIDE;
+ virtual const SkBitmap& onAccessBitmap() override;
virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
- Usage usage) OVERRIDE;
+ Usage usage) override;
private:
// Private constructor.
diff --git a/skia/ext/event_tracer_impl.cc b/skia/ext/event_tracer_impl.cc
index 4974b00..f5e081d 100644
--- a/skia/ext/event_tracer_impl.cc
+++ b/skia/ext/event_tracer_impl.cc
@@ -9,9 +9,9 @@
namespace skia {
class SkChromiumEventTracer: public SkEventTracer {
- virtual const uint8_t* getCategoryGroupEnabled(const char* name) OVERRIDE;
+ virtual const uint8_t* getCategoryGroupEnabled(const char* name) override;
virtual const char* getCategoryGroupName(
- const uint8_t* categoryEnabledFlag) OVERRIDE;
+ const uint8_t* categoryEnabledFlag) override;
virtual SkEventTracer::Handle
addTraceEvent(char phase,
const uint8_t* categoryEnabledFlag,
@@ -21,11 +21,11 @@ class SkChromiumEventTracer: public SkEventTracer {
const char** argNames,
const uint8_t* argTypes,
const uint64_t* argValues,
- uint8_t flags) OVERRIDE;
+ uint8_t flags) override;
virtual void
updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
const char *name,
- SkEventTracer::Handle handle) OVERRIDE;
+ SkEventTracer::Handle handle) override;
};
const uint8_t*
diff --git a/skia/ext/opacity_draw_filter.h b/skia/ext/opacity_draw_filter.h
index a2a686c..9789cc2 100644
--- a/skia/ext/opacity_draw_filter.h
+++ b/skia/ext/opacity_draw_filter.h
@@ -20,7 +20,7 @@ class SK_API OpacityDrawFilter : public SkDrawFilter {
public:
OpacityDrawFilter(float opacity, bool disable_image_filtering);
virtual ~OpacityDrawFilter();
- virtual bool filter(SkPaint* paint, SkDrawFilter::Type type) OVERRIDE;
+ virtual bool filter(SkPaint* paint, SkDrawFilter::Type type) override;
private:
int alpha_;
diff --git a/skia/ext/pixel_ref_utils.cc b/skia/ext/pixel_ref_utils.cc
index 33ae11b..6eb7361 100644
--- a/skia/ext/pixel_ref_utils.cc
+++ b/skia/ext/pixel_ref_utils.cc
@@ -51,8 +51,8 @@ class GatherPixelRefDevice : public SkBitmapDevice {
DiscardablePixelRefSet* pixel_ref_set)
: SkBitmapDevice(bm), pixel_ref_set_(pixel_ref_set) {}
- virtual void clear(SkColor color) SK_OVERRIDE {}
- virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) SK_OVERRIDE {
+ virtual void clear(SkColor color) override {}
+ virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) override {
SkBitmap bitmap;
if (GetBitmapFromPaint(paint, &bitmap)) {
SkRect clip_rect = SkRect::Make(draw.fRC->getBounds());
@@ -64,7 +64,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
SkCanvas::PointMode mode,
size_t count,
const SkPoint points[],
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
SkBitmap bitmap;
if (!GetBitmapFromPaint(paint, &bitmap))
return;
@@ -89,7 +89,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
}
virtual void drawRect(const SkDraw& draw,
const SkRect& rect,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
SkBitmap bitmap;
if (GetBitmapFromPaint(paint, &bitmap)) {
SkRect mapped_rect;
@@ -100,19 +100,19 @@ class GatherPixelRefDevice : public SkBitmapDevice {
}
virtual void drawOval(const SkDraw& draw,
const SkRect& rect,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
GatherPixelRefDevice::drawRect(draw, rect, paint);
}
virtual void drawRRect(const SkDraw& draw,
const SkRRect& rect,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
GatherPixelRefDevice::drawRect(draw, rect.rect(), paint);
}
virtual void drawPath(const SkDraw& draw,
const SkPath& path,
const SkPaint& paint,
const SkMatrix* pre_path_matrix,
- bool path_is_mutable) SK_OVERRIDE {
+ bool path_is_mutable) override {
SkBitmap bitmap;
if (!GetBitmapFromPaint(paint, &bitmap))
return;
@@ -129,7 +129,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
virtual void drawBitmap(const SkDraw& draw,
const SkBitmap& bitmap,
const SkMatrix& matrix,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
SkMatrix total_matrix;
total_matrix.setConcat(*draw.fMatrix, matrix);
@@ -147,7 +147,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
const SkRect* src_or_null,
const SkRect& dst,
const SkPaint& paint,
- SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE {
+ SkCanvas::DrawBitmapRectFlags flags) override {
SkRect bitmap_rect = SkRect::MakeWH(bitmap.width(), bitmap.height());
SkMatrix matrix;
matrix.setRectToRect(bitmap_rect, dst, SkMatrix::kFill_ScaleToFit);
@@ -157,7 +157,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
const SkBitmap& bitmap,
int x,
int y,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
// Sprites aren't affected by current matrix, so we can't reuse drawRect.
SkMatrix matrix;
matrix.setTranslate(x, y);
@@ -176,7 +176,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
size_t len,
SkScalar x,
SkScalar y,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
SkBitmap bitmap;
if (!GetBitmapFromPaint(paint, &bitmap))
return;
@@ -224,7 +224,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
const SkScalar pos[],
int scalars_per_pos,
const SkPoint& offset,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
SkBitmap bitmap;
if (!GetBitmapFromPaint(paint, &bitmap))
return;
@@ -268,7 +268,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
size_t len,
const SkPath& path,
const SkMatrix* matrix,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
SkBitmap bitmap;
if (!GetBitmapFromPaint(paint, &bitmap))
return;
@@ -295,7 +295,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
SkXfermode* xmode,
const uint16_t indices[],
int index_count,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
GatherPixelRefDevice::drawPoints(
draw, SkCanvas::kPolygon_PointMode, vertex_count, verts, paint);
}
@@ -303,14 +303,14 @@ class GatherPixelRefDevice : public SkBitmapDevice {
SkBaseDevice*,
int x,
int y,
- const SkPaint&) SK_OVERRIDE {}
+ const SkPaint&) override {}
protected:
virtual bool onReadPixels(const SkImageInfo& info,
void* pixels,
size_t rowBytes,
int x,
- int y) SK_OVERRIDE {
+ int y) override {
return false;
}
@@ -318,7 +318,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
const void* pixels,
size_t rowBytes,
int x,
- int y) SK_OVERRIDE {
+ int y) override {
return false;
}
diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc
index 92c62d7..aef5766 100644
--- a/skia/ext/pixel_ref_utils_unittest.cc
+++ b/skia/ext/pixel_ref_utils_unittest.cc
@@ -36,18 +36,18 @@ class TestDiscardableShader : public SkShader {
virtual SkShader::BitmapType asABitmap(SkBitmap* bitmap,
SkMatrix* matrix,
- TileMode xy[2]) const OVERRIDE {
+ TileMode xy[2]) const override {
if (bitmap)
*bitmap = bitmap_;
return SkShader::kDefault_BitmapType;
}
// not indended to return an actual context. Just need to supply this.
- virtual size_t contextSize() const OVERRIDE {
+ virtual size_t contextSize() const override {
return sizeof(SkShader::Context);
}
- virtual void flatten(SkWriteBuffer&) const OVERRIDE {}
+ virtual void flatten(SkWriteBuffer&) const override {}
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestDiscardableShader);
diff --git a/skia/ext/vector_platform_device_emf_win.h b/skia/ext/vector_platform_device_emf_win.h
index b6d73da..f65390f 100644
--- a/skia/ext/vector_platform_device_emf_win.h
+++ b/skia/ext/vector_platform_device_emf_win.h
@@ -31,56 +31,56 @@ class VectorPlatformDeviceEmf : public SkBitmapDevice, public PlatformDevice {
virtual ~VectorPlatformDeviceEmf();
// PlatformDevice methods
- virtual PlatformSurface BeginPlatformPaint() OVERRIDE;
+ virtual PlatformSurface BeginPlatformPaint() override;
virtual void DrawToNativeContext(HDC dc, int x, int y,
- const RECT* src_rect) OVERRIDE;
+ const RECT* src_rect) override;
// SkBaseDevice methods.
- virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) OVERRIDE;
+ virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) override;
virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
size_t count, const SkPoint[],
- const SkPaint& paint) OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawRect(const SkDraw& draw, const SkRect& r,
- const SkPaint& paint) OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawRRect(const SkDraw&, const SkRRect& rr,
- const SkPaint& paint) OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawPath(const SkDraw& draw, const SkPath& path,
const SkPaint& paint,
const SkMatrix* prePathMatrix = NULL,
- bool pathIsMutable = false) OVERRIDE;
+ bool pathIsMutable = false) override;
virtual void drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
const SkRect* src, const SkRect& dst,
const SkPaint& paint,
- SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE;
+ SkCanvas::DrawBitmapRectFlags flags) override;
virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
const SkMatrix& matrix,
- const SkPaint& paint) OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
- int x, int y, const SkPaint& paint) OVERRIDE;
+ int x, int y, const SkPaint& paint) override;
virtual void drawText(const SkDraw& draw, const void* text, size_t len,
- SkScalar x, SkScalar y, const SkPaint& paint) OVERRIDE;
+ SkScalar x, SkScalar y, const SkPaint& paint) override;
virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
const SkScalar pos[], int scalarsPerPos,
- const SkPoint& offset, const SkPaint& paint) OVERRIDE;
+ const SkPoint& offset, const SkPaint& paint) override;
virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
const SkPath& path, const SkMatrix* matrix,
- const SkPaint& paint) OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
int vertexCount,
const SkPoint verts[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
- const SkPaint& paint) OVERRIDE;
+ const SkPaint& paint) override;
virtual void drawDevice(const SkDraw& draw, SkBaseDevice*, int x, int y,
- const SkPaint&) OVERRIDE;
+ const SkPaint&) override;
virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
- const SkClipStack&) OVERRIDE;
+ const SkClipStack&) override;
void LoadClipRegion();
protected:
virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
- Usage usage) OVERRIDE;
+ Usage usage) override;
private:
// Applies the SkPaint's painting properties in the current GDI context, if
diff --git a/skia/ext/vector_platform_device_skia.h b/skia/ext/vector_platform_device_skia.h
index cf392c05..fc88904 100644
--- a/skia/ext/vector_platform_device_skia.h
+++ b/skia/ext/vector_platform_device_skia.h
@@ -26,26 +26,26 @@ class VectorPlatformDeviceSkia : public SkPDFDevice, public PlatformDevice {
virtual ~VectorPlatformDeviceSkia();
// PlatformDevice methods.
- virtual bool SupportsPlatformPaint() OVERRIDE;
+ virtual bool SupportsPlatformPaint() override;
- virtual PlatformSurface BeginPlatformPaint() OVERRIDE;
- virtual void EndPlatformPaint() OVERRIDE;
+ virtual PlatformSurface BeginPlatformPaint() override;
+ virtual void EndPlatformPaint() override;
#if defined(OS_WIN)
virtual void DrawToNativeContext(HDC dc,
int x,
int y,
- const RECT* src_rect) OVERRIDE;
+ const RECT* src_rect) override;
#elif defined(OS_MACOSX)
virtual void DrawToNativeContext(CGContext* context,
int x,
int y,
- const CGRect* src_rect) OVERRIDE;
- virtual CGContextRef GetBitmapContext() OVERRIDE;
+ const CGRect* src_rect) override;
+ virtual CGContextRef GetBitmapContext() override;
#elif defined(OS_POSIX)
virtual void DrawToNativeContext(PlatformSurface surface,
int x,
int y,
- const PlatformRect* src_rect) OVERRIDE;
+ const PlatformRect* src_rect) override;
#endif
private:
generated by cgit v1.1 at 2024-09-15 20:11:33 +0000