diff options
author | sclittle <sclittle@chromium.org> | 2016-05-04 18:23:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 18:23:30 -0700 |
commit | d9f5d20f81b15190fa858eda1f536deae21e8e78 (patch) | |
tree | be843fd0a48d47d9ed0d2cc7ef61a4821208c33a /include/ports | |
parent | 7eb33da7eede34c050b865dbb1b60c3dcea7191b (diff) |
Revert of Modernize SkMutex and SkSemaphore. (patchset #2 id:20001 of https://codereview.chromium.org/1947153002/ )
Reason for revert:
This CL seems to have broken the Linux x64 and Mac
bots, e.g.
https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/19052
https://build.chromium.org/p/chromium/builders/Mac/builds/15151
The error appears to have something to do with new static initializers being
added.
Original issue's description:
> Modernize SkMutex and SkSemaphore.
>
> - use <atomic>
> - fuse SkMutex and SkBaseMutex
> - fuse SkSemaphore and SkBaseSemaphore
>
> Still TODO:
> - replace SK_DECLARE_STATIC_MUTEX(name) with static SkMutex name
>
> I just didn't want to bother fixing all that up until I know this CL sticks.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1947153002
>
> No public API changes.
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/427c2819d9237d7d7729c59238036cfc73c072ea
TBR=herb@google.com,mtklein@chromium.org,reed@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=609340
Review-Url: https://codereview.chromium.org/1945343003
Diffstat (limited to 'include/ports')
-rw-r--r-- | include/ports/SkFontConfigInterface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index 9f98e356d2..72cad0ad6b 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -13,6 +13,7 @@ #include "SkRefCnt.h" #include "SkTypeface.h" +struct SkBaseMutex; class SkFontMgr; /** |