diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 03:06:53 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-06 03:06:53 +0000 |
commit | d1d24d273a220b6b76c4918f04cbb1b1769f3588 (patch) | |
tree | b99492c1d1d9a2044b0e5e67fd993eff2a86cf29 | |
parent | 31d179de5aa462f943a67645f6107a2ad4685c15 (diff) | |
download | src-d1d24d273a220b6b76c4918f04cbb1b1769f3588.tar.gz |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk/src@14584 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | core/SkBitmapProcShader.cpp | 4 | ||||
-rw-r--r-- | core/SkComposeShader.cpp | 2 | ||||
-rw-r--r-- | core/SkFilterShader.h | 2 | ||||
-rw-r--r-- | core/SkPictureShader.h | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/core/SkBitmapProcShader.cpp b/core/SkBitmapProcShader.cpp index 503269ac..00d938be 100644 --- a/core/SkBitmapProcShader.cpp +++ b/core/SkBitmapProcShader.cpp @@ -101,13 +101,13 @@ SkShader::Context* SkBitmapProcShader::onCreateContext(const ContextRec& rec, vo if (!fRawBitmap.getTexture() && !valid_for_drawing(fRawBitmap)) { return NULL; } - + SkMatrix totalInverse; // Do this first, so we know the matrix can be inverted. if (!this->computeTotalInverse(rec, &totalInverse)) { return NULL; } - + void* stateStorage = (char*)storage + sizeof(BitmapProcShaderContext); SkBitmapProcState* state = SkNEW_PLACEMENT(stateStorage, SkBitmapProcState); diff --git a/core/SkComposeShader.cpp b/core/SkComposeShader.cpp index 7a7dce66..b2f69b4b 100644 --- a/core/SkComposeShader.cpp +++ b/core/SkComposeShader.cpp @@ -93,7 +93,7 @@ SkShader::Context* SkComposeShader::onCreateContext(const ContextRec& rec, void* // sub-shaders. SkPaint opaquePaint(*rec.fPaint); opaquePaint.setAlpha(0xFF); - + ContextRec newRec(rec); newRec.fMatrix = &tmpM; newRec.fPaint = &opaquePaint; diff --git a/core/SkFilterShader.h b/core/SkFilterShader.h index 3f983e26..1a4b71fe 100644 --- a/core/SkFilterShader.h +++ b/core/SkFilterShader.h @@ -43,7 +43,7 @@ protected: SkFilterShader(SkReadBuffer& ); virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; - + private: SkShader* fShader; diff --git a/core/SkPictureShader.h b/core/SkPictureShader.h index 17882055..0fbfbee4 100644 --- a/core/SkPictureShader.h +++ b/core/SkPictureShader.h @@ -57,23 +57,23 @@ private: SkShader* bitmapShader); virtual ~PictureShaderContext(); - + virtual uint32_t getFlags() const SK_OVERRIDE; - + virtual ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE; virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; - + private: PictureShaderContext(const SkPictureShader&, const ContextRec&, SkShader* bitmapShader); SkAutoTUnref<SkShader> fBitmapShader; SkShader::Context* fBitmapShaderContext; void* fBitmapShaderContextStorage; - + typedef SkShader::Context INHERITED; }; - + typedef SkShader INHERITED; }; |