| Index: src/core/SkBlitter.cpp
|
| diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
|
| index 5bb7ac8d015a9ac113020a076f86880dd435ee14..a5d2b0598b850839fdd33a244cd42b96f5412381 100644
|
| --- a/src/core/SkBlitter.cpp
|
| +++ b/src/core/SkBlitter.cpp
|
| @@ -580,7 +580,7 @@ public:
|
| SkSafeUnref(fProxy);
|
| }
|
|
|
| - virtual size_t contextSize() const SK_OVERRIDE {
|
| + size_t contextSize() const SK_OVERRIDE {
|
| size_t size = sizeof(Sk3DShaderContext);
|
| if (fProxy) {
|
| size += fProxy->contextSize();
|
| @@ -588,7 +588,7 @@ public:
|
| return size;
|
| }
|
|
|
| - virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE {
|
| + Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE {
|
| SkShader::Context* proxyContext = NULL;
|
| if (fProxy) {
|
| char* proxyContextStorage = (char*) storage + sizeof(Sk3DShaderContext);
|
| @@ -620,9 +620,9 @@ public:
|
| }
|
| }
|
|
|
| - virtual void set3DMask(const SkMask* mask) SK_OVERRIDE { fMask = mask; }
|
| + void set3DMask(const SkMask* mask) SK_OVERRIDE { fMask = mask; }
|
|
|
| - virtual void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE {
|
| + void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE {
|
| if (fProxyContext) {
|
| fProxyContext->shadeSpan(x, y, span, count);
|
| }
|
| @@ -697,7 +697,7 @@ public:
|
| };
|
|
|
| #ifndef SK_IGNORE_TO_STRING
|
| - virtual void toString(SkString* str) const SK_OVERRIDE {
|
| + void toString(SkString* str) const SK_OVERRIDE {
|
| str->append("Sk3DShader: (");
|
|
|
| if (fProxy) {
|
| @@ -714,7 +714,7 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk3DShader)
|
|
|
| protected:
|
| - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
|
| + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
|
| buffer.writeFlattenable(fProxy);
|
| }
|
|
|
| @@ -736,7 +736,7 @@ public:
|
| , fShaderContext(shaderContext)
|
| {}
|
|
|
| - virtual void blitH(int x, int y, int width) SK_OVERRIDE {
|
| + void blitH(int x, int y, int width) SK_OVERRIDE {
|
| fProxy->blitH(x, y, width);
|
| }
|
|
|
| @@ -745,15 +745,15 @@ public:
|
| fProxy->blitAntiH(x, y, antialias, runs);
|
| }
|
|
|
| - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
|
| + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
|
| fProxy->blitV(x, y, height, alpha);
|
| }
|
|
|
| - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
|
| + void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
|
| fProxy->blitRect(x, y, width, height);
|
| }
|
|
|
| - virtual void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE {
|
| + void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE {
|
| if (mask.fFormat == SkMask::k3D_Format) {
|
| fShaderContext->set3DMask(&mask);
|
|
|
| @@ -991,7 +991,7 @@ public:
|
| // Override rec with the identity matrix, so it is guaranteed to be invertible.
|
| : INHERITED(shader, SkShader::ContextRec(*rec.fDevice, *rec.fPaint, SkMatrix::I())) {}
|
|
|
| - virtual void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE {
|
| + void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE {
|
| sk_bzero(colors, count * sizeof(SkPMColor));
|
| }
|
|
|
|
|