Diff
Modified: trunk/Source/WebCore/ChangeLog (228513 => 228514)
--- trunk/Source/WebCore/ChangeLog 2018-02-15 16:49:49 UTC (rev 228513)
+++ trunk/Source/WebCore/ChangeLog 2018-02-15 17:19:23 UTC (rev 228514)
@@ -1,3 +1,17 @@
+2018-02-15 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r228495.
+
+ This caused mulitple perf tests to fail consistently.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Make sure
+ WebResourceLoadStatisticsStore::mergeWithDataFromDecoder() can
+ ingest older plist versions and not reset the database"
+ https://bugs.webkit.org/show_bug.cgi?id=182812
+ https://trac.webkit.org/changeset/228495
+
2018-02-15 Zan Dobersek <[email protected]>
Clean up HarfBuzzFaceCairo
Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp (228513 => 228514)
--- trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp 2018-02-15 16:49:49 UTC (rev 228513)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp 2018-02-15 17:19:23 UTC (rev 228514)
@@ -118,7 +118,7 @@
});
}
-bool ResourceLoadStatistics::decode(KeyedDecoder& decoder, unsigned modelVersion)
+bool ResourceLoadStatistics::decode(KeyedDecoder& decoder)
{
if (!decoder.decodeString("PrevalentResourceOrigin", highLevelDomain))
return false;
@@ -131,10 +131,8 @@
decodeHashSet(decoder, "storageAccessUnderTopFrameOrigins", storageAccessUnderTopFrameOrigins);
// Top frame stats
- if (modelVersion >= 11) {
- decodeHashCountedSet(decoder, "topFrameUniqueRedirectsTo", topFrameUniqueRedirectsTo);
- decodeHashCountedSet(decoder, "topFrameUniqueRedirectsFrom", topFrameUniqueRedirectsFrom);
- }
+ decodeHashCountedSet(decoder, "topFrameUniqueRedirectsTo", topFrameUniqueRedirectsTo);
+ decodeHashCountedSet(decoder, "topFrameUniqueRedirectsFrom", topFrameUniqueRedirectsFrom);
// Subframe stats
decodeHashCountedSet(decoder, "subframeUnderTopFrameOrigins", subframeUnderTopFrameOrigins);
@@ -142,8 +140,7 @@
// Subresource stats
decodeHashCountedSet(decoder, "subresourceUnderTopFrameOrigins", subresourceUnderTopFrameOrigins);
decodeHashCountedSet(decoder, "subresourceUniqueRedirectsTo", subresourceUniqueRedirectsTo);
- if (modelVersion >= 11)
- decodeHashCountedSet(decoder, "subresourceUniqueRedirectsFrom", subresourceUniqueRedirectsFrom);
+ decodeHashCountedSet(decoder, "subresourceUniqueRedirectsFrom", subresourceUniqueRedirectsFrom);
// Prevalent Resource
if (!decoder.decodeBool("isPrevalentResource", isPrevalentResource))
@@ -165,12 +162,11 @@
return false;
lastSeen = WallTime::fromRawSeconds(lastSeenTimeAsDouble);
- if (modelVersion >= 11) {
- if (!decoder.decodeUInt32("timesAccessedAsFirstPartyDueToUserInteraction", timesAccessedAsFirstPartyDueToUserInteraction))
- timesAccessedAsFirstPartyDueToUserInteraction = 0;
- if (!decoder.decodeUInt32("timesAccessedAsFirstPartyDueToStorageAccessAPI", timesAccessedAsFirstPartyDueToStorageAccessAPI))
- timesAccessedAsFirstPartyDueToStorageAccessAPI = 0;
- }
+ if (!decoder.decodeUInt32("timesAccessedAsFirstPartyDueToUserInteraction", timesAccessedAsFirstPartyDueToUserInteraction))
+ timesAccessedAsFirstPartyDueToUserInteraction = 0;
+ if (!decoder.decodeUInt32("timesAccessedAsFirstPartyDueToStorageAccessAPI", timesAccessedAsFirstPartyDueToStorageAccessAPI))
+ timesAccessedAsFirstPartyDueToStorageAccessAPI = 0;
+
return true;
}
Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.h (228513 => 228514)
--- trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2018-02-15 16:49:49 UTC (rev 228513)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2018-02-15 17:19:23 UTC (rev 228514)
@@ -54,7 +54,7 @@
WEBCORE_EXPORT static String primaryDomain(const String& host);
WEBCORE_EXPORT void encode(KeyedEncoder&) const;
- WEBCORE_EXPORT bool decode(KeyedDecoder&, unsigned modelVersion);
+ WEBCORE_EXPORT bool decode(KeyedDecoder&);
String toString() const;
Modified: trunk/Source/WebKit/ChangeLog (228513 => 228514)
--- trunk/Source/WebKit/ChangeLog 2018-02-15 16:49:49 UTC (rev 228513)
+++ trunk/Source/WebKit/ChangeLog 2018-02-15 17:19:23 UTC (rev 228514)
@@ -1,3 +1,17 @@
+2018-02-15 Matt Lewis <[email protected]>
+
+ Unreviewed, rolling out r228495.
+
+ This caused mulitple perf tests to fail consistently.
+
+ Reverted changeset:
+
+ "Resource Load Statistics: Make sure
+ WebResourceLoadStatisticsStore::mergeWithDataFromDecoder() can
+ ingest older plist versions and not reset the database"
+ https://bugs.webkit.org/show_bug.cgi?id=182812
+ https://trac.webkit.org/changeset/228495
+
2018-02-14 Ross Kirsling <[email protected]>
Default definition of InjectedBundle::PlatformBundle should not be Windows-specific.
Modified: trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp (228513 => 228514)
--- trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp 2018-02-15 16:49:49 UTC (rev 228513)
+++ trunk/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp 2018-02-15 17:19:23 UTC (rev 228514)
@@ -803,14 +803,9 @@
if (!decoder.decodeUInt32("version", versionOnDisk))
return;
- if (versionOnDisk > statisticsModelVersion) {
- WTFLogAlways("Found resource load statistics on disk with model version %u whereas the highest supported version is %u. Resetting.", versionOnDisk, statisticsModelVersion);
+ if (versionOnDisk != statisticsModelVersion)
return;
- }
- if (versionOnDisk < statisticsModelVersion)
- WTFLogAlways("Found resource load statistics on disk with model version %u and the current version is %u. Ingesting old statistics.", versionOnDisk, statisticsModelVersion);
-
double endOfGrandfatheringTimestamp;
if (decoder.decodeDouble("endOfGrandfatheringTimestamp", endOfGrandfatheringTimestamp))
m_endOfGrandfatheringTimestamp = WallTime::fromRawSeconds(endOfGrandfatheringTimestamp);
@@ -818,8 +813,8 @@
m_endOfGrandfatheringTimestamp = { };
Vector<ResourceLoadStatistics> loadedStatistics;
- bool succeeded = decoder.decodeObjects("browsingStatistics", loadedStatistics, [versionOnDisk](KeyedDecoder& decoderInner, ResourceLoadStatistics& statistics) {
- return statistics.decode(decoderInner, versionOnDisk);
+ bool succeeded = decoder.decodeObjects("browsingStatistics", loadedStatistics, [](KeyedDecoder& decoderInner, ResourceLoadStatistics& statistics) {
+ return statistics.decode(decoderInner);
});
if (!succeeded)
