Move clip off of draw target

tests/ClipCacheTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 // This is a GR test
 #if SK_SUPPORT_GPU
@@ skipping 67 matching lines @@
 
     stack.getConservativeBounds(0, 0, kXSize, kYSize,
                                 &devStackBounds,
                                 &isIntersectionOfRects);
 
     // make sure that the SkClipStack is behaving itself
     REPORTER_ASSERT(reporter, screen == devStackBounds);
     REPORTER_ASSERT(reporter, isIntersectionOfRects);
 
     // wrap the SkClipStack in a GrClipData
-    GrClipData clipData;
-    clipData.fClipStack.reset(SkRef(&stack));
+    GrClip clipData;
+    clipData.setClipStack(&stack);
 
     SkIRect devGrClipDataBound;
     clipData.getConservativeBounds(texture,
                                    &devGrClipDataBound,
                                    &isIntersectionOfRects);
 
     // make sure that GrClipData is behaving itself
     REPORTER_ASSERT(reporter, intScreen == devGrClipDataBound);
     REPORTER_ASSERT(reporter, isIntersectionOfRects);
 }
@@ skipping 124 matching lines @@
         if (NULL == context) {
             continue;
         }
 
         test_cache(reporter, context);
         test_clip_bounds(reporter, context);
     }
 }
 
 #endif