Get rid of extra NULL check when indexing 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 68 matching lines @@
     }
     return false;
 }
 
 struct CSSPropertyInfo {
     unsigned propID: 30; // CSSPropertyID
     unsigned nameWithDash: 1;
     unsigned nameWithCssPrefix: 1;
 };
 
+static inline void countCssPropertyInfoUsage(const CSSPropertyInfo& propInfo)
+{
+    if (propInfo.nameWithDash)
+        UseCounter::count(activeDOMWindow(), UseCounter::CSSStyleDeclarationPropertyName);
+    if (propInfo.propID == CSSPropertyFloat && !propInfo.nameWithCssPrefix)
+        UseCounter::count(activeDOMWindow(), 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)
@@ skipping 41 matching lines @@
         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);
         }
     }
-
-    if (propInfo) {
-        if (propInfo->nameWithDash)
-            UseCounter::count(activeDOMWindow(), UseCounter::CSSStyleDeclarationPropertyName);
-        if (propInfo->propID == CSSPropertyFloat && !propInfo->nameWithCssPrefix)
-            UseCounter::count(activeDOMWindow(), UseCounter::CSSStyleDeclarationFloatPropertyName);
-    }
-
     return propInfo;
 }
 
 void V8CSSStyleDeclaration::namedPropertyEnumeratorCustom(const v8::PropertyCallbackInfo<v8::Array>& info)
 {
     typedef Vector<String, numCSSProperties - 1> PreAllocatedPropertyVector;
     DEFINE_STATIC_LOCAL(PreAllocatedPropertyVector, propertyNames, ());
     static unsigned propertyNamesLength = 0;
 
     if (propertyNames.isEmpty()) {
@@ skipping 13 matching lines @@
         properties->Set(v8::Integer::New(i, info.GetIsolate()), v8String(key, info.GetIsolate()));
     }
 
     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(v8Name)) {
+    if (CSSPropertyInfo* propInfo = cssPropertyInfo(v8Name)) {
+        countCssPropertyInfoUsage(*propInfo);
         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(*propInfo);
     CSSStyleDeclaration* imp = V8CSSStyleDeclaration::toNative(info.Holder());
     RefPtr<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(*propInfo);
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, propertyValue, value);
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
     imp->setPropertyInternal(static_cast<CSSPropertyID>(propInfo->propID), propertyValue, false, exceptionState);
 
     if (exceptionState.throwIfNeeded())
         return;
 
     v8SetReturnValue(info, value);
 }
 
 } // namespace WebCore