Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Side by Side Diff: src/core/SkPixelRef.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, 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:
View unified diff | Download patch
« no previous file with comments | « src/core/SkPath.cpp ('k') | src/core/SkRegion.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkBitmapCache.h" 8 #include "SkBitmapCache.h"
9 #include "SkMutex.h"
10 #include "SkPixelRef.h" 9 #include "SkPixelRef.h"
10 #include "SkThread.h"
11 #include "SkTraceEvent.h" 11 #include "SkTraceEvent.h"
12 12
13 //#define SK_SUPPORT_LEGACY_UNBALANCED_PIXELREF_LOCKCOUNT 13 //#define SK_SUPPORT_LEGACY_UNBALANCED_PIXELREF_LOCKCOUNT
14 //#define SK_TRACE_PIXELREF_LIFETIME 14 //#define SK_TRACE_PIXELREF_LIFETIME
15 15
16 #ifdef SK_BUILD_FOR_WIN32 16 #ifdef SK_BUILD_FOR_WIN32
17 // We don't have SK_BASE_MUTEX_INIT on Windows. 17 // We don't have SK_BASE_MUTEX_INIT on Windows.
18 18
19 // must be a power-of-2. undef to just use 1 mutex 19 // must be a power-of-2. undef to just use 1 mutex
20 #define PIXELREF_MUTEX_RING_COUNT 32 20 #define PIXELREF_MUTEX_RING_COUNT 32
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 } 387 }
388 388
389 result->fUnlockProc = unlock_legacy_result; 389 result->fUnlockProc = unlock_legacy_result;
390 result->fUnlockContext = SkRef(this); // this is balanced in our fUnlockPr oc 390 result->fUnlockContext = SkRef(this); // this is balanced in our fUnlockPr oc
391 result->fCTable = fRec.fColorTable; 391 result->fCTable = fRec.fColorTable;
392 result->fPixels = fRec.fPixels; 392 result->fPixels = fRec.fPixels;
393 result->fRowBytes = fRec.fRowBytes; 393 result->fRowBytes = fRec.fRowBytes;
394 result->fSize.set(fInfo.width(), fInfo.height()); 394 result->fSize.set(fInfo.width(), fInfo.height());
395 return true; 395 return true;
396 } 396 }
OLDNEW
« no previous file with comments | « src/core/SkPath.cpp ('k') | src/core/SkRegion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698