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

Revert "Temporary change to keep chrome happy."

Browse Source 
Now that chrome has https://chromiumcodereview.appspot.com/18078003/,
this is no longer needed.

Fully switched over to using CreateFromStream!

Review URL: https://codereview.chromium.org/18655008

git-svn-id: http://skia.googlecode.com/svn/trunk@9911 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
scroggo@google.com 2013-07-08 18:40:42 +00:00
parent a783f2bee8
commit 056dab300d
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkPicture.h
View File

@ -57,12 +57,6 @@ public:
*/
typedef bool (*InstallPixelRefProc)(const void* src, size_t length, SkBitmap* dst);
/**
* @Deprecated - use CreateFromStream instead.
* Create an SkPicture from an SkStream.
*/
SkPicture(SkStream*, bool*, InstallPixelRefProc);
/**
* Recreate a picture that was serialized into a stream.
* @param SkStream Serialized picture data.

20
src/core/SkPicture.cpp
View File

@ -283,26 +283,6 @@ bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
return true;
}
SkPicture::SkPicture(SkStream* stream, bool* success, InstallPixelRefProc proc) {
fRecord = NULL;
SkAutoTUnref<SkPicture> picture(CreateFromStream(stream, proc));
if (NULL == picture.get()) {
fPlayback = NULL;
fWidth = fHeight = 0;
if (success) {
*success = false;
}
} else {
fPlayback = picture->fPlayback;
picture->fPlayback = NULL;
fWidth = picture->fWidth;
fHeight = picture->fHeight;
if (success) {
*success = true;
}
}
}
SkPicture::SkPicture(SkPicturePlayback* playback, int width, int height)
: fPlayback(playback)
, fRecord(NULL)