Changeset 94074 in webkit

Timestamp:

Aug 30, 2011, 6:16:38 AM (15 years ago)

Author:

commit-queue@webkit.org

Message:

HTMLImageElement: Don't cache "ismap" and "usemap" attributes.
​https://bugs.webkit.org/show_bug.cgi?id=66784

Patch by Andreas Kling <​kling@webkit.org> on 2011-08-30
Reviewed by Darin Adler.

• html/HTMLImageElement.h: Remove the "ismap" and "usemap" members,

shrinking HTMLImageElement by 16 bytes (on 64-bit.)

• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::HTMLImageElement):
(WebCore::HTMLImageElement::parseMappedAttribute): Most of the logic
for "ismap" and "usemap" moved into isServerMap().
(WebCore::HTMLImageElement::isServerMap): Out-of-lined and implemented
using fast*Attribute().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLImageElement.cpp (modified) (3 diffs)
• html/HTMLImageElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-30  Andreas Kling  <kling@webkit.org>
+
+        HTMLImageElement: Don't cache "ismap" and "usemap" attributes.
+        https://bugs.webkit.org/show_bug.cgi?id=66784
+
+        Reviewed by Darin Adler.
+
+        * html/HTMLImageElement.h: Remove the "ismap" and "usemap" members,
+        shrinking HTMLImageElement by 16 bytes (on 64-bit.)
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::HTMLImageElement):
+        (WebCore::HTMLImageElement::parseMappedAttribute): Most of the logic
+        for "ismap" and "usemap" moved into isServerMap().
+        (WebCore::HTMLImageElement::isServerMap): Out-of-lined and implemented
+        using fast*Attribute().
+
 2011-08-30  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -45 +45 @@
     : HTMLElement(tagName, document)
     , m_imageLoader(this)
-    , ismap(false)
     , m_form(form)
     , m_compositeOperator(CompositeSourceOver)
@@ -128 +127 @@
     else if (attrName == valignAttr)
         addCSSProperty(attr, CSSPropertyVerticalAlign, attr->value());
-    else if (attrName == usemapAttr) {
-        if (attr->value().string()[0] == '#')
-            usemap = attr->value();
-        else
-            usemap = document()->completeURL(stripLeadingAndTrailingHTMLSpaces(attr->value())).string();
+    else if (attrName == usemapAttr)
         setIsLink(!attr->isNull());
-    } else if (attrName == ismapAttr)
-        ismap = true;
     else if (attrName == onabortAttr)
         setAttributeEventListener(eventNames().abortEvent, createAttributeEventListener(this, attr));
@@ -401 +394 @@
 }
 
-}
+bool HTMLImageElement::isServerMap() const
+{
+    if (!fastHasAttribute(ismapAttr))
+        return false;
+
+    const AtomicString& usemap = fastGetAttribute(usemapAttr);
+    
+    // If the usemap attribute starts with '#', it refers to a map element in the document.
+    if (usemap.string()[0] == '#')
+        return false;
+
+    return document()->completeURL(stripLeadingAndTrailingHTMLSpaces(usemap)).isEmpty();
+}
+
+}

trunk/Source/WebCore/html/HTMLImageElement.h

@@ -48 +48 @@
     int naturalHeight() const;
 
-    bool isServerMap() const { return ismap && usemap.isEmpty(); }
+    bool isServerMap() const;
 
     String altText() const;
@@ -104 +104 @@
 
     HTMLImageLoader m_imageLoader;
-    String usemap;
-    bool ismap;
     HTMLFormElement* m_form;
     AtomicString m_name;