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

Side by Side Diff: src/core/SkRTree.h

Issue 27192003: Start cleaning up 64bit Win warnings (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: revertedGrBytesPerPixel to returning a size_t Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « src/core/SkOrderedWriteBuffer.h ('k') | src/core/SkRTree.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 2012 Google Inc. 3 * Copyright 2012 Google Inc.
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 #ifndef SkRTree_DEFINED 9 #ifndef SkRTree_DEFINED
10 #define SkRTree_DEFINED 10 #define SkRTree_DEFINED
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 Branch bulkLoad(SkTDArray<Branch>* branches, int level = 0); 172 Branch bulkLoad(SkTDArray<Branch>* branches, int level = 0);
173 173
174 void validate(); 174 void validate();
175 int validateSubtree(Node* root, SkIRect bounds, bool isRoot = false); 175 int validateSubtree(Node* root, SkIRect bounds, bool isRoot = false);
176 176
177 const int fMinChildren; 177 const int fMinChildren;
178 const int fMaxChildren; 178 const int fMaxChildren;
179 const size_t fNodeSize; 179 const size_t fNodeSize;
180 180
181 // This is the count of data elements (rather than total nodes in the tree) 181 // This is the count of data elements (rather than total nodes in the tree)
182 size_t fCount; 182 int fCount;
183 183
184 Branch fRoot; 184 Branch fRoot;
185 SkChunkAlloc fNodes; 185 SkChunkAlloc fNodes;
186 SkTDArray<Branch> fDeferredInserts; 186 SkTDArray<Branch> fDeferredInserts;
187 SkScalar fAspectRatio; 187 SkScalar fAspectRatio;
188 bool fSortWhenBulkLoading; 188 bool fSortWhenBulkLoading;
189 189
190 Node* allocateNode(uint16_t level); 190 Node* allocateNode(uint16_t level);
191 191
192 typedef SkBBoxHierarchy INHERITED; 192 typedef SkBBoxHierarchy INHERITED;
193 }; 193 };
194 194
195 #endif 195 #endif
OLDNEW
« no previous file with comments | « src/core/SkOrderedWriteBuffer.h ('k') | src/core/SkRTree.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698