Attachment 370256 Details for Bug 196307 – Patch for landing

[patch] Patch for landing

bug-196307-20190520093503.patch (text/plain), 8.75 KB, created by Sihui Liu on 2019-05-20 09:35:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-05-20 09:35:03 PDT

Size: 8.75 KB

patch

obsolete

>Subversion Revision: 245516
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 48ab532318dc2bb6e199a79d9b74b1006d0a67ba..0f92242d6f181aa50fca70f182e65db39caf4478 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2019-05-20  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [ Mac WK2 iOS Sim] Layout Test http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html is a flaky failure
>+        https://bugs.webkit.org/show_bug.cgi?id=196307
>+        <rdar://problem/49345360>
>+
>+        Reviewed by Alex Christensen.
>+
>+        Delay dumping statistics if there is data being removed.
>+
>+        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:
>+        (WebKit::ResourceLoadStatisticsStore::removeDataRecords):
>+        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
>+        (WebKit::ResourceLoadStatisticsStore::dataRecordsBeingRemoved const):
>+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
>+        (WebKit::WebResourceLoadStatisticsStore::dumpResourceLoadStatistics):
>+        (WebKit::WebResourceLoadStatisticsStore::tryDumpResourceLoadStatistics):
>+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:
>+
> 2019-05-20  Ludovico de Nittis  <ludovico.denittis@collabora.com>
> 
>         [WPE][Qt] Use C++17 instead of C++14
>diff --git a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp
>index 2291fd3db30ddd8af53998e0597705221cdaadd5..b7d25dec302905be36c511834e549b3db29ba156 100644
>--- a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp
>+++ b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp
>@@ -221,6 +221,7 @@ void ResourceLoadStatisticsStore::removeDataRecords(CompletionHandler<void()>&&
>                 }
>                 weakThis->incrementRecordsDeletedCountForDomains(WTFMove(domainsWithDeletedWebsiteData));
>                 weakThis->setDataRecordsBeingRemoved(false);
>+                weakThis->m_store.tryDumpResourceLoadStatistics();
>                 completionHandler();
> #if !RELEASE_LOG_DISABLED
>                 RELEASE_LOG_INFO_IF(weakThis->m_debugLoggingEnabled, ResourceLoadStatisticsDebug, "Done removing data records.");
>diff --git a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h
>index 220b3c6bf655d2f06b976c141c37d7cce9260a56..0b5775bbb779cc1f1b945621b9a0552484c096c5 100644
>--- a/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h
>+++ b/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h
>@@ -185,6 +185,8 @@ public:
>     virtual bool isMemoryStore() const { return false; }
>     virtual bool isDatabaseStore()const { return false; }
> 
>+    bool dataRecordsBeingRemoved() const { return m_dataRecordsBeingRemoved; }
>+
> protected:
>     static unsigned computeImportance(const WebCore::ResourceLoadStatistics&);
>     static Vector<OperatingDate> mergeOperatingDates(const Vector<OperatingDate>& existingDates, Vector<OperatingDate>&& newDates);
>diff --git a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
>index 252fe1ca0316310f3a4df1fe8b92d6841c5c9697..871b19d2f07486e0f4bb763c69daa1aaff87c992 100644
>--- a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
>+++ b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
>@@ -615,10 +615,24 @@ void WebResourceLoadStatisticsStore::dumpResourceLoadStatistics(CompletionHandle
>     ASSERT(RunLoop::isMain());
> 
>     postTask([this, completionHandler = WTFMove(completionHandler)]() mutable {
>-        String result = m_statisticsStore ? m_statisticsStore->dumpResourceLoadStatistics() : emptyString();
>-        postTaskReply([result = result.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
>-            completionHandler(result);
>-        });
>+        ASSERT(!m_dumpResourceLoadStatisticsCompletionHandler);
>+        m_dumpResourceLoadStatisticsCompletionHandler = WTFMove(completionHandler);
>+        if (m_statisticsStore && m_statisticsStore->dataRecordsBeingRemoved())
>+            return;
>+        tryDumpResourceLoadStatistics();
>+    });
>+}
>+
>+void WebResourceLoadStatisticsStore::tryDumpResourceLoadStatistics()
>+{
>+    ASSERT(!RunLoop::isMain());
>+
>+    if (!m_dumpResourceLoadStatisticsCompletionHandler)
>+        return;
>+
>+    String result = m_statisticsStore ? m_statisticsStore->dumpResourceLoadStatistics() : emptyString();
>+    postTaskReply([result = result.isolatedCopy(), completionHandler = WTFMove(m_dumpResourceLoadStatisticsCompletionHandler)]() mutable {
>+        completionHandler(result);
>     });
> }
> 
>diff --git a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h
>index f569dc36431a4dddc4b7ffb441b340e059eddd1d..8759d60166a550ee69a62b171dea86fe3a41b92f 100644
>--- a/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h
>+++ b/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h
>@@ -127,6 +127,7 @@ public:
>     void setPrevalentResource(const RegistrableDomain&, CompletionHandler<void()>&&);
>     void setVeryPrevalentResource(const RegistrableDomain&, CompletionHandler<void()>&&);
>     void dumpResourceLoadStatistics(CompletionHandler<void(String)>&&);
>+    void tryDumpResourceLoadStatistics();
>     void isPrevalentResource(const RegistrableDomain&, CompletionHandler<void(bool)>&&);
>     void isVeryPrevalentResource(const RegistrableDomain&, CompletionHandler<void(bool)>&&);
>     void isRegisteredAsSubresourceUnder(const SubResourceDomain&, const TopFrameDomain&, CompletionHandler<void(bool)>&&);
>@@ -205,6 +206,8 @@ private:
>     bool m_hasScheduledProcessStats { false };
> 
>     bool m_firstNetworkProcessCreated { false };
>+    
>+    CompletionHandler<void(String)> m_dumpResourceLoadStatisticsCompletionHandler;
> };
> 
> } // namespace WebKit
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b8ef35e1a831185c733942ebeb7160ad558eb0c4..f3dbf2883143977987420aa385a19ea31dcb85ac 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-05-20  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [ Mac WK2 iOS Sim] Layout Test http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html is a flaky failure
>+        https://bugs.webkit.org/show_bug.cgi?id=196307
>+        <rdar://problem/49345360>
>+
>+        Reviewed by Alex Christensen.
>+
>+        * platform/ios-simulator-wk2/TestExpectations:
>+        * platform/mac-wk2/TestExpectations:
>+
> 2019-05-19  Brent Fulgham  <bfulgham@apple.com>
> 
>         Wait to get frame until after layout has been run
>diff --git a/LayoutTests/platform/ios-simulator-wk2/TestExpectations b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>index 22fda6ce66f860b6459d626b52a2a397a8189124..bbbeb56c6c87cd22577942d8f8c6a3127f9bb37d 100644
>--- a/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>@@ -69,8 +69,6 @@ webkit.org/b/196298 fast/viewport/ios/use-minimum-device-width-for-page-without-
> 
> webkit.org/b/162975 http/tests/cache/disk-cache/memory-cache-revalidation-updates-disk-cache.html [ Pass Failure ]
> 
>-webkit.org/b/196307 http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html [ Pass Failure ]
>-
> webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-bold.html [ Pass ImageOnlyFailure ]
> webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-double-struck.html [ Pass ImageOnlyFailure ]
> webkit.org/b/196112 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-italic.html [ Pass ImageOnlyFailure ]
>diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
>index 24e66d32da5baac3cc415e6647b20c7d55fe9bd6..4debed9044393c446d277fd0902c184c416506f5 100644
>--- a/LayoutTests/platform/mac-wk2/TestExpectations
>+++ b/LayoutTests/platform/mac-wk2/TestExpectations
>@@ -909,8 +909,6 @@ webkit.org/b/194253 scrollingcoordinator/scrolling-tree/fixed-inside-frame.html
> 
> webkit.org/b/194916 fast/mediastream/MediaStream-video-element.html [ Pass Failure ]
> 
>-webkit.org/b/196307 http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html [ Pass Failure ]
>-
> webkit.org/b/196376 storage/domstorage/localstorage/private-browsing-affects-storage.html [ Pass Failure ]
> 
> webkit.org/b/197917 [ Debug ] http/wpt/webauthn/public-key-credential-create-success-hid.https.html [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 196307: 369498 | 369499 | 369559 | 370256