commit 42ddc18d108f789705ad4eb697ce9599ad322507
author Andreas Gampe <agampe@google.com> Fri Nov 21 09:49:08 2014 -0800
committer Andreas Gampe <agampe@google.com> Fri Nov 21 10:39:21 2014 -0800
tree 53ed2c03a53112f6bfd515a6d03b02dfed0cc9e9
parent f926d71b8ef2790da067550144860705c1a61fe5

Frameworks/base: Unused parameters in hwui

Remove Clang cutout for unused parameters. Fix warnings.

Remove Clang cutout for deprecated Skia function usage. Has been
fixed in the L push.

Change-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7

libs/hwui/GammaFontRenderer.h

diff --git a/libs/hwui/GammaFontRenderer.h b/libs/hwui/GammaFontRenderer.h
index 46cfd04..3abbad0 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();