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

3 files changed, 0 insertions, 35 deletions

diff --git a/skia/sgl/SkGlyphCache.cpp b/skia/sgl/SkGlyphCache.cpp
index 9836c73..6b214df 100644
--- a/skia/sgl/SkGlyphCache.cpp
+++ b/skia/sgl/SkGlyphCache.cpp
@@ -328,18 +328,6 @@ const SkPath* SkGlyphCache::findPath(const SkGlyph& glyph) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SKIA_HARFBUZZ
-void SkGlyphCache::setupShaper(HB_ShaperItem* item) {
-    fScalerContext->setupShaper(item);
-}
-
-void SkGlyphCache::releaseShaper(HB_ShaperItem* item) {
-    fScalerContext->releaseShaper(item);
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
 bool SkGlyphCache::getAuxProcData(void (*proc)(void*), void** dataPtr) const {
     const AuxProcRec* rec = fAuxProcList;
     while (rec) {
diff --git a/skia/sgl/SkGlyphCache.h b/skia/sgl/SkGlyphCache.h
index db9e8d5..2462ea5 100644
--- a/skia/sgl/SkGlyphCache.h
+++ b/skia/sgl/SkGlyphCache.h
@@ -27,7 +27,6 @@
 class SkPaint;
 
 class SkGlyphCache_Globals;
-typedef struct HB_ShaperItem_ HB_ShaperItem;
 
 /** \class SkGlyphCache
 
@@ -87,16 +86,6 @@ public:
     const SkPaint::FontMetrics& getFontMetricsY() const {
         return fFontMetricsY;
     }
-
-#ifdef SKIA_HARFBUZZ
-    /** Setup a Harfbuzz shaper item with the correct |font| and |face| members.
-    */
-    void setupShaper(HB_ShaperItem* item);
-    /** Release the given references associated with |item|.
-    */
-    void releaseShaper(HB_ShaperItem* item);
-#endif
-
     
     /*  AuxProc/Data allow a client to associate data with this cache entry.
         Multiple clients can use this, as their data is keyed with a function
diff --git a/skia/sgl/SkPaint.cpp b/skia/sgl/SkPaint.cpp
index 5fc1f14..bb6b31e 100644
--- a/skia/sgl/SkPaint.cpp
+++ b/skia/sgl/SkPaint.cpp
@@ -365,18 +365,6 @@ int SkPaint::textToGlyphs(const void* textData, size_t byteLength,
     return gptr - glyphs;
 }
 
-#ifdef SKIA_HARFBUZZ
-void SkPaint::setupShaper(HB_ShaperItem* item) {
-    SkAutoGlyphCache autoCache(*this, NULL);
-    autoCache.getCache()->setupShaper(item);
-}
-
-void SkPaint::releaseShaper(HB_ShaperItem* item) {
-    SkAutoGlyphCache autoCache(*this, NULL);
-    autoCache.getCache()->releaseShaper(item);
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 static uint32_t sk_glyphID_next(const char** text)