Reverting 9083 & 9084 due to Android failures

git-svn-id: http://skia.googlecode.com/svn/trunk@9085 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 2 insertions, 134 deletions

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 35a502d6b8..a73a46a2c6 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -14,9 +14,6 @@
 #include "SkColor.h"
 #include "SkDrawLooper.h"
 #include "SkXfermode.h"
-#ifdef SK_BUILD_FOR_ANDROID
-#include "SkPaintOptionsAndroid.h"
-#endif
 
 class SkAnnotation;
 class SkAutoGlyphCache;
@@ -863,11 +860,6 @@ public:
     /** Returns the base glyph count for the strike associated with this paint
     */
     unsigned getBaseGlyphCount(SkUnichar text) const;
-
-    const SkPaintOptionsAndroid& getPaintOptionsAndroid() const {
-        return fPaintOptionsAndroid;
-    }
-    void setPaintOptionsAndroid(const SkPaintOptionsAndroid& options);
 #endif
 
     // returns true if the paint's settings (e.g. xfermode + alpha) resolve to
@@ -998,8 +990,6 @@ private:
     friend class SkTextToPathIter;
 
 #ifdef SK_BUILD_FOR_ANDROID
-    SkPaintOptionsAndroid fPaintOptionsAndroid;
-
     // In order for the == operator to work properly this must be the last field
     // in the struct so that we can do a memcmp to this field's offset.
     uint32_t        fGenerationID;
diff --git a/include/core/SkPaintOptionsAndroid.h b/include/core/SkPaintOptionsAndroid.h
deleted file mode 100644
index 235cae9a0a..0000000000
--- a/include/core/SkPaintOptionsAndroid.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-/*
- * Copyright 2012 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkPaintOptionsAndroid_DEFINED
-#define SkPaintOptionsAndroid_DEFINED
-
-#ifdef SK_BUILD_FOR_ANDROID
-
-#include "SkString.h"
-#include "SkTypes.h"
-
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
-
-struct SkLanguageInfo {
-    SkLanguageInfo(const char* tag) : fTag(tag) { }
-    SkString fTag; //! BCP 47 language identifier
-};
-
-/** \class SkLanguage
-
-    The SkLanguage class represents a human written language, and is used by
-    text draw operations to determine which glyph to draw when drawing
-    characters with variants (ie Han-derived characters).
-*/
-class SkLanguage {
-public:
-    SkLanguage() : fInfo(getInfo("")) { }
-    SkLanguage(const char* tag) : fInfo(getInfo(tag)) { }
-    SkLanguage(const SkLanguage& b) : fInfo(b.fInfo) { }
-
-    /** Gets a BCP 47 language identifier for this SkLanguage.
-        @return a BCP 47 language identifier representing this language
-    */
-    const SkString& getTag() const { return fInfo->fTag; }
-
-    /** Performs BCP 47 fallback to return an SkLanguage one step more general.
-        @return an SkLanguage one step more general
-    */
-    SkLanguage getParent() const;
-
-    bool operator==(const SkLanguage& b) const {
-        return fInfo == b.fInfo;
-    }
-    bool operator!=(const SkLanguage& b) const {
-        return fInfo != b.fInfo;
-    }
-    bool operator<(const SkLanguage& b) const {
-        return fInfo < b.fInfo;
-    }
-    bool operator>(const SkLanguage& b) const {
-        return fInfo > b.fInfo;
-    }
-    SkLanguage& operator=(const SkLanguage& b) {
-        fInfo = b.fInfo;
-        return *this;
-    }
-
-private:
-    const SkLanguageInfo* fInfo;
-
-    static const SkLanguageInfo* getInfo(const char* tag);
-};
-
-class SkPaintOptionsAndroid {
-public:
-    SkPaintOptionsAndroid() {
-        fFontVariant = kDefault_Variant;
-    }
-
-    /** Return the paint's language value used for drawing text.
-        @return the paint's language value used for drawing text.
-    */
-    const SkLanguage& getLanguage() const { return fLanguage; }
-
-    /** Set the paint's language value used for drawing text.
-        @param language set the paint's language value for drawing text.
-    */
-    void setLanguage(const SkLanguage& language) { fLanguage = language; }
-    void setLanguage(const char* languageTag) { fLanguage = SkLanguage(languageTag); }
-
-
-    enum FontVariant {
-       kDefault_Variant, // Currently setting yourself to Default gives you Compact Variant
-       kCompact_Variant,
-       kElegant_Variant,
-       kLast_Variant = kElegant_Variant,
-    };
-
-    /** Return the font variant
-        @return the font variant used by this paint object
-    */
-    FontVariant getFontVariant() const { return fFontVariant; }
-
-    /** Set the font variant
-      @param fontVariant set the paint's font variant for choosing fonts
-    */
-    void setFontVariant(FontVariant fontVariant) {
-        SkASSERT((unsigned)fontVariant <= kLast_Variant);
-        fFontVariant = fontVariant;
-    }
-
-    void flatten(SkFlattenableWriteBuffer&) const;
-    void unflatten(SkFlattenableReadBuffer&);
-
-private:
-    SkLanguage fLanguage;
-    FontVariant fFontVariant;
-};
-
-#endif // #ifdef SK_BUILD_FOR_ANDROID
-#endif // #ifndef SkPaintOptionsAndroid_DEFINED
diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h
index 0d89736e7e..e87fa4805a 100644
--- a/include/ports/SkTypeface_android.h
+++ b/include/ports/SkTypeface_android.h
@@ -9,8 +9,6 @@
 #ifndef SkTypeface_android_DEFINED
 #define SkTypeface_android_DEFINED
 
-#ifdef SK_BUILD_FOR_ANDROID
-
 #include "SkTypeface.h"
 
 /**
@@ -41,8 +39,6 @@ SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackco
  *  get the 3rd can still inspect the original, and try to match its
  *  stylistic attributes.
  */
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
-                                         const SkPaintOptionsAndroid& options);
+SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID);
 
-#endif // #ifdef SK_BUILD_FOR_ANDROID
-#endif // #ifndef SkTypeface_android_DEFINED
+#endif