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

Side by Side Diff: src/core/SkBitmap.cpp

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « src/core/SkBBoxHierarchy.cpp ('k') | src/core/SkBitmapDevice.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 /* 2 /*
3 * Copyright 2008 The Android Open Source Project 3 * Copyright 2008 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
11 #include "SkColorPriv.h" 11 #include "SkColorPriv.h"
12 #include "SkDither.h" 12 #include "SkDither.h"
13 #include "SkFlattenable.h" 13 #include "SkFlattenable.h"
14 #include "SkImagePriv.h" 14 #include "SkImagePriv.h"
15 #include "SkMallocPixelRef.h" 15 #include "SkMallocPixelRef.h"
16 #include "SkMask.h" 16 #include "SkMask.h"
17 #include "SkOrderedReadBuffer.h" 17 #include "SkOrderedReadBuffer.h"
18 #include "SkOrderedWriteBuffer.h" 18 #include "SkOrderedWriteBuffer.h"
19 #include "SkPixelRef.h" 19 #include "SkPixelRef.h"
20 #include "SkThread.h" 20 #include "SkThread.h"
21 #include "SkUnPreMultiply.h" 21 #include "SkUnPreMultiply.h"
22 #include "SkUtils.h" 22 #include "SkUtils.h"
23 #include "SkValidationUtils.h" 23 #include "SkValidationUtils.h"
24 #include "SkPackBits.h" 24 #include "SkPackBits.h"
25 #include <new> 25 #include <new>
26 26
27 SK_DEFINE_INST_COUNT(SkBitmap::Allocator)
28
29 static bool isPos32Bits(const Sk64& value) { 27 static bool isPos32Bits(const Sk64& value) {
30 return !value.isNeg() && value.is32(); 28 return !value.isNeg() && value.is32();
31 } 29 }
32 30
33 struct MipLevel { 31 struct MipLevel {
34 void* fPixels; 32 void* fPixels;
35 uint32_t fRowBytes; 33 uint32_t fRowBytes;
36 uint32_t fWidth, fHeight; 34 uint32_t fWidth, fHeight;
37 }; 35 };
38 36
(...skipping 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1651 if (NULL != uri) { 1649 if (NULL != uri) {
1652 str->appendf(" uri:\"%s\"", uri); 1650 str->appendf(" uri:\"%s\"", uri);
1653 } else { 1651 } else {
1654 str->appendf(" pixelref:%p", pr); 1652 str->appendf(" pixelref:%p", pr);
1655 } 1653 }
1656 } 1654 }
1657 1655
1658 str->append(")"); 1656 str->append(")");
1659 } 1657 }
1660 #endif 1658 #endif
OLDNEW
« no previous file with comments | « src/core/SkBBoxHierarchy.cpp ('k') | src/core/SkBitmapDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698