Remove ScriptState from NodeIterator, NodeFilter, NodeFilterCondition and TreeWalker

Source/bindings/v8/V8NodeFilterCondition.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef V8NodeFilterCondition_h
 #define V8NodeFilterCondition_h
 
+#include "bindings/v8/NewScriptState.h"
 #include "bindings/v8/ScopedPersistent.h"
 #include "core/dom/NodeFilterCondition.h"
 #include <v8.h>
 #include "wtf/PassRefPtr.h"
 
 namespace WebCore {
 
 class Node;
-class ScriptState;
+class ExceptionState;
 
 // V8NodeFilterCondition maintains a Javascript implemented callback for
 // filtering Node returned by NodeIterator/TreeWalker.
 // A NodeFilterCondition is referenced by a NodeFilter, and A NodeFilter is
 // referenced by a NodeIterator/TreeWalker. As V8NodeFilterCondition maintains
 // a Javascript callback which may reference Document, we need to avoid circular
 // reference spanning V8/Blink object space.
 // To address this issue, V8NodeFilterCondition holds a weak reference to
 // |m_filter|, the Javascript value, and the whole reference is exposed to V8 to
 // let V8 GC handle collection of |m_filter|.
 // (DOM)
 // NodeIterator  ----RefPtr----> NodeFilter ----RefPtr----> NodeFilterCondition
 //   |   ^                        |   ^                        |
 //  weak |                       weak |                ScopedPersistent(weak)
 //   | RefPtr                     | RefPtr                     |
 //   v   |                        v   |                        v
 // NodeIterator  --HiddenValue--> NodeFilter --HiddenValue--> JS Callback
 // (V8)
 class V8NodeFilterCondition FINAL : public NodeFilterCondition {
 public:
     static PassRefPtr<V8NodeFilterCondition> create(v8::Handle<v8::Value> filter, v8::Handle<v8::Object> owner, v8::Isolate* isolate)
     {
         return adoptRef(new V8NodeFilterCondition(filter, owner, isolate));
     }
 
     virtual ~V8NodeFilterCondition();
 
-    virtual short acceptNode(ScriptState*, Node*) const OVERRIDE;
+    virtual short acceptNode(Node*, ExceptionState&) const OVERRIDE;
 
 private:
     // As the value |filter| is maintained by V8GC, the |owner| which references
     // V8NodeFilterCondition, usually a wrapper of NodeFilter, is specified here
     // to hold a strong reference to |filter|.
     V8NodeFilterCondition(v8::Handle<v8::Value> filter, v8::Handle<v8::Object> owner, v8::Isolate*);
 
     static void setWeakCallback(const v8::WeakCallbackData<v8::Value, V8NodeFilterCondition>&);
 
+    RefPtr<NewScriptState> m_scriptState;
     ScopedPersistent<v8::Value> m_filter;
 };
 
 } // namespace WebCore
 
 #endif // V8NodeFilterCondition_h