commit c05b2bf3d2523b6feb2fc1f08bfe6acf917fb03e
author Ben Wagner <bungeman@google.com> Thu Nov 03 16:51:26 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 04 15:35:53 2016 +0000
tree da4ce9841f6e69947448ffa9c4f7b98578fc8162
parent ccd3c8937fce4bb28df19533ed043cad209e277d

Clarify onCreateScalerContext failure modes.

This should not change any behavior, but addresses some readability
concerns.

Change-Id: I2614beaed7b5722a3af2c49ab8f4ac16b56aa3a7
Reviewed-on: https://skia-review.googlesource.com/4393
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 8b233ff..2eaf2bf 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -618,7 +618,7 @@
     auto c = skstd::make_unique<SkScalerContext_FreeType>(
             sk_ref_sp(const_cast<SkTypeface_FreeType*>(this)), effects, desc);
     if (!c->success()) {
-        c = nullptr;
+        return nullptr;
     }
     return c.release();
 }