diff options
| author |  mtklein <mtklein@google.com> | 2014-07-08 14:06:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-08 14:06:46 -0700 |
| commit | d3f3e5895efb5edfd838ba9127093c804f9dbc12 (patch) | |
| tree | d96b928e7df21e36272d4b579d96d7728e56b70a /include/core/SkPixelRef.h | |
| parent | 7b17547bc85df9b3c7738fd55c378151b839e304 (diff) | |
Revert of Add SkRacy (https://codereview.chromium.org/371363004/)
Reason for revert:
hidden symbol 'AnnotateBenignRaceSized' in obj/base/third_party/dynamic_annotations/libdynamic_annotations.a(obj/base/third_party/dynamic_annotations/dynamic_annotations.dynamic_annotations.o) is referenced by DSO lib/libblink_platform.so
Original issue's description:
> Add SkRacy
>
> SkRacy<T> is a zero-overhead wrapper for a T, except it also
> silences race warnings when TSAN is running.
>
> Here we apply in several classes. In SkMatrix and SkPathRef,
> we use it to opportunistically cache some idempotent work.
>
> In SkPixelRef, we wrap the genIDs. We think the worst that
> can happen here is we'll increment the global next-genID a
> few times instead of once when we go to get another ID.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d5e3e6ae1b3434ad1158f441902ff65f1eeaa3a7
R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/377693005
Diffstat (limited to 'include/core/SkPixelRef.h')
| -rw-r--r-- | include/core/SkPixelRef.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h index 263145ba3d..a997993eb1 100644 --- a/include/core/SkPixelRef.h +++ b/include/core/SkPixelRef.h @@ -9,7 +9,6 @@ #define SkPixelRef_DEFINED #include "SkBitmap.h" -#include "SkDynamicAnnotations.h" #include "SkRefCnt.h" #include "SkString.h" #include "SkFlattenable.h" @@ -350,8 +349,8 @@ private: LockRec fRec; int fLockCount; - mutable SkTRacy<uint32_t> fGenerationID; - mutable SkTRacy<bool> fUniqueGenerationID; + mutable uint32_t fGenerationID; + mutable bool fUniqueGenerationID; SkTDArray<GenIDChangeListener*> fGenIDChangeListeners; // pointers are owned |