diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-24 03:05:07 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-24 03:05:07 +0000 |
commit | 88c3a5dce6bb39d47437fdbe853318ea28e0cd13 (patch) | |
tree | 047c5b613ef30b844ea627015e749d8f488d826e | |
parent | 7c64bc913eeea099211c52ee33179fec3245bef6 (diff) | |
download | src-88c3a5dce6bb39d47437fdbe853318ea28e0cd13.tar.gz |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk/src@14346 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | core/SkBBoxHierarchyRecord.h | 2 | ||||
-rw-r--r-- | core/SkBBoxRecord.h | 2 | ||||
-rw-r--r-- | core/SkCanvas.cpp | 6 | ||||
-rw-r--r-- | core/SkPicture.cpp | 4 | ||||
-rw-r--r-- | core/SkPicturePlayback.cpp | 4 | ||||
-rw-r--r-- | core/SkPicturePlayback.h | 10 | ||||
-rw-r--r-- | image/SkImagePriv.cpp | 1 |
7 files changed, 14 insertions, 15 deletions
diff --git a/core/SkBBoxHierarchyRecord.h b/core/SkBBoxHierarchyRecord.h index aa8b70aa..f6fac180 100644 --- a/core/SkBBoxHierarchyRecord.h +++ b/core/SkBBoxHierarchyRecord.h @@ -19,7 +19,7 @@ class SkBBoxHierarchyRecord : public SkBBoxRecord, public SkBBoxHierarchyClient { public: /** This will take a ref of h */ - SkBBoxHierarchyRecord(SkPicture* picture, const SkISize& size, + SkBBoxHierarchyRecord(SkPicture* picture, const SkISize& size, uint32_t recordFlags, SkBBoxHierarchy* h); virtual void handleBBox(const SkRect& bounds) SK_OVERRIDE; diff --git a/core/SkBBoxRecord.h b/core/SkBBoxRecord.h index fef4ce67..f2e9d8d2 100644 --- a/core/SkBBoxRecord.h +++ b/core/SkBBoxRecord.h @@ -19,7 +19,7 @@ class SkBBoxRecord : public SkPictureRecord { public: - SkBBoxRecord(SkPicture* picture, const SkISize& size, uint32_t recordFlags) + SkBBoxRecord(SkPicture* picture, const SkISize& size, uint32_t recordFlags) : INHERITED(picture, size, recordFlags) { } virtual ~SkBBoxRecord() { } diff --git a/core/SkCanvas.cpp b/core/SkCanvas.cpp index e3451cde..0598528b 100644 --- a/core/SkCanvas.cpp +++ b/core/SkCanvas.cpp @@ -2343,7 +2343,7 @@ void SkCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint iter.fDevice->drawPosText(iter, text, byteLength, &pos->fX, 0, 2, dfp.paint()); } - + LOOPER_END } @@ -2356,7 +2356,7 @@ void SkCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScala iter.fDevice->drawPosText(iter, text, byteLength, xpos, constY, 1, dfp.paint()); } - + LOOPER_END } @@ -2368,7 +2368,7 @@ void SkCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPat iter.fDevice->drawTextOnPath(iter, text, byteLength, path, matrix, looper.paint()); } - + LOOPER_END } diff --git a/core/SkPicture.cpp b/core/SkPicture.cpp index cbd64241..10cc14b8 100644 --- a/core/SkPicture.cpp +++ b/core/SkPicture.cpp @@ -467,7 +467,7 @@ SkPicture* SkPicture::CreateFromStream(SkStream* stream, InstallPixelRefProc pro // Check to see if there is a playback to recreate. if (stream->readBool()) { - SkPicturePlayback* playback = SkPicturePlayback::CreateFromStream(newPict, stream, + SkPicturePlayback* playback = SkPicturePlayback::CreateFromStream(newPict, stream, info, proc); if (NULL == playback) { SkDELETE(newPict); @@ -553,7 +553,7 @@ void SkPicture::WriteTagSize(SkWStream* stream, uint32_t tag, size_t size) { } bool SkPicture::parseBufferTag(SkReadBuffer& buffer, - uint32_t tag, + uint32_t tag, uint32_t size) { switch (tag) { case SK_PICT_PATH_BUFFER_TAG: diff --git a/core/SkPicturePlayback.cpp b/core/SkPicturePlayback.cpp index 5eabb097..7d4c8430 100644 --- a/core/SkPicturePlayback.cpp +++ b/core/SkPicturePlayback.cpp @@ -23,7 +23,7 @@ template <typename T> int SafeCount(const T* obj) { */ #define SPEW_CLIP_SKIPPINGx -SkPicturePlayback::SkPicturePlayback(const SkPicture* picture, const SkPictInfo& info) +SkPicturePlayback::SkPicturePlayback(const SkPicture* picture, const SkPictInfo& info) : fPicture(picture) , fInfo(info) { this->init(); @@ -158,7 +158,7 @@ static bool needs_deep_copy(const SkPaint& paint) { paint.getImageFilter(); } -SkPicturePlayback::SkPicturePlayback(const SkPicture* picture, const SkPicturePlayback& src, +SkPicturePlayback::SkPicturePlayback(const SkPicture* picture, const SkPicturePlayback& src, SkPictCopyInfo* deepCopyInfo) : fPicture(picture) , fInfo(src.fInfo) { diff --git a/core/SkPicturePlayback.h b/core/SkPicturePlayback.h index 8df42785..bc5b565f 100644 --- a/core/SkPicturePlayback.h +++ b/core/SkPicturePlayback.h @@ -75,16 +75,16 @@ struct SkPictCopyInfo { class SkPicturePlayback { public: - SkPicturePlayback(const SkPicture* picture, const SkPicturePlayback& src, + SkPicturePlayback(const SkPicture* picture, const SkPicturePlayback& src, SkPictCopyInfo* deepCopyInfo = NULL); - SkPicturePlayback(const SkPicture* picture, const SkPictureRecord& record, const SkPictInfo&, + SkPicturePlayback(const SkPicture* picture, const SkPictureRecord& record, const SkPictInfo&, bool deepCopy = false); static SkPicturePlayback* CreateFromStream(SkPicture* picture, SkStream*, const SkPictInfo&, SkPicture::InstallPixelRefProc); - static SkPicturePlayback* CreateFromBuffer(SkPicture* picture, - SkReadBuffer&, + static SkPicturePlayback* CreateFromBuffer(SkPicture* picture, + SkReadBuffer&, const SkPictInfo&); virtual ~SkPicturePlayback(); @@ -220,7 +220,7 @@ public: #endif private: // these help us with reading/writing - bool parseStreamTag(SkPicture* picture, SkStream*, uint32_t tag, uint32_t size, + bool parseStreamTag(SkPicture* picture, SkStream*, uint32_t tag, uint32_t size, SkPicture::InstallPixelRefProc); bool parseBufferTag(SkPicture* picture, SkReadBuffer&, uint32_t tag, uint32_t size); void flattenToBuffer(SkWriteBuffer&) const; diff --git a/image/SkImagePriv.cpp b/image/SkImagePriv.cpp index 334697ae..538c6bb8 100644 --- a/image/SkImagePriv.cpp +++ b/image/SkImagePriv.cpp @@ -68,4 +68,3 @@ SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) { } return image; } - |