Linux/Skia: remove VDMX and Harfbuzz

In order to unfork our Skia, VDMX parsing has been moved into WebKit
in r42548.

The Harfbuzz stuff should have been functional, but noone on the
WebKit side wants to review a bidi patch so that side never actually
landed. At this point it's probably better to remove the current
Harfbuzz support in Skia with a view to jumping straight to the
version agreed with Mike Reed at some point in the future.

http://codereview.chromium.org/75011


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13795 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 23 deletions

diff --git a/skia/include/SkPaint.h b/skia/include/SkPaint.h
index d13d090..14691b7 100644
--- a/skia/include/SkPaint.h
+++ b/skia/include/SkPaint.h
@@ -39,8 +39,6 @@ class SkDrawLooper;
 class SkTypeface;
 class SkXfermode;
 
-typedef struct HB_ShaperItem_ HB_ShaperItem;
-
 typedef const SkGlyph& (*SkDrawCacheProc)(SkGlyphCache*, const char**,
                                            SkFixed x, SkFixed y);
 
@@ -620,12 +618,6 @@ public:
         SkScalar    fXMin;      //!< The minimum bounding box x value for all glyphs
         SkScalar    fXMax;      //!< The maximum bounding box x value for all glyphs
         SkScalar    fXHeight;   //!< the height of an 'x' in px, or 0 if no 'x' in face
-
-        // VDMX values are exact ascent and descent values for scalable fonts at
-        // a certain pixel size.
-        bool        fVDMXMetricsValid;  //!< If true, the following members are valid
-        unsigned    fVDMXAscent;
-        unsigned    fVDMXDescent;
     };
     
     /** Return the recommend spacing between lines (which will be
@@ -735,11 +727,6 @@ public:
     void getTextPath(const void* text, size_t length, SkScalar x, SkScalar y,
                      SkPath* path) const;
 
-#ifdef SKIA_HARFBUZZ
-    void setupShaper(HB_ShaperItem* item);
-    void releaseShaper(HB_ShaperItem* item);
-#endif
-
 private:
     SkTypeface*     fTypeface;
     SkScalar        fTextSize;
diff --git a/skia/include/SkScalerContext.h b/skia/include/SkScalerContext.h
index 1299f1b..df846f2 100644
--- a/skia/include/SkScalerContext.h
+++ b/skia/include/SkScalerContext.h
@@ -28,8 +28,6 @@ class SkMaskFilter;
 class SkPathEffect;
 class SkRasterizer;
 
-typedef struct HB_ShaperItem_ HB_ShaperItem;
-
 // needs to be != to any valid SkMask::Format
 #define MASK_FORMAT_JUST_ADVANCE    (0xFF)
 
@@ -194,14 +192,6 @@ public:
     static inline void MakeRec(const SkPaint&, const SkMatrix*, Rec* rec);
     static SkScalerContext* Create(const SkDescriptor*);
 
-#ifdef SKIA_HARFBUZZ
-    // This will fill in |item->font| and |item->face| with valid values for
-    // this font.
-    virtual void setupShaper(HB_ShaperItem* item) = 0;
-    // This will release the references held by |item->font| and |item->face|.
-    virtual void releaseShaper(HB_ShaperItem* item) = 0;
-#endif
-
 protected:
     Rec         fRec;
     unsigned    fBaseGlyphCount;