Title: [212150] trunk
Revision
212150
Author
joep...@webkit.org
Date
2017-02-10 14:28:56 -0800 (Fri, 10 Feb 2017)

Log Message

[Resource Timing] Enable Resource Timing by default in Tests
https://bugs.webkit.org/show_bug.cgi?id=168145

Reviewed by Ryosuke Niwa.

Source/WebCore:

* loader/ResourceTimingInformation.cpp:
(WebCore::ResourceTimingInformation::addResourceTiming):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setResourceTimingEnabled): Deleted.
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
No longer needed for tests.

Source/WebKit/mac:

* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences resourceTimingEnabled]):
(-[WebPreferences setResourceTimingEnabled:]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Source/WebKit/win:

* Interfaces/IWebPreferencesPrivate.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::setResourceTimingEnabled):
(WebPreferences::resourceTimingEnabled):
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Source/WebKit2:

* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetResourceTimingEnabled):
(WKPreferencesGetResourceTimingEnabled):
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetPreferencesToConsistentValues):

LayoutTests:

* fast/dom/Window/window-properties-performance-resource-timing.html:
* http/tests/misc/resource-timing-resolution.html:
* http/tests/performance/performance-resource-timing-cached-entries-expected.txt:
* http/tests/performance/performance-resource-timing-cached-entries.html:
* http/tests/performance/performance-resource-timing-entries-iterable.html:
* http/tests/performance/performance-resource-timing-entries.html:
* http/tests/performance/performance-resource-timing-initiator-css.html:
* http/tests/performance/performance-resource-timing-initiator-no-override.html:
* http/tests/performance/performance-resource-timing-xhr-single-entry.html:
* http/tests/preload/dynamic_remove_preload_href-expected.txt:
* http/tests/preload/dynamic_remove_preload_href.html:
* http/tests/preload/dynamic_removing_preload.html:
* http/tests/preload/not_evicting_preload_at_onload.html:
* http/tests/preload/single_download_preload-expected.txt:
* http/tests/preload/single_download_preload.html:
* resources/testharnessreport.js:
Eliminate the internals setResourceTimingEnabled way to toggle a runtime feature.

* platform/efl/js/dom/global-constructors-attributes-expected.txt:
* platform/gtk/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-elcapitan/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
* platform/win/js/dom/global-constructors-attributes-expected.txt:
Update results when ResourceTiming is enabled.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (212149 => 212150)


--- trunk/LayoutTests/ChangeLog	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/ChangeLog	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,3 +1,37 @@
+2017-02-10  Joseph Pecoraro  <pecor...@apple.com>
+
+        [Resource Timing] Enable Resource Timing by default in Tests
+        https://bugs.webkit.org/show_bug.cgi?id=168145
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/dom/Window/window-properties-performance-resource-timing.html:
+        * http/tests/misc/resource-timing-resolution.html:
+        * http/tests/performance/performance-resource-timing-cached-entries-expected.txt:
+        * http/tests/performance/performance-resource-timing-cached-entries.html:
+        * http/tests/performance/performance-resource-timing-entries-iterable.html:
+        * http/tests/performance/performance-resource-timing-entries.html:
+        * http/tests/performance/performance-resource-timing-initiator-css.html:
+        * http/tests/performance/performance-resource-timing-initiator-no-override.html:
+        * http/tests/performance/performance-resource-timing-xhr-single-entry.html:
+        * http/tests/preload/dynamic_remove_preload_href-expected.txt:
+        * http/tests/preload/dynamic_remove_preload_href.html:
+        * http/tests/preload/dynamic_removing_preload.html:
+        * http/tests/preload/not_evicting_preload_at_onload.html:
+        * http/tests/preload/single_download_preload-expected.txt:
+        * http/tests/preload/single_download_preload.html:
+        * resources/testharnessreport.js:
+        Eliminate the internals setResourceTimingEnabled way to toggle a runtime feature.
+
+        * platform/efl/js/dom/global-constructors-attributes-expected.txt:
+        * platform/gtk/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-elcapitan/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+        * platform/win/js/dom/global-constructors-attributes-expected.txt:
+        Update results when ResourceTiming is enabled.
+
 2017-02-10  Chris Dumez  <cdu...@apple.com>
 
         Update LayoutTests/resources/testharness.js

Modified: trunk/LayoutTests/fast/dom/Window/window-properties-performance-resource-timing.html (212149 => 212150)


--- trunk/LayoutTests/fast/dom/Window/window-properties-performance-resource-timing.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/fast/dom/Window/window-properties-performance-resource-timing.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -6,9 +6,6 @@
 if (window.testRunner)
     testRunner.dumpAsText();
 
-if (window.internals)
-    internals.settings.setResourceTimingEnabled(true);
-    
 var logBuffer = [];
 function log(s)
 {
@@ -99,6 +96,4 @@
 window.performance = 'performance is replaceable';
 logValue('window.performance');
 flushLog();
-if (window.internals)
-    internals.settings.setResourceTimingEnabled(false);
 </script>

Modified: trunk/LayoutTests/http/tests/misc/resource-timing-resolution.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/misc/resource-timing-resolution.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/misc/resource-timing-resolution.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -3,8 +3,6 @@
 <script src=""
 <script>
     window.jsTestIsAsync = true;
-    if (window.internals)
-        window.internals.settings.setResourceTimingEnabled(true);
 </script>
 </head>
 <body>
@@ -26,8 +24,6 @@
     var integerMultipleOfResolution = (t1 - t0) / expectedResolutionMilliseconds;
     shouldBeNearZeroOrOne = integerMultipleOfResolution % 1;
     shouldBe("shouldBeNearZeroOrOne < 1e-10 || Math.abs(shouldBeNearZeroOrOne - 1) < 1e-10", "true");
-    if (window.internals)
-        window.internals.settings.setResourceTimingEnabled(false);
     finishJSTest();
 });
 </script>

Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries-expected.txt (212149 => 212150)


--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,6 +1,6 @@
-CONSOLE MESSAGE: line 11: current entries: 0
-CONSOLE MESSAGE: line 20: entry: http://127.0.0.1:8000/resources/js-test-pre.js
-CONSOLE MESSAGE: line 20: entry: http://127.0.0.1:8000/resources/square100.png
-CONSOLE MESSAGE: line 20: entry: http://127.0.0.1:8000/resources/square100.png
+CONSOLE MESSAGE: line 9: current entries: 0
+CONSOLE MESSAGE: line 18: entry: http://127.0.0.1:8000/resources/js-test-pre.js
+CONSOLE MESSAGE: line 18: entry: http://127.0.0.1:8000/resources/square100.png
+CONSOLE MESSAGE: line 18: entry: http://127.0.0.1:8000/resources/square100.png
 PASS foundResource is 2
 

Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-cached-entries.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <script>
-    if (window.internals)
-        internals.settings.setResourceTimingEnabled(true);
     if (window.testRunner) {
         testRunner.dumpAsText()
         testRunner.waitUntilDone();
@@ -22,8 +20,6 @@
                 ++foundResource;
         };
         shouldBe("foundResource", "2");
-        if (window.internals)
-            window.internals.settings.setResourceTimingEnabled(false);
         if (window.testRunner)
             testRunner.notifyDone();
     };

Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-entries-iterable.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-entries-iterable.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-entries-iterable.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <script>
-    if (window.internals)
-        internals.settings.setResourceTimingEnabled(true);
     function resolve(path) {
         var a = document.createElement("a");
         a.href = ""
@@ -26,8 +24,6 @@
         shouldBeDefined("resources[0]");
         entryTypes = resources.map((entry) => entry.entryType);
         shouldBeEqualToString("entryTypes[0]", "resource");
-        if (window.internals)
-            window.internals.settings.setResourceTimingEnabled(false);
         finishJSTest();
     });
 </script>

Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-entries.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-entries.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-entries.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <script>
-    if (window.internals)
-        internals.settings.setResourceTimingEnabled(true);
     var url = ""
     url += Math.random();
     document.write("<img src=''>");
@@ -20,8 +18,6 @@
             }
         };
         shouldBeTrue("foundImg");
-        if (window.internals)
-            window.internals.settings.setResourceTimingEnabled(false);
     });
 </script>
 </body>

Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-css.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <script>
-    if (window.internals)
-        internals.settings.setResourceTimingEnabled(true);
     if (window.testRunner) {
         testRunner.dumpAsText()
         testRunner.waitUntilDone();
@@ -23,8 +21,6 @@
                 shouldBeEqualToString("initiator", "css");
             }
         };
-        if (window.internals)
-            window.internals.settings.setResourceTimingEnabled(false);
         if (window.testRunner)
             testRunner.notifyDone();
     };

Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-initiator-no-override.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <script>
-    if (window.internals)
-        internals.settings.setResourceTimingEnabled(true);
     if (window.testRunner) {
         testRunner.dumpAsText()
         testRunner.waitUntilDone();
@@ -27,8 +25,6 @@
             }
         };
         shouldBe("foundResources", "1");
-        if (window.internals)
-            window.internals.settings.setResourceTimingEnabled(false);
         if (window.testRunner)
             testRunner.notifyDone();
     };

Modified: trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/performance/performance-resource-timing-xhr-single-entry.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <script>
-    if (window.internals)
-        internals.settings.setResourceTimingEnabled(true);
     if (window.testRunner) {
         testRunner.dumpAsText()
         testRunner.waitUntilDone();
@@ -22,8 +20,6 @@
         };
         shouldBe("foundResource", "1");
         shouldBeEqualToString("initiator", "xmlhttprequest");
-        if (window.internals)
-            window.internals.settings.setResourceTimingEnabled(false);
         if (window.testRunner)
             testRunner.notifyDone();
     };

Modified: trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href-expected.txt (212149 => 212150)


--- trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 18: <link rel=preload> has an invalid `href` value
+CONSOLE MESSAGE: line 14: <link rel=preload> has an invalid `href` value
 PASS downloadedImage is false
 PASS successfullyParsed is true
 

Modified: trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-    if (window.internals)
-        window.internals.settings.setResourceTimingEnabled(true);
-</script>
 <script src=""
 <body>
 <script>
@@ -23,8 +19,6 @@
                 downloadedImage = true;
         }
         shouldBeFalse("downloadedImage");
-        if (window.internals)
-            window.internals.settings.setResourceTimingEnabled(false);
     });
 </script>
 </body>

Modified: trunk/LayoutTests/http/tests/preload/dynamic_removing_preload.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/preload/dynamic_removing_preload.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/preload/dynamic_removing_preload.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-    if (window.internals)
-        window.internals.settings.setResourceTimingEnabled(true);
-</script>
 <script src=""
 <body>
 <script>

Modified: trunk/LayoutTests/http/tests/preload/not_evicting_preload_at_onload.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/preload/not_evicting_preload_at_onload.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/preload/not_evicting_preload_at_onload.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
 <script>
-    if (window.internals)
-        window.internals.settings.setResourceTimingEnabled(true);
     if (window.testRunner) {
         testRunner.dumpAsText()
         testRunner.waitUntilDone();
@@ -16,8 +14,6 @@
             var entries = performance.getEntriesByName(imageURL).length;
             shouldBe(entries.toString(), "1");
 
-            if (window.internals)
-                window.internals.settings.setResourceTimingEnabled(false);
             if (window.testRunner)
                 testRunner.notifyDone();
         }, 0);

Modified: trunk/LayoutTests/http/tests/preload/single_download_preload-expected.txt (212149 => 212150)


--- trunk/LayoutTests/http/tests/preload/single_download_preload-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 19: <link rel=preload> must have a valid `as` value
+CONSOLE MESSAGE: line 15: <link rel=preload> must have a valid `as` value
  
 
 PASS Makes sure that preloaded resources are not downloaded again when used 

Modified: trunk/LayoutTests/http/tests/preload/single_download_preload.html (212149 => 212150)


--- trunk/LayoutTests/http/tests/preload/single_download_preload.html	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload.html	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,8 +1,4 @@
 <!DOCTYPE html>
-<script>
-    if (window.internals)
-        internals.settings.setResourceTimingEnabled(true);
-</script>
 <script src=""
 <script src=""
 <script>
@@ -59,8 +55,6 @@
             // FIXME: XHR should trigger a single download, but it downloads 2 resources instead.
             verifyDownloadNumber("http://127.0.0.1:8000/resources/dummy.xml", 2);
             // FIXME: We should verify for video and audio as well, but they seem to (flakily?) trigger multiple partial requests.
-            if (window.internals)
-                internals.settings.setResourceTimingEnabled(false);
             t.done();
             }), 100);
     }));

Modified: trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt (212149 => 212150)


--- trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1038,6 +1038,11 @@
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').value is PerformanceResourceTiming
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').value is PerformanceTiming
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('set') is false

Modified: trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt (212149 => 212150)


--- trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1168,6 +1168,11 @@
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').value is PerformanceResourceTiming
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').value is PerformanceTiming
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('set') is false

Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (212149 => 212150)


--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1208,6 +1208,11 @@
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').value is PerformanceResourceTiming
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').value is PerformanceTiming
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('set') is false

Modified: trunk/LayoutTests/platform/mac-elcapitan/js/dom/global-constructors-attributes-expected.txt (212149 => 212150)


--- trunk/LayoutTests/platform/mac-elcapitan/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/platform/mac-elcapitan/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1203,6 +1203,11 @@
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').value is PerformanceResourceTiming
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').value is PerformanceTiming
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('set') is false

Modified: trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt (212149 => 212150)


--- trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1203,6 +1203,11 @@
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').value is PerformanceResourceTiming
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').value is PerformanceTiming
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('set') is false

Modified: trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt (212149 => 212150)


--- trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1198,6 +1198,11 @@
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').value is PerformanceResourceTiming
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').value is PerformanceTiming
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('set') is false

Modified: trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt (212149 => 212150)


--- trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt	2017-02-10 22:28:56 UTC (rev 212150)
@@ -898,6 +898,11 @@
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceObserverEntryList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').value is PerformanceResourceTiming
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'PerformanceResourceTiming').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').value is PerformanceTiming
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'PerformanceTiming').hasOwnProperty('set') is false

Modified: trunk/LayoutTests/resources/testharnessreport.js (212149 => 212150)


--- trunk/LayoutTests/resources/testharnessreport.js	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/LayoutTests/resources/testharnessreport.js	2017-02-10 22:28:56 UTC (rev 212150)
@@ -87,8 +87,4 @@
             testRunner.notifyDone();
         }, 0);
     });
-
-    if (window.internals) {
-        internals.settings.setResourceTimingEnabled(true);
-    }
 }

Modified: trunk/Source/WebCore/ChangeLog (212149 => 212150)


--- trunk/Source/WebCore/ChangeLog	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebCore/ChangeLog	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,3 +1,20 @@
+2017-02-10  Joseph Pecoraro  <pecor...@apple.com>
+
+        [Resource Timing] Enable Resource Timing by default in Tests
+        https://bugs.webkit.org/show_bug.cgi?id=168145
+
+        Reviewed by Ryosuke Niwa.
+
+        * loader/ResourceTimingInformation.cpp:
+        (WebCore::ResourceTimingInformation::addResourceTiming):
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        (WebCore::InternalSettings::setResourceTimingEnabled): Deleted.
+        * testing/InternalSettings.h:
+        * testing/InternalSettings.idl:
+        No longer needed for tests.
+
 2017-02-10  Dan Bernstein  <m...@apple.com>
 
         [Cocoa] Add shouldChangeSelectedRange to WKWebProcessPlugInEditingDelegate

Modified: trunk/Source/WebCore/loader/ResourceTimingInformation.cpp (212149 => 212150)


--- trunk/Source/WebCore/loader/ResourceTimingInformation.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebCore/loader/ResourceTimingInformation.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -49,9 +49,12 @@
             Document* initiatorDocument = &document;
             if (resource->type() == CachedResource::MainResource)
                 initiatorDocument = document.parentDocument();
-            ASSERT(initiatorDocument);
-            ASSERT(initiatorDocument->domWindow());
-            ASSERT(initiatorDocument->domWindow()->performance());
+            if (!initiatorDocument)
+                return;
+            if (!initiatorDocument->domWindow())
+                return;
+            if (!initiatorDocument->domWindow()->performance())
+                return;
             const InitiatorInfo& info = initiatorIt->value;
             initiatorDocument->domWindow()->performance()->addResourceTiming(info.name, resource->resourceRequest().url(), resource->response(), loadTiming);
             initiatorIt->value.added = Added;

Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (212149 => 212150)


--- trunk/Source/WebCore/testing/InternalSettings.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -94,7 +94,6 @@
     , m_forcedColorsAreInvertedAccessibilityValue(settings.forcedColorsAreInvertedAccessibilityValue())
     , m_forcedDisplayIsMonochromeAccessibilityValue(settings.forcedDisplayIsMonochromeAccessibilityValue())
     , m_forcedPrefersReducedMotionAccessibilityValue(settings.forcedPrefersReducedMotionAccessibilityValue())
-    , m_resourceTimingEnabled(RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
     , m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
 #endif
@@ -182,7 +181,6 @@
     settings.setForcedPrefersReducedMotionAccessibilityValue(m_forcedPrefersReducedMotionAccessibilityValue);
     Settings::setAllowsAnySSLCertificate(false);
 
-    RuntimeEnabledFeatures::sharedFeatures().setResourceTimingEnabled(m_resourceTimingEnabled);
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
     RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
 #endif
@@ -673,11 +671,6 @@
     return { };
 }
 
-void InternalSettings::setResourceTimingEnabled(bool enabled)
-{
-    RuntimeEnabledFeatures::sharedFeatures().setResourceTimingEnabled(enabled);
-}
-
 void InternalSettings::setIndexedDBWorkersEnabled(bool enabled)
 {
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)

Modified: trunk/Source/WebCore/testing/InternalSettings.h (212149 => 212150)


--- trunk/Source/WebCore/testing/InternalSettings.h	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebCore/testing/InternalSettings.h	2017-02-10 22:28:56 UTC (rev 212150)
@@ -110,7 +110,6 @@
     void setForcedPrefersReducedMotionAccessibilityValue(ForcedAccessibilityValue);
 
     // RuntimeEnabledFeatures.
-    static void setResourceTimingEnabled(bool);
     static void setIndexedDBWorkersEnabled(bool);
     static void setCSSGridLayoutEnabled(bool);
     static void setWebGL2Enabled(bool);
@@ -187,7 +186,6 @@
         Settings::ForcedAccessibilityValue m_forcedPrefersReducedMotionAccessibilityValue;
 
         // Runtime enabled settings.
-        bool m_resourceTimingEnabled;
         bool m_indexedDBWorkersEnabled;
         bool m_cssGridLayoutEnabled;
         bool m_webGL2Enabled;

Modified: trunk/Source/WebCore/testing/InternalSettings.idl (212149 => 212150)


--- trunk/Source/WebCore/testing/InternalSettings.idl	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebCore/testing/InternalSettings.idl	2017-02-10 22:28:56 UTC (rev 212150)
@@ -83,7 +83,6 @@
     [MayThrowException] void setInlineMediaPlaybackRequiresPlaysInlineAttribute(boolean requires);
 
     // RuntimeEnabledFeatures.
-    void setResourceTimingEnabled(boolean enabled);
     void setIndexedDBWorkersEnabled(boolean enabled);
     void setCSSGridLayoutEnabled(boolean enabled);
     void setWebGL2Enabled(boolean enabled);

Modified: trunk/Source/WebKit/mac/ChangeLog (212149 => 212150)


--- trunk/Source/WebKit/mac/ChangeLog	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/mac/ChangeLog	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,3 +1,19 @@
+2017-02-10  Joseph Pecoraro  <pecor...@apple.com>
+
+        [Resource Timing] Enable Resource Timing by default in Tests
+        https://bugs.webkit.org/show_bug.cgi?id=168145
+
+        Reviewed by Ryosuke Niwa.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences resourceTimingEnabled]):
+        (-[WebPreferences setResourceTimingEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2017-02-10  Aakash Jain  <aakash_j...@apple.com>
 
         cleanup WebLocalizableStrings.

Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (212149 => 212150)


--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h	2017-02-10 22:28:56 UTC (rev 212150)
@@ -225,3 +225,4 @@
 #define WebKitAttachmentElementEnabledPreferenceKey @"WebKitAttachmentElementEnabled"
 #define WebKitIntersectionObserverEnabledPreferenceKey @"WebKitIntersectionObserverEnabled"
 #define WebKitUserTimingEnabledPreferenceKey @"WebKitUserTimingEnabled"
+#define WebKitResourceTimingEnabledPreferenceKey @"WebKitResourceTimingEnabled"

Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (212149 => 212150)


--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm	2017-02-10 22:28:56 UTC (rev 212150)
@@ -652,6 +652,7 @@
         @NO, WebKitIntersectionObserverEnabledPreferenceKey,
 #endif
         @NO, WebKitUserTimingEnabledPreferenceKey,
+        @NO, WebKitResourceTimingEnabledPreferenceKey,
         nil];
 
 #if !PLATFORM(IOS)
@@ -2945,6 +2946,16 @@
     [self _setBoolValue:flag forKey:WebKitUserTimingEnabledPreferenceKey];
 }
 
+- (BOOL)resourceTimingEnabled
+{
+    return [self _boolValueForKey:WebKitResourceTimingEnabledPreferenceKey];
+}
+
+- (void)setResourceTimingEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitResourceTimingEnabledPreferenceKey];
+}
+
 #if PLATFORM(IOS)
 - (BOOL)quickLookDocumentSavingEnabled
 {

Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (212149 => 212150)


--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h	2017-02-10 22:28:56 UTC (rev 212150)
@@ -529,6 +529,7 @@
 @property (nonatomic) BOOL allowsInlineMediaPlaybackAfterFullscreen;
 @property (nonatomic) BOOL intersectionObserverEnabled;
 @property (nonatomic) BOOL userTimingEnabled;
+@property (nonatomic) BOOL resourceTimingEnabled;
 @property (nonatomic) BOOL linkPreloadEnabled;
 
 #if TARGET_OS_IPHONE

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (212149 => 212150)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2017-02-10 22:28:56 UTC (rev 212150)
@@ -2912,7 +2912,7 @@
 #endif
 
     RuntimeEnabledFeatures::sharedFeatures().setUserTimingEnabled(preferences.userTimingEnabled);
-
+    RuntimeEnabledFeatures::sharedFeatures().setResourceTimingEnabled(preferences.resourceTimingEnabled);
     RuntimeEnabledFeatures::sharedFeatures().setLinkPreloadEnabled(preferences.linkPreloadEnabled);
 
     NSTimeInterval timeout = [preferences incrementalRenderingSuppressionTimeoutInSeconds];

Modified: trunk/Source/WebKit/win/ChangeLog (212149 => 212150)


--- trunk/Source/WebKit/win/ChangeLog	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/win/ChangeLog	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,3 +1,20 @@
+2017-02-10  Joseph Pecoraro  <pecor...@apple.com>
+
+        [Resource Timing] Enable Resource Timing by default in Tests
+        https://bugs.webkit.org/show_bug.cgi?id=168145
+
+        Reviewed by Ryosuke Niwa.
+
+        * Interfaces/IWebPreferencesPrivate.idl:
+        * WebPreferenceKeysPrivate.h:
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        (WebPreferences::setResourceTimingEnabled):
+        (WebPreferences::resourceTimingEnabled):
+        * WebPreferences.h:
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
 2017-02-06  Alex Christensen  <achristen...@webkit.org>
 
         More build fixes after r211751

Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (212149 => 212150)


--- trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl	2017-02-10 22:28:56 UTC (rev 212150)
@@ -196,6 +196,8 @@
     HRESULT setWebAnimationsEnabled([in] BOOL enabled);
     HRESULT userTimingEnabled([out, retval] BOOL*);
     HRESULT setUserTimingEnabled([in] BOOL enabled);
+    HRESULT resourceTimingEnabled([out, retval] BOOL*);
+    HRESULT setResourceTimingEnabled([in] BOOL enabled);
     HRESULT linkPreloadEnabled([out, retval] BOOL*);
     HRESULT setLinkPreloadEnabled([in] BOOL enabled);
 }

Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (212149 => 212150)


--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h	2017-02-10 22:28:56 UTC (rev 212150)
@@ -181,4 +181,6 @@
 
 #define WebKitUserTimingEnabledPreferenceKey "WebKitUserTimingEnabled"
 
+#define WebKitResourceTimingEnabledPreferenceKey "WebKitResourceTimingEnabled"
+
 #define WebKitLinkPreloadEnabledPreferenceKey "WebKitLinkPreloadEnabled"

Modified: trunk/Source/WebKit/win/WebPreferences.cpp (212149 => 212150)


--- trunk/Source/WebKit/win/WebPreferences.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/win/WebPreferences.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -309,6 +309,8 @@
 
     CFDictionaryAddValue(defaults, CFSTR(WebKitUserTimingEnabledPreferenceKey), kCFBooleanFalse);
 
+    CFDictionaryAddValue(defaults, CFSTR(WebKitResourceTimingEnabledPreferenceKey), kCFBooleanFalse);
+
     CFDictionaryAddValue(defaults, CFSTR(WebKitLinkPreloadEnabledPreferenceKey), kCFBooleanFalse);
 
     defaultSettings = defaults;
@@ -2057,3 +2059,17 @@
     *enabled = boolValueForKey(WebKitUserTimingEnabledPreferenceKey);
     return S_OK;
 }
+
+HRESULT WebPreferences::setResourceTimingEnabled(BOOL enabled)
+{
+    setBoolValue(WebKitResourceTimingEnabledPreferenceKey, enabled);
+    return S_OK;
+}
+
+HRESULT WebPreferences::resourceTimingEnabled(_Out_ BOOL* enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+    *enabled = boolValueForKey(WebKitResourceTimingEnabledPreferenceKey);
+    return S_OK;
+}

Modified: trunk/Source/WebKit/win/WebPreferences.h (212149 => 212150)


--- trunk/Source/WebKit/win/WebPreferences.h	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/win/WebPreferences.h	2017-02-10 22:28:56 UTC (rev 212150)
@@ -249,6 +249,8 @@
     virtual HRESULT STDMETHODCALLTYPE setWebAnimationsEnabled(BOOL);
     virtual HRESULT STDMETHODCALLTYPE userTimingEnabled(_Out_ BOOL*);
     virtual HRESULT STDMETHODCALLTYPE setUserTimingEnabled(BOOL);
+    virtual HRESULT STDMETHODCALLTYPE resourceTimingEnabled(_Out_ BOOL*);
+    virtual HRESULT STDMETHODCALLTYPE setResourceTimingEnabled(BOOL);
     virtual HRESULT STDMETHODCALLTYPE linkPreloadEnabled(_Out_ BOOL*);
     virtual HRESULT STDMETHODCALLTYPE setLinkPreloadEnabled(BOOL);
 

Modified: trunk/Source/WebKit/win/WebView.cpp (212149 => 212150)


--- trunk/Source/WebKit/win/WebView.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit/win/WebView.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -5267,6 +5267,11 @@
         return hr;
     RuntimeEnabledFeatures::sharedFeatures().setUserTimingEnabled(!!enabled);
 
+    hr = prefsPrivate->resourceTimingEnabled(&enabled);
+    if (FAILED(hr))
+        return hr;
+    RuntimeEnabledFeatures::sharedFeatures().setResourceTimingEnabled(!!enabled);
+
     hr = preferences->privateBrowsingEnabled(&enabled);
     if (FAILED(hr))
         return hr;

Modified: trunk/Source/WebKit2/ChangeLog (212149 => 212150)


--- trunk/Source/WebKit2/ChangeLog	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit2/ChangeLog	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,3 +1,18 @@
+2017-02-10  Joseph Pecoraro  <pecor...@apple.com>
+
+        [Resource Timing] Enable Resource Timing by default in Tests
+        https://bugs.webkit.org/show_bug.cgi?id=168145
+
+        Reviewed by Ryosuke Niwa.
+
+        * Shared/WebPreferencesDefinitions.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetResourceTimingEnabled):
+        (WKPreferencesGetResourceTimingEnabled):
+        * UIProcess/API/C/WKPreferencesRefPrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2017-02-10  Dan Bernstein  <m...@apple.com>
 
         [Cocoa] Add shouldChangeSelectedRange to WKWebProcessPlugInEditingDelegate

Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (212149 => 212150)


--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2017-02-10 22:28:56 UTC (rev 212150)
@@ -247,6 +247,7 @@
     macro(InteractiveFormValidationEnabled, interactiveFormValidationEnabled, Bool, bool, DEFAULT_HTML_INTERACTIVE_FORM_VALIDATION_ENABLED, "HTML Interactive Form Validation", "HTML interactive form validation") \
     macro(ShouldSuppressKeyboardInputDuringProvisionalNavigation, shouldSuppressKeyboardInputDuringProvisionalNavigation, Bool, bool, false, "", "") \
     macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, true, "CSS Grid", "CSS Grid Layout Module support") \
+    macro(ResourceTimingEnabled, resourceTimingEnabled, Bool, bool, false, "Resource Timing", "Enable ResourceTiming API") \
     \
 
 #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (212149 => 212150)


--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1591,6 +1591,16 @@
     return toImpl(preferencesRef)->userTimingEnabled();
 }
 
+void WKPreferencesSetResourceTimingEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+    toImpl(preferencesRef)->setResourceTimingEnabled(flag);
+}
+
+bool WKPreferencesGetResourceTimingEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->resourceTimingEnabled();
+}
+
 void WKPreferencesSetSelectionPaintingWithoutSelectionGapsEnabled(WKPreferencesRef preferencesRef, bool flag)
 {
     toImpl(preferencesRef)->setSelectionPaintingWithoutSelectionGapsEnabled(flag);

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (212149 => 212150)


--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h	2017-02-10 22:28:56 UTC (rev 212150)
@@ -453,6 +453,10 @@
 WK_EXPORT void WKPreferencesSetUserTimingEnabled(WKPreferencesRef, bool flag);
 WK_EXPORT bool WKPreferencesGetUserTimingEnabled(WKPreferencesRef);
 
+// Defaults to false
+WK_EXPORT void WKPreferencesSetResourceTimingEnabled(WKPreferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetResourceTimingEnabled(WKPreferencesRef);
+
 // Defaults to true
 WK_EXPORT void WKPreferencesSetSubtleCryptoEnabled(WKPreferencesRef, bool flag);
 WK_EXPORT bool WKPreferencesGetSubtleCryptoEnabled(WKPreferencesRef);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (212149 => 212150)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -3229,8 +3229,6 @@
 
     // Experimental Features.
 
-    RuntimeEnabledFeatures::sharedFeatures().setLinkPreloadEnabled(store.getBoolValueForKey(WebPreferencesKey::linkPreloadEnabledKey()));
-
 #if ENABLE(CSS_GRID_LAYOUT)
     RuntimeEnabledFeatures::sharedFeatures().setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::cssGridLayoutEnabledKey()));
 #endif
@@ -3259,6 +3257,8 @@
 #endif
 
     RuntimeEnabledFeatures::sharedFeatures().setUserTimingEnabled(store.getBoolValueForKey(WebPreferencesKey::userTimingEnabledKey()));
+    RuntimeEnabledFeatures::sharedFeatures().setResourceTimingEnabled(store.getBoolValueForKey(WebPreferencesKey::resourceTimingEnabledKey()));
+    RuntimeEnabledFeatures::sharedFeatures().setLinkPreloadEnabled(store.getBoolValueForKey(WebPreferencesKey::linkPreloadEnabledKey()));
 
     bool processSuppressionEnabled = store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey());
     if (m_processSuppressionEnabled != processSuppressionEnabled) {

Modified: trunk/Tools/ChangeLog (212149 => 212150)


--- trunk/Tools/ChangeLog	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Tools/ChangeLog	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1,3 +1,17 @@
+2017-02-10  Joseph Pecoraro  <pecor...@apple.com>
+
+        [Resource Timing] Enable Resource Timing by default in Tests
+        https://bugs.webkit.org/show_bug.cgi?id=168145
+
+        Reviewed by Ryosuke Niwa.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebPreferencesToConsistentValues):
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (resetWebPreferencesToConsistentValues):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetPreferencesToConsistentValues):
+
 2017-02-10  Jonathan Bedard  <jbed...@apple.com>
 
         Removing LayoutTestRelay

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (212149 => 212150)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2017-02-10 22:28:56 UTC (rev 212150)
@@ -1017,6 +1017,8 @@
     [preferences setMediaStreamEnabled:YES];
     [preferences setPeerConnectionEnabled:YES];
 
+    [preferences setResourceTimingEnabled:YES];
+
     [WebPreferences _clearNetworkLoaderSession];
     [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
 }

Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (212149 => 212150)


--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -879,6 +879,7 @@
     prefsPrivate4->setShadowDOMEnabled(TRUE);
     prefsPrivate4->setCustomElementsEnabled(TRUE);
     prefsPrivate4->setModernMediaControlsEnabled(FALSE);
+    prefsPrivate4->setResourceTimingEnabled(TRUE);
     prefsPrivate4->setLinkPreloadEnabled(TRUE);
 
     setAlwaysAcceptCookies(false);

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (212149 => 212150)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2017-02-10 22:16:19 UTC (rev 212149)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2017-02-10 22:28:56 UTC (rev 212150)
@@ -697,6 +697,8 @@
     // FIXME: We should be testing the default.
     WKPreferencesSetStorageBlockingPolicy(preferences, kWKAllowAllStorage);
 
+    WKPreferencesSetResourceTimingEnabled(preferences, true);
+
     WKPreferencesSetMediaPlaybackAllowsInline(preferences, true);
     WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(preferences, false);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to