remove view matrix from context

include/gpu/GrPaint.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrPaint_DEFINED
@@ skipping 138 matching lines @@
      *
      */
     bool isOpaque() const;
 
     /**
      * Returns true if isOpaque would return true and the paint represents a solid constant color
      * draw. If the result is true, constantColor will be updated to contain the constant color.
      */
     bool isOpaqueAndConstantColor(GrColor* constantColor) const;
 
-private:
-
-    /**
-     * Helper for isOpaque and isOpaqueAndConstantColor.
-     */
-    bool getOpaqueAndKnownColor(GrColor* solidColor, uint32_t* solidColorKnownComponents) const;
-
     /**
      * Called when the source coord system from which geometry is rendered changes. It ensures that
      * the local coordinates seen by effects remains unchanged. oldToNew gives the transformation
      * from the previous coord system to the new coord system.
      */
     void localCoordChange(const SkMatrix& oldToNew) {
         for (int i = 0; i < fColorStages.count(); ++i) {
             fColorStages[i].localCoordChange(oldToNew);
         }
         for (int i = 0; i < fCoverageStages.count(); ++i) {
@@ skipping 16 matching lines @@
             if (!computed && !newToOld.invert(&oldToNew)) {
                 return false;
             } else {
                 computed = true;
             }
             fCoverageStages[i].localCoordChange(oldToNew);
         }
         return true;
     }
 
+private:
+
+    /**

[bsalomon, 2014/12/17 17:12:33]

tx

+     * Helper for isOpaque and isOpaqueAndConstantColor.
+     */
+    bool getOpaqueAndKnownColor(GrColor* solidColor, uint32_t* solidColorKnownComponents) const;
+
     friend class GrContext; // To access above two functions
     friend class GrStencilAndCoverTextContext;  // To access above two functions
 
     SkAutoTUnref<const GrXPFactory> fXPFactory;
     SkSTArray<4, GrFragmentStage>   fColorStages;
     SkSTArray<2, GrFragmentStage>   fCoverageStages;
 
     bool                            fAntiAlias;
     bool                            fDither;
 
     GrColor                         fColor;
 
     void resetOptions() {
         fAntiAlias = false;
         fDither = false;
     }
 
     void resetColor() {
         fColor = GrColorPackRGBA(0xff, 0xff, 0xff, 0xff);
     }
 
     void resetStages();
 };
 
 #endif