commit e46f9feb44780a6269c6dcfe993f4215427fd98e
author bsalomon <bsalomon@google.com> Tue Aug 18 06:05:14 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 18 06:05:14 2015 -0700
tree 8aad4e37b1fffdf3d49d509c01ad5b672db12d4f
parent cf9c4759039c1d6dc5834d653fb36e465e3166d1

Privatize GrBatch subclass overrides

Review URL: https://codereview.chromium.org/1301663002

src/gpu/GrOvalRenderer.cpp

diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index bd5042c..c9d6f1f 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -651,6 +651,7 @@
         out->setUnknownSingleComponent();
     }
 
+private:
     void initBatchTracker(const GrPipelineOptimizations& opt) override {
         // Handle any color overrides
         if (!opt.readsColor()) {
@@ -727,7 +728,6 @@
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
-private:
     CircleBatch(const Geometry& geometry) {
         this->initClassID<CircleBatch>();
         fGeoData.push_back(geometry);
@@ -869,6 +869,7 @@
         out->setUnknownSingleComponent();
     }
 
+private:
     void initBatchTracker(const GrPipelineOptimizations& opt) override {
         // Handle any color overrides
         if (!opt.readsCoverage()) {
@@ -950,7 +951,6 @@
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
-private:
     EllipseBatch(const Geometry& geometry) {
         this->initClassID<EllipseBatch>();
         fGeoData.push_back(geometry);
@@ -1137,6 +1137,8 @@
         out->setUnknownSingleComponent();
     }
 
+private:
+
     void initBatchTracker(const GrPipelineOptimizations& opt) override {
         // Handle any color overrides
         if (!opt.readsColor()) {
@@ -1209,7 +1211,6 @@
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
-private:
     DIEllipseBatch(const Geometry& geometry, const SkRect& bounds) {
         this->initClassID<DIEllipseBatch>();
         fGeoData.push_back(geometry);
@@ -1488,6 +1489,7 @@
         out->setUnknownSingleComponent();
     }
 
+private:
     void initBatchTracker(const GrPipelineOptimizations& opt) override {
         // Handle any color overrides
         if (!opt.readsColor()) {
@@ -1586,7 +1588,6 @@
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
-private:
     RRectCircleRendererBatch(const Geometry& geometry) {
         this->initClassID<RRectCircleRendererBatch>();
         fGeoData.push_back(geometry);
@@ -1664,6 +1665,7 @@
         out->setUnknownSingleComponent();
     }
 
+private:
     void initBatchTracker(const GrPipelineOptimizations& opt) override {
         // Handle any color overrides
         if (!opt.readsColor()) {
@@ -1772,7 +1774,6 @@
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
-private:
     RRectEllipseRendererBatch(const Geometry& geometry) {
         this->initClassID<RRectEllipseRendererBatch>();
         fGeoData.push_back(geometry);