src/core/SkBitmap.cpp - Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.

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: src/core/SkBitmap.cpp

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master

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

View side-by-side diff with in-line comments

Download patch

Index: src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp

index aa26bdcab38c85d2123d6f139d07fa2cb4f54c97..8f799125e4d10a9252c3690ad14ea24ab25a1cd8 100644

--- a/src/core/SkBitmap.cpp

+++ b/src/core/SkBitmap.cpp

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

-#include "SkAtomics.h"

#include "SkBitmap.h"

#include "SkColorPriv.h"

#include "SkDither.h"

@@ -15,13 +14,14 @@

#include "SkImagePriv.h"

#include "SkMallocPixelRef.h"

#include "SkMask.h"

-#include "SkPackBits.h"

+#include "SkReadBuffer.h"

+#include "SkWriteBuffer.h"

#include "SkPixelRef.h"

-#include "SkReadBuffer.h"

+#include "SkThread.h"

#include "SkUnPreMultiply.h"

#include "SkUtils.h"

#include "SkValidationUtils.h"

-#include "SkWriteBuffer.h"

+#include "SkPackBits.h"

#include <new>

static bool reset_return_false(SkBitmap* bm) {

« no previous file with comments | « src/core/SkAAClip.cpp ('k') | src/core/SkBitmapHeap.h » ('j') | no next file with comments »