diff options
| author |  djsollen <djsollen@google.com> | 2016-01-22 06:50:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-22 06:50:25 -0800 |
| commit | aa97a84404c7505738713a4c19b42347c7daef9e (patch) | |
| tree | c78f46c5226d73ffeb29e828d60eed196fa7f21d /src/ports/SkFontMgr_win_dw.cpp | |
| parent | 7df3f5e127f8016d17b637cc48a6a4718f1a6822 (diff) | |
Revert of Consolidate SK_CRASH and sk_throw into SK_ABORT (patchset #5 id:80001 of https://codereview.chromium.org/1610823002/ )
Reason for revert:
Chrome is calling SK_CRASH
Original issue's description:
> Consolidate SK_CRASH and sk_throw into SK_ABORT
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1610823002
>
> Committed: https://skia.googlesource.com/skia/+/4c5cd7d527ed29aabfa72aa47b23a4496eeda357
TBR=reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1620333002
Diffstat (limited to 'src/ports/SkFontMgr_win_dw.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index ef09210e38..585d809406 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -273,7 +273,7 @@ public: if (!SUCCEEDED(fFactory->QueryInterface(&fFactory2))) { // IUnknown::QueryInterface states that if it fails, punk will be set to nullptr. // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/26/96777.aspx - SkASSERT_RELEASE(nullptr == fFactory2.get()); + SK_ALWAYSBREAK(nullptr == fFactory2.get()); } #endif memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR)); |