diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkDraw.h | 2 | ||||
| -rw-r--r-- | include/core/SkPaint.h | 27 | ||||
| -rw-r--r-- | include/core/SkRect.h | 11 |
3 files changed, 2 insertions, 38 deletions
diff --git a/include/core/SkDraw.h b/include/core/SkDraw.h index ae323f2..8c659c2 100644 --- a/include/core/SkDraw.h +++ b/include/core/SkDraw.h @@ -104,8 +104,6 @@ private: void drawBitmapAsMask(const SkBitmap&, const SkPaint&) const; public: - //Be noted to update SkDraw::SkDraw() constructor code when struture is - //change! const SkBitmap* fBitmap; // required const SkMatrix* fMatrix; // required const SkRegion* fClip; // DEPRECATED diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 76ec7fc..30ff663 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -15,8 +15,6 @@ #include "SkXfermode.h" #include "SkString.h" -#include <pthread.h> - class SkAutoGlyphCache; class SkColorFilter; class SkDescriptor; @@ -39,25 +37,6 @@ typedef const SkGlyph& (*SkDrawCacheProc)(SkGlyphCache*, const char**, typedef const SkGlyph& (*SkMeasureCacheProc)(SkGlyphCache*, const char**); -class SkTextLocale { - public: - SkTextLocale(); - - SkString s; - SkTextLocale *next; -}; - -class SkTextLocales { -public: - SkTextLocales(); - SkTextLocale * setTextLocale( const SkString& locale ); - SkString& getTextLocale( SkTextLocale * t ); - -private: - SkTextLocale * LocaleArray; - pthread_mutex_t update_mutex; -}; - /** \class SkPaint The SkPaint class holds the style and color information about how to draw @@ -680,7 +659,7 @@ public: /** Return the paint's text locale value. @return the paint's text locale value used for drawing text. */ - const SkString& getTextLocale(); + const SkString& getTextLocale() const { return fTextLocale; } /** Set the paint's text locale. @param locale set the paint's locale value for drawing text. @@ -901,8 +880,6 @@ public: bool nothingToDraw() const; private: - //Be noted to update SkPaint::SkPaint(const SkPaint& src) copy - //constructor when struture is changed for fast path! SkTypeface* fTypeface; SkScalar fTextSize; SkScalar fTextScaleX; @@ -928,7 +905,7 @@ private: unsigned fTextEncoding : 2; // 3 values unsigned fHinting : 2; #ifdef SK_BUILD_FOR_ANDROID - SkTextLocale* fpTextLocale; + SkString fTextLocale; #endif SkDrawCacheProc getDrawCacheProc() const; diff --git a/include/core/SkRect.h b/include/core/SkRect.h index 64568c9..65e7611 100644 --- a/include/core/SkRect.h +++ b/include/core/SkRect.h @@ -347,16 +347,6 @@ struct SK_API SkRect { */ bool isFinite() const { #ifdef SK_SCALAR_IS_FLOAT -#if defined(KRAIT_OPTIMIZATION) - if (SkScalarIsFinite(fBottom) && - SkScalarIsFinite(fRight) && - SkScalarIsFinite(fLeft) && - SkScalarIsFinite(fTop)) { - return true; - } else { - return false; - } -#else // x * 0 will be NaN iff x is infinity or NaN. // a + b will be NaN iff either a or b is NaN. float value = fLeft * 0 + fTop * 0 + fRight * 0 + fBottom * 0; @@ -364,7 +354,6 @@ struct SK_API SkRect { // value is either NaN or it is finite (zero). // value==value will be true iff value is not NaN return value == value; -#endif #else // use bit-or for speed, since we don't care about short-circuting the // tests, and we expect the common case will be that we need to check all. |