diff options
author | Ben Wagner <bungeman@google.com> | 2018-05-15 15:15:15 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-15 19:42:13 +0000 |
commit | ecd35c16ef1257233c5677ae5f9a31f654d22994 (patch) | |
tree | f78b01f11eb49dd302ac5e4b009666b7763ec9a0 | |
parent | 0f690105496fa7f1de4bee85f4bf035cdefa84a8 (diff) |
Remove non-smart SkFontConfigInterface::SetGlobal.
This method is no longer used and is superseded by the 'smart' version.
Change-Id: Ic27545a2ec2666d77966727630ba7e960eac5506
Reviewed-on: https://skia-review.googlesource.com/128316
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
-rw-r--r-- | include/ports/SkFontConfigInterface.h | 1 | ||||
-rw-r--r-- | src/ports/SkFontConfigInterface.cpp | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index bb7eebe5d5..12f777d655 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -35,7 +35,6 @@ public: * Replace the current global instance with the specified one. */ static void SetGlobal(sk_sp<SkFontConfigInterface> fc); - static SkFontConfigInterface* SetGlobal(SkFontConfigInterface*); /** * This should be treated as private to the impl of SkFontConfigInterface. diff --git a/src/ports/SkFontConfigInterface.cpp b/src/ports/SkFontConfigInterface.cpp index a30bd2dac2..0d52c0efc2 100644 --- a/src/ports/SkFontConfigInterface.cpp +++ b/src/ports/SkFontConfigInterface.cpp @@ -22,13 +22,6 @@ sk_sp<SkFontConfigInterface> SkFontConfigInterface::RefGlobal() { return sk_ref_sp(SkFontConfigInterface::GetSingletonDirectInterface()); } -SkFontConfigInterface* SkFontConfigInterface::SetGlobal(SkFontConfigInterface* fc) { - SkAutoMutexAcquire ac(gFontConfigInterfaceMutex); - - gFontConfigInterface = sk_ref_sp(fc); - return fc; -} - void SkFontConfigInterface::SetGlobal(sk_sp<SkFontConfigInterface> fc) { SkAutoMutexAcquire ac(gFontConfigInterfaceMutex); |