Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: Source/platform/graphics/LoggingCanvas.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "platform/JSONValues.h" 34 #include "platform/JSONValues.h"
35 #include "platform/graphics/InterceptingCanvas.h" 35 #include "platform/graphics/InterceptingCanvas.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class LoggingCanvas : public InterceptingCanvas { 39 class LoggingCanvas : public InterceptingCanvas {
40 public: 40 public:
41 LoggingCanvas(int width, int height); 41 LoggingCanvas(int width, int height);
42 PassRefPtr<JSONArray> log(); 42 PassRefPtr<JSONArray> log();
43 43
44 virtual void clear(SkColor) OVERRIDE; 44 virtual void clear(SkColor) override;
45 virtual void drawPaint(const SkPaint&) OVERRIDE; 45 virtual void drawPaint(const SkPaint&) override;
46 virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) OVERRIDE; 46 virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
47 virtual void drawRect(const SkRect&, const SkPaint&) OVERRIDE; 47 virtual void drawRect(const SkRect&, const SkPaint&) override;
48 virtual void drawOval(const SkRect&, const SkPaint&) OVERRIDE; 48 virtual void drawOval(const SkRect&, const SkPaint&) override;
49 virtual void drawRRect(const SkRRect&, const SkPaint&) OVERRIDE; 49 virtual void drawRRect(const SkRRect&, const SkPaint&) override;
50 virtual void drawPath(const SkPath&, const SkPaint&) OVERRIDE; 50 virtual void drawPath(const SkPath&, const SkPaint&) override;
51 virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint* = 0) OVERRIDE; 51 virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint* = 0) override;
52 virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, DrawBitmapRectFlags) OVERRIDE; 52 virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, DrawBitmapRectFlags) override;
53 virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&, const SkPain t* = 0) OVERRIDE; 53 virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&, const SkPain t* = 0) override;
54 virtual void drawBitmapNine(const SkBitmap&, const SkIRect& center, const Sk Rect& dst, const SkPaint*) OVERRIDE; 54 virtual void drawBitmapNine(const SkBitmap&, const SkIRect& center, const Sk Rect& dst, const SkPaint*) override;
55 virtual void drawSprite(const SkBitmap&, int left, int top, const SkPaint* = 0) OVERRIDE; 55 virtual void drawSprite(const SkBitmap&, int left, int top, const SkPaint* = 0) override;
56 virtual void drawVertices(VertexMode vmode, int vertexCount, const SkPoint v ertices[], const SkPoint texs[], 56 virtual void drawVertices(VertexMode vmode, int vertexCount, const SkPoint v ertices[], const SkPoint texs[],
57 const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, const SkPaint&) OVERRIDE; 57 const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, const SkPaint&) override;
58 virtual void drawData(const void* data, size_t length) OVERRIDE; 58 virtual void drawData(const void* data, size_t length) override;
59 virtual void beginCommentGroup(const char* description) OVERRIDE; 59 virtual void beginCommentGroup(const char* description) override;
60 virtual void addComment(const char* keyword, const char* value) OVERRIDE; 60 virtual void addComment(const char* keyword, const char* value) override;
61 virtual void endCommentGroup() OVERRIDE; 61 virtual void endCommentGroup() override;
62 62
63 virtual void onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint&) OVERRIDE; 63 virtual void onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint&) override;
64 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS calar y, const SkPaint&) OVERRIDE; 64 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS calar y, const SkPaint&) override;
65 virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoin t pos[], const SkPaint&) OVERRIDE; 65 virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoin t pos[], const SkPaint&) override;
66 virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkSca lar xpos[], SkScalar constY, const SkPaint&) OVERRIDE; 66 virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkSca lar xpos[], SkScalar constY, const SkPaint&) override;
67 virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkP ath&, const SkMatrix*, const SkPaint&) OVERRIDE; 67 virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkP ath&, const SkMatrix*, const SkPaint&) override;
68 virtual void onPushCull(const SkRect& cullRect) OVERRIDE; 68 virtual void onPushCull(const SkRect& cullRect) override;
69 virtual void onPopCull() OVERRIDE; 69 virtual void onPopCull() override;
70 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE ; 70 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override ;
71 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) OVERRI DE; 71 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) overri de;
72 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) OVERRIDE ; 72 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override ;
73 virtual void onClipRegion(const SkRegion&, SkRegion::Op) OVERRIDE; 73 virtual void onClipRegion(const SkRegion&, SkRegion::Op) override;
74 virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint* ); 74 virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint* );
75 virtual void didSetMatrix(const SkMatrix&) OVERRIDE; 75 virtual void didSetMatrix(const SkMatrix&) override;
76 virtual void didConcat(const SkMatrix&) OVERRIDE; 76 virtual void didConcat(const SkMatrix&) override;
77 virtual void willSave() OVERRIDE; 77 virtual void willSave() override;
78 SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint*, SaveFl ags) OVERRIDE; 78 SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint*, SaveFl ags) override;
79 virtual void willRestore() OVERRIDE; 79 virtual void willRestore() override;
80 80
81 private: 81 private:
82 RefPtr<JSONArray> m_log; 82 RefPtr<JSONArray> m_log;
83 friend class AutoLogger; 83 friend class AutoLogger;
84 84
85 struct VerbParams { 85 struct VerbParams {
86 String name; 86 String name;
87 unsigned pointCount; 87 unsigned pointCount;
88 unsigned pointOffset; 88 unsigned pointOffset;
89 89
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 String regionOpName(SkRegion::Op); 130 String regionOpName(SkRegion::Op);
131 String saveFlagsToString(SkCanvas::SaveFlags); 131 String saveFlagsToString(SkCanvas::SaveFlags);
132 String textEncodingCanonicalName(SkPaint::TextEncoding); 132 String textEncodingCanonicalName(SkPaint::TextEncoding);
133 String stringForUTFText(const void* text, size_t length, SkPaint::TextEncodi ng); 133 String stringForUTFText(const void* text, size_t length, SkPaint::TextEncodi ng);
134 String stringForText(const void* text, size_t byteLength, const SkPaint&); 134 String stringForText(const void* text, size_t byteLength, const SkPaint&);
135 }; 135 };
136 136
137 } // namespace blink 137 } // namespace blink
138 138
139 #endif // LoggingCanvas_h 139 #endif // LoggingCanvas_h
OLDNEW
« no previous file with comments | « Source/platform/graphics/InterceptingCanvas.h ('k') | Source/platform/graphics/ProfilingCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698