Drop UseCounters for certain properties on CSSStyleDeclaration

Source/bindings/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 22 matching lines @@
 
 #include "CSSPropertyNames.h"
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/V8Binding.h"
 #include "core/css/parser/BisonCSSParser.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSStyleDeclaration.h"
 #include "core/css/CSSValue.h"
 #include "core/css/RuntimeCSSEnabled.h"
 #include "core/events/EventTarget.h"
-#include "core/frame/UseCounter.h"
 #include "wtf/ASCIICType.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/StringConcatenate.h"
 
 using namespace WTF;
 using namespace std;
@@ skipping 21 matching lines @@
     for (unsigned i = 1; i < length; ++i) {
         if (!prefix[i])
             return isASCIIUpper(propertyName[i]);
         if (propertyName[i] != prefix[i])
             return false;
     }
     return false;
 }
 
 struct CSSPropertyInfo {
-    unsigned propID: 30; // CSSPropertyID
-    unsigned nameWithDash: 1;
-    unsigned nameWithCssPrefix: 1;
+    CSSPropertyID propID;
 };
 
-static inline void countCssPropertyInfoUsage(v8::Isolate* isolate, const CSSPropertyInfo& propInfo)
-{
-    if (propInfo.nameWithDash)
-        UseCounter::count(callingExecutionContext(isolate), UseCounter::CSSStyleDeclarationPropertyName);
-    if (propInfo.propID == CSSPropertyFloat && !propInfo.nameWithCssPrefix)
-        UseCounter::count(callingExecutionContext(isolate), UseCounter::CSSStyleDeclarationFloatPropertyName);
-}
-
 // 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::Handle<v8::String> v8PropertyName)
 {
     String propertyName = toCoreString(v8PropertyName);
     typedef HashMap<String, CSSPropertyInfo*> CSSPropertyInfoMap;
     DEFINE_STATIC_LOCAL(CSSPropertyInfoMap, map, ());
     CSSPropertyInfo* propInfo = map.get(propertyName);
     if (!propInfo) {
         unsigned length = propertyName.length();
         if (!length)
             return 0;
 
         StringBuilder builder;
         builder.reserveCapacity(length);
 
         unsigned i = 0;
         bool hasSeenDash = false;
-        bool hasSeenCssPrefix = false;
 
-        if (hasCSSPropertyNamePrefix(propertyName, "css")) {
-            hasSeenCssPrefix = true;
+        if (hasCSSPropertyNamePrefix(propertyName, "css"))
             i += 3;
-        } else if (hasCSSPropertyNamePrefix(propertyName, "webkit")) {
+        else if (hasCSSPropertyNamePrefix(propertyName, "webkit"))
             builder.append('-');
-        } else if (isASCIIUpper(propertyName[0])) {
+        else if (isASCIIUpper(propertyName[0]))
             return 0;
-        }
 
         bool hasSeenUpper = isASCIIUpper(propertyName[i]);
 
         builder.append(toASCIILower(propertyName[i++]));
 
         for (; i < length; ++i) {
             UChar c = propertyName[i];
             if (!isASCIIUpper(c)) {
                 if (c == '-')
                     hasSeenDash = true;
                 builder.append(c);
             }
             else {
                 hasSeenUpper = true;
                 builder.append('-');
                 builder.append(toASCIILower(c));
             }
         }
 
         // Reject names containing both dashes and upper-case characters, such as "border-rightColor".
         if (hasSeenDash && hasSeenUpper)
             return 0;
 
         String propName = builder.toString();
         CSSPropertyID propertyID = cssPropertyID(propName);
         if (propertyID && RuntimeCSSEnabled::isCSSPropertyEnabled(propertyID)) {
             propInfo = new CSSPropertyInfo();
             propInfo->propID = propertyID;
-            propInfo->nameWithDash = hasSeenDash;
-            propInfo->nameWithCssPrefix = hasSeenCssPrefix;
             map.add(propertyName, propInfo);
         }
     }
     return propInfo;
 }
 
 void V8CSSStyleDeclaration::namedPropertyEnumeratorCustom(const v8::PropertyCallbackInfo<v8::Array>& info)
 {
     typedef Vector<String, numCSSProperties - 1> PreAllocatedPropertyVector;
     DEFINE_STATIC_LOCAL(PreAllocatedPropertyVector, propertyNames, ());
@@ skipping 16 matching lines @@
         properties->Set(v8::Integer::New(info.GetIsolate(), i), v8String(info.GetIsolate(), key));
     }
 
     v8SetReturnValue(info, properties);
 }
 
 void V8CSSStyleDeclaration::namedPropertyQueryCustom(v8::Local<v8::String> v8Name, const v8::PropertyCallbackInfo<v8::Integer>& info)
 {
     // NOTE: cssPropertyInfo lookups incur several mallocs.
     // Successful lookups have the same cost the first time, but are cached.
-    if (CSSPropertyInfo* propInfo = cssPropertyInfo(v8Name)) {
-        countCssPropertyInfoUsage(info.GetIsolate(), *propInfo);
+    if (cssPropertyInfo(v8Name)) {
         v8SetReturnValueInt(info, 0);
         return;
     }
 }
 
 void V8CSSStyleDeclaration::namedPropertyGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     // First look for API defined attributes on the style declaration object.
     if (info.Holder()->HasRealNamedCallbackProperty(name))
         return;
 
     // Search the style declaration.
     CSSPropertyInfo* propInfo = cssPropertyInfo(name);
 
     // Do not handle non-property names.
     if (!propInfo)
         return;
 
-    countCssPropertyInfoUsage(info.GetIsolate(), *propInfo);
     CSSStyleDeclaration* imp = V8CSSStyleDeclaration::toNative(info.Holder());
     RefPtrWillBeRawPtr<CSSValue> cssValue = imp->getPropertyCSSValueInternal(static_cast<CSSPropertyID>(propInfo->propID));
     if (cssValue) {
         v8SetReturnValueStringOrNull(info, cssValue->cssText(), info.GetIsolate());
         return;
     }
 
     String result = imp->getPropertyValueInternal(static_cast<CSSPropertyID>(propInfo->propID));
     if (result.isNull())
         result = ""; // convert null to empty string.
 
     v8SetReturnValueString(info, result, info.GetIsolate());
 }
 
 void V8CSSStyleDeclaration::namedPropertySetterCustom(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     CSSStyleDeclaration* imp = V8CSSStyleDeclaration::toNative(info.Holder());
     CSSPropertyInfo* propInfo = cssPropertyInfo(name);
     if (!propInfo)
         return;
 
-    countCssPropertyInfoUsage(info.GetIsolate(), *propInfo);
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, propertyValue, value);
     ExceptionState exceptionState(ExceptionState::SetterContext, getPropertyName(static_cast<CSSPropertyID>(propInfo->propID)), "CSSStyleDeclaration", info.Holder(), info.GetIsolate());
     imp->setPropertyInternal(static_cast<CSSPropertyID>(propInfo->propID), propertyValue, false, exceptionState);
 
     if (exceptionState.throwIfNeeded())
         return;
 
     v8SetReturnValue(info, value);
 }
 
 } // namespace WebCore