include/core/SkPixelRef.h - Issue 955803002: SkTRacy<T> -> SkAtomic<T>

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/core/SkPixelRef.h

Issue 955803002: SkTRacy<T> -> SkAtomic<T> (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: great warning Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: include/core/SkPixelRef.h

diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h

index f859642921c4437d91e59ae0cfd5ce69f78bfc80..5027a353294c3546599970ae67dd5ab745e90e27 100644

--- a/include/core/SkPixelRef.h

+++ b/include/core/SkPixelRef.h

@@ -8,13 +8,13 @@

#ifndef SkPixelRef_DEFINED

#define SkPixelRef_DEFINED

+#include "SkAtomics.h"

#include "SkBitmap.h"

-#include "SkDynamicAnnotations.h"

+#include "SkImageInfo.h"

#include "SkMutex.h"

#include "SkRefCnt.h"

-#include "SkString.h"

-#include "SkImageInfo.h"

#include "SkSize.h"

+#include "SkString.h"

#include "SkTDArray.h"

//#define xed

@@ -313,8 +313,8 @@ private:

LockRec fRec;

int fLockCount;

- mutable SkTRacy<uint32_t> fGenerationID;

- mutable SkTRacy<bool> fUniqueGenerationID;

+ mutable SkAtomic<uint32_t> fGenerationID;

+ mutable SkAtomic<bool> fUniqueGenerationID;

#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK

const uint32_t fStableID;

#endif