Changeset 24103 in webkit

Timestamp:

Jul 8, 2007 2:02:23 PM (17 years ago)

Author:

bdash

Message:

2007-07-08 Mitz Pettel <​mitz@webkit.org>

Reviewed by Maciej.

• fix leaks introduced in r24099

• dom/Element.cpp: (WebCore::Element::~Element): Do not delete the cached computed style here. (WebCore::Element::detach): Delete the computed style here instead. (WebCore::Element::computedStyle): Removed a redundant ref() which was causing the leak. Changed to return 0 if the element is not attached, because in that case there is currently no way to tell when to delete the computed style.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-08  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Maciej.
+
+        - fix leaks introduced in r24099
+
+        * dom/Element.cpp:
+        (WebCore::Element::~Element): Do not delete the cached computed style here.
+        (WebCore::Element::detach): Delete the computed style here instead.
+        (WebCore::Element::computedStyle): Removed a redundant ref() which was
+        causing the leak. Changed to return 0 if the element is not attached,
+        because in that case there is currently no way to tell when to delete the computed
+        style.
+
 2007-07-08  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/dom/Element.cpp

@@ -108 +108 @@
         ElementRareDataMap::iterator it = dataMap.find(this);
         ASSERT(it != dataMap.end());
-        it->second->resetComputedStyle(this);
         delete it->second;
         dataMap.remove(it);
@@ -671 +670 @@
 {
     stopUpdateFocusAppearanceTimer();
+    if (ElementRareData* rd = rareData())
+        rd->resetComputedStyle(this);
     ContainerNode::detach();
 }
@@ -1090 +1091 @@
         return usedStyle;
 
+    if (!attached())
+        // FIXME: Try to do better than this. Ensure that styleForElement() works for elements that are not in the
+        // document tree and figure out when to destroy the computed style for such elements.
+        return 0;
+
     ElementRareData* rd = createRareData();
-    if (!rd->m_computedStyle) {
+    if (!rd->m_computedStyle)
         rd->m_computedStyle = document()->styleSelector()->styleForElement(this, parent() ? parent()->computedStyle() : 0);
-        rd->m_computedStyle->ref();
-    }
     return rd->m_computedStyle;
 }