Skip to content

Commit

Permalink
Replace OVERRIDE with its C++11 counterparts in src/skia
Browse files Browse the repository at this point in the history 
This step is a giant search for OVERRIDE to
replace it with its lowercase versions.

BUG=417463

Review URL: https://codereview.chromium.org/641523002

Cr-Commit-Position: refs/heads/master@{#298861}
  • Loading branch information
r.nagaraj authored and Commit bot committed Oct 9, 2014
1 parent d52dffd commit 3c200fa
Show file tree
Hide file tree
Showing 14 changed files with 121 additions and 120 deletions.
1 change: 1 addition & 0 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions skia/ext/SkDiscardableMemory_chrome.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class SK_API SkDiscardableMemoryChrome : public SkDiscardableMemory {
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;
Expand Down
54 changes: 27 additions & 27 deletions skia/ext/analysis_canvas.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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[],
Expand All @@ -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();

Expand Down
48 changes: 24 additions & 24 deletions skia/ext/benchmarking_canvas.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,76 +40,76 @@ class TimingCanvas : public SkProxyCanvas {
}

// 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);
}

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);
}
Expand All @@ -118,71 +118,71 @@ class TimingCanvas : public SkProxyCanvas {
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);
}
Expand Down
8 changes: 4 additions & 4 deletions skia/ext/bitmap_platform_device_cairo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions skia/ext/bitmap_platform_device_mac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions skia/ext/bitmap_platform_device_skia.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit 3c200fa

Please sign in to comment.