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

Side by Side Diff: src/effects/SkColorMatrixFilter.cpp

Issue 804813002: Cleanup: Mark some overridden methods with 'SK_OVERRIDE'. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years 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/utils/SkDeferredCanvas.h ('k') | src/effects/SkLightingImageFilter.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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkColorMatrixFilter.h" 8 #include "SkColorMatrixFilter.h"
9 #include "SkColorMatrix.h" 9 #include "SkColorMatrix.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 GrGLProgramDataManager::UniformHandle fVectorHandle; 409 GrGLProgramDataManager::UniformHandle fVectorHandle;
410 410
411 typedef GrGLFragmentProcessor INHERITED; 411 typedef GrGLFragmentProcessor INHERITED;
412 }; 412 };
413 413
414 private: 414 private:
415 ColorMatrixEffect(const SkColorMatrix& matrix) : fMatrix(matrix) { 415 ColorMatrixEffect(const SkColorMatrix& matrix) : fMatrix(matrix) {
416 this->initClassID<ColorMatrixEffect>(); 416 this->initClassID<ColorMatrixEffect>();
417 } 417 }
418 418
419 virtual bool onIsEqual(const GrFragmentProcessor& s) const { 419 virtual bool onIsEqual(const GrFragmentProcessor& s) const SK_OVERRIDE {
420 const ColorMatrixEffect& cme = s.cast<ColorMatrixEffect>(); 420 const ColorMatrixEffect& cme = s.cast<ColorMatrixEffect>();
421 return cme.fMatrix == fMatrix; 421 return cme.fMatrix == fMatrix;
422 } 422 }
423 423
424 virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVE RRIDE { 424 virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVE RRIDE {
425 // We only bother to check whether the alpha channel will be constant. I f SkColorMatrix had 425 // We only bother to check whether the alpha channel will be constant. I f SkColorMatrix had
426 // type flags it might be worth checking the other components. 426 // type flags it might be worth checking the other components.
427 427
428 // The matrix is defined such the 4th row determines the output alpha. T he first four 428 // The matrix is defined such the 4th row determines the output alpha. T he first four
429 // columns of that row multiply the input r, g, b, and a, respectively, and the last column 429 // columns of that row multiply the input r, g, b, and a, respectively, and the last column
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 str->append("matrix: ("); 497 str->append("matrix: (");
498 for (int i = 0; i < 20; ++i) { 498 for (int i = 0; i < 20; ++i) {
499 str->appendScalar(fMatrix.fMat[i]); 499 str->appendScalar(fMatrix.fMat[i]);
500 if (i < 19) { 500 if (i < 19) {
501 str->append(", "); 501 str->append(", ");
502 } 502 }
503 } 503 }
504 str->append(")"); 504 str->append(")");
505 } 505 }
506 #endif 506 #endif
OLDNEW
« no previous file with comments | « include/utils/SkDeferredCanvas.h ('k') | src/effects/SkLightingImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698