- Revision
- 227933
- Author
- [email protected]
- Date
- 2018-01-31 14:43:29 -0800 (Wed, 31 Jan 2018)
Log Message
REGRESSION(r227223): http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html, http/tests/resourceLoadStatistics/grandfathering.html timing out on GTK, WPE
https://bugs.webkit.org/show_bug.cgi?id=182222
Reviewed by Alex Christensen.
Source/WebKit:
Add callbacks to notify when resource load statistics deletion is complete.
* UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
(WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
(WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
* UIProcess/API/C/WKWebsiteDataStoreRef.h:
Tools:
Use the new API to notify when resource load statistics deletion is complete.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::statisticsClearThroughWebsiteDataRemovalCallback):
(WTR::TestController::statisticsClearInMemoryAndPersistentStore):
(WTR::TestController::statisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
LayoutTests:
* platform/gtk/TestExpectations:
* platform/wpe/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (227932 => 227933)
--- trunk/LayoutTests/ChangeLog 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/LayoutTests/ChangeLog 2018-01-31 22:43:29 UTC (rev 227933)
@@ -1,3 +1,13 @@
+2018-01-31 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r227223): http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html, http/tests/resourceLoadStatistics/grandfathering.html timing out on GTK, WPE
+ https://bugs.webkit.org/show_bug.cgi?id=182222
+
+ Reviewed by Alex Christensen.
+
+ * platform/gtk/TestExpectations:
+ * platform/wpe/TestExpectations:
+
2018-01-31 Ryosuke Niwa <[email protected]>
Release assertion in Performance::resourceTimingBufferFullTimerFired when the resource timing buffer is shrunk
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (227932 => 227933)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2018-01-31 22:43:29 UTC (rev 227933)
@@ -2249,10 +2249,8 @@
webkit.org/b/182109 media/video-fullscreen-reload-crash.html [ Timeout ]
-webkit.org/b/182222 http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html [ Timeout ]
-webkit.org/b/182222 webkit.org/b/175189 http/tests/resourceLoadStatistics/grandfathering.html [ Timeout ]
+webkit.org/b/182317 http/tests/resourceLoadStatistics/grandfathering.html [ Failure ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# End of Tests timing out
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (227932 => 227933)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2018-01-31 22:43:29 UTC (rev 227933)
@@ -1170,8 +1170,7 @@
webkit.org/b/181534 perf/show-hide-table-rows.html [ Pass Failure ]
-webkit.org/b/182222 http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html [ Timeout ]
-webkit.org/b/182222 webkit.org/b/175189 webkit.org/b/175189 http/tests/resourceLoadStatistics/grandfathering.html [ Timeout ]
+webkit.org/b/182317 http/tests/resourceLoadStatistics/grandfathering.html [ Failure ]
webkit.org/b/182240 svg/animations/svgenum-animation-7.html [ Pass Crash ]
Modified: trunk/Source/WebKit/ChangeLog (227932 => 227933)
--- trunk/Source/WebKit/ChangeLog 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/Source/WebKit/ChangeLog 2018-01-31 22:43:29 UTC (rev 227933)
@@ -1,3 +1,17 @@
+2018-01-31 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r227223): http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html, http/tests/resourceLoadStatistics/grandfathering.html timing out on GTK, WPE
+ https://bugs.webkit.org/show_bug.cgi?id=182222
+
+ Reviewed by Alex Christensen.
+
+ Add callbacks to notify when resource load statistics deletion is complete.
+
+ * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
+ (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore):
+ (WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
+ * UIProcess/API/C/WKWebsiteDataStoreRef.h:
+
2018-01-31 Tim Horton <[email protected]>
Occasional null deref under WebPageProxy::updateBackingStoreDiscardableState()
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (227932 => 227933)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp 2018-01-31 22:43:29 UTC (rev 227933)
@@ -327,22 +327,26 @@
store->setPruneEntriesDownTo(entries);
}
-void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef)
+void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction callback)
{
auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
if (!store)
return;
- store->scheduleClearInMemoryAndPersistent(WebKit::WebResourceLoadStatisticsStore::ShouldGrandfather::Yes, []() { });
+ store->scheduleClearInMemoryAndPersistent(WebKit::WebResourceLoadStatisticsStore::ShouldGrandfather::Yes, [context, callback]() {
+ callback(context);
+ });
}
-void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours)
+void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction callback)
{
auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
if (!store)
return;
- store->scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::WebResourceLoadStatisticsStore::ShouldGrandfather::Yes, []() { });
+ store->scheduleClearInMemoryAndPersistent(WallTime::now() - Seconds::fromHours(hours), WebKit::WebResourceLoadStatisticsStore::ShouldGrandfather::Yes, [context, callback]() {
+ callback(context);
+ });
}
void WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemoval(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemovalFunction callback)
Modified: trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h (227932 => 227933)
--- trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h 2018-01-31 22:43:29 UTC (rev 227933)
@@ -71,8 +71,10 @@
WK_EXPORT void WKWebsiteDataStoreSetStatisticsGrandfatheringTime(WKWebsiteDataStoreRef dataStoreRef, double seconds);
WK_EXPORT void WKWebsiteDataStoreSetStatisticsMaxStatisticsEntries(WKWebsiteDataStoreRef dataStoreRef, unsigned entries);
WK_EXPORT void WKWebsiteDataStoreSetStatisticsPruneEntriesDownTo(WKWebsiteDataStoreRef dataStoreRef, unsigned entries);
-WK_EXPORT void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef);
-WK_EXPORT void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours);
+typedef void (*WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction)(void* functionContext);
+WK_EXPORT void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreFunction callback);
+typedef void (*WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction)(void* functionContext);
+WK_EXPORT void WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(WKWebsiteDataStoreRef dataStoreRef, unsigned hours, void* context, WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHoursFunction callback);
typedef void (*WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemovalFunction)(void* functionContext);
WK_EXPORT void WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemoval(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemovalFunction callback);
WK_EXPORT void WKWebsiteDataStoreStatisticsResetToConsistentState(WKWebsiteDataStoreRef dataStoreRef);
Modified: trunk/Tools/ChangeLog (227932 => 227933)
--- trunk/Tools/ChangeLog 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/Tools/ChangeLog 2018-01-31 22:43:29 UTC (rev 227933)
@@ -1,3 +1,17 @@
+2018-01-31 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r227223): http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html, http/tests/resourceLoadStatistics/grandfathering.html timing out on GTK, WPE
+ https://bugs.webkit.org/show_bug.cgi?id=182222
+
+ Reviewed by Alex Christensen.
+
+ Use the new API to notify when resource load statistics deletion is complete.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::statisticsClearThroughWebsiteDataRemovalCallback):
+ (WTR::TestController::statisticsClearInMemoryAndPersistentStore):
+ (WTR::TestController::statisticsClearInMemoryAndPersistentStoreModifiedSinceHours):
+
2018-01-31 Ryosuke Niwa <[email protected]>
Add the support for running StyleBench to run-benchmark
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (227932 => 227933)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2018-01-31 22:40:10 UTC (rev 227932)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2018-01-31 22:43:29 UTC (rev 227933)
@@ -2639,23 +2639,23 @@
WKWebsiteDataStoreSetStatisticsPruneEntriesDownTo(dataStore, entries);
}
+void TestController::statisticsClearThroughWebsiteDataRemovalCallback(void* userData)
+{
+ static_cast<TestController*>(userData)->m_currentInvocation->didClearStatisticsThroughWebsiteDataRemoval();
+}
+
void TestController::statisticsClearInMemoryAndPersistentStore()
{
auto* dataStore = WKContextGetWebsiteDataStore(platformContext());
- WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(dataStore);
+ WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStore(dataStore, this, statisticsClearThroughWebsiteDataRemovalCallback);
}
void TestController::statisticsClearInMemoryAndPersistentStoreModifiedSinceHours(unsigned hours)
{
auto* dataStore = WKContextGetWebsiteDataStore(platformContext());
- WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(dataStore, hours);
+ WKWebsiteDataStoreStatisticsClearInMemoryAndPersistentStoreModifiedSinceHours(dataStore, hours, this, statisticsClearThroughWebsiteDataRemovalCallback);
}
-void TestController::statisticsClearThroughWebsiteDataRemovalCallback(void* userData)
-{
- static_cast<TestController*>(userData)->m_currentInvocation->didClearStatisticsThroughWebsiteDataRemoval();
-}
-
void TestController::statisticsClearThroughWebsiteDataRemoval()
{
auto* dataStore = WKContextGetWebsiteDataStore(platformContext());
