commit 8b59a528b54279ce640b2d23a00acae1d0f477c5
author John Reck <jreck@android.com> Sat Nov 22 00:10:02 2014 +0000
committer John Reck <jreck@android.com> Sat Nov 22 00:10:02 2014 +0000
tree fd10f5ffc634e0d574f269f7fd2f18b742f6e1d1
parent 42ddc18d108f789705ad4eb697ce9599ad322507

Revert "Frameworks/base: Unused parameters in hwui"

This reverts commit 42ddc18d108f789705ad4eb697ce9599ad322507.

Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d

libs/hwui/GammaFontRenderer.h

diff --git a/libs/hwui/GammaFontRenderer.h b/libs/hwui/GammaFontRenderer.h
index 3abbad0..46cfd04 100644
--- a/libs/hwui/GammaFontRenderer.h
+++ b/libs/hwui/GammaFontRenderer.h
@@ -70,7 +70,7 @@
         }
     }
 
-    FontRenderer& getFontRenderer(const SkPaint* /* paint */) {
+    FontRenderer& getFontRenderer(const SkPaint* paint) {
         if (!mRenderer) {
             mRenderer = new FontRenderer;
         }
@@ -81,7 +81,7 @@
         return 1;
     }
 
-    uint32_t getFontRendererSize(uint32_t /* fontRenderer */, GLenum format) const {
+    uint32_t getFontRendererSize(uint32_t fontRenderer, GLenum format) const {
         return mRenderer ? mRenderer->getCacheSize(format) : 0;
     }
 
@@ -116,7 +116,7 @@
         }
     }
 
-    FontRenderer& getFontRenderer(const SkPaint* /* paint */) {
+    FontRenderer& getFontRenderer(const SkPaint* paint) {
         if (!mRenderer) {
             mRenderer = new FontRenderer;
             mRenderer->setGammaTable(&mGammaTable[0]);
@@ -128,14 +128,14 @@
         return 1;
     }
 
-    uint32_t getFontRendererSize(uint32_t /* fontRenderer */, GLenum format) const {
+    uint32_t getFontRendererSize(uint32_t fontRenderer, GLenum format) const {
         return mRenderer ? mRenderer->getCacheSize(format) : 0;
     }
 
-    void describe(ProgramDescription& /* description */, const SkPaint* /* paint */) const {
+    void describe(ProgramDescription& description, const SkPaint* paint) const {
     }
 
-    void setupProgram(ProgramDescription& /* description */, Program* /* program */) const {
+    void setupProgram(ProgramDescription& description, Program* program) const {
     }
 
     void endPrecaching();
@@ -171,10 +171,10 @@
         return renderer->getCacheSize(format);
     }
 
-    void describe(ProgramDescription& /* description */, const SkPaint* /* paint */) const {
+    void describe(ProgramDescription& description, const SkPaint* paint) const {
     }
 
-    void setupProgram(ProgramDescription& /* description */, Program* /* program */) const {
+    void setupProgram(ProgramDescription& description, Program* program) const {
     }
 
     void endPrecaching();