Title: [98894] trunk/Source/WebKit2
- Revision
- 98894
- Author
- je...@apple.com
- Date
- 2011-10-31 15:55:01 -0700 (Mon, 31 Oct 2011)
Log Message
Add more APIs to WKUserContentURLPattern.h
https://bugs.webkit.org/show_bug.cgi?id=71245
Add additional WKUserContentURLPattern APIs to match what was provided by
the equivalent WebKit1 API.
Reviewed by Darin Adler.
* Shared/API/c/WKUserContentURLPattern.cpp:
(WKUserContentURLPatternCopyHost): Added.
(WKUserContentURLPatternCopyScheme): Added.
(WKUserContentURLPatternIsValid): Added.
(WKUserContentURLPatternMatchesSubdomains): Added.
* Shared/API/c/WKUserContentURLPattern.h: Added new APIs.
* Shared/WebUserContentURLPattern.h:
(WebKit::WebUserContentURLPattern::host): Added.
(WebKit::WebUserContentURLPattern::scheme): Added.
(WebKit::WebUserContentURLPattern::isValid): Added.
(WebKit::WebUserContentURLPattern::matchesSubdomains): Added.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98893 => 98894)
--- trunk/Source/WebKit2/ChangeLog 2011-10-31 22:52:58 UTC (rev 98893)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-31 22:55:01 UTC (rev 98894)
@@ -1,3 +1,27 @@
+2011-10-31 Jeff Miller <je...@apple.com>
+
+ Add more APIs to WKUserContentURLPattern.h
+ https://bugs.webkit.org/show_bug.cgi?id=71245
+
+ Add additional WKUserContentURLPattern APIs to match what was provided by
+ the equivalent WebKit1 API.
+
+ Reviewed by Darin Adler.
+
+ * Shared/API/c/WKUserContentURLPattern.cpp:
+ (WKUserContentURLPatternCopyHost): Added.
+ (WKUserContentURLPatternCopyScheme): Added.
+ (WKUserContentURLPatternIsValid): Added.
+ (WKUserContentURLPatternMatchesSubdomains): Added.
+
+ * Shared/API/c/WKUserContentURLPattern.h: Added new APIs.
+
+ * Shared/WebUserContentURLPattern.h:
+ (WebKit::WebUserContentURLPattern::host): Added.
+ (WebKit::WebUserContentURLPattern::scheme): Added.
+ (WebKit::WebUserContentURLPattern::isValid): Added.
+ (WebKit::WebUserContentURLPattern::matchesSubdomains): Added.
+
2011-10-31 Anders Carlsson <ander...@apple.com>
More work on making plug-ins work better with transforms
Modified: trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp (98893 => 98894)
--- trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp 2011-10-31 22:52:58 UTC (rev 98893)
+++ trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.cpp 2011-10-31 22:55:01 UTC (rev 98894)
@@ -27,6 +27,7 @@
#include "WKUserContentURLPattern.h"
#include "WKAPICast.h"
+#include "WKString.h"
#include "WebUserContentURLPattern.h"
using namespace WebKit;
@@ -42,7 +43,27 @@
return toAPI(userContentURLPattern.release().leakRef());
}
+WKStringRef WKUserContentURLPatternCopyHost(WKUserContentURLPatternRef urlPatternRef)
+{
+ return toCopiedAPI(toImpl(urlPatternRef)->host());
+}
+
+WKStringRef WKUserContentURLPatternCopyScheme(WKUserContentURLPatternRef urlPatternRef)
+{
+ return toCopiedAPI(toImpl(urlPatternRef)->scheme());
+}
+
+bool WKUserContentURLPatternIsValid(WKUserContentURLPatternRef urlPatternRef)
+{
+ return toImpl(urlPatternRef)->isValid();
+}
+
bool WKUserContentURLPatternMatchesURL(WKUserContentURLPatternRef urlPatternRef, WKURLRef urlRef)
{
return toImpl(urlPatternRef)->matchesURL(toWTFString(urlRef));
}
+
+bool WKUserContentURLPatternMatchesSubdomains(WKUserContentURLPatternRef urlPatternRef)
+{
+ return toImpl(urlPatternRef)->matchesSubdomains();
+}
Modified: trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h (98893 => 98894)
--- trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h 2011-10-31 22:52:58 UTC (rev 98893)
+++ trunk/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h 2011-10-31 22:55:01 UTC (rev 98894)
@@ -37,7 +37,11 @@
WK_EXPORT WKUserContentURLPatternRef WKUserContentURLPatternCreate(WKStringRef patternRef);
+WK_EXPORT WKStringRef WKUserContentURLPatternCopyHost(WKUserContentURLPatternRef urlPatternRef);
+WK_EXPORT WKStringRef WKUserContentURLPatternCopyScheme(WKUserContentURLPatternRef urlPatternRef);
+WK_EXPORT bool WKUserContentURLPatternIsValid(WKUserContentURLPatternRef urlPatternRef);
WK_EXPORT bool WKUserContentURLPatternMatchesURL(WKUserContentURLPatternRef urlPatternRef, WKURLRef urlRef);
+WK_EXPORT bool WKUserContentURLPatternMatchesSubdomains(WKUserContentURLPatternRef urlPatternRef);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h (98893 => 98894)
--- trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h 2011-10-31 22:52:58 UTC (rev 98893)
+++ trunk/Source/WebKit2/Shared/WebUserContentURLPattern.h 2011-10-31 22:55:01 UTC (rev 98894)
@@ -43,7 +43,11 @@
return adoptRef(new WebUserContentURLPattern(pattern));
}
+ const String& host() const { return m_pattern.host(); }
+ const String& scheme() const { return m_pattern.scheme(); }
+ bool isValid() const { return m_pattern.isValid(); };
bool matchesURL(const String& url) const { return m_pattern.matches(WebCore::KURL(WebCore::ParsedURLString, url)); }
+ bool matchesSubdomains() const { return m_pattern.matchSubdomains(); }
const String& patternString() const { return m_patternString; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
