commit 2577db1ec135a1470a2c42139772ec97a6c30e78
author Romain Guy <romainguy@google.com> Tue Jan 18 13:02:38 2011 -0800
committer Romain Guy <romainguy@google.com> Tue Jan 18 13:02:38 2011 -0800
tree 8be799a2fa33a0b68b8b11706ded6e0c66ce66d7
parent 807daf7df615b60ce6fc41355aabe3aa353cebab

Add support for Paint::setTextSkewX in OpenGLRenderer.
Bug #3360888

Change-Id: I42e81a1f10bf7b9ae1c63ca8add1878fd59a1e8a

libs/hwui/FontRenderer.cpp

diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index d1fbfba..c080501 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -38,8 +38,10 @@
 // Font
 ///////////////////////////////////////////////////////////////////////////////
 
-Font::Font(FontRenderer* state, uint32_t fontId, float fontSize, int flags) :
-    mState(state), mFontId(fontId), mFontSize(fontSize), mFlags(flags) {
+Font::Font(FontRenderer* state, uint32_t fontId, float fontSize,
+        int flags, uint32_t italicStyle) :
+        mState(state), mFontId(fontId), mFontSize(fontSize),
+        mFlags(flags), mItalicStyle(italicStyle) {
 }
 
 
@@ -275,17 +277,19 @@
     return newGlyph;
 }
 
-Font* Font::create(FontRenderer* state, uint32_t fontId, float fontSize, int flags) {
+Font* Font::create(FontRenderer* state, uint32_t fontId, float fontSize,
+        int flags, uint32_t italicStyle) {
     Vector<Font*> &activeFonts = state->mActiveFonts;
 
     for (uint32_t i = 0; i < activeFonts.size(); i++) {
         Font* font = activeFonts[i];
-        if (font->mFontId == fontId && font->mFontSize == fontSize && font->mFlags == flags) {
+        if (font->mFontId == fontId && font->mFontSize == fontSize &&
+                font->mFlags == flags && font->mItalicStyle == italicStyle) {
             return font;
         }
     }
 
-    Font* newFont = new Font(state, fontId, fontSize, flags);
+    Font* newFont = new Font(state, fontId, fontSize, flags, italicStyle);
     activeFonts.push(newFont);
     return newFont;
 }
@@ -638,7 +642,10 @@
     if (paint->isFakeBoldText()) {
         flags |= Font::kFakeBold;
     }
-    mCurrentFont = Font::create(this, fontId, fontSize, flags);
+
+    const float skewX = paint->getTextSkewX();
+    uint32_t italicStyle = *(uint32_t*) &skewX;
+    mCurrentFont = Font::create(this, fontId, fontSize, flags, italicStyle);
 
     const float maxPrecacheFontSize = 40.0f;
     bool isNewFont = currentNumFonts != mActiveFonts.size();

libs/hwui/FontRenderer.h

diff --git a/libs/hwui/FontRenderer.h b/libs/hwui/FontRenderer.h
index 40572c6..1005812 100644
--- a/libs/hwui/FontRenderer.h
+++ b/libs/hwui/FontRenderer.h
@@ -57,7 +57,8 @@
     /**
      * Creates a new font associated with the specified font state.
      */
-    static Font* create(FontRenderer* state, uint32_t fontId, float fontSize, int flags);
+    static Font* create(FontRenderer* state, uint32_t fontId, float fontSize,
+            int flags, uint32_t italicStyle);
 
 protected:
     friend class FontRenderer;
@@ -103,7 +104,7 @@
         SkFixed mRsbDelta;
     };
 
-    Font(FontRenderer* state, uint32_t fontId, float fontSize, int flags);
+    Font(FontRenderer* state, uint32_t fontId, float fontSize, int flags, uint32_t italicStyle);
 
     DefaultKeyedVector<int32_t, CachedGlyphInfo*> mCachedGlyphs;
 
@@ -122,6 +123,7 @@
     uint32_t mFontId;
     float mFontSize;
     int mFlags;
+    uint32_t mItalicStyle;
 };
 
 class FontRenderer {

tests/HwAccelerationTest/src/com/android/test/hwui/TextActivity.java

diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/TextActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/TextActivity.java
index 1b79cb6..e7f431c 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/TextActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/TextActivity.java
@@ -37,6 +37,7 @@
         private final Paint mLargePaint;
         private final Paint mStrikePaint;
         private final Paint mScaledPaint;
+        private final Paint mSkewPaint;
 
         CustomTextView(Context c) {
             super(c);
@@ -57,6 +58,10 @@
             mScaledPaint = new Paint();
             mScaledPaint.setAntiAlias(true);
             mScaledPaint.setTextSize(16.0f);
+
+            mSkewPaint = new Paint();
+            mSkewPaint.setAntiAlias(true);
+            mSkewPaint.setTextSize(16.0f);            
         }
 
         @Override
@@ -100,11 +105,18 @@
             mStrikePaint.setStrikeThruText(false);
             mStrikePaint.setUnderlineText(true);
             
+            mSkewPaint.setTextSkewX(-0.25f);
+            canvas.drawText("Hello OpenGL renderer!", 680, 200, mSkewPaint);
+            mSkewPaint.setTextSkewX(0.5f);
+            canvas.drawText("Hello OpenGL renderer!", 680, 230, mSkewPaint);
+            mSkewPaint.setTextSkewX(0.0f);
+            canvas.drawText("Hello OpenGL renderer!", 680, 260, mSkewPaint);
+
             mScaledPaint.setTextScaleX(0.5f);
             canvas.drawText("Hello OpenGL renderer!", 500, 200, mScaledPaint);
-            mScaledPaint.setTextScaleX(2.0f);
-            canvas.drawText("Hello OpenGL renderer!", 500, 230, mScaledPaint);
             mScaledPaint.setTextScaleX(1.0f);
+            canvas.drawText("Hello OpenGL renderer!", 500, 230, mScaledPaint);
+            mScaledPaint.setTextScaleX(2.0f);
             canvas.drawText("Hello OpenGL renderer!", 500, 260, mScaledPaint);
             
             canvas.save();