Title: [197427] trunk/Source/WebKit2
- Revision
- 197427
- Author
- [email protected]
- Date
- 2016-03-01 17:02:13 -0800 (Tue, 01 Mar 2016)
Log Message
[WK2] Stub support for WebsiteDataTypeResourceLoadStatistics
https://bugs.webkit.org/show_bug.cgi?id=154689
<rdar://problem/24702576>
Reviewed by Sam Weinig.
* Shared/WebsiteData/WebsiteDataType.h: Add new WebsiteDataTypeResourceLoadStatistics.
* UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
(dataTypesToString): Handle new type.
* UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes): Ditto.
(WebKit::toWKWebsiteDataTypes): Ditto.
* UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h: Add new _WebsiteDataTypeResourceLoadStatistics.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197426 => 197427)
--- trunk/Source/WebKit2/ChangeLog 2016-03-02 00:39:01 UTC (rev 197426)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-02 01:02:13 UTC (rev 197427)
@@ -1,3 +1,19 @@
+2016-02-29 Brent Fulgham <[email protected]>
+
+ [WK2] Stub support for WebsiteDataTypeResourceLoadStatistics
+ https://bugs.webkit.org/show_bug.cgi?id=154689
+ <rdar://problem/24702576>
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebsiteData/WebsiteDataType.h: Add new WebsiteDataTypeResourceLoadStatistics.
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
+ (dataTypesToString): Handle new type.
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes): Ditto.
+ (WebKit::toWKWebsiteDataTypes): Ditto.
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h: Add new _WebsiteDataTypeResourceLoadStatistics.
+
2016-03-01 Alex Christensen <[email protected]>
Correctly keep track of NetworkDataTasks with and without credentials when using NetworkSession
Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataType.h (197426 => 197427)
--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataType.h 2016-03-02 00:39:01 UTC (rev 197426)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataType.h 2016-03-02 01:02:13 UTC (rev 197427)
@@ -46,6 +46,7 @@
#if ENABLE(MEDIA_STREAM)
MediaDeviceIdentifier = 1 << 12,
#endif
+ WebsiteDataTypeResourceLoadStatistics = 1 << 13,
};
};
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm (197426 => 197427)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2016-03-02 00:39:01 UTC (rev 197426)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2016-03-02 01:02:13 UTC (rev 197427)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -44,6 +44,7 @@
NSString * const _WKWebsiteDataTypeMediaKeys = @"_WKWebsiteDataTypeMediaKeys";
NSString * const _WKWebsiteDataTypeHSTSCache = @"_WKWebsiteDataTypeHSTSCache";
NSString * const _WKWebsiteDataTypeSearchFieldRecentSearches = @"_WKWebsiteDataTypeSearchFieldRecentSearches";
+NSString * const _WKWebsiteDataTypeResourceLoadStatistics = @"_WKWebsiteDataTypeResourceLoadStatistics";
#if PLATFORM(MAC)
NSString * const _WKWebsiteDataTypePlugInData = @"_WKWebsiteDataTypePlugInData";
@@ -88,6 +89,8 @@
if ([dataTypes containsObject:_WKWebsiteDataTypePlugInData])
[array addObject:@"Plug-in Data"];
#endif
+ if ([dataTypes containsObject:_WKWebsiteDataTypeResourceLoadStatistics])
+ [array addObject:@"Resource Load Statistics"];
return [array componentsJoinedByString:@", "];
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (197426 => 197427)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2016-03-02 00:39:01 UTC (rev 197426)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2016-03-02 01:02:13 UTC (rev 197427)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -68,6 +68,8 @@
if ([websiteDataType isEqualToString:_WKWebsiteDataTypePlugInData])
return WebsiteDataType::PlugInData;
#endif
+ if ([websiteDataType isEqualToString:_WKWebsiteDataTypeResourceLoadStatistics])
+ return WebsiteDataType::WebsiteDataTypeResourceLoadStatistics;
return Nullopt;
}
@@ -114,6 +116,8 @@
if (websiteDataTypes.contains(WebsiteDataType::PlugInData))
[wkWebsiteDataTypes addObject:_WKWebsiteDataTypePlugInData];
#endif
+ if (websiteDataTypes.contains(WebsiteDataType::WebsiteDataTypeResourceLoadStatistics))
+ [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeResourceLoadStatistics];
return wkWebsiteDataTypes;
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (197426 => 197427)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2016-03-02 00:39:01 UTC (rev 197426)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2016-03-02 01:02:13 UTC (rev 197427)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,7 +34,9 @@
WK_EXTERN NSString * const _WKWebsiteDataTypeHSTSCache WK_AVAILABLE(10_11, 9_0);
WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(10_11, 9_0);
WK_EXTERN NSString * const _WKWebsiteDataTypeSearchFieldRecentSearches WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+WK_EXTERN NSString * const _WKWebsiteDataTypeResourceLoadStatistics WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
#if !TARGET_OS_IPHONE
WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_AVAILABLE(10_11, NA);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
