diff options
author | 2016-11-03 16:51:26 -0400 | |
---|---|---|
committer | 2016-11-04 15:35:53 +0000 | |
commit | c05b2bf3d2523b6feb2fc1f08bfe6acf917fb03e (patch) | |
tree | da4ce9841f6e69947448ffa9c4f7b98578fc8162 | |
parent | ccd3c8937fce4bb28df19533ed043cad209e277d (diff) |
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>
-rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 2 | ||||
-rw-r--r-- | src/ports/SkFontHost_win.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 8b233ffdf3..2eaf2bf06e 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -618,7 +618,7 @@ SkScalerContext* SkTypeface_FreeType::onCreateScalerContext(const SkScalerContex 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(); } diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 83fbd1d601..a3264a8924 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -2260,7 +2260,7 @@ SkScalerContext* LogFontTypeface::onCreateScalerContext(const SkScalerContextEff auto ctx = skstd::make_unique<SkScalerContext_GDI>( sk_ref_sp(const_cast<LogFontTypeface*>(this)), effects, desc); if (!ctx->isValid()) { - ctx = nullptr; + return nullptr; } return ctx.release(); } |