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

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

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 const SkSize& trimSize, 63 const SkSize& trimSize,
64 const SkRect* mediaBox = NULL, 64 const SkRect* mediaBox = NULL,
65 const SkRect* bleedBox = NULL, 65 const SkRect* bleedBox = NULL,
66 const SkRect* artBox = NULL, 66 const SkRect* artBox = NULL,
67 const SkRect* cropBox = NULL); 67 const SkRect* cropBox = NULL);
68 68
69 virtual bool endSheet(); 69 virtual bool endSheet();
70 virtual bool endPortfolio(); 70 virtual bool endPortfolio();
71 71
72 protected: 72 protected:
73 virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; 73 void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
74 74
75 virtual void drawPoints( 75 virtual void drawPoints(
76 const SkDraw&, 76 const SkDraw&,
77 SkCanvas::PointMode mode, 77 SkCanvas::PointMode mode,
78 size_t count, const SkPoint[], 78 size_t count, const SkPoint[],
79 const SkPaint& paint) SK_OVERRIDE; 79 const SkPaint& paint) SK_OVERRIDE;
80 80
81 virtual void drawRect( 81 virtual void drawRect(
82 const SkDraw&, 82 const SkDraw&,
83 const SkRect& r, 83 const SkRect& r,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 SkXfermode* xmode, 134 SkXfermode* xmode,
135 const uint16_t indices[], int indexCount, 135 const uint16_t indices[], int indexCount,
136 const SkPaint& paint) SK_OVERRIDE; 136 const SkPaint& paint) SK_OVERRIDE;
137 137
138 virtual void drawDevice( 138 virtual void drawDevice(
139 const SkDraw&, 139 const SkDraw&,
140 SkBaseDevice* device, 140 SkBaseDevice* device,
141 int x, int y, 141 int x, int y,
142 const SkPaint& paint) SK_OVERRIDE; 142 const SkPaint& paint) SK_OVERRIDE;
143 143
144 virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE; 144 bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE;
145 145
146 private: 146 private:
147 class TypefaceUse : ::SkNoncopyable { 147 class TypefaceUse : ::SkNoncopyable {
148 public: 148 public:
149 SkFontID typefaceId; 149 SkFontID typefaceId;
150 int ttcIndex; 150 int ttcIndex;
151 SkStream* fontData; 151 SkStream* fontData;
152 IXpsOMFontResource* xpsFont; 152 IXpsOMFontResource* xpsFont;
153 SkBitSet* glyphsUsed; 153 SkBitSet* glyphsUsed;
154 154
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 SkMatrix* matrix, 310 SkMatrix* matrix,
311 SkVector* ppuScale, 311 SkVector* ppuScale,
312 const SkIRect& clip, SkIRect* clipIRect); 312 const SkIRect& clip, SkIRect* clipIRect);
313 313
314 HRESULT applyMask( 314 HRESULT applyMask(
315 const SkDraw& d, 315 const SkDraw& d,
316 const SkMask& mask, 316 const SkMask& mask,
317 const SkVector& ppuScale, 317 const SkVector& ppuScale,
318 IXpsOMPath* shadedPath); 318 IXpsOMPath* shadedPath);
319 319
320 virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRID E; 320 SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE;
321 321
322 // Disable the default copy and assign implementation. 322 // Disable the default copy and assign implementation.
323 SkXPSDevice(const SkXPSDevice&); 323 SkXPSDevice(const SkXPSDevice&);
324 void operator=(const SkXPSDevice&); 324 void operator=(const SkXPSDevice&);
325 325
326 typedef SkBitmapDevice INHERITED; 326 typedef SkBitmapDevice INHERITED;
327 }; 327 };
328 328
329 #endif 329 #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