Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 8 insertions, 8 deletions

diff --git a/Source/WebCore/page/UserContentURLPattern.h b/Source/WebCore/page/UserContentURLPattern.h
index 0de055ef5..8b8af6d80 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
@@ -31,7 +31,7 @@
 
 namespace WebCore {
 
-class KURL;
+class URL;
 
 class UserContentURLPattern {
 public:
@@ -45,7 +45,7 @@ public:
 
     bool isValid() const { return !m_invalid; }
 
-    bool matches(const KURL&) const;
+    WEBCORE_EXPORT bool matches(const URL&) const;
 
     const String& scheme() const { return m_scheme; }
     const String& host() const { return m_host; }
@@ -53,13 +53,13 @@ public:
 
     bool matchSubdomains() const { return m_matchSubdomains; }
     
-    static bool matchesPatterns(const KURL&, const Vector<String>& whitelist, const Vector<String>& blacklist);
+    static bool matchesPatterns(const URL&, const Vector<String>& whitelist, const Vector<String>& blacklist);
 
 private:
-    bool parse(const String& pattern);
+    WEBCORE_EXPORT bool parse(const String& pattern);
 
-    bool matchesHost(const KURL&) const;
-    bool matchesPath(const KURL&) const;
+    bool matchesHost(const URL&) const;
+    bool matchesPath(const URL&) const;
 
     bool m_invalid;