Make UseCounters work on aliased properties

Source/bindings/core/v8/custom/V8CSSStyleDeclarationCustom.cpp

 /*
  * Copyright (C) 2007-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 66 matching lines @@
         if (propertyName[i] != prefix[i])
             return false;
     }
     return false;
 }
 
 struct CSSPropertyInfo {
     CSSPropertyID propID;
 };
 
-static CSSPropertyID cssResolvedPropertyID(const String& propertyName, v8::Isolate* isolate)
+static CSSPropertyID parseCSSPropertyID(const String& propertyName, v8::Isolate* isolate)
 {
     unsigned length = propertyName.length();
     if (!length)
         return CSSPropertyInvalid;
 
     StringBuilder builder;
     builder.reserveCapacity(length);
 
     unsigned i = 0;
     bool hasSeenDash = false;
@@ skipping 23 matching lines @@
             builder.append('-');
             builder.append(toASCIILower(c));
         }
     }
 
     // Reject names containing both dashes and upper-case characters, such as "border-rightColor".
     if (hasSeenDash && hasSeenUpper)
         return CSSPropertyInvalid;
 
     String propName = builder.toString();
-    return cssPropertyID(propName);
+    return unresolvedCSSPropertyID(propName);
 }
 
 // When getting properties on CSSStyleDeclarations, the name used from
 // Javascript and the actual name of the property are not the same, so
 // we have to do the following translation. The translation turns upper
 // case characters into lower case characters and inserts dashes to
 // separate words.
 //
 // Example: 'backgroundPositionY' -> 'background-position-y'
 //
 // Also, certain prefixes such as 'css-' are stripped.
 static CSSPropertyInfo* cssPropertyInfo(v8::Local<v8::String> v8PropertyName, v8::Isolate* isolate)
 {
     String propertyName = toCoreString(v8PropertyName);
     typedef HashMap<String, CSSPropertyInfo*> CSSPropertyInfoMap;
     DEFINE_STATIC_LOCAL(CSSPropertyInfoMap, map, ());
     CSSPropertyInfo* propInfo = map.get(propertyName);
     if (!propInfo) {
         propInfo = new CSSPropertyInfo();
-        propInfo->propID = cssResolvedPropertyID(propertyName, isolate);
+        propInfo->propID = parseCSSPropertyID(propertyName, isolate);
         map.add(propertyName, propInfo);
     }
     if (!propInfo->propID)
         return 0;
     ASSERT(CSSPropertyMetadata::isEnabledProperty(propInfo->propID));
     return propInfo;
 }
 
 void V8CSSStyleDeclaration::namedPropertyEnumeratorCustom(const v8::PropertyCallbackInfo<v8::Array>& info)
 {
@@ skipping 34 matching lines @@
 }
 
 void V8CSSStyleDeclaration::namedPropertyGetterCustom(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     // Search the style declaration.
     CSSPropertyInfo* propInfo = cssPropertyInfo(name.As<v8::String>(), info.GetIsolate());
 
     // Do not handle non-property names.
     if (!propInfo)
         return;
+    CSSPropertyID resolvedProperty = resolveCSSPropertyID(propInfo->propID);
 
     CSSStyleDeclaration* impl = V8CSSStyleDeclaration::toImpl(info.Holder());
-    RefPtrWillBeRawPtr<CSSValue> cssValue = impl->getPropertyCSSValueInternal(static_cast<CSSPropertyID>(propInfo->propID));
+    RefPtrWillBeRawPtr<CSSValue> cssValue = impl->getPropertyCSSValueInternal(resolvedProperty);
     if (cssValue) {
         v8SetReturnValueStringOrNull(info, cssValue->cssText(), info.GetIsolate());
         return;
     }
 
-    String result = impl->getPropertyValueInternal(static_cast<CSSPropertyID>(propInfo->propID));
+    String result = impl->getPropertyValueInternal(resolvedProperty);
     v8SetReturnValueString(info, result, info.GetIsolate());
 }
 
 void V8CSSStyleDeclaration::namedPropertySetterCustom(v8::Local<v8::Name> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     if (!name->IsString())
         return;
     CSSStyleDeclaration* impl = V8CSSStyleDeclaration::toImpl(info.Holder());
     CSSPropertyInfo* propInfo = cssPropertyInfo(name.As<v8::String>(), info.GetIsolate());
     if (!propInfo)
         return;
 
     TOSTRING_VOID(V8StringResource<TreatNullAsNullString>, propertyValue, value);
-    ExceptionState exceptionState(ExceptionState::SetterContext, getPropertyName(static_cast<CSSPropertyID>(propInfo->propID)), "CSSStyleDeclaration", info.Holder(), info.GetIsolate());
+    ExceptionState exceptionState(ExceptionState::SetterContext, getPropertyName(resolveCSSPropertyID(propInfo->propID)), "CSSStyleDeclaration", info.Holder(), info.GetIsolate());
     impl->setPropertyInternal(static_cast<CSSPropertyID>(propInfo->propID), propertyValue, false, exceptionState);
 
     if (exceptionState.throwIfNeeded())
         return;
 
     v8SetReturnValue(info, value);
 }
 
 } // namespace blink