include/core/SkMatrix.h - Issue 377693005: Revert of Add SkRacy

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/SkMatrix.h

Issue 377693005: Revert of Add SkRacy (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 5 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/SkMatrix.h

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

index bfa03de7c5ddc1af83bf9f4e90723c37e1b78bb8..84d1a87e959638e8ad9ae909e0b672caf7bc9a63 100644

--- a/include/core/SkMatrix.h

+++ b/include/core/SkMatrix.h

@@ -10,7 +10,6 @@

#ifndef SkMatrix_DEFINED

#define SkMatrix_DEFINED

-#include "SkDynamicAnnotations.h"

#include "SkRect.h"

class SkString;

@@ -644,7 +643,7 @@

};

SkScalar fMat[9];

- mutable SkTRacy<uint32_t> fTypeMask;

+ mutable uint32_t fTypeMask;

uint8_t computeTypeMask() const;

uint8_t computePerspectiveTypeMask() const;

@@ -665,7 +664,7 @@

void clearTypeMask(int mask) {

// only allow a valid mask

SkASSERT((mask & kAllMasks) == mask);

- fTypeMask = fTypeMask & ~mask;

+ fTypeMask &= ~mask;

}

TypeMask getPerspectiveTypeMaskOnly() const {

« no previous file with comments | « include/core/SkDynamicAnnotations.h ('k') | include/core/SkPathRef.h » ('j') | no next file with comments »