Changeset 30391 in webkit

Timestamp:

Feb 18, 2008, 5:12:12 PM (17 years ago)

Author:

Darin Adler

Message:

Reviewed by Sam.

• bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::hasCSSPropertyNamePrefix): Added. (WebCore::cssPropertyName): Reimplement to not use DeprecatedString. Also made faster by using a Vector<UChar> and eliminating all the string operations.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSCSSStyleDeclarationCustom.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog ¶

@@ +1 @@
+2008-02-18  Darin Adler  <darin@apple.com>
+
+        Reviewed by Sam.
+
+        * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+        (WebCore::hasCSSPropertyNamePrefix): Added.
+        (WebCore::cssPropertyName): Reimplement to not use DeprecatedString. Also made faster
+        by using a Vector<UChar> and eliminating all the string operations.
+
 2008-02-18  Stephanie Lewis  <slewis@apple.com>
 

trunk/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp ¶

@@ -1 +1 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31 +31 @@
 #include "CSSStyleDeclaration.h"
 #include "CSSValue.h"
-#include "DeprecatedString.h"
 #include "PlatformString.h"
 #include <kjs/string_object.h>
+#include <wtf/ASCIICType.h>
+
+using namespace KJS;
+using namespace WTF;
 
 namespace WebCore {
 
-using namespace KJS;
+// Check for a CSS prefix.
+// Passed prefix is all lowercase.
+// First characters of property name may be upper or lowercase.
+// Other characters in the prefix within the property name must be lowercase.
+// The prefix within the property name must be followed by a capital letter.
+static bool hasCSSPropertyNamePrefix(const Identifier& propertyName, const char* prefix)
+{
+#ifndef NDEBUG
+    ASSERT(*prefix);
+    for (const char* p = prefix; *p; ++p)
+        ASSERT(isASCIILower(*p));
+#endif
+
+    unsigned length = propertyName.size();
+    ASSERT(length);
+
+    if (toASCIILower(propertyName.data()[0].unicode()) != prefix[0])
+        return false;
+
+    for (unsigned i = 1; i < length; ++i) {
+        if (!prefix[i])
+            return isASCIIUpper(propertyName.data()[i].unicode());
+        if (propertyName.data()[0].unicode() != prefix[0])
+            return false;
+    }
+    return false;
+}
 
 static String cssPropertyName(const Identifier& propertyName, bool* hadPixelOrPosPrefix = 0)
 {
-    DeprecatedString prop = propertyName;
-
-    int i = prop.length();
-
-    if (!i)
-        return prop;
-
-    while (--i) {
-        ::UChar c = prop[i].unicode();
-        if (c >= 'A' && c <= 'Z')
-            prop.insert(i, '-');
-    }
-
-    prop = prop.lower();
-
     if (hadPixelOrPosPrefix)
         *hadPixelOrPosPrefix = false;
 
-    if (prop.startsWith("css-"))
-        prop = prop.mid(4);
-    else if (prop.startsWith("pixel-")) {
-        prop = prop.mid(6);
+    unsigned length = propertyName.size();
+    if (!length)
+        return String();
+
+    Vector< ::UChar> name;
+    name.reserveCapacity(length);
+
+    unsigned i = 0;
+
+    if (hasCSSPropertyNamePrefix(propertyName, "css"))
+        i += 3;
+    else if (hasCSSPropertyNamePrefix(propertyName, "pixel")) {
+        i += 5;
         if (hadPixelOrPosPrefix)
             *hadPixelOrPosPrefix = true;
-    } else if (prop.startsWith("pos-")) {
-        prop = prop.mid(4);
+    } else if (hasCSSPropertyNamePrefix(propertyName, "pos")) {
+        i += 3;
         if (hadPixelOrPosPrefix)
             *hadPixelOrPosPrefix = true;
-    } else if (prop.startsWith("khtml-") || prop.startsWith("apple-") || prop.startsWith("webkit-"))
-        prop.insert(0, '-');
+    } else if (hasCSSPropertyNamePrefix(propertyName, "webkit")
+            || hasCSSPropertyNamePrefix(propertyName, "khtml")
+            || hasCSSPropertyNamePrefix(propertyName, "apple"))
+        name.append('-');
 
-    return prop;
+    name.append(toASCIILower(propertyName.data()[i++].unicode()));
+
+    for (; i < length; ++i) {
+        ::UChar c = propertyName.data()[i].unicode();
+        if (!isASCIIUpper(c))
+            name.append(c);
+        else {
+            name.append('-');
+            name.append(toASCIILower(c));
+        }
+    }
+
+    return String::adopt(name);
 }
 
@@ -85 +122 @@
 }
 
-JSValue* JSCSSStyleDeclaration::nameGetter(ExecState* exec, JSObject* originalObject, const Identifier& propertyName, const PropertySlot& slot)
+// FIXME: You can get these properties, and set them (see customPut below),
+// but you should also be able the enumerate them.
+JSValue* JSCSSStyleDeclaration::nameGetter(ExecState* exec, JSObject* originalObject,
+    const Identifier& propertyName, const PropertySlot& slot)
 {
     JSCSSStyleDeclaration* thisObj = static_cast<JSCSSStyleDeclaration*>(slot.slotBase());
@@ -108 +148 @@
     // Make the SVG 'filter' attribute undetectable, to avoid confusion with the IE 'filter' attribute.
     if (propertyName == "filter")
-        return new StringInstanceThatMasqueradesAsUndefined(exec->lexicalGlobalObject()->stringPrototype(), thisObj->impl()->getPropertyValue(prop));
+        return new StringInstanceThatMasqueradesAsUndefined(exec->lexicalGlobalObject()->stringPrototype(),
+            thisObj->impl()->getPropertyValue(prop));
 
     return jsString(thisObj->impl()->getPropertyValue(prop));