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

Side by Side Diff: src/gpu/GrRectanizer_pow2.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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/gpu/GrPathRendering.cpp ('k') | src/gpu/GrRectanizer_skyline.h » ('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 2014 Google Inc. 2 * Copyright 2014 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 #ifndef GrRectanizer_pow2_DEFINED 8 #ifndef GrRectanizer_pow2_DEFINED
9 #define GrRectanizer_pow2_DEFINED 9 #define GrRectanizer_pow2_DEFINED
10 10
11 #include "GrRectanizer.h" 11 #include "GrRectanizer.h"
12 #include "SkPoint.h" 12 #include "SkPoint.h"
13 13
14 // This Rectanizer quantizes the incoming rects to powers of 2. Each power 14 // This Rectanizer quantizes the incoming rects to powers of 2. Each power
15 // of two can have, at most, one active row/shelf. Once a row/shelf for 15 // of two can have, at most, one active row/shelf. Once a row/shelf for
16 // a particular power of two gets full its fRows entry is recycled to point 16 // a particular power of two gets full its fRows entry is recycled to point
17 // to a new row. 17 // to a new row.
18 // The skyline algorithm almost always provides a better packing. 18 // The skyline algorithm almost always provides a better packing.
19 class GrRectanizerPow2 : public GrRectanizer { 19 class GrRectanizerPow2 : public GrRectanizer {
20 public: 20 public:
21 GrRectanizerPow2(int w, int h) : INHERITED(w, h) { 21 GrRectanizerPow2(int w, int h) : INHERITED(w, h) {
22 this->reset(); 22 this->reset();
23 } 23 }
24 24
25 virtual ~GrRectanizerPow2() { } 25 virtual ~GrRectanizerPow2() { }
26 26
27 void reset() SK_OVERRIDE { 27 void reset() override {
28 fNextStripY = 0; 28 fNextStripY = 0;
29 fAreaSoFar = 0; 29 fAreaSoFar = 0;
30 sk_bzero(fRows, sizeof(fRows)); 30 sk_bzero(fRows, sizeof(fRows));
31 } 31 }
32 32
33 bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE; 33 bool addRect(int w, int h, SkIPoint16* loc) override;
34 34
35 float percentFull() const SK_OVERRIDE { 35 float percentFull() const override {
36 return fAreaSoFar / ((float)this->width() * this->height()); 36 return fAreaSoFar / ((float)this->width() * this->height());
37 } 37 }
38 38
39 private: 39 private:
40 static const int kMIN_HEIGHT_POW2 = 2; 40 static const int kMIN_HEIGHT_POW2 = 2;
41 static const int kMaxExponent = 16; 41 static const int kMaxExponent = 16;
42 42
43 struct Row { 43 struct Row {
44 SkIPoint16 fLoc; 44 SkIPoint16 fLoc;
45 // fRowHeight is actually known by this struct's position in fRows 45 // fRowHeight is actually known by this struct's position in fRows
(...skipping 24 matching lines...) Expand all
70 void initRow(Row* row, int rowHeight) { 70 void initRow(Row* row, int rowHeight) {
71 row->fLoc.set(0, fNextStripY); 71 row->fLoc.set(0, fNextStripY);
72 row->fRowHeight = rowHeight; 72 row->fRowHeight = rowHeight;
73 fNextStripY += rowHeight; 73 fNextStripY += rowHeight;
74 } 74 }
75 75
76 typedef GrRectanizer INHERITED; 76 typedef GrRectanizer INHERITED;
77 }; 77 };
78 78
79 #endif 79 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrPathRendering.cpp ('k') | src/gpu/GrRectanizer_skyline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698