From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/xml/NativeXPathNSResolver.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Source/WebCore/xml/NativeXPathNSResolver.h') diff --git a/Source/WebCore/xml/NativeXPathNSResolver.h b/Source/WebCore/xml/NativeXPathNSResolver.h index f71ad9364..0264207c8 100644 --- a/Source/WebCore/xml/NativeXPathNSResolver.h +++ b/Source/WebCore/xml/NativeXPathNSResolver.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,8 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef NativeXPathNSResolver_h -#define NativeXPathNSResolver_h +#pragma once #include "XPathNSResolver.h" #include @@ -35,16 +34,14 @@ class Node; class NativeXPathNSResolver : public XPathNSResolver { public: - static PassRefPtr create(PassRefPtr node) { return adoptRef(new NativeXPathNSResolver(node)); } + static Ref create(RefPtr&& node) { return adoptRef(*new NativeXPathNSResolver(WTFMove(node))); } virtual ~NativeXPathNSResolver(); - virtual String lookupNamespaceURI(const String& prefix); + String lookupNamespaceURI(const String& prefix) override; private: - explicit NativeXPathNSResolver(PassRefPtr); + explicit NativeXPathNSResolver(RefPtr&&); RefPtr m_node; }; } // namespace WebCore - -#endif // NativeXPathNSResolver_h -- cgit v1.2.1