src/core/SkXfermode.cpp - Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/core/SkXfermode.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 side-by-side diff with in-line comments

Download patch

Index: src/core/SkXfermode.cpp

diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp

index 08f760d2054d5ccec46f56da2d4494394a71c368..7165e99161bd2bc69e4aff56e536a1c5f9e5d336 100644

--- a/src/core/SkXfermode.cpp

+++ b/src/core/SkXfermode.cpp

@@ -1020,8 +1020,8 @@ public:

return SkNEW_ARGS(SkClearXfermode, (rec));

}

- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;

- void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;

+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;

+ void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const override;

SK_TO_STRING_OVERRIDE()

@@ -1082,8 +1082,8 @@ public:

return SkNEW_ARGS(SkSrcXfermode, (rec));

}

- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;

- void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;

+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;

+ void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const override;

SK_TO_STRING_OVERRIDE()

@@ -1148,7 +1148,7 @@ public:

return SkNEW_ARGS(SkDstInXfermode, (rec));

}

- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;

+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;

SK_TO_STRING_OVERRIDE()

@@ -1192,7 +1192,7 @@ public:

return SkNEW_ARGS(SkDstOutXfermode, (rec));

}

- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;

+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;

SK_TO_STRING_OVERRIDE()

« no previous file with comments | « src/core/SkValidatingReadBuffer.h ('k') | src/core/SkXfermode_proccoeff.h » ('j') | no next file with comments »