API modifications needed to upstream Android font changes.

include/core/SkPaint.h

 
 
 /*
  * Copyright 2006 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 SkPaint_DEFINED
 #define SkPaint_DEFINED
 
 #include "SkColor.h"
 #include "SkDrawLooper.h"
 #include "SkXfermode.h"
+#ifdef SK_BUILD_FOR_ANDROID
+#include "SkPaintOptionsAndroid.h"
+#endif
 
 class SkAnnotation;
 class SkAutoGlyphCache;
 class SkColorFilter;
 class SkDescriptor;
 struct SkDeviceProperties;
 class SkFlattenableReadBuffer;
 class SkFlattenableWriteBuffer;
 struct SkGlyph;
 struct SkRect;
@@ skipping 604 matching lines @@
     /** Return the paint's Align value for drawing text.
         @return the paint's Align value for drawing text.
     */
     Align   getTextAlign() const { return (Align)fTextAlign; }
 
     /** Set the paint's text alignment.
         @param align set the paint's Align value for drawing text.
     */
     void    setTextAlign(Align align);
 
+#ifdef SK_BUILD_FOR_ANDROID

[reed1, 2013/05/09 20:35:38]

can we move the getter (do we have one?) for genreationID() inside this #ifdef?

+    const SkPaintOptionsAndroid& getPaintOptionsAndroid() const { return fPaintOptionsAndroid; }

[reed1, 2013/05/09 20:35:38]

nit: 80 for this file.

getPaintOptionsANdorid() const {
    reutrn ...
}

+    void setPaintOptionsAndroid(const SkPaintOptionsAndroid& options);
+#endif
+
     /** Return the paint's text size.
         @return the paint's text size.
     */
     SkScalar getTextSize() const { return fTextSize; }
 
     /** Set the paint's text size. This value must be > 0
         @param textSize set the paint's text size.
     */
     void setTextSize(SkScalar textSize);
 
@@ skipping 332 matching lines @@
         kCanonicalTextSizeForPaths = 64
     };
     friend class SkAutoGlyphCache;
     friend class SkCanvas;
     friend class SkDraw;
     friend class SkGraphics; // So Term() can be called.
     friend class SkPDFDevice;
     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;
 #endif
 };
 
 #endif