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

Side by Side Diff: src/core/SkShader.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/SkScalerContext.cpp ('k') | src/core/SkString.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 "SkAtomics.h"
9 #include "SkBitmapProcShader.h" 8 #include "SkBitmapProcShader.h"
10 #include "SkColorShader.h" 9 #include "SkColorShader.h"
11 #include "SkEmptyShader.h" 10 #include "SkEmptyShader.h"
11 #include "SkReadBuffer.h"
12 #include "SkMallocPixelRef.h" 12 #include "SkMallocPixelRef.h"
13 #include "SkPaint.h" 13 #include "SkPaint.h"
14 #include "SkPicture.h" 14 #include "SkPicture.h"
15 #include "SkPictureShader.h" 15 #include "SkPictureShader.h"
16 #include "SkReadBuffer.h"
17 #include "SkScalar.h" 16 #include "SkScalar.h"
18 #include "SkShader.h" 17 #include "SkShader.h"
18 #include "SkThread.h"
19 #include "SkWriteBuffer.h" 19 #include "SkWriteBuffer.h"
20 20
21 //#define SK_TRACK_SHADER_LIFETIME 21 //#define SK_TRACK_SHADER_LIFETIME
22 22
23 #ifdef SK_TRACK_SHADER_LIFETIME 23 #ifdef SK_TRACK_SHADER_LIFETIME
24 static int32_t gShaderCounter; 24 static int32_t gShaderCounter;
25 #endif 25 #endif
26 26
27 static inline void inc_shader_counter() { 27 static inline void inc_shader_counter() {
28 #ifdef SK_TRACK_SHADER_LIFETIME 28 #ifdef SK_TRACK_SHADER_LIFETIME
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 #include "SkEmptyShader.h" 389 #include "SkEmptyShader.h"
390 390
391 void SkEmptyShader::toString(SkString* str) const { 391 void SkEmptyShader::toString(SkString* str) const {
392 str->append("SkEmptyShader: ("); 392 str->append("SkEmptyShader: (");
393 393
394 this->INHERITED::toString(str); 394 this->INHERITED::toString(str);
395 395
396 str->append(")"); 396 str->append(")");
397 } 397 }
398 #endif 398 #endif
OLDNEW
« no previous file with comments | « src/core/SkScalerContext.cpp ('k') | src/core/SkString.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698