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/page/UserContentURLPattern.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'Source/WebCore/page/UserContentURLPattern.h') diff --git a/Source/WebCore/page/UserContentURLPattern.h b/Source/WebCore/page/UserContentURLPattern.h index a86892bce..e9ffe1c00 100644 --- a/Source/WebCore/page/UserContentURLPattern.h +++ b/Source/WebCore/page/UserContentURLPattern.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 UserContentURLPattern_h -#define UserContentURLPattern_h +#pragma once #include #include @@ -45,7 +44,7 @@ public: bool isValid() const { return !m_invalid; } - bool matches(const URL&) const; + WEBCORE_EXPORT bool matches(const URL&) const; const String& scheme() const { return m_scheme; } const String& host() const { return m_host; } @@ -56,7 +55,7 @@ public: static bool matchesPatterns(const URL&, const Vector& whitelist, const Vector& blacklist); private: - bool parse(const String& pattern); + WEBCORE_EXPORT bool parse(const String& pattern); bool matchesHost(const URL&) const; bool matchesPath(const URL&) const; @@ -70,7 +69,4 @@ private: bool m_matchSubdomains; }; - } // namespace WebCore - -#endif // UserContentURLPattern_h -- cgit v1.2.1