diff options
| -rw-r--r-- | include/core/SkPicture.h | 2 | ||||
| -rw-r--r-- | src/gpu/GrAtlas.cpp | 8 | ||||
| -rw-r--r-- | src/gpu/GrAtlas.h | 2 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.h | 4 | ||||
| -rw-r--r-- | src/utils/debugger/SkDrawCommand.h | 2 | ||||
| -rw-r--r-- | tools/skpinfo.cpp | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index ae5e81e36d..56596c40df 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -219,7 +219,7 @@ public: /** Return true if the SkStream/Buffer represents a serialized picture, and fills out SkPictInfo. After this function returns, the data source is not - rewound so it will have to be manually reset before passing to + rewound so it will have to be manually reset before passing to CreateFromStream or CreateFromBuffer. Note, CreateFromStream and CreateFromBuffer perform this check internally so these entry points are intended for stand alone tools. diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp index c2fcf46f68..668a73a695 100644 --- a/src/gpu/GrAtlas.cpp +++ b/src/gpu/GrAtlas.cpp @@ -89,9 +89,9 @@ bool GrPlot::addSubImage(int width, int height, const void* image, return true; } -void GrPlot::resetRects() { - SkASSERT(NULL != fRects); - fRects->reset(); +void GrPlot::resetRects() { + SkASSERT(NULL != fRects); + fRects->reset(); } /////////////////////////////////////////////////////////////////////////////// @@ -134,7 +134,7 @@ void GrAtlasMgr::moveToHead(GrPlot* plot) { if (fPlotList.head() == plot) { return; } - + fPlotList.remove(plot); fPlotList.addToHead(plot); }; diff --git a/src/gpu/GrAtlas.h b/src/gpu/GrAtlas.h index ee4ead92a0..7219ab24c2 100644 --- a/src/gpu/GrAtlas.h +++ b/src/gpu/GrAtlas.h @@ -32,7 +32,7 @@ class GrAtlas; class GrPlot { public: SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrPlot); - + int getOffsetX() const { return fOffset.fX; } int getOffsetY() const { return fOffset.fY; } diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index 8c1f72f968..b9780369d1 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -281,13 +281,13 @@ private: */ int fOutstandingSaveCount; - /** + /** The active saveLayer commands at a given point in the renderering. Only used when "mega" visualization is enabled. */ SkTDArray<SkDrawCommand*> fActiveLayers; - /** + /** The active cull commands at a given point in the rendering. Only used when "mega" visualization is enabled. */ diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h index a4f50c9737..3c40393fe7 100644 --- a/src/utils/debugger/SkDrawCommand.h +++ b/src/utils/debugger/SkDrawCommand.h @@ -44,7 +44,7 @@ public: // The next "active" system is only used by save, saveLayer, restore, // pushCull and popCull. It is used in two ways: - // To determine which saveLayers are currently active (at a + // To determine which saveLayers are currently active (at a // given point in the rendering). // save just return a kPushLayer action but don't track active state // restore just return a kPopLayer action diff --git a/tools/skpinfo.cpp b/tools/skpinfo.cpp index e14abd430b..97171c5999 100644 --- a/tools/skpinfo.cpp +++ b/tools/skpinfo.cpp @@ -66,8 +66,8 @@ int tool_main(int argc, char** argv) { } if (!stream.readBool()) { - // If we read true there's a picture playback object flattened - // in the file; if false, there isn't a playback, so we're done + // If we read true there's a picture playback object flattened + // in the file; if false, there isn't a playback, so we're done // reading the file. return kSuccess; } @@ -95,7 +95,7 @@ int tool_main(int argc, char** argv) { // fonts) instead. This forces us to early exit when those // chunks are encountered. switch (tag) { - case SK_PICT_READER_TAG: + case SK_PICT_READER_TAG: if (FLAGS_tags && !FLAGS_quiet) { SkDebugf("SK_PICT_READER_TAG %d\n", chunkSize); } |