Changeset 74260 in webkit

Timestamp:

Dec 17, 2010 6:39:13 AM (13 years ago)

Author:

antonm@chromium.org

Message:

2010-12-17 Anton Muhin <​antonm@chromium.org>

Reviewed by Yury Semikhatsky.

[v8] The last portion of CSS GC work: fixing fast/dom/StyleSheet/gc-stylesheet-wrapper.html
​https://bugs.webkit.org/show_bug.cgi?id=51121

Properly group style elements of HTML links, style elements and processing instructions.

• bindings/v8/V8GCController.cpp: (WebCore::NodeGrouperVisitor::visitDOMWrapper): (WebCore::NodeGrouperVisitor::addDOMObjectToGroup):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8GCController.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-17  Anton Muhin  <antonm@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        [v8] The last portion of CSS GC work: fixing fast/dom/StyleSheet/gc-stylesheet-wrapper.html
+        https://bugs.webkit.org/show_bug.cgi?id=51121
+
+        Properly group style elements of HTML links, style elements and processing instructions.
+
+        * bindings/v8/V8GCController.cpp:
+        (WebCore::NodeGrouperVisitor::visitDOMWrapper):
+        (WebCore::NodeGrouperVisitor::addDOMObjectToGroup):
+
 2010-12-17  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/WebCore/bindings/v8/V8GCController.cpp

@@ -51 +51 @@
 #include "V8CSSStyleSheet.h"
 #include "V8DOMMap.h"
+#include "V8HTMLLinkElement.h"
+#include "V8HTMLStyleElement.h"
 #include "V8MessagePort.h"
+#include "V8ProcessingInstruction.h"
 #include "V8Proxy.h"
 #include "V8StyleSheetList.h"
@@ -330 +333 @@
         if (node->isStyledElement()) {
             StyledElement* element = reinterpret_cast<StyledElement*>(node);
-            CSSStyleDeclaration* style = element->inlineStyleDecl();
-            if (style) {
-                wrapper = store->domObjectMap().get(style);
-                if (!wrapper.IsEmpty())
-                    m_grouper.append(GrouperItem(groupId, wrapper));
-            }
+            addDOMObjectToGroup(store, groupId, element->inlineStyleDecl());
         }
 
         if (node->isDocumentNode()) {
             Document* document = reinterpret_cast<Document*>(node);
-            wrapper = store->domObjectMap().get(document->styleSheets());
-            if (!wrapper.IsEmpty())
-                m_grouper.append(GrouperItem(groupId, wrapper));
+            addDOMObjectToGroup(store, groupId, document->styleSheets());
+        }
+
+        WrapperTypeInfo* typeInfo = V8DOMWrapper::domWrapperType(wrapper);
+
+        if (V8HTMLLinkElement::info.equals(typeInfo)) {
+            HTMLLinkElement* htmlLinkElement = static_cast<HTMLLinkElement*>(node);
+            addDOMObjectToGroup(store, groupId, htmlLinkElement->sheet());
+        }
+
+        if (V8HTMLStyleElement::info.equals(typeInfo)) {
+            HTMLStyleElement* htmlStyleElement = static_cast<HTMLStyleElement*>(node);
+            addDOMObjectToGroup(store, groupId, htmlStyleElement->sheet());
+        }
+
+        if (V8ProcessingInstruction::info.equals(typeInfo)) {
+            ProcessingInstruction* processingInstruction = static_cast<ProcessingInstruction*>(node);
+            addDOMObjectToGroup(store, groupId, processingInstruction->sheet());
         }
     }
@@ -353 +366 @@
 private:
     GrouperList m_grouper;
+
+    void addDOMObjectToGroup(DOMDataStore* store, uintptr_t groupId, void* object)
+    {
+        if (!object)
+            return;
+        v8::Persistent<v8::Object> wrapper = store->domObjectMap().get(object);
+        if (!wrapper.IsEmpty())
+            m_grouper.append(GrouperItem(groupId, wrapper));
+    }
 };