Diff
Modified: trunk/LayoutTests/ChangeLog (212690 => 212691)
--- trunk/LayoutTests/ChangeLog 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/ChangeLog 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,5 +1,18 @@
2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+ Unreviewed, rolling out r212685.
+
+ This change broke the 32-bit Sierra build.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Add alternate classification
+ method"
+ https://bugs.webkit.org/show_bug.cgi?id=168347
+ http://trac.webkit.org/changeset/212685
+
+2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+
Add mac-wk1 baseline for fast/canvas/webgl/context-creation-attributes.html
https://bugs.webkit.org/show_bug.cgi?id=168623
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Mixed Statistics
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Mixed Statistics</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host classified as prevalent resource.");
- else
- testPassed("Host did not get classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Sub Frame Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Sub Frame Under Top Frame Origins</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host classified as prevalent resource.");
- else
- testPassed("Host did not get classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Subresource Under Top Frame Origins</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host classified as prevalent resource.");
- else
- testPassed("Host did not get classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Unique Redirects To
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Subresource Unique Redirects To</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin2);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host classified as prevalent resource.");
- else
- testPassed("Host did not get classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Mixed Statistics
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Mixed Statistics</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
- const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get classified as prevalent resource.");
- else
- testPassed("Host classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Sub Frame Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Sub Frame Under Top Frame Origins</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
- const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
- testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get classified as prevalent resource.");
- else
- testPassed("Host classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Subresource Under Top Frame Origins</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
- const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
- testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get classified as prevalent resource.");
- else
- testPassed("Host classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Unique Redirects To
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
Deleted: trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html (212690 => 212691)
--- trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Tests for Classification Based on Subresource Unique Redirects To</title>
- <script src=""
-</head>
-<body>
-<script>
- const hostUnderTest = "127.0.0.1:8000";
- const statisticsUrl = "http://" + hostUnderTest + "/temp";
- const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
- const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
- const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
- const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
- function runTestRunnerTest() {
- testRunner.setStatisticsPrevalentResource(statisticsUrl, false);
- if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get set as non-prevalent resource.");
-
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin2);
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
- testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin4);
-
- testRunner.statisticsFireDataModificationHandler();
-
- if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
- testFailed("Host did not get classified as prevalent resource.");
- else
- testPassed("Host classified as prevalent resource.");
-
- testRunner.statisticsResetToConsistentState();
- testRunner.notifyDone();
- }
-
- if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
- testRunner.waitUntilDone();
- internals.setResourceLoadStatisticsEnabled(true);
- runTestRunnerTest();
- }
-</script>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (212690 => 212691)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2017-02-21 01:48:10 UTC (rev 212691)
@@ -931,7 +931,11 @@
webkit.org/b/163782 media/video-played-ranges-1.html [ Crash Pass ]
-webkit.org/b/168171 http/tests/loading/resourceLoadStatistics [ Crash ]
+webkit.org/b/168171 http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html [ Crash ]
+webkit.org/b/168171 http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html [ Crash ]
+webkit.org/b/168171 http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html [ Crash ]
+webkit.org/b/168171 http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction.html [ Crash ]
+webkit.org/b/168171 http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html [ Crash ]
webkit.org/b/167576 imported/w3c/IndexedDB-private-browsing/idbcursor_iterating.html [ Crash ]
webkit.org/b/167576 imported/w3c/IndexedDB-private-browsing/idbcursor_iterating_index.html [ Crash ]
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (212690 => 212691)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2017-02-21 01:48:10 UTC (rev 212691)
@@ -705,14 +705,6 @@
http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html [ Pass Timeout ]
http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html [ Pass Timeout ]
http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html [ Pass Timeout ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html [ Pass ]
### END OF (5) Progressions, expected successes that are expected failures in WebKit1.
########################################
Modified: trunk/Source/WTF/ChangeLog (212690 => 212691)
--- trunk/Source/WTF/ChangeLog 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WTF/ChangeLog 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,3 +1,16 @@
+2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r212685.
+
+ This change broke the 32-bit Sierra build.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Add alternate classification
+ method"
+ https://bugs.webkit.org/show_bug.cgi?id=168347
+ http://trac.webkit.org/changeset/212685
+
2017-02-20 John Wilander <wilan...@apple.com>
Resource Load Statistics: Add alternate classification method
Modified: trunk/Source/WTF/wtf/Platform.h (212690 => 212691)
--- trunk/Source/WTF/wtf/Platform.h 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WTF/wtf/Platform.h 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1208,8 +1208,4 @@
#endif
#endif /* PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 */
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
-#define HAVE_CORE_PREDICTION 1
-#endif
-
#endif /* WTF_Platform_h */
Modified: trunk/Source/WebCore/ChangeLog (212690 => 212691)
--- trunk/Source/WebCore/ChangeLog 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebCore/ChangeLog 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,3 +1,16 @@
+2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r212685.
+
+ This change broke the 32-bit Sierra build.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Add alternate classification
+ method"
+ https://bugs.webkit.org/show_bug.cgi?id=168347
+ http://trac.webkit.org/changeset/212685
+
2017-02-20 Sam Weinig <s...@webkit.org>
[WebIDL] Add support for constructors that have variadic parameters
Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (212690 => 212691)
--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2017-02-21 01:48:10 UTC (rev 212691)
@@ -375,33 +375,6 @@
statistics.isPrevalentResource = false;
}
-void ResourceLoadObserver::setSubframeUnderTopFrameOrigin(const URL& subframe, const URL& topFrame)
-{
- if (subframe.isBlankURL() || subframe.isEmpty() || topFrame.isBlankURL() || topFrame.isEmpty())
- return;
-
- auto& statistics = m_store->ensureResourceStatisticsForPrimaryDomain(primaryDomain(subframe));
- statistics.subframeUnderTopFrameOrigins.add(primaryDomain(topFrame));
-}
-
-void ResourceLoadObserver::setSubresourceUnderTopFrameOrigin(const URL& subresource, const URL& topFrame)
-{
- if (subresource.isBlankURL() || subresource.isEmpty() || topFrame.isBlankURL() || topFrame.isEmpty())
- return;
-
- auto& statistics = m_store->ensureResourceStatisticsForPrimaryDomain(primaryDomain(subresource));
- statistics.subresourceUnderTopFrameOrigins.add(primaryDomain(topFrame));
-}
-
-void ResourceLoadObserver::setSubresourceUniqueRedirectTo(const URL& subresource, const URL& hostNameRedirectedTo)
-{
- if (subresource.isBlankURL() || subresource.isEmpty() || hostNameRedirectedTo.isBlankURL() || hostNameRedirectedTo.isEmpty())
- return;
-
- auto& statistics = m_store->ensureResourceStatisticsForPrimaryDomain(primaryDomain(subresource));
- statistics.subresourceUniqueRedirectsTo.add(primaryDomain(hostNameRedirectedTo));
-}
-
void ResourceLoadObserver::setTimeToLiveUserInteraction(double seconds)
{
m_store->setTimeToLiveUserInteraction(seconds);
Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.h (212690 => 212691)
--- trunk/Source/WebCore/loader/ResourceLoadObserver.h 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.h 2017-02-21 01:48:10 UTC (rev 212691)
@@ -58,10 +58,6 @@
WEBCORE_EXPORT bool isPrevalentResource(const URL&);
WEBCORE_EXPORT void clearPrevalentResource(const URL&);
- WEBCORE_EXPORT void setSubframeUnderTopFrameOrigin(const URL& subframe, const URL& topFrame);
- WEBCORE_EXPORT void setSubresourceUnderTopFrameOrigin(const URL& subresource, const URL& topFrame);
- WEBCORE_EXPORT void setSubresourceUniqueRedirectTo(const URL& subresource, const URL& hostNameRedirectedTo);
-
WEBCORE_EXPORT void setTimeToLiveUserInteraction(double seconds);
WEBCORE_EXPORT void setReducedTimestampResolution(double seconds);
Modified: trunk/Source/WebKit2/ChangeLog (212690 => 212691)
--- trunk/Source/WebKit2/ChangeLog 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,3 +1,16 @@
+2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r212685.
+
+ This change broke the 32-bit Sierra build.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Add alternate classification
+ method"
+ https://bugs.webkit.org/show_bug.cgi?id=168347
+ http://trac.webkit.org/changeset/212685
+
2017-02-20 John Wilander <wilan...@apple.com>
Resource Load Statistics: Add alternate classification method
Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (212690 => 212691)
--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2017-02-21 01:48:10 UTC (rev 212691)
@@ -32,7 +32,7 @@
WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)" /System/Library/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);
+FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)" $(FRAMEWORK_SEARCH_PATHS);
FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (212690 => 212691)
--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2017-02-21 01:48:10 UTC (rev 212691)
@@ -34,14 +34,12 @@
INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CorePrediction -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt $(FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_$(PLATFORM_NAME));
+FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt $(FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_$(PLATFORM_NAME));
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphoneos*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios) -framework IOSurface;
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphonesimulator*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios);
FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphoneos = ;
FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphonesimulator = ;
-FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL $(EXTRA_FRAMEWORK_AND_LIBRARY_LDFLAGS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-EXTRA_FRAMEWORK_AND_LIBRARY_LDFLAGS_101200 = -framework CorePrediction;
-EXTRA_FRAMEWORK_AND_LIBRARY_LDFLAGS_101300 = -framework CorePrediction;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore
12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (212690 => 212691)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2017-02-21 01:48:10 UTC (rev 212691)
@@ -46,8 +46,6 @@
Platform/IPC/unix/AttachmentUnix.cpp
Platform/IPC/unix/ConnectionUnix.cpp
- Platform/classifier/ResourceLoadStatisticsClassifierBase.cpp
-
Platform/glib/ModuleGlib.cpp
Platform/unix/LoggingUnix.cpp
@@ -854,7 +852,6 @@
"${WEBKIT2_DIR}/NetworkProcess/soup"
"${WEBKIT2_DIR}/NetworkProcess/unix"
"${WEBKIT2_DIR}/Platform/IPC/glib"
- "${WEBKIT2_DIR}/Platform/classifier"
"${WEBKIT2_DIR}/Shared/API/c/gtk"
"${WEBKIT2_DIR}/Shared/Plugins/unix"
"${WEBKIT2_DIR}/Shared/glib"
Modified: trunk/Source/WebKit2/PlatformMac.cmake (212690 => 212691)
--- trunk/Source/WebKit2/PlatformMac.cmake 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2017-02-21 01:48:10 UTC (rev 212691)
@@ -49,10 +49,6 @@
Platform/cg/CGUtilities.cpp
- Platform/classifier/ResourceLoadStatisticsClassifierBase.cpp
-
- Platform/classifier/cocoa/ResourceLoadStatisticsClassifierCocoa.cpp
-
Platform/foundation/LoggingFoundation.mm
Platform/cocoa/SharedMemoryCocoa.cpp
@@ -396,8 +392,6 @@
"${WEBKIT2_DIR}/UIProcess/Scrolling"
"${WEBKIT2_DIR}/UIProcess/ios"
"${WEBKIT2_DIR}/Platform/cg"
- "${WEBKIT2_DIR}/Platform/classifier"
- "${WEBKIT2_DIR}/Platform/classifier/cocoa"
"${WEBKIT2_DIR}/Platform/mac"
"${WEBKIT2_DIR}/Platform/unix"
"${WEBKIT2_DIR}/Platform/spi/Cocoa"
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKResourceLoadStatisticsManager.cpp (212690 => 212691)
--- trunk/Source/WebKit2/UIProcess/API/C/WKResourceLoadStatisticsManager.cpp 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKResourceLoadStatisticsManager.cpp 2017-02-21 01:48:10 UTC (rev 212691)
@@ -56,21 +56,6 @@
return WebResourceLoadStatisticsManager::hasHadUserInteraction(toWTFString(hostName));
}
-void WKResourceLoadStatisticsManagerSetSubframeUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName)
-{
- WebResourceLoadStatisticsManager::setSubframeUnderTopFrameOrigin(toWTFString(hostName), toWTFString(topFrameHostName));
-}
-
-void WKResourceLoadStatisticsManagerSetSubresourceUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName)
-{
- WebResourceLoadStatisticsManager::setSubresourceUnderTopFrameOrigin(toWTFString(hostName), toWTFString(topFrameHostName));
-}
-
-void WKResourceLoadStatisticsManagerSetSubresourceUniqueRedirectTo(WKStringRef hostName, WKStringRef hostNameRedirectedTo)
-{
- WebResourceLoadStatisticsManager::setSubresourceUniqueRedirectTo(toWTFString(hostName), toWTFString(hostNameRedirectedTo));
-}
-
void WKResourceLoadStatisticsManagerSetTimeToLiveUserInteraction(double seconds)
{
WebResourceLoadStatisticsManager::setTimeToLiveUserInteraction(seconds);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKResourceLoadStatisticsManager.h (212690 => 212691)
--- trunk/Source/WebKit2/UIProcess/API/C/WKResourceLoadStatisticsManager.h 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKResourceLoadStatisticsManager.h 2017-02-21 01:48:10 UTC (rev 212691)
@@ -38,9 +38,6 @@
WK_EXPORT bool WKResourceLoadStatisticsManagerIsPrevalentResource(WKStringRef hostName);
WK_EXPORT void WKResourceLoadStatisticsManagerSetHasHadUserInteraction(WKStringRef hostName, bool value);
WK_EXPORT bool WKResourceLoadStatisticsManagerIsHasHadUserInteraction(WKStringRef hostName);
- WK_EXPORT void WKResourceLoadStatisticsManagerSetSubframeUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName);
- WK_EXPORT void WKResourceLoadStatisticsManagerSetSubresourceUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName);
- WK_EXPORT void WKResourceLoadStatisticsManagerSetSubresourceUniqueRedirectTo(WKStringRef hostName, WKStringRef hostNameRedirectedTo);
WK_EXPORT void WKResourceLoadStatisticsManagerSetTimeToLiveUserInteraction(double seconds);
WK_EXPORT void WKResourceLoadStatisticsManagerSetReducedTimestampResolution(double seconds);
WK_EXPORT void WKResourceLoadStatisticsManagerFireDataModificationHandler();
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsManager.cpp (212690 => 212691)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsManager.cpp 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsManager.cpp 2017-02-21 01:48:10 UTC (rev 212691)
@@ -61,21 +61,6 @@
return WebCore::ResourceLoadObserver::sharedObserver().hasHadUserInteraction(URL(URL(), hostName));
}
-void WebResourceLoadStatisticsManager::setSubframeUnderTopFrameOrigin(const String& hostName, const String& topFrameHostName)
-{
- WebCore::ResourceLoadObserver::sharedObserver().setSubframeUnderTopFrameOrigin(URL(URL(), hostName), URL(URL(), topFrameHostName));
-}
-
-void WebResourceLoadStatisticsManager::setSubresourceUnderTopFrameOrigin(const String& hostName, const String& topFrameHostName)
-{
- WebCore::ResourceLoadObserver::sharedObserver().setSubresourceUnderTopFrameOrigin(URL(URL(), hostName), URL(URL(), topFrameHostName));
-}
-
-void WebResourceLoadStatisticsManager::setSubresourceUniqueRedirectTo(const String& hostName, const String& hostNameRedirectedTo)
-{
- WebCore::ResourceLoadObserver::sharedObserver().setSubresourceUniqueRedirectTo(URL(URL(), hostName), URL(URL(), hostNameRedirectedTo));
-}
-
void WebResourceLoadStatisticsManager::setTimeToLiveUserInteraction(double seconds)
{
WebCore::ResourceLoadObserver::sharedObserver().setTimeToLiveUserInteraction(seconds);
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsManager.h (212690 => 212691)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsManager.h 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsManager.h 2017-02-21 01:48:10 UTC (rev 212691)
@@ -42,9 +42,6 @@
static bool isPrevalentResource(const String& hostName);
static void setHasHadUserInteraction(const String& hostName, bool value);
static bool hasHadUserInteraction(const String& hostName);
- static void setSubframeUnderTopFrameOrigin(const String& hostName, const String& topFrameHostName);
- static void setSubresourceUnderTopFrameOrigin(const String& hostName, const String& topFrameHostName);
- static void setSubresourceUniqueRedirectTo(const String& hostName, const String& hostNameRedirectedTo);
static void setTimeToLiveUserInteraction(double seconds);
static void setReducedTimestampResolution(double seconds);
static void fireDataModificationHandler();
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (212690 => 212691)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-02-21 01:48:10 UTC (rev 212691)
@@ -45,6 +45,7 @@
namespace WebKit {
+static const auto featureVectorLengthThreshold = 3;
static auto minimumTimeBetweeenDataRecordsRemoval = 60;
static OptionSet<WebKit::WebsiteDataType> dataTypesToRemove;
static auto notifyPages = false;
@@ -58,7 +59,7 @@
WebResourceLoadStatisticsStore::WebResourceLoadStatisticsStore(const String& resourceLoadStatisticsDirectory)
: m_resourceLoadStatisticsStore(ResourceLoadStatisticsStore::create())
, m_statisticsQueue(WorkQueue::create("WebResourceLoadStatisticsStore Process Data Queue"))
- , m_statisticsStoragePath(resourceLoadStatisticsDirectory)
+ , m_storagePath(resourceLoadStatisticsDirectory)
{
}
@@ -82,11 +83,40 @@
minimumTimeBetweeenDataRecordsRemoval = seconds;
}
+bool WebResourceLoadStatisticsStore::hasPrevalentResourceCharacteristics(const ResourceLoadStatistics& resourceStatistic)
+{
+ auto subresourceUnderTopFrameOriginsCount = resourceStatistic.subresourceUnderTopFrameOrigins.size();
+ auto subresourceUniqueRedirectsToCount = resourceStatistic.subresourceUniqueRedirectsTo.size();
+ auto subframeUnderTopFrameOriginsCount = resourceStatistic.subframeUnderTopFrameOrigins.size();
+
+ if (!subresourceUnderTopFrameOriginsCount
+ && !subresourceUniqueRedirectsToCount
+ && !subframeUnderTopFrameOriginsCount)
+ return false;
+
+ if (subresourceUnderTopFrameOriginsCount > featureVectorLengthThreshold
+ || subresourceUniqueRedirectsToCount > featureVectorLengthThreshold
+ || subframeUnderTopFrameOriginsCount > featureVectorLengthThreshold)
+ return true;
+
+ // The resource is considered prevalent if the feature vector
+ // is longer than the threshold.
+ // Vector length for n dimensions is sqrt(a^2 + (...) + n^2).
+ double vectorLength = 0;
+ vectorLength += subresourceUnderTopFrameOriginsCount * subresourceUnderTopFrameOriginsCount;
+ vectorLength += subresourceUniqueRedirectsToCount * subresourceUniqueRedirectsToCount;
+ vectorLength += subframeUnderTopFrameOriginsCount * subframeUnderTopFrameOriginsCount;
+
+ ASSERT(vectorLength > 0);
+
+ return sqrt(vectorLength) > featureVectorLengthThreshold;
+}
+
void WebResourceLoadStatisticsStore::classifyResource(ResourceLoadStatistics& resourceStatistic)
{
- if (!resourceStatistic.isPrevalentResource
- && m_resourceLoadStatisticsClassifier.hasPrevalentResourceCharacteristics(resourceStatistic))
+ if (!resourceStatistic.isPrevalentResource && hasPrevalentResourceCharacteristics(resourceStatistic)) {
resourceStatistic.isPrevalentResource = true;
+ }
}
void WebResourceLoadStatisticsStore::removeDataRecords()
@@ -218,11 +248,11 @@
String WebResourceLoadStatisticsStore::persistentStoragePath(const String& label) const
{
- if (m_statisticsStoragePath.isEmpty())
+ if (m_storagePath.isEmpty())
return emptyString();
// TODO Decide what to call this file
- return pathByAppendingComponent(m_statisticsStoragePath, label + "_resourceLog.plist");
+ return pathByAppendingComponent(m_storagePath, label + "_resourceLog.plist");
}
void WebResourceLoadStatisticsStore::writeEncoderToDisk(KeyedEncoder& encoder, const String& label) const
@@ -235,8 +265,8 @@
if (resourceLog.isEmpty())
return;
- if (!m_statisticsStoragePath.isEmpty())
- makeAllDirectories(m_statisticsStoragePath);
+ if (!m_storagePath.isEmpty())
+ makeAllDirectories(m_storagePath);
auto handle = openFile(resourceLog, OpenForWrite);
if (!handle)
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h (212690 => 212691)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h 2017-02-21 01:48:10 UTC (rev 212691)
@@ -28,7 +28,6 @@
#include "APIObject.h"
#include "Connection.h"
-#include "ResourceLoadStatisticsClassifier.h"
#include "WebsiteDataRecord.h"
#include <WebCore/ResourceLoadStatisticsStore.h>
#include <wtf/Vector.h>
@@ -77,6 +76,7 @@
void processStatisticsAndDataRecords();
+ bool hasPrevalentResourceCharacteristics(const WebCore::ResourceLoadStatistics&);
void classifyResource(WebCore::ResourceLoadStatistics&);
void removeDataRecords();
@@ -89,9 +89,8 @@
std::unique_ptr<WebCore::KeyedDecoder> createDecoderFromDisk(const String& label) const;
Ref<WebCore::ResourceLoadStatisticsStore> m_resourceLoadStatisticsStore;
- ResourceLoadStatisticsClassifier m_resourceLoadStatisticsClassifier;
Ref<WTF::WorkQueue> m_statisticsQueue;
- String m_statisticsStoragePath;
+ String m_storagePath;
bool m_resourceLoadStatisticsEnabled { false };
double m_lastTimeDataRecordsWereRemoved { 0 };
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (212690 => 212691)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1148,17 +1148,10 @@
6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A /* WKBundleInspector.cpp */; };
659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6546A82913000164000CEB1C /* InjectedBundlePageResourceLoadClient.cpp */; };
65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B86F1812F11D7B00B7DD8A /* WKBundleInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 6B2E09BA1E57B88100C8A8B9 /* CorePredictionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B2E09B91E57B88100C8A8B9 /* CorePredictionSPI.h */; };
6BE9699C1E43B3FF008B7483 /* WKResourceLoadStatisticsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE9699B1E43B3FF008B7483 /* WKResourceLoadStatisticsManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
6BE9699E1E43B41D008B7483 /* WKResourceLoadStatisticsManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BE9699D1E43B41D008B7483 /* WKResourceLoadStatisticsManager.cpp */; };
6BE969A01E43B86E008B7483 /* WebResourceLoadStatisticsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE9699F1E43B86E008B7483 /* WebResourceLoadStatisticsManager.h */; };
6BE969A21E43B8A4008B7483 /* WebResourceLoadStatisticsManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BE969A11E43B8A4008B7483 /* WebResourceLoadStatisticsManager.cpp */; };
- 6BE969C11E54D452008B7483 /* corePrediction_model in Resources */ = {isa = PBXBuildFile; fileRef = 6BE969C01E54D452008B7483 /* corePrediction_model */; };
- 6BE969C51E54D4A4008B7483 /* ResourceLoadStatisticsClassifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE969C41E54D4A4008B7483 /* ResourceLoadStatisticsClassifier.h */; };
- 6BE969C71E54D4B6008B7483 /* ResourceLoadStatisticsClassifierBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BE969C61E54D4B6008B7483 /* ResourceLoadStatisticsClassifierBase.cpp */; };
- 6BE969CA1E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BE969C81E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.cpp */; };
- 6BE969CB1E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE969C91E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h */; };
- 6BE969CD1E54E054008B7483 /* ResourceLoadStatisticsClassifierBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE969CC1E54E054008B7483 /* ResourceLoadStatisticsClassifierBase.h */; };
6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 728E86EF1795188C0087879E /* WebColorPickerMac.h */; };
728E86F21795188C0087879E /* WebColorPickerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 728E86F01795188C0087879E /* WebColorPickerMac.mm */; };
@@ -3345,17 +3338,10 @@
6546A82A13000164000CEB1C /* InjectedBundlePageResourceLoadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageResourceLoadClient.h; sourceTree = "<group>"; };
65B86F1712F11D7B00B7DD8A /* WKBundleInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleInspector.cpp; sourceTree = "<group>"; };
65B86F1812F11D7B00B7DD8A /* WKBundleInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleInspector.h; sourceTree = "<group>"; };
- 6B2E09B91E57B88100C8A8B9 /* CorePredictionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CorePredictionSPI.h; sourceTree = "<group>"; };
6BE9699B1E43B3FF008B7483 /* WKResourceLoadStatisticsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKResourceLoadStatisticsManager.h; sourceTree = "<group>"; };
6BE9699D1E43B41D008B7483 /* WKResourceLoadStatisticsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKResourceLoadStatisticsManager.cpp; sourceTree = "<group>"; };
6BE9699F1E43B86E008B7483 /* WebResourceLoadStatisticsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadStatisticsManager.h; sourceTree = "<group>"; };
6BE969A11E43B8A4008B7483 /* WebResourceLoadStatisticsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoadStatisticsManager.cpp; sourceTree = "<group>"; };
- 6BE969C01E54D452008B7483 /* corePrediction_model */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = corePrediction_model; sourceTree = "<group>"; };
- 6BE969C41E54D4A4008B7483 /* ResourceLoadStatisticsClassifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadStatisticsClassifier.h; sourceTree = "<group>"; };
- 6BE969C61E54D4B6008B7483 /* ResourceLoadStatisticsClassifierBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadStatisticsClassifierBase.cpp; sourceTree = "<group>"; };
- 6BE969C81E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadStatisticsClassifierCocoa.cpp; sourceTree = "<group>"; };
- 6BE969C91E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadStatisticsClassifierCocoa.h; sourceTree = "<group>"; };
- 6BE969CC1E54E054008B7483 /* ResourceLoadStatisticsClassifierBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadStatisticsClassifierBase.h; sourceTree = "<group>"; };
6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.WebProcess.sb.in; path = WebProcess/com.apple.WebProcess.sb.in; sourceTree = "<group>"; };
6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKInspectorPrivateMac.h; path = mac/WKInspectorPrivateMac.h; sourceTree = "<group>"; };
728E86EF1795188C0087879E /* WebColorPickerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebColorPickerMac.h; sourceTree = "<group>"; };
@@ -4368,7 +4354,6 @@
089C1665FE841158C02AAC07 /* Resources */ = {
isa = PBXGroup;
children = (
- 6BE969BF1E54D452008B7483 /* ResourceLoadStatistics */,
37F8C94F1AE22BD8007DAB9E /* mac */,
7CB16FE11724B9B5007A0A95 /* PlugInSandboxProfiles */,
A78CCDD5193AC9E3005ECC25 /* SandboxProfiles */,
@@ -6130,36 +6115,6 @@
name = Cocoa;
sourceTree = "<group>";
};
- 6BE969BF1E54D452008B7483 /* ResourceLoadStatistics */ = {
- isa = PBXGroup;
- children = (
- 6BE969C01E54D452008B7483 /* corePrediction_model */,
- );
- name = ResourceLoadStatistics;
- path = Resources/ResourceLoadStatistics;
- sourceTree = "<group>";
- };
- 6BE969C21E54D467008B7483 /* classifier */ = {
- isa = PBXGroup;
- children = (
- 6BE969C31E54D467008B7483 /* cocoa */,
- 6BE969C61E54D4B6008B7483 /* ResourceLoadStatisticsClassifierBase.cpp */,
- 6BE969C41E54D4A4008B7483 /* ResourceLoadStatisticsClassifier.h */,
- 6BE969CC1E54E054008B7483 /* ResourceLoadStatisticsClassifierBase.h */,
- );
- path = classifier;
- sourceTree = "<group>";
- };
- 6BE969C31E54D467008B7483 /* cocoa */ = {
- isa = PBXGroup;
- children = (
- 6BE969C81E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.cpp */,
- 6BE969C91E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h */,
- 6B2E09B91E57B88100C8A8B9 /* CorePredictionSPI.h */,
- );
- path = cocoa;
- sourceTree = "<group>";
- };
6EE849C41368D9040038D481 /* mac */ = {
isa = PBXGroup;
children = (
@@ -7060,7 +7015,6 @@
BC2E6E74114196F000A63B1E /* Platform */ = {
isa = PBXGroup;
children = (
- 6BE969C21E54D467008B7483 /* classifier */,
3709504118A88BA40087AE5D /* cf */,
1AA2E51A12E4C05600BC4966 /* cg */,
4450AEBE1DC3FAAC009943F2 /* cocoa */,
@@ -7943,7 +7897,6 @@
41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */,
7C1BA33E1A4A0E600043E249 /* APIDictionary.h in Headers */,
1F7D36C118DA513F00D9D659 /* APIDownloadClient.h in Headers */,
- 6BE969CB1E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h in Headers */,
516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */,
317FE7C51C487A6C00A0CA89 /* APIExperimentalFeature.h in Headers */,
00B9661618E24CBA00CE1F88 /* APIFindClient.h in Headers */,
@@ -8364,7 +8317,6 @@
3309344A1315B9220097A7BC /* WebCookieManagerProxyMessages.h in Headers */,
BC1DD7B2114DC396005ADAF3 /* WebCoreArgumentCoders.h in Headers */,
512F589B12A8838800629530 /* WebCredential.h in Headers */,
- 6BE969C51E54D4A4008B7483 /* ResourceLoadStatisticsClassifier.h in Headers */,
1AA83F6D1A5B63FF00026EC6 /* WebDatabaseProvider.h in Headers */,
CD19A26E1A13E834008D650E /* WebDiagnosticLoggingClient.h in Headers */,
1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */,
@@ -8450,7 +8402,6 @@
512127C41908239A00DAF35C /* WebPasteboardOverrides.h in Headers */,
7C4694D11A51E36800AD5845 /* WebPasteboardProxy.h in Headers */,
7C4694CA1A4B4EA100AD5845 /* WebPasteboardProxyMessages.h in Headers */,
- 6B2E09BA1E57B88100C8A8B9 /* CorePredictionSPI.h in Headers */,
1AB1F7971D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h in Headers */,
1AB1F78C1D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.h in Headers */,
1AB1F77E1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyCocoa.h in Headers */,
@@ -8569,7 +8520,6 @@
BC7B633D12A45D1200D174A4 /* WKBundlePageGroup.h in Headers */,
1AB474D8184D43FD0051B622 /* WKBundlePageLoaderClient.h in Headers */,
ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */,
- 6BE969CD1E54E054008B7483 /* ResourceLoadStatisticsClassifierBase.h in Headers */,
1AB474EA184D45130051B622 /* WKBundlePagePolicyClient.h in Headers */,
BC1B419811D41D570011E8DD /* WKBundlePagePrivate.h in Headers */,
1AB474DA184D44250051B622 /* WKBundlePageResourceLoadClient.h in Headers */,
@@ -9103,7 +9053,6 @@
7A5E394A1D5BD8BE00B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb in Resources */,
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
93A2A3461D246125002B59D3 /* mediaIcon.pdf in Resources */,
- 6BE969C11E54D452008B7483 /* corePrediction_model in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9692,7 +9641,6 @@
51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */,
5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */,
E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */,
- 6BE969CA1E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.cpp in Sources */,
5179556D162877B100FA43B6 /* NetworkProcessProxy.cpp in Sources */,
516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */,
513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
@@ -10037,7 +9985,6 @@
D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,
BCC43AC7127B99DE00317F16 /* WebPopupMenuMac.mm in Sources */,
BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */,
- 6BE969C71E54D4B6008B7483 /* ResourceLoadStatisticsClassifierBase.cpp in Sources */,
BCD59800112B57BE00EC8C23 /* WebPreferences.cpp in Sources */,
7C85FD7F19341665000177C4 /* WebPreferencesKeys.cpp in Sources */,
BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */,
Modified: trunk/Tools/ChangeLog (212690 => 212691)
--- trunk/Tools/ChangeLog 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Tools/ChangeLog 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,3 +1,16 @@
+2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r212685.
+
+ This change broke the 32-bit Sierra build.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Add alternate classification
+ method"
+ https://bugs.webkit.org/show_bug.cgi?id=168347
+ http://trac.webkit.org/changeset/212685
+
2017-02-20 John Wilander <wilan...@apple.com>
Resource Load Statistics: Add alternate classification method
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (212690 => 212691)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2017-02-21 01:48:10 UTC (rev 212691)
@@ -253,9 +253,6 @@
boolean isStatisticsPrevalentResource(DOMString hostName);
void setStatisticsHasHadUserInteraction(DOMString hostName, boolean value);
boolean isStatisticsHasHadUserInteraction(DOMString hostName);
- void setStatisticsSubframeUnderTopFrameOrigin(DOMString hostName, DOMString topFrameHostName);
- void setStatisticsSubresourceUnderTopFrameOrigin(DOMString hostName, DOMString topFrameHostName);
- void setStatisticsSubresourceUniqueRedirectTo(DOMString hostName, DOMString hostNameRedirectedTo);
void setStatisticsTimeToLiveUserInteraction(double seconds);
void statisticsFireDataModificationHandler();
void setStatisticsNotifyPagesWhenDataRecordsWereScanned(boolean value);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (212690 => 212691)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1226,84 +1226,6 @@
return WKBooleanGetValue(static_cast<WKBooleanRef>(returnData));
}
-void TestRunner::setStatisticsSubframeUnderTopFrameOrigin(JSStringRef hostName, JSStringRef topFrameHostName)
-{
- Vector<WKRetainPtr<WKStringRef>> keys;
- Vector<WKRetainPtr<WKTypeRef>> values;
-
- keys.append({ AdoptWK, WKStringCreateWithUTF8CString("HostName") });
- values.append({ AdoptWK, WKStringCreateWithJSString(hostName) });
-
- keys.append({ AdoptWK, WKStringCreateWithUTF8CString("TopFrameHostName") });
- values.append({ AdoptWK, WKStringCreateWithJSString(topFrameHostName) });
-
- Vector<WKStringRef> rawKeys;
- Vector<WKTypeRef> rawValues;
- rawKeys.resize(keys.size());
- rawValues.resize(values.size());
-
- for (size_t i = 0; i < keys.size(); ++i) {
- rawKeys[i] = keys[i].get();
- rawValues[i] = values[i].get();
- }
-
- WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetStatisticsSubframeUnderTopFrameOrigin"));
- WKRetainPtr<WKDictionaryRef> messageBody(AdoptWK, WKDictionaryCreate(rawKeys.data(), rawValues.data(), rawKeys.size()));
- WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
-}
-
-void TestRunner::setStatisticsSubresourceUnderTopFrameOrigin(JSStringRef hostName, JSStringRef topFrameHostName)
-{
- Vector<WKRetainPtr<WKStringRef>> keys;
- Vector<WKRetainPtr<WKTypeRef>> values;
-
- keys.append({ AdoptWK, WKStringCreateWithUTF8CString("HostName") });
- values.append({ AdoptWK, WKStringCreateWithJSString(hostName) });
-
- keys.append({ AdoptWK, WKStringCreateWithUTF8CString("TopFrameHostName") });
- values.append({ AdoptWK, WKStringCreateWithJSString(topFrameHostName) });
-
- Vector<WKStringRef> rawKeys;
- Vector<WKTypeRef> rawValues;
- rawKeys.resize(keys.size());
- rawValues.resize(values.size());
-
- for (size_t i = 0; i < keys.size(); ++i) {
- rawKeys[i] = keys[i].get();
- rawValues[i] = values[i].get();
- }
-
- WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetStatisticsSubresourceUnderTopFrameOrigin"));
- WKRetainPtr<WKDictionaryRef> messageBody(AdoptWK, WKDictionaryCreate(rawKeys.data(), rawValues.data(), rawKeys.size()));
- WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
-}
-
-void TestRunner::setStatisticsSubresourceUniqueRedirectTo(JSStringRef hostName, JSStringRef hostNameRedirectedTo)
-{
- Vector<WKRetainPtr<WKStringRef>> keys;
- Vector<WKRetainPtr<WKTypeRef>> values;
-
- keys.append({ AdoptWK, WKStringCreateWithUTF8CString("HostName") });
- values.append({ AdoptWK, WKStringCreateWithJSString(hostName) });
-
- keys.append({ AdoptWK, WKStringCreateWithUTF8CString("HostNameRedirectedTo") });
- values.append({ AdoptWK, WKStringCreateWithJSString(hostNameRedirectedTo) });
-
- Vector<WKStringRef> rawKeys;
- Vector<WKTypeRef> rawValues;
- rawKeys.resize(keys.size());
- rawValues.resize(values.size());
-
- for (size_t i = 0; i < keys.size(); ++i) {
- rawKeys[i] = keys[i].get();
- rawValues[i] = values[i].get();
- }
-
- WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetStatisticsSubresourceUniqueRedirectTo"));
- WKRetainPtr<WKDictionaryRef> messageBody(AdoptWK, WKDictionaryCreate(rawKeys.data(), rawValues.data(), rawKeys.size()));
- WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
-}
-
void TestRunner::setStatisticsTimeToLiveUserInteraction(double seconds)
{
WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetStatisticsTimeToLiveUserInteraction"));
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (212690 => 212691)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2017-02-21 01:48:10 UTC (rev 212691)
@@ -354,9 +354,6 @@
bool isStatisticsPrevalentResource(JSStringRef hostName);
void setStatisticsHasHadUserInteraction(JSStringRef hostName, bool value);
bool isStatisticsHasHadUserInteraction(JSStringRef hostName);
- void setStatisticsSubframeUnderTopFrameOrigin(JSStringRef hostName, JSStringRef topFrameHostName);
- void setStatisticsSubresourceUnderTopFrameOrigin(JSStringRef hostName, JSStringRef topFrameHostName);
- void setStatisticsSubresourceUniqueRedirectTo(JSStringRef hostName, JSStringRef hostNameRedirectedTo);
void setStatisticsTimeToLiveUserInteraction(double seconds);
void setStatisticsNotifyPagesWhenDataRecordsWereScanned(bool);
void setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(bool);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (212690 => 212691)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-02-21 01:48:10 UTC (rev 212691)
@@ -2229,21 +2229,6 @@
return WKResourceLoadStatisticsManagerIsHasHadUserInteraction(hostName);
}
-void TestController::setStatisticsSubframeUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName)
-{
- WKResourceLoadStatisticsManagerSetSubframeUnderTopFrameOrigin(hostName, topFrameHostName);
-}
-
-void TestController::setStatisticsSubresourceUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName)
-{
- WKResourceLoadStatisticsManagerSetSubresourceUnderTopFrameOrigin(hostName, topFrameHostName);
-}
-
-void TestController::setStatisticsSubresourceUniqueRedirectTo(WKStringRef hostName, WKStringRef hostNameRedirectedTo)
-{
- WKResourceLoadStatisticsManagerSetSubresourceUniqueRedirectTo(hostName, hostNameRedirectedTo);
-}
-
void TestController::setStatisticsTimeToLiveUserInteraction(double seconds)
{
WKResourceLoadStatisticsManagerSetTimeToLiveUserInteraction(seconds);
Modified: trunk/Tools/WebKitTestRunner/TestController.h (212690 => 212691)
--- trunk/Tools/WebKitTestRunner/TestController.h 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Tools/WebKitTestRunner/TestController.h 2017-02-21 01:48:10 UTC (rev 212691)
@@ -152,9 +152,6 @@
bool isStatisticsPrevalentResource(WKStringRef hostName);
void setStatisticsHasHadUserInteraction(WKStringRef hostName, bool value);
bool isStatisticsHasHadUserInteraction(WKStringRef hostName);
- void setStatisticsSubframeUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName);
- void setStatisticsSubresourceUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName);
- void setStatisticsSubresourceUniqueRedirectTo(WKStringRef hostName, WKStringRef hostNameRedirectedTo);
void setStatisticsTimeToLiveUserInteraction(double seconds);
void statisticsFireDataModificationHandler();
void setStatisticsNotifyPagesWhenDataRecordsWereScanned(bool);
Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (212690 => 212691)
--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2017-02-21 01:48:10 UTC (rev 212691)
@@ -932,48 +932,6 @@
return result;
}
- if (WKStringIsEqualToUTF8CString(messageName, "SetStatisticsSubframeUnderTopFrameOrigin")) {
- ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
-
- WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
- WKRetainPtr<WKStringRef> hostNameKey(AdoptWK, WKStringCreateWithUTF8CString("HostName"));
- WKRetainPtr<WKStringRef> topFrameHostNameKey(AdoptWK, WKStringCreateWithUTF8CString("TopFrameHostName"));
-
- WKStringRef hostName = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, hostNameKey.get()));
- WKStringRef topFrameHostName = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, topFrameHostNameKey.get()));
-
- TestController::singleton().setStatisticsSubframeUnderTopFrameOrigin(hostName, topFrameHostName);
- return nullptr;
- }
-
- if (WKStringIsEqualToUTF8CString(messageName, "SetStatisticsSubresourceUnderTopFrameOrigin")) {
- ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
-
- WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
- WKRetainPtr<WKStringRef> hostNameKey(AdoptWK, WKStringCreateWithUTF8CString("HostName"));
- WKRetainPtr<WKStringRef> topFrameHostNameKey(AdoptWK, WKStringCreateWithUTF8CString("TopFrameHostName"));
-
- WKStringRef hostName = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, hostNameKey.get()));
- WKStringRef topFrameHostName = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, topFrameHostNameKey.get()));
-
- TestController::singleton().setStatisticsSubresourceUnderTopFrameOrigin(hostName, topFrameHostName);
- return nullptr;
- }
-
- if (WKStringIsEqualToUTF8CString(messageName, "SetStatisticsSubresourceUniqueRedirectTo")) {
- ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
-
- WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
- WKRetainPtr<WKStringRef> hostNameKey(AdoptWK, WKStringCreateWithUTF8CString("HostName"));
- WKRetainPtr<WKStringRef> hostNameRedirectedToKey(AdoptWK, WKStringCreateWithUTF8CString("HostNameRedirectedTo"));
-
- WKStringRef hostName = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, hostNameKey.get()));
- WKStringRef hostNameRedirectedTo = static_cast<WKStringRef>(WKDictionaryGetItemForKey(messageBodyDictionary, hostNameRedirectedToKey.get()));
-
- TestController::singleton().setStatisticsSubresourceUniqueRedirectTo(hostName, hostNameRedirectedTo);
- return nullptr;
- }
-
if (WKStringIsEqualToUTF8CString(messageName, "SetStatisticsTimeToLiveUserInteraction")) {
ASSERT(WKGetTypeID(messageBody) == WKDoubleGetTypeID());
WKDoubleRef seconds = static_cast<WKDoubleRef>(messageBody);
Modified: trunk/WebKitLibraries/ChangeLog (212690 => 212691)
--- trunk/WebKitLibraries/ChangeLog 2017-02-21 01:46:12 UTC (rev 212690)
+++ trunk/WebKitLibraries/ChangeLog 2017-02-21 01:48:10 UTC (rev 212691)
@@ -1,3 +1,16 @@
+2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r212685.
+
+ This change broke the 32-bit Sierra build.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Add alternate classification
+ method"
+ https://bugs.webkit.org/show_bug.cgi?id=168347
+ http://trac.webkit.org/changeset/212685
+
2017-02-20 John Wilander <wilan...@apple.com>
Resource Load Statistics: Add alternate classification method
