Changeset 84021 in webkit

Timestamp:

Apr 15, 2011 12:55:54 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-04-14 Oliver Hunt <​oliver@apple.com>

Reviewed by Geoffrey Garen.

Make JSNodeFilterCondition handle its lifetime correctly
​https://bugs.webkit.org/show_bug.cgi?id=58622

Add export

• JavaScriptCore.exp:

2011-04-14 Oliver Hunt <​oliver@apple.com>

Reviewed by Geoffrey Garen.

Make JSNodeFilterCondition handle its lifetime correctly
​https://bugs.webkit.org/show_bug.cgi?id=58622

Switch over to a WeakHandle and external roots to keep the
condition value live.

• bindings/js/JSNodeFilterCondition.cpp: (WebCore::JSNodeFilterCondition::JSNodeFilterCondition): (WebCore::JSNodeFilterCondition::markAggregate): (WebCore::JSNodeFilterCondition::acceptNode): (WebCore::JSNodeFilterCondition::WeakOwner::isReachableFromOpaqueRoots):
• bindings/js/JSNodeFilterCondition.h: (WebCore::JSNodeFilterCondition::create):
• bindings/js/JSNodeFilterCustom.cpp: (WebCore::toNodeFilter):
• bindings/scripts/CodeGeneratorJS.pm:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (7 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSNodeFilterCondition.cpp (modified) (4 diffs)
• WebCore/bindings/js/JSNodeFilterCondition.h (modified) (2 diffs)
• WebCore/bindings/js/JSNodeFilterCustom.cpp (modified) (1 diff)
• WebCore/bindings/js/JSNodeIteratorCustom.cpp (modified) (1 diff)
• WebCore/bindings/js/JSTreeWalkerCustom.cpp (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (2 diffs)
• WebCore/dom/NodeFilter.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-14  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Make JSNodeFilterCondition handle its lifetime correctly
+        https://bugs.webkit.org/show_bug.cgi?id=58622
+
+        Add export
+
+        * JavaScriptCore.exp:
+
 2011-04-14  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.exp

@@ -170 +170 @@
 __ZN3JSC15JSWrapperObject12markChildrenERNS_9MarkStackE
 __ZN3JSC15WeakHandleOwner26isReachableFromOpaqueRootsENS_6HandleINS_7UnknownEEEPvRNS_9MarkStackE
+__ZN3JSC15WeakHandleOwner8finalizeENS_6HandleINS_7UnknownEEEPv
 __ZN3JSC15WeakHandleOwnerD2Ev
 __ZN3JSC15createTypeErrorEPNS_9ExecStateERKNS_7UStringE

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -665 +665 @@
                         containerPortal = F33EE0D3135678CA00E09E65 /* gtest.xcodeproj */;
                         proxyType = 2;
-                        remoteGlobalIDString = 4539C8FF0EC27F6400A70F4C /* gtest.framework */;
+                        remoteGlobalIDString = 4539C8FF0EC27F6400A70F4C;
                         remoteInfo = "gtest-framework";
                 };
@@ -672 +672 @@
                         containerPortal = F33EE0D3135678CA00E09E65 /* gtest.xcodeproj */;
                         proxyType = 2;
-                        remoteGlobalIDString = 40C848FA101A209C0083642A /* libgtest.a */;
+                        remoteGlobalIDString = 40C848FA101A209C0083642A;
                         remoteInfo = "gtest-static";
                 };
@@ -679 +679 @@
                         containerPortal = F33EE0D3135678CA00E09E65 /* gtest.xcodeproj */;
                         proxyType = 2;
-                        remoteGlobalIDString = 40C8490B101A217E0083642A /* libgtest_main.a */;
+                        remoteGlobalIDString = 40C8490B101A217E0083642A;
                         remoteInfo = "gtest_main-static";
                 };
@@ -686 +686 @@
                         containerPortal = F33EE0D3135678CA00E09E65 /* gtest.xcodeproj */;
                         proxyType = 2;
-                        remoteGlobalIDString = 40899F430FFA7184000B29AE /* gtest_unittest-framework */;
+                        remoteGlobalIDString = 40899F430FFA7184000B29AE;
                         remoteInfo = "gtest_unittest-framework";
                 };
@@ -693 +693 @@
                         containerPortal = F33EE0D3135678CA00E09E65 /* gtest.xcodeproj */;
                         proxyType = 2;
-                        remoteGlobalIDString = 40C84987101A36850083642A /* gtest_unittest */;
+                        remoteGlobalIDString = 40C84987101A36850083642A;
                         remoteInfo = "gtest_unittest-static";
                 };
@@ -700 +700 @@
                         containerPortal = F33EE0D3135678CA00E09E65 /* gtest.xcodeproj */;
                         proxyType = 2;
-                        remoteGlobalIDString = 4089A0130FFACEFC000B29AE /* sample1_unittest-framework */;
+                        remoteGlobalIDString = 4089A0130FFACEFC000B29AE;
                         remoteInfo = "sample1_unittest-framework";
                 };
@@ -707 +707 @@
                         containerPortal = F33EE0D3135678CA00E09E65 /* gtest.xcodeproj */;
                         proxyType = 2;
-                        remoteGlobalIDString = 40C84997101A36A60083642A /* sample1_unittest-static */;
+                        remoteGlobalIDString = 40C84997101A36A60083642A;
                         remoteInfo = "sample1_unittest-static";
                 };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Make JSNodeFilterCondition handle its lifetime correctly
+        https://bugs.webkit.org/show_bug.cgi?id=58622
+
+        Switch over to a WeakHandle and external roots to keep the
+        condition value live.
+
+        * bindings/js/JSNodeFilterCondition.cpp:
+        (WebCore::JSNodeFilterCondition::JSNodeFilterCondition):
+        (WebCore::JSNodeFilterCondition::markAggregate):
+        (WebCore::JSNodeFilterCondition::acceptNode):
+        (WebCore::JSNodeFilterCondition::WeakOwner::isReachableFromOpaqueRoots):
+        * bindings/js/JSNodeFilterCondition.h:
+        (WebCore::JSNodeFilterCondition::create):
+        * bindings/js/JSNodeFilterCustom.cpp:
+        (WebCore::toNodeFilter):
+        * bindings/scripts/CodeGeneratorJS.pm:
+
 2011-04-13  Luiz Agostini  <luiz.agostini@openbossa.org>
 

trunk/Source/WebCore/bindings/js/JSNodeFilterCondition.cpp

@@ -33 +33 @@
 ASSERT_CLASS_FITS_IN_CELL(JSNodeFilterCondition);
 
-JSNodeFilterCondition::JSNodeFilterCondition(JSValue filter)
-    : m_filter(filter)
+JSNodeFilterCondition::JSNodeFilterCondition(JSGlobalData& globalData, NodeFilter* owner, JSValue filter)
+    : m_filter(globalData, filter, &m_weakOwner, owner)
 {
-}
-
-void JSNodeFilterCondition::markAggregate(MarkStack& markStack)
-{
-    markStack.append(&m_filter);
 }
 
@@ -47 +42 @@
     JSLock lock(SilenceAssertionsOnly);
 
-    if (!m_filter->isObject())
+    if (!m_filter.isObject())
         return NodeFilter::FILTER_ACCEPT;
 
@@ -63 +58 @@
     CallType callType = getCallData(function, callData);
     if (callType == CallTypeNone) {
-        function = m_filter->get(exec, Identifier(exec, "acceptNode"));
+        function = m_filter.get().get(exec, Identifier(exec, "acceptNode"));
         callType = getCallData(function, callData);
         if (callType == CallTypeNone) {
@@ -89 +84 @@
 }
 
+bool JSNodeFilterCondition::WeakOwner::isReachableFromOpaqueRoots(JSC::Handle<Unknown>, void* context, MarkStack& markStack)
+{
+    return markStack.containsOpaqueRoot(context);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/bindings/js/JSNodeFilterCondition.h

@@ -22 +22 @@
 
 #include "NodeFilterCondition.h"
+#include <heap/Weak.h>
 #include <runtime/JSValue.h>
 #include <wtf/PassRefPtr.h>
@@ -28 +29 @@
 
     class Node;
+    class NodeFilter;
 
     class JSNodeFilterCondition : public NodeFilterCondition {
     public:
-        static PassRefPtr<JSNodeFilterCondition> create(JSC::JSValue filter)
+        static PassRefPtr<JSNodeFilterCondition> create(JSC::JSGlobalData& globalData, NodeFilter* owner, JSC::JSValue filter)
         {
-            return adoptRef(new JSNodeFilterCondition(filter));
+            return adoptRef(new JSNodeFilterCondition(globalData, owner, filter));
         }
 
     private:
-        JSNodeFilterCondition(JSC::JSValue filter);
+        JSNodeFilterCondition(JSC::JSGlobalData&, NodeFilter* owner, JSC::JSValue filter);
 
         virtual short acceptNode(ScriptState*, Node*) const;
-        virtual void markAggregate(JSC::MarkStack&);
 
-        mutable JSC::DeprecatedPtr<JSC::Unknown> m_filter;
+        class WeakOwner : public JSC::WeakHandleOwner {
+            virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::MarkStack&);
+        };
+        WeakOwner m_weakOwner;
+        mutable JSC::Weak<JSC::Unknown> m_filter;
     };
 

trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp

@@ -40 +40 @@
 {
     Base::markChildren(markStack);
-    impl()->markAggregate(markStack);
+    markStack.addOpaqueRoot(impl());
 }
 
-PassRefPtr<NodeFilter> toNodeFilter(JSValue value)
+PassRefPtr<NodeFilter> toNodeFilter(JSGlobalData& globalData, JSValue value)
 {
     if (value.inherits(&JSNodeFilter::s_info))
         return static_cast<JSNodeFilter*>(asObject(value))->impl();
 
-    return NodeFilter::create(JSNodeFilterCondition::create(value));
+    RefPtr<NodeFilter> result = NodeFilter::create();
+    result->setCondition(JSNodeFilterCondition::create(globalData, result.get(), value));
+    return result.release();
 }
 

trunk/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp

@@ -35 +35 @@
 
     if (NodeFilter* filter = m_impl->filter())
-        filter->markAggregate(markStack);
+        markStack.addOpaqueRoot(filter);
 }
 

trunk/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp

@@ -35 +35 @@
 
     if (NodeFilter* filter = m_impl->filter())
-        filter->markAggregate(markStack);
+        markStack.addOpaqueRoot(filter);
 }
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -924 +924 @@
     if (!$hasParent || $dataNode->extendedAttributes->{"GenerateNativeConverter"}) {
         if ($interfaceName eq "NodeFilter") {
-            push(@headerContent, "PassRefPtr<NodeFilter> toNodeFilter(JSC::JSValue);\n");
+            push(@headerContent, "PassRefPtr<NodeFilter> toNodeFilter(JSC::JSGlobalData&, JSC::JSValue);\n");
         } else {
             push(@headerContent, "$implType* to${interfaceName}(JSC::JSValue);\n");
@@ -2467 +2467 @@
     }
 
+    if ($type eq "NodeFilter") {
+        $implIncludes{"JS$type.h"} = 1;
+        return "to$type(exec->globalData(), $value)";
+    }
+
     if ($type eq "MediaQueryListListener") {
         $implIncludes{"MediaQueryListListener.h"} = 1;

trunk/Source/WebCore/dom/NodeFilter.h

@@ -71 +71 @@
         }
 
+        static PassRefPtr<NodeFilter> create()
+        {
+            return adoptRef(new NodeFilter());
+        }
+
         short acceptNode(ScriptState*, Node*) const;
-        void markAggregate(JSC::MarkStack& markStack) { m_condition->markAggregate(markStack); };
 
         // Do not call these functions. They are just scaffolding to support the Objective-C bindings.
         // They operate in the main thread normal world, and they swallow JS exceptions.
         short acceptNode(Node* node) const { return acceptNode(scriptStateFromNode(mainThreadNormalWorld(), node), node); }
+        
+        void setCondition(PassRefPtr<NodeFilterCondition> condition) { ASSERT(!m_condition); m_condition = condition; }
 
     private:
         NodeFilter(PassRefPtr<NodeFilterCondition> condition) : m_condition(condition) { }
+        NodeFilter() {}
 
         RefPtr<NodeFilterCondition> m_condition;