Title: [185383] trunk/Source/WebKit2
- Revision
- 185383
- Author
- [email protected]
- Date
- 2015-06-09 14:33:21 -0700 (Tue, 09 Jun 2015)
Log Message
Add Plug-in type declarations to WKWebsiteDataRecord and friends
https://bugs.webkit.org/show_bug.cgi?id=145816
Reviewed by Andreas Kling.
* Shared/WebsiteData/WebsiteDataTypes.h:
* UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
(dataTypesToString):
* UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes):
(WebKit::toWKWebsiteDataTypes):
* UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185382 => 185383)
--- trunk/Source/WebKit2/ChangeLog 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-09 21:33:21 UTC (rev 185383)
@@ -1,3 +1,18 @@
+2015-06-09 Anders Carlsson <[email protected]>
+
+ Add Plug-in type declarations to WKWebsiteDataRecord and friends
+ https://bugs.webkit.org/show_bug.cgi?id=145816
+
+ Reviewed by Andreas Kling.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
+ (dataTypesToString):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
+
2015-06-09 Antti Koivisto <[email protected]>
REGRESSION(r185262): NetworkCache is in wrong location on OS X
Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (185382 => 185383)
--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-06-09 21:33:21 UTC (rev 185383)
@@ -38,6 +38,9 @@
WebsiteDataTypeWebSQLDatabases = 1 << 6,
WebsiteDataTypeIndexedDBDatabases = 1 << 7,
WebsiteDataTypeMediaKeys = 1 << 8,
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ WebsiteDataTypePlugInData = 1 << 9,
+#endif
};
};
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm (185382 => 185383)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-06-09 21:33:21 UTC (rev 185383)
@@ -41,6 +41,10 @@
NSString * const _WKWebsiteDataTypeMediaKeys = @"_WKWebsiteDataTypeMediaKeys";
+#if PLATFORM(MAC)
+NSString * const _WKWebsiteDataTypePlugInData = @"_WKWebsiteDataTypePlugInData";
+#endif
+
@implementation WKWebsiteDataRecord
- (void)dealloc
@@ -72,6 +76,10 @@
[array addObject:@"IndexedDB"];
if ([dataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
[array addObject:@"Media Keys"];
+#if PLATFORM(MAC)
+ if ([dataTypes containsObject:_WKWebsiteDataTypePlugInData])
+ [array addObject:@"Plug-in Data"];
+#endif
return [array componentsJoinedByString:@", "];
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (185382 => 185383)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-06-09 21:33:21 UTC (rev 185383)
@@ -62,7 +62,10 @@
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases;
if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMediaKeys;
-
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypePlugInData])
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypePlugInData;
+#endif
return static_cast<WebsiteDataTypes>(websiteDataTypes);
}
@@ -90,6 +93,10 @@
[wkWebsiteDataTypes addObject:WKWebsiteDataTypeIndexedDBDatabases];
if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMediaKeys)
[wkWebsiteDataTypes addObject:_WKWebsiteDataTypeMediaKeys];
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypePlugInData)
+ [wkWebsiteDataTypes addObject:_WKWebsiteDataTypePlugInData];
+#endif
return wkWebsiteDataTypes;
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (185382 => 185383)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2015-06-09 21:33:21 UTC (rev 185383)
@@ -29,4 +29,8 @@
WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+#if !TARGET_OS_IPHONE
+WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_AVAILABLE(WK_MAC_TBA, NA);
#endif
+
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
