Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / NodeFilter.h

diff --git a/src/third_party/WebKit/Source/core/dom/NodeFilter.h b/src/third_party/WebKit/Source/core/dom/NodeFilter.h
index a811a13..1bad0fc 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/NodeFilter.h
+++ b/src/third_party/WebKit/Source/core/dom/NodeFilter.h
@@ -25,13 +25,15 @@
 #ifndef NodeFilter_h
 #define NodeFilter_h
 
-#include "bindings/v8/ScriptWrappable.h"
+#include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/NodeFilterCondition.h"
+#include "platform/heap/Handle.h"
 #include "wtf/RefPtr.h"
 
-namespace WebCore {
+namespace blink {
 
-class NodeFilter : public RefCounted<NodeFilter>, public ScriptWrappable {
+class NodeFilter final : public RefCountedWillBeGarbageCollected<NodeFilter>, public ScriptWrappable {
+    DEFINE_WRAPPERTYPEINFO();
 public:
     /**
      * The following constants are returned by the acceptNode()
@@ -65,37 +67,33 @@ public:
         SHOW_NOTATION                  = 0x00000800
     };
 
-    static PassRefPtr<NodeFilter> create(PassRefPtr<NodeFilterCondition> condition)
+    static PassRefPtrWillBeRawPtr<NodeFilter> create(PassRefPtrWillBeRawPtr<NodeFilterCondition> condition)
     {
-        return adoptRef(new NodeFilter(condition));
+        return adoptRefWillBeNoop(new NodeFilter(condition));
     }
 
-    static PassRefPtr<NodeFilter> create()
+    static PassRefPtrWillBeRawPtr<NodeFilter> create()
     {
-        return adoptRef(new NodeFilter());
+        return adoptRefWillBeNoop(new NodeFilter());
     }
 
-    short acceptNode(ScriptState*, Node*) const;
+    short acceptNode(Node*, ExceptionState&) const;
 
-    void setCondition(PassRefPtr<NodeFilterCondition> condition)
+    void setCondition(PassRefPtrWillBeRawPtr<NodeFilterCondition> condition)
     {
         m_condition = condition;
     }
 
+    void trace(Visitor*);
+
 private:
-    explicit NodeFilter(PassRefPtr<NodeFilterCondition> condition) : m_condition(condition)
-    {
-        ScriptWrappable::init(this);
-    }
+    explicit NodeFilter(PassRefPtrWillBeRawPtr<NodeFilterCondition> condition) : m_condition(condition) { }
 
-    NodeFilter()
-    {
-        ScriptWrappable::init(this);
-    }
+    NodeFilter() { }
 
-    RefPtr<NodeFilterCondition> m_condition;
+    RefPtrWillBeMember<NodeFilterCondition> m_condition;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // NodeFilter_h