commit f088c349dfea985e561d7e838ecd41be5168cd4a
author John Reck <jreck@google.com> Fri Dec 12 09:49:29 2014 -0800
committer John Reck <jreck@google.com> Fri Dec 12 09:49:29 2014 -0800
tree 5b9d412b5bf31cd6f20f0e94dc464174441efca0
parent 7fc885b0bfb8a799825531932567a1d472a55087

Fix style

Change-Id: I7227b0eac126bf470ed50249a7809b845872983b

libs/hwui/font/Font.cpp

diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp
index d73d9ac..e1a38dd 100644
--- a/libs/hwui/font/Font.cpp
+++ b/libs/hwui/font/Font.cpp
@@ -139,8 +139,8 @@
 }
 
 void Font::measureCachedGlyph(CachedGlyphInfo *glyph, int x, int y,
-        uint8_t* /* bitmap */, uint32_t /* bitmapW */, uint32_t /* bitmapH */, Rect* bounds,
-        const float* /* pos */) {
+        uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds,
+        const float* pos) {
     int width = (int) glyph->mBitmapWidth;
     int height = (int) glyph->mBitmapHeight;
 
@@ -162,8 +162,8 @@
 }
 
 void Font::drawCachedGlyph(CachedGlyphInfo* glyph, int x, int y,
-        uint8_t* /* bitmap */, uint32_t /* bitmapW */, uint32_t /* bitmapH */, Rect* /* bounds */,
-        const float* /* pos */) {
+        uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds,
+        const float* pos) {
     float width = (float) glyph->mBitmapWidth;
     float height = (float) glyph->mBitmapHeight;
 
@@ -182,8 +182,8 @@
 }
 
 void Font::drawCachedGlyphTransformed(CachedGlyphInfo* glyph, int x, int y,
-        uint8_t* /* bitmap */, uint32_t /* bitmapW */, uint32_t /* bitmapH */, Rect* /* bounds */,
-        const float* /* pos */) {
+        uint8_t* bitmap, uint32_t bitmapW, uint32_t bitmapH, Rect* bounds,
+        const float* pos) {
     float width = (float) glyph->mBitmapWidth;
     float height = (float) glyph->mBitmapHeight;
 
@@ -213,8 +213,8 @@
 }
 
 void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, uint8_t* bitmap,
-        uint32_t bitmapWidth, uint32_t /* bitmapHeight */, Rect* /* bounds */,
-        const float* /* pos */) {
+        uint32_t bitmapWidth, uint32_t bitmapHeight, Rect* bounds,
+        const float* pos) {
     int dstX = x + glyph->mBitmapLeft;
     int dstY = y + glyph->mBitmapTop;
 
@@ -431,7 +431,7 @@
     }
 }
 
-void Font::updateGlyphCache(const SkPaint* /* paint */, const SkGlyph& skiaGlyph,
+void Font::updateGlyphCache(const SkPaint* paint, const SkGlyph& skiaGlyph,
         SkGlyphCache* skiaGlyphCache, CachedGlyphInfo* glyph, bool precaching) {
     glyph->mAdvanceX = skiaGlyph.fAdvanceX;
     glyph->mAdvanceY = skiaGlyph.fAdvanceY;