commit 4cbf8e3dce10ef0d06e5ef95ea88b084bbad2553
author robertphillips <robertphillips@google.com> Mon Jun 09 07:59:25 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 09 07:59:25 2014 -0700
tree e9c1d6a360236b3eea3d1cba83bd5f1d6cc30456
parent b6b02526438d6839481fb40ccf610d28f7652397

Add some comments to GrRectanizer_skyline

R=jvanverth@google.com

Author: robertphillips@google.com

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

src/gpu/GrRectanizer_skyline.cpp

diff --git a/src/gpu/GrRectanizer_skyline.cpp b/src/gpu/GrRectanizer_skyline.cpp
index b759cb2..44da1c3 100755
--- a/src/gpu/GrRectanizer_skyline.cpp
+++ b/src/gpu/GrRectanizer_skyline.cpp
@@ -81,8 +81,9 @@
     SkASSERT(newSegment.fX + newSegment.fWidth <= this->width());
     SkASSERT(newSegment.fY <= this->height());
 
-    // delete width of this skyline segment from following ones
+    // delete width of the new skyline segment from following ones
     for (int i = skylineIndex+1; i < fSkyline.count(); ++i) {
+        // The new segment subsumes all or part of fSkyline[i]
         SkASSERT(fSkyline[i-1].fX <= fSkyline[i].fX);
 
         if (fSkyline[i].fX < fSkyline[i-1].fX + fSkyline[i-1].fWidth) {
@@ -92,9 +93,11 @@
             fSkyline[i].fWidth -= shrink;
 
             if (fSkyline[i].fWidth <= 0) {
+                // fully consumed
                 fSkyline.remove(i);
                 --i;
             } else {
+                // only partially consumed
                 break;
             }
         } else {

src/gpu/GrRectanizer_skyline.h

diff --git a/src/gpu/GrRectanizer_skyline.h b/src/gpu/GrRectanizer_skyline.h
index 2062667..21043c0 100644
--- a/src/gpu/GrRectanizer_skyline.h
+++ b/src/gpu/GrRectanizer_skyline.h
@@ -32,7 +32,7 @@
 
     virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
 
-    virtual float percentFull() const SK_OVERRIDE{
+    virtual float percentFull() const SK_OVERRIDE {
         return fAreaSoFar / ((float)this->width() * this->height());
     }
 
@@ -47,7 +47,13 @@
 
     int32_t fAreaSoFar;
 
+    // Can a width x height rectangle fit in the free space represented by
+    // the skyline segments >= 'skylineIndex'? If so, return true and fill in
+    // 'y' with the y-location at which it fits (the x location is pulled from 
+    // 'skylineIndex's segment.
     bool rectangleFits(int skylineIndex, int width, int height, int* y) const;
+    // Update the skyline structure to include a width x height rect located
+    // at x,y.
     void addSkylineLevel(int skylineIndex, int x, int y, int width, int height);
 
     typedef GrRectanizer INHERITED;