diff options
| author |  reed <reed@chromium.org> | 2014-06-30 16:48:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-30 16:48:24 -0700 |
| commit | 50a7b0e6212cfad02e356f9d0bd82b6eadf31f96 (patch) | |
| tree | 33a0b411d648b6cbfe183540bec73bbd09df1c37 /include | |
| parent | df022f5972ae6a2a1d96d15c50eca52cade3abd8 (diff) | |
Revert of Fix race condition in parallel font initialization. (https://codereview.chromium.org/355573006/)
Reason for revert:
breaks chrome builds
Original issue's description:
> Fix race condition in parallel font initialization.
>
> Uses a mutex to guard construction of the singleton, which initialies
> the non-threadsafe libfontconfig. Without this change, the parallel
> path ops test runner crashes 6/10 and hangs 2/10 on startup; with this
> change, 0/10 problems.
>
> BUG=skia:2693
> R=mtklein@google.com,bungeman@google.com
>
> Committed: https://skia.googlesource.com/skia/+/df022f5972ae6a2a1d96d15c50eca52cade3abd8
R=mtklein@google.com, bungeman@google.com, reed@google.com, tomhudson@google.com, tomhudson@chromium.org
TBR=bungeman@google.com, mtklein@google.com, reed@google.com, tomhudson@chromium.org, tomhudson@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2693
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/365503003
Diffstat (limited to 'include')
| -rw-r--r-- | include/ports/SkFontConfigInterface.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index f548f37d5d..8c12a5628a 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -14,8 +14,6 @@ #include "SkTArray.h" #include "SkTypeface.h" -struct SkBaseMutex; - /** * \class SkFontConfigInterface * @@ -97,9 +95,8 @@ public: /** * Return a singleton instance of a direct subclass that calls into * libfontconfig. This does not affect the refcnt of the returned instance. - * The mutex may be used to guarantee the singleton is only constructed once. */ - static SkFontConfigInterface* GetSingletonDirectInterface(SkBaseMutex* mutex); + static SkFontConfigInterface* GetSingletonDirectInterface(); // New APIS, which have default impls for now (which do nothing) |