Changeset 96638 in webkit

Timestamp:

Oct 4, 2011 1:39:45 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Shrink HTMLTableCellElement.
​https://bugs.webkit.org/show_bug.cgi?id=69347

Patch by Andreas Kling <​kling@webkit.org> on 2011-10-04
Reviewed by Antti Koivisto.

Don't cache the rowspan and colspan attributes on the element.
This shrinks HTMLTableCellElement by one CPU word, reducing memory
consumption by 80 kB (on 64-bit) when loading the full HTML5 spec.

• html/HTMLTableCellElement.cpp:

(WebCore::HTMLTableCellElement::HTMLTableCellElement):
(WebCore::HTMLTableCellElement::colSpan):
(WebCore::HTMLTableCellElement::rowSpan):
(WebCore::HTMLTableCellElement::parseMappedAttribute):

• html/HTMLTableCellElement.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-04  Andreas Kling  <kling@webkit.org>
+
+        Shrink HTMLTableCellElement.
+        https://bugs.webkit.org/show_bug.cgi?id=69347
+
+        Reviewed by Antti Koivisto.
+
+        Don't cache the rowspan and colspan attributes on the element.
+        This shrinks HTMLTableCellElement by one CPU word, reducing memory
+        consumption by 80 kB (on 64-bit) when loading the full HTML5 spec.
+
+        * html/HTMLTableCellElement.cpp:
+        (WebCore::HTMLTableCellElement::HTMLTableCellElement):
+        (WebCore::HTMLTableCellElement::colSpan):
+        (WebCore::HTMLTableCellElement::rowSpan):
+        (WebCore::HTMLTableCellElement::parseMappedAttribute):
+        * html/HTMLTableCellElement.h:
+
 2011-10-04  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/html/HTMLTableCellElement.cpp

@@ -45 +45 @@
 inline HTMLTableCellElement::HTMLTableCellElement(const QualifiedName& tagName, Document* document)
     : HTMLTablePartElement(tagName, document)
-    , m_rowSpan(1)
-    , m_colSpan(1)
 {
 }
@@ -53 +51 @@
 {
     return adoptRef(new HTMLTableCellElement(tagName, document));
+}
+
+int HTMLTableCellElement::colSpan() const
+{
+    const AtomicString& colSpanValue = fastGetAttribute(colspanAttr);
+    return max(1, colSpanValue.toInt());
+}
+
+int HTMLTableCellElement::rowSpan() const
+{
+    const AtomicString& rowSpanValue = fastGetAttribute(rowspanAttr);
+    return max(1, min(rowSpanValue.toInt(), maxRowspan));
 }
 
@@ -85 +95 @@
 {
     if (attr->name() == rowspanAttr) {
-        m_rowSpan = max(1, min(attr->value().toInt(), maxRowspan));
         if (renderer() && renderer()->isTableCell())
             toRenderTableCell(renderer())->updateFromElement();
     } else if (attr->name() == colspanAttr) {
-        m_colSpan = max(1, attr->value().toInt());
         if (renderer() && renderer()->isTableCell())
             toRenderTableCell(renderer())->updateFromElement();

trunk/Source/WebCore/html/HTMLTableCellElement.h

@@ -37 +37 @@
     int cellIndex() const;
 
-    int colSpan() const { return m_colSpan; }
-    int rowSpan() const { return m_rowSpan; }
+    int colSpan() const;
+    int rowSpan() const;
 
     void setCellIndex(int);
@@ -64 +64 @@
 
     virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
-
-    int m_rowSpan;
-    int m_colSpan;
 };