Title: [184756] branches/safari-601.1.32.2-branch/Source/WebKit2
- Revision
- 184756
- Author
- [email protected]
- Date
- 2015-05-21 23:34:17 -0700 (Thu, 21 May 2015)
Log Message
Merged r184726. rdar://problem/21031414
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184755 => 184756)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:32:30 UTC (rev 184755)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:34:17 UTC (rev 184756)
@@ -1,5 +1,23 @@
2015-05-21 Babak Shafiei <[email protected]>
+ Merge r184726.
+
+ 2015-05-21 Brian Weinstein <[email protected]>
+
+ Add a _WKWebKitContentExtensionStore initializer that takes a path.
+ https://bugs.webkit.org/show_bug.cgi?id=145269 and work towards <rdar://problem/21031414>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/APIUserContentExtensionStore.cpp:
+ (API::UserContentExtensionStore::storeWithPath):
+ * UIProcess/API/APIUserContentExtensionStore.h:
+ * UIProcess/API/Cocoa/_WKUserContentExtensionStore.h:
+ * UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm:
+ (+[_WKUserContentExtensionStore storeWithURL:]):
+
+2015-05-21 Babak Shafiei <[email protected]>
+
Merge r184514.
2015-05-18 Brady Eidson <[email protected]>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (184755 => 184756)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-22 06:32:30 UTC (rev 184755)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-22 06:34:17 UTC (rev 184756)
@@ -52,6 +52,11 @@
return *defaultStore;
}
+Ref<UserContentExtensionStore> UserContentExtensionStore::storeWithPath(const WTF::String& storePath)
+{
+ return adoptRef(*new UserContentExtensionStore(storePath));
+}
+
UserContentExtensionStore::UserContentExtensionStore()
: UserContentExtensionStore(defaultStorePath())
{
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h (184755 => 184756)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h 2015-05-22 06:32:30 UTC (rev 184755)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h 2015-05-22 06:34:17 UTC (rev 184756)
@@ -49,6 +49,7 @@
};
static UserContentExtensionStore& defaultStore();
+ static Ref<UserContentExtensionStore> storeWithPath(const WTF::String& storePath);
explicit UserContentExtensionStore();
explicit UserContentExtensionStore(const WTF::String& storePath);
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h (184755 => 184756)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h 2015-05-22 06:32:30 UTC (rev 184755)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h 2015-05-22 06:34:17 UTC (rev 184756)
@@ -33,6 +33,7 @@
@interface _WKUserContentExtensionStore : NSObject
+ (instancetype)defaultStore;
++ (instancetype)storeWithURL:(NSURL *)url;
- (void)compileContentExtensionForIdentifier:(NSString *)identifier encodedContentExtension:(NSString *) NS_RELEASES_ARGUMENT encodedContentExtension completionHandler:(void (^)(_WKUserContentFilter *, NSError *))completionHandler;
- (void)lookupContentExtensionForIdentifier:(NSString *)identifier completionHandler:(void (^)(_WKUserContentFilter *, NSError *))completionHandler;
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm (184755 => 184756)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm 2015-05-22 06:32:30 UTC (rev 184755)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm 2015-05-22 06:34:17 UTC (rev 184756)
@@ -46,6 +46,12 @@
return WebKit::wrapper(API::UserContentExtensionStore::defaultStore());
}
++ (instancetype)storeWithURL:(NSURL *)url
+{
+ Ref<API::UserContentExtensionStore> store = API::UserContentExtensionStore::storeWithPath(url.absoluteURL.fileSystemRepresentation);
+ return WebKit::wrapper(store.leakRef());
+}
+
- (void)compileContentExtensionForIdentifier:(NSString *)identifier encodedContentExtension:(NSString *)encodedContentExtension completionHandler:(void (^)(_WKUserContentFilter *, NSError *))completionHandler
{
auto handler = adoptNS([completionHandler copy]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
