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

Make SkEmptyPicture a singleton.

Browse Source 
In my confusion yesterday I accidentally left this as a non-singleton.
The issue in Blink was not related to this being a singleton,
and it should be safe to make it one.

This means recording an empty picture properly costs zero mallocs.

BUG=skia:

Review URL: https://codereview.chromium.org/1147053002
This commit is contained in:
mtklein 2015-05-20 10:32:22 -07:00 committed by Commit bot
parent d41ea1d1cf
commit 2e172ecd3b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/SkMiniRecorder.cpp
View File

@ -6,6 +6,7 @@
*/
#include "SkCanvas.h"
#include "SkLazyPtr.h"
#include "SkMiniRecorder.h"
#include "SkPicture.h"
#include "SkPictureCommon.h"
@ -14,9 +15,6 @@
using namespace SkRecords;
// SkEmptyPicture could logically be a singleton, but that plays badly with Blink's
// Debug-only adopted() / requireAdoption() tracking in sk_ref_cnt_ext_debug.h.
// TODO(mtklein): modify sk_ref_cnt_ext_debug.h to play better with non-new'd objects.
class SkEmptyPicture final : public SkPicture {
public:
void playback(SkCanvas*, AbortCallback*) const override { }
@ -28,6 +26,7 @@ public:
int numSlowPaths() const override { return 0; }
bool willPlayBackBitmaps() const override { return false; }
};
SK_DECLARE_STATIC_LAZY_PTR(SkEmptyPicture, gEmptyPicture);
template <typename T>
class SkMiniPicture final : public SkPicture {
@ -94,7 +93,7 @@ SkPicture* SkMiniRecorder::detachAsPicture(const SkRect& cull) {
return SkNEW_ARGS(SkMiniPicture<Type>, (cull, reinterpret_cast<Type*>(fBuffer.get())))
switch (fState) {
case State::kEmpty: return SkNEW(SkEmptyPicture);
case State::kEmpty: return SkRef(gEmptyPicture.get());
CASE(DrawPath);
CASE(DrawRect);
CASE(DrawTextBlob);