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

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

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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/SkPictureShader.cpp ('k') | src/core/SkRegion_path.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 23 matching lines...) Expand all
34 SK_DECLARE_INST_COUNT(SkRTree) 34 SK_DECLARE_INST_COUNT(SkRTree)
35 35
36 /** 36 /**
37 * If you have some prior information about the distribution of bounds you'r e expecting, you 37 * If you have some prior information about the distribution of bounds you'r e expecting, you
38 * can provide an optional aspect ratio parameter. This allows the bulk-load algorithm to 38 * can provide an optional aspect ratio parameter. This allows the bulk-load algorithm to
39 * create better proportioned tiles of rectangles. 39 * create better proportioned tiles of rectangles.
40 */ 40 */
41 explicit SkRTree(SkScalar aspectRatio = 1); 41 explicit SkRTree(SkScalar aspectRatio = 1);
42 virtual ~SkRTree() {} 42 virtual ~SkRTree() {}
43 43
44 virtual void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE; 44 void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE;
45 virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE; 45 void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVER RIDE;
46 virtual size_t bytesUsed() const SK_OVERRIDE; 46 size_t bytesUsed() const SK_OVERRIDE;
47 47
48 // Methods and constants below here are only public for tests. 48 // Methods and constants below here are only public for tests.
49 49
50 // Return the depth of the tree structure. 50 // Return the depth of the tree structure.
51 int getDepth() const { return fCount ? fRoot.fSubtree->fLevel + 1 : 0; } 51 int getDepth() const { return fCount ? fRoot.fSubtree->fLevel + 1 : 0; }
52 // Insertion count (not overall node count, which may be greater). 52 // Insertion count (not overall node count, which may be greater).
53 int getCount() const { return fCount; } 53 int getCount() const { return fCount; }
54 54
55 // These values were empirically determined to produce reasonable performanc e in most cases. 55 // These values were empirically determined to produce reasonable performanc e in most cases.
56 static const int kMinChildren = 6, 56 static const int kMinChildren = 6,
(...skipping 29 matching lines...) Expand all
86 // This is the count of data elements (rather than total nodes in the tree) 86 // This is the count of data elements (rather than total nodes in the tree)
87 int fCount; 87 int fCount;
88 SkScalar fAspectRatio; 88 SkScalar fAspectRatio;
89 Branch fRoot; 89 Branch fRoot;
90 SkTDArray<Node> fNodes; 90 SkTDArray<Node> fNodes;
91 91
92 typedef SkBBoxHierarchy INHERITED; 92 typedef SkBBoxHierarchy INHERITED;
93 }; 93 };
94 94
95 #endif 95 #endif
OLDNEW
« no previous file with comments | « src/core/SkPictureShader.cpp ('k') | src/core/SkRegion_path.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698