Revert of Improve usage of window rectangles

src/gpu/GrPipeline.h

Index: src/gpu/GrPipeline.h
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 8c2f538e27c6bb276c0e9cb3b8da84d71e2220ce..18f1a2a266d819303855016c55c518555357ee4d 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -16,9 +16,9 @@
 #include "GrPrimitiveProcessor.h"
 #include "GrProcOptInfo.h"
 #include "GrProgramDesc.h"
-#include "GrScissorState.h"
 #include "GrStencilSettings.h"
-#include "GrWindowRectsState.h"
+#include "GrTypesPriv.h"
+#include "GrWindowRectangles.h"
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
 
@@ -60,7 +60,7 @@
         const GrCaps*               fCaps;
         GrPipelineOptimizations     fOpts;
         const GrScissorState*       fScissor;
-        const GrWindowRectsState*   fWindowRectsState;
+        const GrWindowRectangles*   fWindowRects;
         bool                        fHasStencilClip;
         GrXferProcessor::DstTexture fDstTexture;
     };
@@ -154,7 +154,7 @@
 
     const GrScissorState& getScissorState() const { return fScissorState; }
 
-    const GrWindowRectsState& getWindowRectsState() const { return fWindowRectsState; }
+    const GrWindowRectangles& getWindowRectangles() const { return fWindowRects; }
 
     bool isHWAntialiasState() const { return SkToBool(fFlags & kHWAA_Flag); }
     bool snapVerticesToPixelCenters() const { return SkToBool(fFlags & kSnapVertices_Flag); }
@@ -223,7 +223,7 @@
     typedef GrPendingProgramElement<const GrXferProcessor> ProgramXferProcessor;
     RenderTarget                        fRenderTarget;
     GrScissorState                      fScissorState;
-    GrWindowRectsState                  fWindowRectsState;
+    GrWindowRectangles                  fWindowRects;
     GrStencilSettings                   fStencilSettings;
     GrDrawFace                          fDrawFace;
     uint32_t                            fFlags;