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

Side by Side Diff: src/core/SkScan_Path.cpp

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 | « src/core/SkScan_Antihair.cpp ('k') | src/core/SkSpriteBlitter_ARGB32.cpp » ('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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 #include "SkScanPriv.h" 8 #include "SkScanPriv.h"
9 #include "SkBlitter.h" 9 #include "SkBlitter.h"
10 #include "SkEdge.h" 10 #include "SkEdge.h"
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 fPrevX = fFirstX; 316 fPrevX = fFirstX;
317 } else { 317 } else {
318 int invWidth = fLastX - fPrevX; 318 int invWidth = fLastX - fPrevX;
319 if (invWidth > 0) { 319 if (invWidth > 0) {
320 fBlitter->blitH(fPrevX, y, invWidth); 320 fBlitter->blitH(fPrevX, y, invWidth);
321 } 321 }
322 } 322 }
323 } 323 }
324 324
325 // overrides 325 // overrides
326 void blitH(int x, int y, int width) SK_OVERRIDE { 326 void blitH(int x, int y, int width) override {
327 int invWidth = x - fPrevX; 327 int invWidth = x - fPrevX;
328 if (invWidth > 0) { 328 if (invWidth > 0) {
329 fBlitter->blitH(fPrevX, y, invWidth); 329 fBlitter->blitH(fPrevX, y, invWidth);
330 } 330 }
331 fPrevX = x + width; 331 fPrevX = x + width;
332 } 332 }
333 333
334 // we do not expect to get called with these entrypoints 334 // we do not expect to get called with these entrypoints
335 void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE { 335 void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) override {
336 SkDEBUGFAIL("blitAntiH unexpected"); 336 SkDEBUGFAIL("blitAntiH unexpected");
337 } 337 }
338 void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { 338 void blitV(int x, int y, int height, SkAlpha alpha) override {
339 SkDEBUGFAIL("blitV unexpected"); 339 SkDEBUGFAIL("blitV unexpected");
340 } 340 }
341 void blitRect(int x, int y, int width, int height) SK_OVERRIDE { 341 void blitRect(int x, int y, int width, int height) override {
342 SkDEBUGFAIL("blitRect unexpected"); 342 SkDEBUGFAIL("blitRect unexpected");
343 } 343 }
344 void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE { 344 void blitMask(const SkMask&, const SkIRect& clip) override {
345 SkDEBUGFAIL("blitMask unexpected"); 345 SkDEBUGFAIL("blitMask unexpected");
346 } 346 }
347 const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE { 347 const SkBitmap* justAnOpaqueColor(uint32_t* value) override {
348 SkDEBUGFAIL("justAnOpaqueColor unexpected"); 348 SkDEBUGFAIL("justAnOpaqueColor unexpected");
349 return NULL; 349 return NULL;
350 } 350 }
351 351
352 private: 352 private:
353 SkBlitter* fBlitter; 353 SkBlitter* fBlitter;
354 int fFirstX, fLastX, fPrevX; 354 int fFirstX, fLastX, fPrevX;
355 }; 355 };
356 356
357 static void PrePostInverseBlitterProc(SkBlitter* blitter, int y, bool isStart) { 357 static void PrePostInverseBlitterProc(SkBlitter* blitter, int y, bool isStart) {
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 clipRgn = &wrap.getRgn(); 700 clipRgn = &wrap.getRgn();
701 blitter = wrap.getBlitter(); 701 blitter = wrap.getBlitter();
702 } 702 }
703 703
704 SkScanClipper clipper(blitter, clipRgn, ir); 704 SkScanClipper clipper(blitter, clipRgn, ir);
705 blitter = clipper.getBlitter(); 705 blitter = clipper.getBlitter();
706 if (blitter) { 706 if (blitter) {
707 sk_fill_triangle(pts, clipper.getClipRect(), blitter, ir); 707 sk_fill_triangle(pts, clipper.getClipRect(), blitter, ir);
708 } 708 }
709 } 709 }
OLDNEW
« no previous file with comments | « src/core/SkScan_Antihair.cpp ('k') | src/core/SkSpriteBlitter_ARGB32.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698