Title: [170032] trunk/Source/WebKit2
- Revision
- 170032
- Author
- [email protected]
- Date
- 2014-06-16 15:57:16 -0700 (Mon, 16 Jun 2014)
Log Message
<rdar://problem/17327707> [Cocoa] Expose WebPreferences::storageBlockingPolicy
https://bugs.webkit.org/show_bug.cgi?id=133958
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKPreferences.mm:
(toStorageBlockingPolicy): Added this helper conversion function.
(toAPI): Ditto.
(-[WKPreferences _storageBlockingPolicy]): Added this getter.
(-[WKPreferences _setStorageBlockingPolicy:]): Added this setter.
* UIProcess/API/Cocoa/WKPreferencesPrivate.h: Declared new _storageBlockingPolicy property
and _WKStorageBlockingPolicy enum.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170031 => 170032)
--- trunk/Source/WebKit2/ChangeLog 2014-06-16 22:46:58 UTC (rev 170031)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-16 22:57:16 UTC (rev 170032)
@@ -1,3 +1,18 @@
+2014-06-16 Dan Bernstein <[email protected]>
+
+ <rdar://problem/17327707> [Cocoa] Expose WebPreferences::storageBlockingPolicy
+ https://bugs.webkit.org/show_bug.cgi?id=133958
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (toStorageBlockingPolicy): Added this helper conversion function.
+ (toAPI): Ditto.
+ (-[WKPreferences _storageBlockingPolicy]): Added this getter.
+ (-[WKPreferences _setStorageBlockingPolicy:]): Added this setter.
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Declared new _storageBlockingPolicy property
+ and _WKStorageBlockingPolicy enum.
+
2014-06-16 Anders Carlsson <[email protected]>
Don't use AtomicString in HTTPHeaderMap
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (170031 => 170032)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-06-16 22:46:58 UTC (rev 170031)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-06-16 22:57:16 UTC (rev 170032)
@@ -29,6 +29,7 @@
#if WK_API_ENABLED
#import "WebPreferences.h"
+#import <WebCore/SecurityOrigin.h>
#import <wtf/RetainPtr.h>
@implementation WKPreferences
@@ -112,6 +113,46 @@
_preferences->setTelephoneNumberParsingEnabled(telephoneNumberDetectionIsEnabled);
}
+static WebCore::SecurityOrigin::StorageBlockingPolicy toStorageBlockingPolicy(_WKStorageBlockingPolicy policy)
+{
+ switch (policy) {
+ case _WKStorageBlockingPolicyAllowAll:
+ return WebCore::SecurityOrigin::AllowAllStorage;
+ case _WKStorageBlockingPolicyBlockThirdParty:
+ return WebCore::SecurityOrigin::BlockThirdPartyStorage;
+ case _WKStorageBlockingPolicyBlockAll:
+ return WebCore::SecurityOrigin::BlockAllStorage;
+ }
+
+ ASSERT_NOT_REACHED();
+ return WebCore::SecurityOrigin::AllowAllStorage;
+}
+
+static _WKStorageBlockingPolicy toAPI(WebCore::SecurityOrigin::StorageBlockingPolicy policy)
+{
+ switch (policy) {
+ case WebCore::SecurityOrigin::AllowAllStorage:
+ return _WKStorageBlockingPolicyAllowAll;
+ case WebCore::SecurityOrigin::BlockThirdPartyStorage:
+ return _WKStorageBlockingPolicyBlockThirdParty;
+ case WebCore::SecurityOrigin::BlockAllStorage:
+ return _WKStorageBlockingPolicyBlockAll;
+ }
+
+ ASSERT_NOT_REACHED();
+ return _WKStorageBlockingPolicyAllowAll;
+}
+
+- (_WKStorageBlockingPolicy)_storageBlockingPolicy
+{
+ return toAPI(static_cast<WebCore::SecurityOrigin::StorageBlockingPolicy>(_preferences->storageBlockingPolicy()));
+}
+
+- (void)_setStorageBlockingPolicy:(_WKStorageBlockingPolicy)policy
+{
+ _preferences->setStorageBlockingPolicy(toStorageBlockingPolicy(policy));
+}
+
@end
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (170031 => 170032)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-06-16 22:46:58 UTC (rev 170031)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-06-16 22:57:16 UTC (rev 170032)
@@ -31,9 +31,16 @@
#if WK_API_ENABLED
+typedef NS_ENUM(NSInteger, _WKStorageBlockingPolicy) {
+ _WKStorageBlockingPolicyAllowAll,
+ _WKStorageBlockingPolicyBlockThirdParty,
+ _WKStorageBlockingPolicyBlockAll,
+} WK_ENUM_AVAILABLE(10_10, 8_0);
+
@interface WKPreferences (WKPrivate)
@property (nonatomic, setter=_setTelephoneNumberDetectionIsEnabled:) BOOL _telephoneNumberDetectionIsEnabled;
+@property (nonatomic, setter=_setStorageBlockingPolicy:) _WKStorageBlockingPolicy _storageBlockingPolicy;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
