webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 28 deletions

diff --git a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.h b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.h
index 7e218e8b7..4cee8d316 100644
--- a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.h
+++ b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,43 +23,32 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef JSCustomXPathNSResolver_h
-#define JSCustomXPathNSResolver_h
+#pragma once
 
+#include "ExceptionOr.h"
 #include "XPathNSResolver.h"
 #include <heap/Strong.h>
 #include <heap/StrongInlines.h>
+#include <runtime/JSCInlines.h>
 #include <runtime/JSCJSValue.h>
-#include <runtime/Operations.h>
-#include <wtf/Forward.h>
-#include <wtf/RefPtr.h>
-
-namespace JSC {
-    class ExecState;
-    class JSObject;
-}
 
 namespace WebCore {
 
-    class Frame;
-    class JSDOMWindow;
+class JSDOMWindow;
 
-    class JSCustomXPathNSResolver : public XPathNSResolver {
-    public:
-        static PassRefPtr<JSCustomXPathNSResolver> create(JSC::ExecState*, JSC::JSValue);
-        
-        virtual ~JSCustomXPathNSResolver();
+class JSCustomXPathNSResolver final : public XPathNSResolver {
+public:
+    static ExceptionOr<Ref<JSCustomXPathNSResolver>> create(JSC::ExecState&, JSC::JSValue);
+    virtual ~JSCustomXPathNSResolver();
 
-        virtual String lookupNamespaceURI(const String& prefix);
+private:
+    JSCustomXPathNSResolver(JSC::VM&, JSC::JSObject*, JSDOMWindow*);
 
-    private:
-        JSCustomXPathNSResolver(JSC::ExecState*, JSC::JSObject*, JSDOMWindow*);
+    String lookupNamespaceURI(const String& prefix) final;
 
-        // JSCustomXPathNSResolvers are always temporary so using a Strong reference is safe here.
-        JSC::Strong<JSC::JSObject> m_customResolver;
-        JSC::Strong<JSDOMWindow> m_globalObject;
-    };
+    // JSCustomXPathNSResolvers are always temporary so using a Strong reference is safe here.
+    JSC::Strong<JSC::JSObject> m_customResolver;
+    JSC::Strong<JSDOMWindow> m_globalObject;
+};
 
 } // namespace WebCore
-
-#endif // JSCustomXPathNSResolver_h