diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-18 03:03:54 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-18 03:03:54 +0000 |
commit | 60bd7519a9db4ddddd95e490f93165e5676f90f5 (patch) | |
tree | 8a04510ab7abf7e543ab3b4ee59c35a2067440d2 /src | |
parent | 5fb2ce38b3dcb8e60e9e112df23c9d42456d7069 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14252 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkPicture.cpp | 4 | ||||
-rw-r--r-- | src/core/SkTileGridPicture.cpp | 2 | ||||
-rw-r--r-- | src/core/SkXfermode.cpp | 12 | ||||
-rw-r--r-- | src/utils/debugger/SkDebugCanvas.cpp | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index d6f05b1850..85e018f48a 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -256,7 +256,7 @@ SkCanvas* SkPicture::beginRecording(int width, int height, #endif -SkCanvas* SkPicture::beginRecording(int width, int height, +SkCanvas* SkPicture::beginRecording(int width, int height, SkBBHFactory* bbhFactory, uint32_t recordingFlags) { if (fPlayback) { @@ -276,7 +276,7 @@ SkCanvas* SkPicture::beginRecording(int width, int height, if (NULL != bbhFactory) { SkAutoTUnref<SkBBoxHierarchy> tree((*bbhFactory)(width, height)); SkASSERT(NULL != tree); - fRecord = SkNEW_ARGS(SkBBoxHierarchyRecord, (size, + fRecord = SkNEW_ARGS(SkBBoxHierarchyRecord, (size, recordingFlags| kOptimizeForClippedPlayback_RecordingFlag, tree.get())); diff --git a/src/core/SkTileGridPicture.cpp b/src/core/SkTileGridPicture.cpp index 501346aec6..f2f44a0bde 100644 --- a/src/core/SkTileGridPicture.cpp +++ b/src/core/SkTileGridPicture.cpp @@ -26,7 +26,7 @@ SkBBoxHierarchy* SkTileGridFactory::operator()(int width, int height) const { #ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES -SkTileGridPicture::SkTileGridPicture(int width, int height, +SkTileGridPicture::SkTileGridPicture(int width, int height, const SkTileGridFactory::TileGridInfo& info) { SkASSERT(info.fMargin.width() >= 0); SkASSERT(info.fMargin.height() >= 0); diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index fb1726808f..53c431b7a0 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -1391,9 +1391,9 @@ void SkProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, const SkAlpha* SK_RESTRICT aa) const { SkASSERT(dst && src && count >= 0); - + SkXfermodeProc proc = fProc; - + if (NULL != proc) { if (NULL == aa) { for (int i = count - 1; i >= 0; --i) { @@ -1419,9 +1419,9 @@ void SkProcCoeffXfermode::xfer16(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, const SkAlpha* SK_RESTRICT aa) const { SkASSERT(dst && src && count >= 0); - + SkXfermodeProc proc = fProc; - + if (NULL != proc) { if (NULL == aa) { for (int i = count - 1; i >= 0; --i) { @@ -1448,9 +1448,9 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, const SkAlpha* SK_RESTRICT aa) const { SkASSERT(dst && src && count >= 0); - + SkXfermodeProc proc = fProc; - + if (NULL != proc) { if (NULL == aa) { for (int i = count - 1; i >= 0; --i) { diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index 22eef6f9a5..18affcb418 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -109,13 +109,13 @@ public: SkPackARGB32(0xFF, 255, 50, 0), SkPackARGB32(0xFF, 255, 0, 0) }; - + for (size_t i = 0; i < SK_ARRAY_COUNT(gTable)-1; ++i) { if (gTable[i] == dst) { return gTable[i+1]; } } - + return gTable[SK_ARRAY_COUNT(gTable)-1]; } |