aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/atlastext.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2018-02-07 08:37:50 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-07 14:22:58 +0000
commited858ec0951a10bc8bef1f883c925e1ac5e5766f (patch)
treeb1b12d3ccd7778b9d96cf1b172f638c3b951ab00 /gm/atlastext.cpp
parent14962b7f1341941ec1f2e759c4783f28fd0330c6 (diff)
Re-enable explicit resource allocation in Skia (take 2)
Unsurprisingly, given how we're adding them to the opList's deferredProxy list, a proxy can appear twice. Change-Id: I474357a1c3ee8cedf51dbeffcd0e0a96f396375c Reviewed-on: https://skia-review.googlesource.com/103701 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm/atlastext.cpp')
-rw-r--r--gm/atlastext.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/gm/atlastext.cpp b/gm/atlastext.cpp
index ac5b3e4582..226b83fdd7 100644
--- a/gm/atlastext.cpp
+++ b/gm/atlastext.cpp
@@ -69,6 +69,9 @@ protected:
}
fContext = SkAtlasTextContext::Make(fRenderer);
auto targetHandle = fRenderer->makeTargetHandle(kSize, kSize);
+ if (!targetHandle) {
+ return;
+ }
fTarget = SkAtlasTextTarget::Make(fContext, kSize, kSize, targetHandle);
fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif", SkFontStyle::Italic());
@@ -82,7 +85,7 @@ protected:
}
void onDraw(SkCanvas* canvas) override {
- if (!fRenderer) {
+ if (!fRenderer || !fTarget || !fTarget->handle()) {
canvas->clear(SK_ColorRED);
return;
}