| Index: Source/platform/URLPatternMatcher.h
|
| diff --git a/Source/core/page/UserContentURLPattern.h b/Source/platform/URLPatternMatcher.h
|
| similarity index 75%
|
| rename from Source/core/page/UserContentURLPattern.h
|
| rename to Source/platform/URLPatternMatcher.h
|
| index 7415b8870532c86c7235047852c2307cab977859..38c99619f984e6239a7f89ae239c682a4edb3263 100644
|
| --- a/Source/core/page/UserContentURLPattern.h
|
| +++ b/Source/platform/URLPatternMatcher.h
|
| @@ -23,9 +23,10 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef UserContentURLPattern_h
|
| -#define UserContentURLPattern_h
|
| +#ifndef URLPatternMatcher_h
|
| +#define URLPatternMatcher_h
|
|
|
| +#include "platform/PlatformExport.h"
|
| #include "wtf/Vector.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| @@ -33,31 +34,21 @@ namespace WebCore {
|
|
|
| class KURL;
|
|
|
| -class UserContentURLPattern {
|
| +class PLATFORM_EXPORT URLPatternMatcher {
|
| public:
|
| - UserContentURLPattern() : m_invalid(true), m_matchSubdomains(false) { }
|
| + static bool matchesPatterns(const KURL&, const Vector<String>& whitelist);
|
|
|
| - UserContentURLPattern(const String& pattern)
|
| - : m_matchSubdomains(false)
|
| +private:
|
| + URLPatternMatcher(const String& pattern)
|
| + : m_matchSubdomains(false)
|
| {
|
| m_invalid = !parse(pattern);
|
| }
|
|
|
| - bool isValid() const { return !m_invalid; }
|
| + bool parse(const String& pattern);
|
|
|
| bool matches(const KURL&) const;
|
|
|
| - const String& scheme() const { return m_scheme; }
|
| - const String& host() const { return m_host; }
|
| - const String& path() const { return m_path; }
|
| -
|
| - bool matchSubdomains() const { return m_matchSubdomains; }
|
| -
|
| - static bool matchesPatterns(const KURL&, const Vector<String>& whitelist, const Vector<String>& blacklist);
|
| -
|
| -private:
|
| - bool parse(const String& pattern);
|
| -
|
| bool matchesHost(const KURL&) const;
|
| bool matchesPath(const KURL&) const;
|
|
|
| @@ -73,4 +64,4 @@ private:
|
|
|
| } // namespace WebCore
|
|
|
| -#endif // UserContentURLPattern_h
|
| +#endif // URLPatternMatcher_h
|
|
|