Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: Source/bindings/v8/V8NodeFilterCondition.cpp

Issue 21274004: Fix Document leak from NodeFilter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: don't print numberOfLiveDocuments when test passed Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/bindings/v8/V8NodeFilterCondition.h ('k') | Source/bindings/v8/custom/V8NodeIteratorCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/V8NodeFilterCondition.cpp
diff --git a/Source/bindings/v8/V8NodeFilterCondition.cpp b/Source/bindings/v8/V8NodeFilterCondition.cpp
index 52bafc17c07b31b87f7802f3a8bd1541d049fa3c..ec2621e14d6f383917f7e8b06334069139ab67f4 100644
--- a/Source/bindings/v8/V8NodeFilterCondition.cpp
+++ b/Source/bindings/v8/V8NodeFilterCondition.cpp
@@ -34,15 +34,18 @@
#include "V8Node.h"
#include "bindings/v8/ScriptController.h"
#include "bindings/v8/ScriptState.h"
+#include "bindings/v8/V8HiddenPropertyName.h"
#include "core/dom/Node.h"
#include "core/dom/NodeFilter.h"
#include "wtf/OwnArrayPtr.h"
namespace WebCore {
-V8NodeFilterCondition::V8NodeFilterCondition(v8::Handle<v8::Value> filter)
+V8NodeFilterCondition::V8NodeFilterCondition(v8::Handle<v8::Value> filter, v8::Handle<v8::Object> owner)
: m_filter(filter)
{
+ owner->SetHiddenValue(V8HiddenPropertyName::condition(), filter);
+ m_filter.makeWeak(this, &makeWeakCallback);
}
V8NodeFilterCondition::~V8NodeFilterCondition()
@@ -56,6 +59,7 @@ short V8NodeFilterCondition::acceptNode(ScriptState* state, Node* node) const
v8::Isolate* isolate = state->isolate();
v8::HandleScope handleScope(isolate);
v8::Handle<v8::Value> filter = m_filter.newLocal(isolate);
+ ASSERT(!filter.IsEmpty());
if (!filter->IsObject())
return NodeFilter::FILTER_ACCEPT;
@@ -89,4 +93,9 @@ short V8NodeFilterCondition::acceptNode(ScriptState* state, Node* node) const
return result->Int32Value();
}
+void V8NodeFilterCondition::makeWeakCallback(v8::Isolate*, v8::Persistent<v8::Value>*, V8NodeFilterCondition* condition)
+{
+ condition->m_filter.clear();
+}
+
} // namespace WebCore
« no previous file with comments | « Source/bindings/v8/V8NodeFilterCondition.h ('k') | Source/bindings/v8/custom/V8NodeIteratorCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698