diff options
| -rw-r--r-- | include/core/SkPicture.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrLayerCache.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/GrLayerCache.h | 6 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 2 | ||||
| -rw-r--r-- | tests/PictureTest.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 0985bf8b5f..cfa8c95f0b 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -203,8 +203,8 @@ public: static const uint32_t kInvalidGenID = 0; - /** Return a non-zero, unique value representing the picture. This call is - only valid when not recording. Between a beginRecording/endRecording + /** Return a non-zero, unique value representing the picture. This call is + only valid when not recording. Between a beginRecording/endRecording pair it will just return 0 (the invalid gen ID). Each beginRecording/ endRecording pair will cause a different generation ID to be returned. */ diff --git a/src/gpu/GrLayerCache.cpp b/src/gpu/GrLayerCache.cpp index 4120c54d8f..12da5893a3 100644 --- a/src/gpu/GrLayerCache.cpp +++ b/src/gpu/GrLayerCache.cpp @@ -14,7 +14,7 @@ */ class GrLayerCache::PictureLayerKey { public: - PictureLayerKey(uint32_t pictureID, int layerID) + PictureLayerKey(uint32_t pictureID, int layerID) : fPictureID(pictureID) , fLayerID(layerID) { } @@ -41,7 +41,7 @@ private: int fLayerID; }; -GrLayerCache::GrLayerCache(GrGpu* gpu) +GrLayerCache::GrLayerCache(GrGpu* gpu) : fGpu(SkRef(gpu)) , fLayerPool(16) { // TODO: may need to increase this later } diff --git a/src/gpu/GrLayerCache.h b/src/gpu/GrLayerCache.h index a692a024c1..eef20ff23e 100644 --- a/src/gpu/GrLayerCache.h +++ b/src/gpu/GrLayerCache.h @@ -52,15 +52,15 @@ public: uint32_t pictureID() const { return fPictureID; } int layerID() const { return fLayerID; } - void init(uint32_t pictureID, int layerID) { + void init(uint32_t pictureID, int layerID) { fPictureID = pictureID; - fLayerID = layerID; + fLayerID = layerID; } private: uint32_t fPictureID; int fLayerID; // only valid if fPicture != kInvalidGenID - GrAtlasLocation fLocation; + GrAtlasLocation fLocation; }; // The GrLayerCache caches pre-computed saveLayers for later rendering. diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 0e836b1b6f..ae9bb742e3 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -225,7 +225,7 @@ void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { } if ((kGL_GrGLStandard == standard && version >= GR_GL_VER(4,3)) || - (kGLES_GrGLStandard == standard && version >= GR_GL_VER(3,0)) || + (kGLES_GrGLStandard == standard && version >= GR_GL_VER(3,0)) || ctxInfo.hasExtension("GL_ARB_invalidate_subdata")) { fDiscardRenderTargetSupport = true; fInvalidateFBType = kInvalidate_InvalidateFBType; diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 809661bfc2..4ac98052be 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -1171,7 +1171,7 @@ static void test_gen_id(skiatest::Reporter* reporter) { SkPicture emptyCopy(empty); REPORTER_ASSERT(reporter, empty.getGenerationID() != emptyCopy.getGenerationID()); - + SkPicture copyMidRecord(midRecord); REPORTER_ASSERT(reporter, midRecord.getGenerationID() != copyMidRecord.getGenerationID()); REPORTER_ASSERT(reporter, copyMidRecord.getGenerationID() != SkPicture::kInvalidGenID); |