Clean up clipping code a bit

src/gpu/GrTextContext.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTextContext.h"
 #include "GrContext.h"
 
 #include "SkAutoKern.h"
 #include "SkGlyphCache.h"
 #include "GrFontScaler.h"
 
 GrTextContext::GrTextContext(GrContext* context, const SkDeviceProperties& properties) :
                             fFallbackTextContext(NULL),
                             fContext(context), fDeviceProperties(properties), fDrawTarget(NULL) {
 }
 
 GrTextContext::~GrTextContext() {
     SkDELETE(fFallbackTextContext);
 }
 
 void GrTextContext::init(const GrPaint& grPaint, const SkPaint& skPaint) {
     const GrClipData* clipData = fContext->getClip();
 
-    SkRect devConservativeBound;
-    clipData->fClipStack->getConservativeBounds(
-                                     -clipData->fOrigin.fX,
-                                     -clipData->fOrigin.fY,
-                                     fContext->getRenderTarget()->width(),
+    clipData->getConservativeBounds(fContext->getRenderTarget()->width(),
                                      fContext->getRenderTarget()->height(),
-                                     &devConservativeBound);
-
-    devConservativeBound.roundOut(&fClipRect);
+                                     &fClipRect);
 
     fDrawTarget = fContext->getTextTarget();
 
     fPaint = grPaint;
     fSkPaint = skPaint;
 }
 
 bool GrTextContext::drawText(const GrPaint& paint, const SkPaint& skPaint,
                              const SkMatrix& viewMatrix,
                              const char text[], size_t byteLength,
@@ skipping 68 matching lines @@
     if (cache->getAuxProcData(GlyphCacheAuxProc, &auxData)) {
         scaler = (GrFontScaler*)auxData;
     }
     if (NULL == scaler) {
         scaler = SkNEW_ARGS(GrFontScaler, (cache));
         cache->setAuxProc(GlyphCacheAuxProc, scaler);
     }
 
     return scaler;
 }