Diff
Modified: branches/safari-607-branch/LayoutTests/ChangeLog (240074 => 240075)
--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/LayoutTests/ChangeLog 2019-01-16 23:28:07 UTC (rev 240075)
@@ -1,5 +1,91 @@
2019-01-15 Alan Coon <[email protected]>
+ Cherry-pick r239888. rdar://problem/47260286
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebCore:
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 John Wilander <[email protected]>
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+2019-01-15 Alan Coon <[email protected]>
+
Cherry-pick r239877. rdar://problem/47260302
Release assert when removing element with a map element in the shadow tree
Modified: branches/safari-607-branch/LayoutTests/platform/ios-wk2/TestExpectations (240074 => 240075)
--- branches/safari-607-branch/LayoutTests/platform/ios-wk2/TestExpectations 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/LayoutTests/platform/ios-wk2/TestExpectations 2019-01-16 23:28:07 UTC (rev 240075)
@@ -53,7 +53,8 @@
http/tests/security/contentSecurityPolicy/manifest-src-blocked.html [ Pass ]
applicationmanifest/ [ Pass ]
-webkit.org/b/187773 http/tests/webAPIStatistics [ Pass ]
+# Skipped because of <rdar://problem/45388584>.
+http/tests/webAPIStatistics [ Skip ]
#//////////////////////////////////////////////////////////////////////////////////////////
# End platform-specific directories.
Modified: branches/safari-607-branch/LayoutTests/platform/mac-wk2/TestExpectations (240074 => 240075)
--- branches/safari-607-branch/LayoutTests/platform/mac-wk2/TestExpectations 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/LayoutTests/platform/mac-wk2/TestExpectations 2019-01-16 23:28:07 UTC (rev 240075)
@@ -63,7 +63,8 @@
fast/misc/valid-primary-screen-displayID.html [ Pass ]
-webkit.org/b/187773 http/tests/webAPIStatistics [ Pass ]
+# Skipped because of <rdar://problem/45388584>.
+http/tests/webAPIStatistics [ Skip ]
webkit.org/b/184569 storage/indexeddb/modern/transactions-stop-on-navigation.html [ Pass Failure ]
Modified: branches/safari-607-branch/Source/_javascript_Core/ChangeLog (240074 => 240075)
--- branches/safari-607-branch/Source/_javascript_Core/ChangeLog 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/_javascript_Core/ChangeLog 2019-01-16 23:28:07 UTC (rev 240075)
@@ -1,5 +1,89 @@
2019-01-15 Alan Coon <[email protected]>
+ Cherry-pick r239888. rdar://problem/47260286
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebCore:
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 John Wilander <[email protected]>
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+2019-01-15 Alan Coon <[email protected]>
+
Cherry-pick r239882. rdar://problem/47260361
DFG combined liveness can be wrong for terminal basic blocks
Modified: branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (240074 => 240075)
--- branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:07 UTC (rev 240075)
@@ -309,6 +309,7 @@
ENABLE_RESOLUTION_MEDIA_QUERY = ;
ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+ENABLE_WEB_API_STATISTICS = ;
ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
@@ -402,4 +403,4 @@
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EX
PERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_M
EDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_AP
I) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXP
ERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_ME
DIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENA
BLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (240074 => 240075)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-01-16 23:28:07 UTC (rev 240075)
@@ -1,5 +1,107 @@
2019-01-15 Alan Coon <[email protected]>
+ Cherry-pick r239888. rdar://problem/47260286
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebCore:
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 John Wilander <[email protected]>
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+2019-01-15 Alan Coon <[email protected]>
+
Cherry-pick r239880. rdar://problem/47260310
REGRESSION (PSON): Firefox app lacks Open in New Tab in menu
Modified: branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (240074 => 240075)
--- branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:07 UTC (rev 240075)
@@ -309,6 +309,7 @@
ENABLE_RESOLUTION_MEDIA_QUERY = ;
ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+ENABLE_WEB_API_STATISTICS = ;
ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
@@ -402,4 +403,4 @@
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EX
PERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_M
EDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_AP
I) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXP
ERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_ME
DIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENA
BLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: branches/safari-607-branch/Source/WebCore/PAL/ChangeLog (240074 => 240075)
--- branches/safari-607-branch/Source/WebCore/PAL/ChangeLog 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebCore/PAL/ChangeLog 2019-01-16 23:28:07 UTC (rev 240075)
@@ -1,5 +1,89 @@
2019-01-15 Alan Coon <[email protected]>
+ Cherry-pick r239888. rdar://problem/47260286
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebCore:
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 John Wilander <[email protected]>
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+2019-01-15 Alan Coon <[email protected]>
+
Cherry-pick r239832. rdar://problem/47260343
Override the session configuration for cookieAcceptPolicy
Modified: branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (240074 => 240075)
--- branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:07 UTC (rev 240075)
@@ -309,6 +309,7 @@
ENABLE_RESOLUTION_MEDIA_QUERY = ;
ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+ENABLE_WEB_API_STATISTICS = ;
ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
@@ -402,4 +403,4 @@
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EX
PERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_M
EDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_AP
I) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXP
ERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_ME
DIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENA
BLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: branches/safari-607-branch/Source/WebCore/loader/ResourceLoadObserver.cpp (240074 => 240075)
--- branches/safari-607-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2019-01-16 23:28:07 UTC (rev 240075)
@@ -234,6 +234,7 @@
void ResourceLoadObserver::logFontLoad(const Document& document, const String& familyName, bool loadStatus)
{
+#if ENABLE(WEB_API_STATISTICS)
if (!shouldLog(document.sessionID().isEphemeral()))
return;
auto registrableDomain = primaryDomain(document.url());
@@ -251,10 +252,16 @@
shouldCallNotificationCallback = true;
if (shouldCallNotificationCallback)
scheduleNotificationIfNeeded();
+#else
+ UNUSED_PARAM(document);
+ UNUSED_PARAM(familyName);
+ UNUSED_PARAM(loadStatus);
+#endif
}
void ResourceLoadObserver::logCanvasRead(const Document& document)
{
+#if ENABLE(WEB_API_STATISTICS)
if (!shouldLog(document.sessionID().isEphemeral()))
return;
auto registrableDomain = primaryDomain(document.url());
@@ -263,10 +270,14 @@
statistics.canvasActivityRecord.wasDataRead = true;
if (statistics.topFrameRegistrableDomainsWhichAccessedWebAPIs.add(mainFrameRegistrableDomain).isNewEntry)
scheduleNotificationIfNeeded();
+#else
+ UNUSED_PARAM(document);
+#endif
}
void ResourceLoadObserver::logCanvasWriteOrMeasure(const Document& document, const String& textWritten)
{
+#if ENABLE(WEB_API_STATISTICS)
if (!shouldLog(document.sessionID().isEphemeral()))
return;
auto registrableDomain = primaryDomain(document.url());
@@ -279,10 +290,15 @@
shouldCallNotificationCallback = true;
if (shouldCallNotificationCallback)
scheduleNotificationIfNeeded();
+#else
+ UNUSED_PARAM(document);
+ UNUSED_PARAM(textWritten);
+#endif
}
void ResourceLoadObserver::logNavigatorAPIAccessed(const Document& document, const ResourceLoadStatistics::NavigatorAPI functionName)
{
+#if ENABLE(WEB_API_STATISTICS)
if (!shouldLog(document.sessionID().isEphemeral()))
return;
auto registrableDomain = primaryDomain(document.url());
@@ -297,10 +313,15 @@
shouldCallNotificationCallback = true;
if (shouldCallNotificationCallback)
scheduleNotificationIfNeeded();
+#else
+ UNUSED_PARAM(document);
+ UNUSED_PARAM(functionName);
+#endif
}
void ResourceLoadObserver::logScreenAPIAccessed(const Document& document, const ResourceLoadStatistics::ScreenAPI functionName)
{
+#if ENABLE(WEB_API_STATISTICS)
if (!shouldLog(document.sessionID().isEphemeral()))
return;
auto registrableDomain = primaryDomain(document.url());
@@ -315,6 +336,10 @@
shouldCallNotificationCallback = true;
if (shouldCallNotificationCallback)
scheduleNotificationIfNeeded();
+#else
+ UNUSED_PARAM(document);
+ UNUSED_PARAM(functionName);
+#endif
}
ResourceLoadStatistics& ResourceLoadObserver::ensureResourceStatisticsForPrimaryDomain(const String& primaryDomain)
Modified: branches/safari-607-branch/Source/WebCore/loader/ResourceLoadStatistics.cpp (240074 => 240075)
--- branches/safari-607-branch/Source/WebCore/loader/ResourceLoadStatistics.cpp 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebCore/loader/ResourceLoadStatistics.cpp 2019-01-16 23:28:07 UTC (rev 240075)
@@ -74,7 +74,8 @@
uint64_t optionSetBitMask = optionSet.toRaw();
encoder.encodeUInt64(label, optionSetBitMask);
}
-
+
+#if ENABLE(WEB_API_STATISTICS)
static void encodeFontHashSet(KeyedEncoder& encoder, const String& label, const HashSet<String>& hashSet)
{
encodeHashSet(encoder, label, "font", hashSet);
@@ -89,6 +90,7 @@
});
});
}
+#endif
void ResourceLoadStatistics::encode(KeyedEncoder& encoder) const
{
@@ -123,7 +125,8 @@
encoder.encodeUInt32("timesAccessedAsFirstPartyDueToUserInteraction", timesAccessedAsFirstPartyDueToUserInteraction);
encoder.encodeUInt32("timesAccessedAsFirstPartyDueToStorageAccessAPI", timesAccessedAsFirstPartyDueToStorageAccessAPI);
-
+
+#if ENABLE(WEB_API_STATISTICS)
encodeFontHashSet(encoder, "fontsFailedToLoad", fontsFailedToLoad);
encodeFontHashSet(encoder, "fontsSuccessfullyLoaded", fontsSuccessfullyLoaded);
encodeHashCountedSet(encoder, "topFrameRegistrableDomainsWhichAccessedWebAPIs", topFrameRegistrableDomainsWhichAccessedWebAPIs);
@@ -130,6 +133,7 @@
encodeCanvasActivityRecord(encoder, "canvasActivityRecord", canvasActivityRecord);
encodeOptionSet(encoder, "navigatorFunctionsAccessedBitMask", navigatorFunctionsAccessed);
encodeOptionSet(encoder, "screenFunctionsAccessedBitMask", screenFunctionsAccessed);
+#endif
}
static void decodeHashCountedSet(KeyedDecoder& decoder, const String& label, HashCountedSet<String>& hashCountedSet)
@@ -172,7 +176,8 @@
decoder.decodeUInt64(label, optionSetBitMask);
optionSet = OptionSet<T>::fromRaw(optionSetBitMask);
}
-
+
+#if ENABLE(WEB_API_STATISTICS)
static void decodeFontHashSet(KeyedDecoder& decoder, const String& label, HashSet<String>& hashSet)
{
decodeHashSet(decoder, label, "font", hashSet);
@@ -193,6 +198,7 @@
return true;
});
}
+#endif
bool ResourceLoadStatistics::decode(KeyedDecoder& decoder, unsigned modelVersion)
{
@@ -259,7 +265,8 @@
if (!decoder.decodeUInt32("timesAccessedAsFirstPartyDueToStorageAccessAPI", timesAccessedAsFirstPartyDueToStorageAccessAPI))
timesAccessedAsFirstPartyDueToStorageAccessAPI = 0;
}
-
+
+#if ENABLE(WEB_API_STATISTICS)
if (modelVersion >= 13) {
decodeFontHashSet(decoder, "fontsFailedToLoad", fontsFailedToLoad);
decodeFontHashSet(decoder, "fontsSuccessfullyLoaded", fontsSuccessfullyLoaded);
@@ -268,7 +275,8 @@
decodeOptionSet(decoder, "navigatorFunctionsAccessedBitMask", navigatorFunctionsAccessed);
decodeOptionSet(decoder, "screenFunctionsAccessedBitMask", screenFunctionsAccessed);
}
-
+#endif
+
return true;
}
@@ -314,6 +322,7 @@
}
}
+#if ENABLE(WEB_API_STATISTICS)
static ASCIILiteral navigatorAPIEnumToString(ResourceLoadStatistics::NavigatorAPI navigatorEnum)
{
switch (navigatorEnum) {
@@ -381,6 +390,7 @@
builder.append('\n');
}
}
+#endif
String ResourceLoadStatistics::toString() const
{
@@ -425,6 +435,7 @@
builder.appendNumber(dataRecordsRemoved);
builder.append('\n');
+#if ENABLE(WEB_API_STATISTICS)
appendHashSet(builder, "fontsFailedToLoad", fontsFailedToLoad);
appendHashSet(builder, "fontsSuccessfullyLoaded", fontsSuccessfullyLoaded);
appendHashCountedSet(builder, "topFrameRegistrableDomainsWhichAccessedWebAPIs", topFrameRegistrableDomainsWhichAccessedWebAPIs);
@@ -434,6 +445,7 @@
appendBoolean(builder, "canvasReadData", canvasActivityRecord.wasDataRead);
builder.append('\n');
builder.append('\n');
+#endif
return builder.toString();
}
@@ -493,6 +505,7 @@
isVeryPrevalentResource |= other.isVeryPrevalentResource;
dataRecordsRemoved = std::max(dataRecordsRemoved, other.dataRecordsRemoved);
+#if ENABLE(WEB_API_STATISTICS)
mergeHashSet(fontsFailedToLoad, other.fontsFailedToLoad);
mergeHashSet(fontsSuccessfullyLoaded, other.fontsSuccessfullyLoaded);
mergeHashCountedSet(topFrameRegistrableDomainsWhichAccessedWebAPIs, other.topFrameRegistrableDomainsWhichAccessedWebAPIs);
@@ -499,6 +512,7 @@
canvasActivityRecord.mergeWith(other.canvasActivityRecord);
navigatorFunctionsAccessed.add(other.navigatorFunctionsAccessed);
screenFunctionsAccessed.add(other.screenFunctionsAccessed);
+#endif
}
String ResourceLoadStatistics::primaryDomain(const URL& url)
Modified: branches/safari-607-branch/Source/WebCore/loader/ResourceLoadStatistics.h (240074 => 240075)
--- branches/safari-607-branch/Source/WebCore/loader/ResourceLoadStatistics.h 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebCore/loader/ResourceLoadStatistics.h 2019-01-16 23:28:07 UTC (rev 240075)
@@ -96,12 +96,6 @@
unsigned timesAccessedAsFirstPartyDueToUserInteraction { 0 };
unsigned timesAccessedAsFirstPartyDueToStorageAccessAPI { 0 };
- // This set represents the registrable domain of the top frame where web API
- // were used in the top frame or one of its subframes.
- HashCountedSet<String> topFrameRegistrableDomainsWhichAccessedWebAPIs;
- HashSet<String> fontsFailedToLoad;
- HashSet<String> fontsSuccessfullyLoaded;
- CanvasActivityRecord canvasActivityRecord;
enum class NavigatorAPI : uint64_t {
AppVersion = 1 << 0,
UserAgent = 1 << 1,
@@ -120,8 +114,16 @@
AvailHeight = 1 << 6,
AvailWidth = 1 << 7,
};
+#if ENABLE(WEB_API_STATISTICS)
+ // This set represents the registrable domain of the top frame where web API
+ // were used in the top frame or one of its subframes.
+ HashCountedSet<String> topFrameRegistrableDomainsWhichAccessedWebAPIs;
+ HashSet<String> fontsFailedToLoad;
+ HashSet<String> fontsSuccessfullyLoaded;
+ CanvasActivityRecord canvasActivityRecord;
OptionSet<NavigatorAPI> navigatorFunctionsAccessed;
OptionSet<ScreenAPI> screenFunctionsAccessed;
+#endif
};
} // namespace WebCore
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (240074 => 240075)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-16 23:28:07 UTC (rev 240075)
@@ -1,5 +1,94 @@
2019-01-15 Alan Coon <[email protected]>
+ Cherry-pick r239888. rdar://problem/47260286
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebCore:
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 John Wilander <[email protected]>
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+2019-01-15 Alan Coon <[email protected]>
+
Cherry-pick r239880. rdar://problem/47260310
REGRESSION (PSON): Firefox app lacks Open in New Tab in menu
Modified: branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig (240074 => 240075)
--- branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:07 UTC (rev 240075)
@@ -309,6 +309,7 @@
ENABLE_RESOLUTION_MEDIA_QUERY = ;
ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+ENABLE_WEB_API_STATISTICS = ;
ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
@@ -402,4 +403,4 @@
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EX
PERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_M
EDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_AP
I) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXP
ERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_ME
DIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENA
BLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: branches/safari-607-branch/Source/WebKit/Shared/WebCoreArgumentCoders.cpp (240074 => 240075)
--- branches/safari-607-branch/Source/WebKit/Shared/WebCoreArgumentCoders.cpp 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebKit/Shared/WebCoreArgumentCoders.cpp 2019-01-16 23:28:07 UTC (rev 240075)
@@ -2647,7 +2647,8 @@
encoder << statistics.isPrevalentResource;
encoder << statistics.isVeryPrevalentResource;
encoder << statistics.dataRecordsRemoved;
-
+
+#if ENABLE(WEB_API_STATISTICS)
encoder << statistics.fontsFailedToLoad;
encoder << statistics.fontsSuccessfullyLoaded;
encoder << statistics.topFrameRegistrableDomainsWhichAccessedWebAPIs;
@@ -2656,7 +2657,7 @@
encoder << statistics.navigatorFunctionsAccessed;
encoder << statistics.screenFunctionsAccessed;
-
+#endif
}
Optional<ResourceLoadStatistics> ArgumentCoder<ResourceLoadStatistics>::decode(Decoder& decoder)
@@ -2717,6 +2718,7 @@
if (!decoder.decode(statistics.dataRecordsRemoved))
return WTF::nullopt;
+#if ENABLE(WEB_API_STATISTICS)
if (!decoder.decode(statistics.fontsFailedToLoad))
return WTF::nullopt;
@@ -2734,7 +2736,8 @@
if (!decoder.decode(statistics.screenFunctionsAccessed))
return WTF::nullopt;
-
+#endif
+
return WTFMove(statistics);
}
Modified: branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog (240074 => 240075)
--- branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebKitLegacy/mac/ChangeLog 2019-01-16 23:28:07 UTC (rev 240075)
@@ -1,3 +1,87 @@
+2019-01-15 Alan Coon <[email protected]>
+
+ Cherry-pick r239888. rdar://problem/47260286
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebCore:
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 John Wilander <[email protected]>
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
2019-01-04 Alex Christensen <[email protected]>
Progress towards fixing Mac CMake build
Modified: branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (240074 => 240075)
--- branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:07 UTC (rev 240075)
@@ -309,6 +309,7 @@
ENABLE_RESOLUTION_MEDIA_QUERY = ;
ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+ENABLE_WEB_API_STATISTICS = ;
ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
@@ -402,4 +403,4 @@
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EX
PERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_M
EDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_AP
I) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXP
ERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_ME
DIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENA
BLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: branches/safari-607-branch/Tools/ChangeLog (240074 => 240075)
--- branches/safari-607-branch/Tools/ChangeLog 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Tools/ChangeLog 2019-01-16 23:28:07 UTC (rev 240075)
@@ -1,5 +1,89 @@
2019-01-15 Alan Coon <[email protected]>
+ Cherry-pick r239888. rdar://problem/47260286
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebCore:
+
+ No new tests. This patch disables functionality. The associated tests
+ are skipped.
+
+ These functions are now no-ops unless web API statistics is enabled.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFontLoad):
+ (WebCore::ResourceLoadObserver::logCanvasRead):
+ (WebCore::ResourceLoadObserver::logCanvasWriteOrMeasure):
+ (WebCore::ResourceLoadObserver::logNavigatorAPIAccessed):
+ (WebCore::ResourceLoadObserver::logScreenAPIAccessed):
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::ResourceLoadStatistics::encode const):
+ (WebCore::ResourceLoadStatistics::decode):
+ (WebCore::ResourceLoadStatistics::toString const):
+ (WebCore::ResourceLoadStatistics::merge):
+ * loader/ResourceLoadStatistics.h:
+ The associated struct members are skipped unless web API
+ statistics is enabled.
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::encode):
+ Skipped encoding of web API statistics.
+ (IPC::ArgumentCoder<ResourceLoadStatistics>::decode):
+ Skipped decoding of web API statistics.
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+ LayoutTests:
+
+ * platform/ios-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+ * platform/mac-wk2/TestExpectations:
+ http/tests/webAPIStatistics skipped.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 John Wilander <[email protected]>
+
+ Compile out Web API Statistics Collection
+ https://bugs.webkit.org/show_bug.cgi?id=193370
+ <rdar://problem/45388584>
+
+ Reviewed by Brent Fulgham.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ Defined ENABLE_WEB_API_STATISTICS, off by default.
+
+2019-01-15 Alan Coon <[email protected]>
+
Cherry-pick r239866. rdar://problem/47260326
Unreviewed, fix #ifdef in API test added in r239851.
Modified: branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (240074 => 240075)
--- branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:00 UTC (rev 240074)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2019-01-16 23:28:07 UTC (rev 240075)
@@ -309,6 +309,7 @@
ENABLE_RESOLUTION_MEDIA_QUERY = ;
ENABLE_RESOURCE_LOAD_STATISTICS = ENABLE_RESOURCE_LOAD_STATISTICS;
+ENABLE_WEB_API_STATISTICS = ;
ENABLE_RESOURCE_USAGE = ENABLE_RESOURCE_USAGE;
@@ -402,4 +403,4 @@
ENABLE_XSLT = ENABLE_XSLT;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EX
PERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_M
EDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBASSEMBLY_STREAMING_AP
I) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_APPLE_PAY_SESSION_V4) $(ENABLE_APPLICATION_MANIFEST) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_PAINTING_API) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS_TYPED_OM) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_CSS_CONIC_GRADIENTS) $(ENABLE_DARK_MODE_CSS) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_EXP
ERIMENTAL_FEATURES) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_LAYOUT_FORMATTING_CONTEXT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LETTERPRESS) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_ME
DIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAYMENT_REQUEST) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_LOAD_STATISTICS) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_WEB_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_USER_MESSAGE_HANDLERS) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN) $(ENABLE_WEB_API_STATISTICS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_AUTHN) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENA
BLE_WEBASSEMBLY_STREAMING_API) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WEBMETAL) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
