aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkGlobalInitialization_core.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2016-04-27 09:29:34 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-27 09:29:34 -0700
commit569b02151f399628b0c0c0ca825dfe7b6e2795e1 (patch)
tree8c10668cf5feee18fbe7fa3e691449753fe875f0 /src/core/SkGlobalInitialization_core.cpp
parentd636950e8ecba89c0021ce4e76037c67aa6ee2cd (diff)
Revert of Enable flattening of SkRecordedDrawable (patchset #8 id:140001 of https://codereview.chromium.org/1913843002/ )
Reason for revert: Release mode bots appear to be crashing while loading .skp files in nanobench. Original issue's description: > Enable flattening of SkRecordedDrawable > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1913843002 > > Committed: https://skia.googlesource.com/skia/+/d636950e8ecba89c0021ce4e76037c67aa6ee2cd TBR=djsollen@google.com,reed@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/1923393002
Diffstat (limited to 'src/core/SkGlobalInitialization_core.cpp')
-rw-r--r--src/core/SkGlobalInitialization_core.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/SkGlobalInitialization_core.cpp b/src/core/SkGlobalInitialization_core.cpp
index e377437a99..d7b4a80003 100644
--- a/src/core/SkGlobalInitialization_core.cpp
+++ b/src/core/SkGlobalInitialization_core.cpp
@@ -14,11 +14,10 @@
#include "SkFlattenable.h"
#include "SkImageShader.h"
#include "SkLocalMatrixShader.h"
-#include "SkMatrixImageFilter.h"
#include "SkOnce.h"
#include "SkPathEffect.h"
#include "SkPictureShader.h"
-#include "SkRecordedDrawable.h"
+#include "SkMatrixImageFilter.h"
#include "SkXfermode.h"
/*
@@ -50,9 +49,6 @@ void SkFlattenable::PrivateInitializer::InitCore() {
// Xfermode
SkXfermode::InitializeFlattenables();
- // Drawable
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRecordedDrawable)
-
// Now initialize any optional/additional effects (implemented in src/ports)
InitEffects();
};