Retract GrRenderTarget a bit

include/gpu/GrClip.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClip_DEFINED
 #define GrClip_DEFINED
 
 #include "SkClipStack.h"
-#include "GrSurface.h"
 
 struct SkIRect;
 
 /**
  * GrClip encapsulates the information required to construct the clip
  * masks. 'A GrClip is either wide open, just an IRect, just a Rect, or a full clipstack.
  * If the clip is a clipstack than the origin is used to translate the stack with
  * respect to device coordinates. This allows us to use a clip stack that is
  * specified for a root device with a layer device that is restricted to a subset
  * of the original canvas. For other clip types the origin will always be (0,0).
@@ skipping 127 matching lines @@
         return (kWideOpen_ClipType == fClipType) ||
                (kClipStack_ClipType == fClipType && this->clipStack()->isWideOpen());
     }
 
     bool quickContains(const SkRect& rect) const {
         return (kWideOpen_ClipType == fClipType) ||
                (kClipStack_ClipType == fClipType && this->clipStack()->quickContains(rect)) ||
                (kIRect_ClipType == fClipType && this->irect().contains(rect));
     }
 
-    void getConservativeBounds(const GrSurface* surface,
-                               SkIRect* devResult,
-                               bool* isIntersectionOfRects = NULL) const {
-        this->getConservativeBounds(surface->width(), surface->height(),
-                                    devResult, isIntersectionOfRects);
-    }
-
     void getConservativeBounds(int width, int height,
                                SkIRect* devResult,
                                bool* isIntersectionOfRects = NULL) const;
 
     static const GrClip& WideOpen();
 
     enum ClipType {
         kClipStack_ClipType,
         kWideOpen_ClipType,
         kIRect_ClipType,
     };
 
     ClipType clipType() const { return fClipType; }
 
 private:
     union Clip {
         const SkClipStack* fStack;
         SkIRect fIRect;
     } fClip;
 
     SkIPoint fOrigin;
     ClipType fClipType;
 };
 
 #endif