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

Side by Side Diff: src/gpu/GrRectanizer_skyline.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/GrRectanizer_pow2.h ('k') | src/gpu/GrSoftwarePathRenderer.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_skyline_DEFINED 8 #ifndef GrRectanizer_skyline_DEFINED
9 #define GrRectanizer_skyline_DEFINED 9 #define GrRectanizer_skyline_DEFINED
10 10
11 #include "GrRectanizer.h" 11 #include "GrRectanizer.h"
12 #include "SkTDArray.h" 12 #include "SkTDArray.h"
13 13
14 // Pack rectangles and track the current silhouette 14 // Pack rectangles and track the current silhouette
15 // Based, in part, on Jukka Jylanki's work at http://clb.demon.fi 15 // Based, in part, on Jukka Jylanki's work at http://clb.demon.fi
16 class GrRectanizerSkyline : public GrRectanizer { 16 class GrRectanizerSkyline : public GrRectanizer {
17 public: 17 public:
18 GrRectanizerSkyline(int w, int h) : INHERITED(w, h) { 18 GrRectanizerSkyline(int w, int h) : INHERITED(w, h) {
19 this->reset(); 19 this->reset();
20 } 20 }
21 21
22 virtual ~GrRectanizerSkyline() { } 22 virtual ~GrRectanizerSkyline() { }
23 23
24 void reset() SK_OVERRIDE{ 24 void reset() override{
25 fAreaSoFar = 0; 25 fAreaSoFar = 0;
26 fSkyline.reset(); 26 fSkyline.reset();
27 SkylineSegment* seg = fSkyline.append(1); 27 SkylineSegment* seg = fSkyline.append(1);
28 seg->fX = 0; 28 seg->fX = 0;
29 seg->fY = 0; 29 seg->fY = 0;
30 seg->fWidth = this->width(); 30 seg->fWidth = this->width();
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 struct SkylineSegment { 40 struct SkylineSegment {
41 int fX; 41 int fX;
42 int fY; 42 int fY;
43 int fWidth; 43 int fWidth;
44 }; 44 };
45 45
46 SkTDArray<SkylineSegment> fSkyline; 46 SkTDArray<SkylineSegment> fSkyline;
47 47
48 int32_t fAreaSoFar; 48 int32_t fAreaSoFar;
49 49
50 // Can a width x height rectangle fit in the free space represented by 50 // Can a width x height rectangle fit in the free space represented by
51 // the skyline segments >= 'skylineIndex'? If so, return true and fill in 51 // the skyline segments >= 'skylineIndex'? If so, return true and fill in
52 // 'y' with the y-location at which it fits (the x location is pulled from 52 // 'y' with the y-location at which it fits (the x location is pulled from
53 // 'skylineIndex's segment. 53 // 'skylineIndex's segment.
54 bool rectangleFits(int skylineIndex, int width, int height, int* y) const; 54 bool rectangleFits(int skylineIndex, int width, int height, int* y) const;
55 // Update the skyline structure to include a width x height rect located 55 // Update the skyline structure to include a width x height rect located
56 // at x,y. 56 // at x,y.
57 void addSkylineLevel(int skylineIndex, int x, int y, int width, int height); 57 void addSkylineLevel(int skylineIndex, int x, int y, int width, int height);
58 58
59 typedef GrRectanizer INHERITED; 59 typedef GrRectanizer INHERITED;
60 }; 60 };
61 61
62 #endif 62 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrRectanizer_pow2.h ('k') | src/gpu/GrSoftwarePathRenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698