Skia Merge (revision 950)

This merge will allow us to now import the sample app
infrastructure in skia to do on device measurements.

Change-Id: Idcab6b1524f371521717cde61a6e98a12d897e6b

2 files changed, 3 insertions, 1 deletions

diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
index 3fed99a..8852803 100644
--- a/include/gpu/SkGpuDevice.h
+++ b/include/gpu/SkGpuDevice.h
@@ -109,6 +109,7 @@ public:
                               const SkPaint& paint);
     virtual void drawDevice(const SkDraw&, SkDevice*, int x, int y,
                             const SkPaint&);
+    virtual bool filterTextFlags(const SkPaint& paint, TextFlags*);
 
     virtual void flush() { fContext->flush(false); }
 
diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h
index 6f5ebfe..7221213 100644
--- a/include/gpu/SkGr.h
+++ b/include/gpu/SkGr.h
@@ -231,7 +231,7 @@ public:
     SkGrRegionIterator() {}
     SkGrRegionIterator(const SkRegion& region) { this->reset(region); }
 
-    void reset(const SkRegion& region) { 
+    void reset(const SkRegion& region) {
         fRegion = &region;
         fIter.reset(region);
     }
@@ -275,6 +275,7 @@ public:
 
     // overrides
     virtual const GrKey* getKey();
+    virtual GrMaskFormat getMaskFormat();
     virtual bool getPackedGlyphBounds(GrGlyph::PackedID, GrIRect* bounds);
     virtual bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height,
                                      int rowBytes, void* image);