Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures

src/gpu/SkGpuDevice.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.
  */
 
 
 
@@ skipping 16 matching lines @@
 class GrTextContext;
 
 /**
  *  Subclass of SkBaseDevice, which directs all drawing to the GrGpu owned by the
  *  canvas.
  */
 class SK_API SkGpuDevice : public SkBaseDevice {
 public:
     enum Flags {
         kNeedClear_Flag = 1 << 0,  //!< Surface requires an initial clear
-        kDFText_Flag   = 1 << 1,  //!< Surface should render text using signed distance fields
+        kDFFonts_Flag   = 1 << 1,  //!< Surface should render fonts using signed distance fields
     };
 
     /**
      * Creates an SkGpuDevice from a GrSurface. This will fail if the surface is not a render
      * target. The caller owns a ref on the returned device. If the surface is cached,
      * the kCached_Flag should be specified to make the device responsible for unlocking
      * the surface when it is released.
      */
     static SkGpuDevice* Create(GrSurface* surface, const SkSurfaceProps&, unsigned flags = 0);
 
@@ skipping 81 matching lines @@
 private:
     GrContext*      fContext;
 
     GrSkDrawProcs*  fDrawProcs;
 
     GrClipData      fClipData;
 
     GrTextContext*  fTextContext;
 
     // state for our render-target
-    GrRenderTarget* fRenderTarget;
-    uint32_t        fFlags;
+    GrRenderTarget*     fRenderTarget;
+    bool                fNeedClear;
 
     // remove when our clients don't rely on accessBitmap()
     SkBitmap fLegacyBitmap;
 
     SkGpuDevice(GrSurface*, const SkSurfaceProps&, unsigned flags = 0);
 
     virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE;
 
     virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
 
@@ skipping 45 matching lines @@
                          bool bicubic);
 
     bool drawDashLine(const SkPoint pts[2], const SkPaint& paint);
 
     static SkPicture::AccelData::Key ComputeAccelDataKey();
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif