commit 64bb413a664001c95c8439cf097dc3033f4ed733
author Andreas Gampe <agampe@google.com> Sat Nov 22 00:35:09 2014 +0000
committer Andreas Gampe <agampe@google.com> Sat Nov 22 00:35:09 2014 +0000
tree d4562f7bb5656865d32e5d684b5a41542ecfaf58
parent 8a902d9f24e83c87b054adb5836b4a5b8a257be9

Revert "resolved conflicts for merge of 220c3f4f to master"

Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a

libs/hwui/Animator.cpp

diff --git a/libs/hwui/Animator.cpp b/libs/hwui/Animator.cpp
index f45ac50..a1bbc06 100644
--- a/libs/hwui/Animator.cpp
+++ b/libs/hwui/Animator.cpp
@@ -246,11 +246,11 @@
         , mProperty(property) {
 }
 
-float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* /* target */) const {
+float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* target) const {
     return mProperty->value;
 }
 
-void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* /* target */, float value) {
+void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* target, float value) {
     mProperty->value = value;
 }
 
@@ -269,7 +269,7 @@
         , mField(field) {
 }
 
-float CanvasPropertyPaintAnimator::getValue(RenderNode* /* target */) const {
+float CanvasPropertyPaintAnimator::getValue(RenderNode* target) const {
     switch (mField) {
     case STROKE_WIDTH:
         return mProperty->value.getStrokeWidth();
@@ -285,7 +285,7 @@
     return static_cast<uint8_t>( c < 0 ? 0 : c > 255 ? 255 : c );
 }
 
-void CanvasPropertyPaintAnimator::setValue(RenderNode* /* target */, float value) {
+void CanvasPropertyPaintAnimator::setValue(RenderNode* target, float value) {
     switch (mField) {
     case STROKE_WIDTH:
         mProperty->value.setStrokeWidth(value);