Attachment 341318 Details for Bug 185992 – Patch

[patch] Patch

bug-185992-20180525132724.patch (text/plain), 4.09 KB, created by Chris Dumez on 2018-05-25 13:27:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-05-25 13:27:25 PDT

Size: 4.09 KB

patch

obsolete

>Subversion Revision: 232192
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 030e2e3b5440604e20e8d3bcc92bb0b75a079416..f25e14ebfc18157758cf6945e32f9e7d1734179b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-25  Chris Dumez  <cdumez@apple.com>
>+
>+        WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback() unexpectedly constructs a process pool
>+        https://bugs.webkit.org/show_bug.cgi?id=185992
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update enableResourceLoadStatisticsAndSetTestingCallback() to pass the right parameter to processPools()
>+        to avoid constructing a process pool when none exist. Also drop the 'resourceLoadStatisticsEnabled'
>+        flag on the WebProcessPool and have it query its data store instead to know if the feature is enabled.
>+
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::initializeNewWebProcess):
>+        (WebKit::WebProcessPool::setResourceLoadStatisticsEnabled):
>+        * UIProcess/WebProcessPool.h:
>+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
>+        (WebKit::WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback):
>+
> 2018-05-25  Chris Dumez  <cdumez@apple.com>
> 
>         Drop support for NSURLCache in WebKit2
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index bf3bc98e4628d69d5519826be884f3c552b3be34..067a5b507a4b7d6a220900a79128f6dbdb794ea0 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -942,7 +942,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
>         parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
> #endif
> 
>-    parameters.resourceLoadStatisticsEnabled = resourceLoadStatisticsEnabled();
>+    parameters.resourceLoadStatisticsEnabled = websiteDataStore.resourceLoadStatisticsEnabled();
> #if ENABLE(MEDIA_STREAM)
>     parameters.shouldCaptureAudioInUIProcess = m_configuration->shouldCaptureAudioInUIProcess();
> #endif
>@@ -1368,7 +1368,6 @@ void WebProcessPool::setShouldUseFontSmoothing(bool useFontSmoothing)
> 
> void WebProcessPool::setResourceLoadStatisticsEnabled(bool enabled)
> {
>-    m_resourceLoadStatisticsEnabled = enabled;
>     sendToAllProcesses(Messages::WebProcess::SetResourceLoadStatisticsEnabled(enabled));
> }
> 
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 192fc39f00f85948c73fa53c92afaad5507a15bf..aeb1910a60e45af0255c05e7edccbbdb1693b8f0 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -414,7 +414,6 @@ public:
>     static String legacyPlatformDefaultNetworkCacheDirectory();
>     static String legacyPlatformDefaultJavaScriptConfigurationDirectory();
> 
>-    bool resourceLoadStatisticsEnabled() { return m_resourceLoadStatisticsEnabled; }
>     void setResourceLoadStatisticsEnabled(bool);
>     void clearResourceLoadStatistics();
> 
>@@ -631,7 +630,6 @@ private:
> #endif
> 
>     bool m_memoryCacheDisabled { false };
>-    bool m_resourceLoadStatisticsEnabled { false };
>     bool m_javaScriptConfigurationFileEnabled { false };
>     bool m_alwaysRunsAtBackgroundPriority;
>     bool m_shouldTakeUIBackgroundAssertion;
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>index a9f268cff1baf4f0a89c8785cc99c70556f82b57..548761a3fc493c91fc733acf1b983c50d9d0e44e 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>@@ -1477,7 +1477,7 @@ void WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback(Functio
>     m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory, WTFMove(callback), m_sessionID.isEphemeral());
> #endif
> 
>-    for (auto& processPool : processPools())
>+    for (auto& processPool : processPools(std::numeric_limits<size_t>::max(), false))
>         processPool->setResourceLoadStatisticsEnabled(true);
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185992: 341318