commit 5d8d18651a64f62dbb8881794e23f53bf22c9a23
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 15 14:36:41 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 15 14:36:41 2012 +0000
tree f1de838dc1288635ea2cfb08ba01d808fd95a5f0
parent 5bdef29ae0f5a495381cd2c9787ce7c112e58354

Addressed Windows compiler complaints

http://codereview.appspot.com/6462062/

This CL will require re-baselining of the imagemagnifier GM



git-svn-id: http://skia.googlecode.com/svn/trunk@5108 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrClipMaskManager.h

diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index fed4205..1187a08 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -264,8 +264,8 @@
 public:
     GR_DECLARE_RESOURCE_CACHE_DOMAIN(GetAlphaMaskDomain)
 
-    GrClipMaskManager(GrGpu* gpu)
-        : fGpu(gpu)
+    GrClipMaskManager()
+        : fGpu(NULL)
         , fCurrClipMaskType(kNone_ClipMaskType) {
     }
 
@@ -299,6 +299,10 @@
         return fAACache.getContext();
     }
 
+    void setGpu(GrGpu* gpu) { 
+        fGpu = gpu;
+    }
+
 private:
     /**
      * Informs the helper function adjustStencilParams() about how the stencil

src/gpu/GrGpu.cpp

diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index a9306f4..c159f5e 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -29,8 +29,7 @@
 #define DEBUG_INVAL_START_IDX -1
 
 GrGpu::GrGpu()
-    : fClipMaskManager(this)
-    , fContext(NULL)
+    : fContext(NULL)
     , fResetTimestamp(kExpiredTimestamp+1)
     , fVertexPool(NULL)
     , fIndexPool(NULL)
@@ -41,10 +40,12 @@
     , fContextIsDirty(true)
     , fResourceHead(NULL) {
 
+    fClipMaskManager.setGpu(this);
+
 #if GR_DEBUG
     //gr_run_unittests();
 #endif
-        
+
     fGeomPoolStateStack.push_back();
 #if GR_DEBUG
     GeometryPoolState& poolState = fGeomPoolStateStack.back();