AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@14346 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-04-24 03:05:07 +00:00
parent c822bb3d4b
commit b0430d0245
9 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/QT/SkDebuggerGUI.cpp
View File

@ -173,7 +173,7 @@ public:
}
SkTimedPicturePlayback(SkPicture* picture,
const SkTDArray<bool>& deletedCommands,
const SkTDArray<bool>& deletedCommands,
const SkPictInfo& info)
: INHERITED(picture, info)
, fSkipCommands(deletedCommands)

6
include/core/SkCanvas.h
View File

@ -1195,14 +1195,14 @@ protected:
virtual void onDrawText(const void* text, size_t byteLength, SkScalar x,
SkScalar y, const SkPaint& paint);
virtual void onDrawPosText(const void* text, size_t byteLength,
const SkPoint pos[], const SkPaint& paint);
virtual void onDrawPosTextH(const void* text, size_t byteLength,
const SkScalar xpos[], SkScalar constY,
const SkPaint& paint);
virtual void onDrawTextOnPath(const void* text, size_t byteLength,
const SkPath& path, const SkMatrix* matrix,
const SkPaint& paint);

2
src/core/SkBBoxHierarchyRecord.h
View File

@ -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;

2
src/core/SkBBoxRecord.h
View File

@ -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() { }

6
src/core/SkCanvas.cpp
View File

@ -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
}

4
src/core/SkPicture.cpp
View File

@ -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:

4
src/core/SkPicturePlayback.cpp
View File

@ -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) {

10
src/core/SkPicturePlayback.h
View File

@ -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;

1
src/image/SkImagePriv.cpp
View File

@ -68,4 +68,3 @@ SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
}
return image;
}