aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/atlastext.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2018-02-07 16:02:38 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-07 16:02:50 +0000
commit8e546043c6d421b82c8f8945f9688e6d64c76a06 (patch)
treef186323839b9216734b7b3ffbc6739006b7021d7 /gm/atlastext.cpp
parent7558e4dbecac109c5e971f5d028b847070e773e7 (diff)
Revert "Re-enable explicit resource allocation in Skia (take 2)"
This reverts commit ed858ec0951a10bc8bef1f883c925e1ac5e5766f. Reason for revert: Breaking some text GMs Original change's description: > 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> TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com Change-Id: I90aa30c37bfc506e5a8e4c2ccf3bd1b968fd9c5f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/105100 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gm/atlastext.cpp')
-rw-r--r--gm/atlastext.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/gm/atlastext.cpp b/gm/atlastext.cpp
index 226b83fdd7..ac5b3e4582 100644
--- a/gm/atlastext.cpp
+++ b/gm/atlastext.cpp
@@ -69,9 +69,6 @@ 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());
@@ -85,7 +82,7 @@ protected:
}
void onDraw(SkCanvas* canvas) override {
- if (!fRenderer || !fTarget || !fTarget->handle()) {
+ if (!fRenderer) {
canvas->clear(SK_ColorRED);
return;
}