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

Side by Side Diff: include/device/xps/SkXPSDevice.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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
« no previous file with comments | « include/core/SkWeakRefCnt.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkXPSDevice_DEFINED 8 #ifndef SkXPSDevice_DEFINED
9 #define SkXPSDevice_DEFINED 9 #define SkXPSDevice_DEFINED
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 const SkSize& trimSize, 64 const SkSize& trimSize,
65 const SkRect* mediaBox = NULL, 65 const SkRect* mediaBox = NULL,
66 const SkRect* bleedBox = NULL, 66 const SkRect* bleedBox = NULL,
67 const SkRect* artBox = NULL, 67 const SkRect* artBox = NULL,
68 const SkRect* cropBox = NULL); 68 const SkRect* cropBox = NULL);
69 69
70 virtual bool endSheet(); 70 virtual bool endSheet();
71 virtual bool endPortfolio(); 71 virtual bool endPortfolio();
72 72
73 protected: 73 protected:
74 void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; 74 void drawPaint(const SkDraw&, const SkPaint& paint) override;
75 75
76 virtual void drawPoints( 76 virtual void drawPoints(
77 const SkDraw&, 77 const SkDraw&,
78 SkCanvas::PointMode mode, 78 SkCanvas::PointMode mode,
79 size_t count, const SkPoint[], 79 size_t count, const SkPoint[],
80 const SkPaint& paint) SK_OVERRIDE; 80 const SkPaint& paint) override;
81 81
82 virtual void drawRect( 82 virtual void drawRect(
83 const SkDraw&, 83 const SkDraw&,
84 const SkRect& r, 84 const SkRect& r,
85 const SkPaint& paint) SK_OVERRIDE; 85 const SkPaint& paint) override;
86 86
87 virtual void drawRRect( 87 virtual void drawRRect(
88 const SkDraw&, 88 const SkDraw&,
89 const SkRRect&, 89 const SkRRect&,
90 const SkPaint& paint) SK_OVERRIDE; 90 const SkPaint& paint) override;
91 91
92 virtual void drawPath( 92 virtual void drawPath(
93 const SkDraw&, 93 const SkDraw&,
94 const SkPath& platonicPath, 94 const SkPath& platonicPath,
95 const SkPaint& paint, 95 const SkPaint& paint,
96 const SkMatrix* prePathMatrix, 96 const SkMatrix* prePathMatrix,
97 bool pathIsMutable) SK_OVERRIDE; 97 bool pathIsMutable) override;
98 98
99 virtual void drawBitmap( 99 virtual void drawBitmap(
100 const SkDraw&, 100 const SkDraw&,
101 const SkBitmap& bitmap, 101 const SkBitmap& bitmap,
102 const SkMatrix& matrix, 102 const SkMatrix& matrix,
103 const SkPaint& paint) SK_OVERRIDE; 103 const SkPaint& paint) override;
104 104
105 virtual void drawSprite( 105 virtual void drawSprite(
106 const SkDraw&, 106 const SkDraw&,
107 const SkBitmap& bitmap, 107 const SkBitmap& bitmap,
108 int x, int y, 108 int x, int y,
109 const SkPaint& paint) SK_OVERRIDE; 109 const SkPaint& paint) override;
110 110
111 virtual void drawText( 111 virtual void drawText(
112 const SkDraw&, 112 const SkDraw&,
113 const void* text, size_t len, 113 const void* text, size_t len,
114 SkScalar x, SkScalar y, 114 SkScalar x, SkScalar y,
115 const SkPaint& paint) SK_OVERRIDE; 115 const SkPaint& paint) override;
116 116
117 virtual void drawPosText( 117 virtual void drawPosText(
118 const SkDraw&, 118 const SkDraw&,
119 const void* text, size_t len, 119 const void* text, size_t len,
120 const SkScalar pos[], int scalarsPerPos, 120 const SkScalar pos[], int scalarsPerPos,
121 const SkPoint& offset, const SkPaint& paint) SK_OVERRIDE; 121 const SkPoint& offset, const SkPaint& paint) override;
122 122
123 virtual void drawVertices( 123 virtual void drawVertices(
124 const SkDraw&, 124 const SkDraw&,
125 SkCanvas::VertexMode, 125 SkCanvas::VertexMode,
126 int vertexCount, const SkPoint verts[], 126 int vertexCount, const SkPoint verts[],
127 const SkPoint texs[], const SkColor colors[], 127 const SkPoint texs[], const SkColor colors[],
128 SkXfermode* xmode, 128 SkXfermode* xmode,
129 const uint16_t indices[], int indexCount, 129 const uint16_t indices[], int indexCount,
130 const SkPaint& paint) SK_OVERRIDE; 130 const SkPaint& paint) override;
131 131
132 virtual void drawDevice( 132 virtual void drawDevice(
133 const SkDraw&, 133 const SkDraw&,
134 SkBaseDevice* device, 134 SkBaseDevice* device,
135 int x, int y, 135 int x, int y,
136 const SkPaint& paint) SK_OVERRIDE; 136 const SkPaint& paint) override;
137 137
138 private: 138 private:
139 class TypefaceUse : ::SkNoncopyable { 139 class TypefaceUse : ::SkNoncopyable {
140 public: 140 public:
141 SkFontID typefaceId; 141 SkFontID typefaceId;
142 int ttcIndex; 142 int ttcIndex;
143 SkStream* fontData; 143 SkStream* fontData;
144 IXpsOMFontResource* xpsFont; 144 IXpsOMFontResource* xpsFont;
145 SkBitSet* glyphsUsed; 145 SkBitSet* glyphsUsed;
146 146
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 SkMatrix* matrix, 302 SkMatrix* matrix,
303 SkVector* ppuScale, 303 SkVector* ppuScale,
304 const SkIRect& clip, SkIRect* clipIRect); 304 const SkIRect& clip, SkIRect* clipIRect);
305 305
306 HRESULT applyMask( 306 HRESULT applyMask(
307 const SkDraw& d, 307 const SkDraw& d,
308 const SkMask& mask, 308 const SkMask& mask,
309 const SkVector& ppuScale, 309 const SkVector& ppuScale,
310 IXpsOMPath* shadedPath); 310 IXpsOMPath* shadedPath);
311 311
312 SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE; 312 SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
313 313
314 // Disable the default copy and assign implementation. 314 // Disable the default copy and assign implementation.
315 SkXPSDevice(const SkXPSDevice&); 315 SkXPSDevice(const SkXPSDevice&);
316 void operator=(const SkXPSDevice&); 316 void operator=(const SkXPSDevice&);
317 317
318 typedef SkBitmapDevice INHERITED; 318 typedef SkBitmapDevice INHERITED;
319 }; 319 };
320 320
321 #endif 321 #endif
OLDNEW
« no previous file with comments | « include/core/SkWeakRefCnt.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698