Attachment 373332 Details for Bug 199407 – Patch

[patch] Patch

bug-199407-20190702092501.patch (text/plain), 6.96 KB, created by Chris Dumez on 2019-07-02 09:25:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-07-02 09:25:01 PDT

Size: 6.96 KB

patch

obsolete

>Subversion Revision: 247051
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 64ba38a96a29dc6457993bca73a5b1015ecaf4ee..4f5f1673c31f087694cc030bacb23e9bc03a78cb 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-07-02  Chris Dumez  <cdumez@apple.com>
>+
>+        VisitedLinkStore does not need to subclass WebProcessLifetimeObserver
>+        https://bugs.webkit.org/show_bug.cgi?id=199407
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/mac/WKView.mm:
>+        * UIProcess/Automation/WebAutomationSession.cpp:
>+        * UIProcess/VisitedLinkStore.cpp:
>+        * UIProcess/VisitedLinkStore.h:
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::m_resetRecentCrashCountTimer):
>+        * UIProcess/WebProcessPool.h:
>+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
>+
> 2019-07-02  Alexander Mikhaylenko  <exalm7659@gmail.com>
> 
>         [GTK] Support cancelling touchscreen back/forward gesture
>diff --git a/Source/WebKit/UIProcess/API/mac/WKView.mm b/Source/WebKit/UIProcess/API/mac/WKView.mm
>index 38d305fa8498adbe79781817c82d3cf2f495fa40..90831996ebcb4f384721c5cf49519ed79989f8a9 100644
>--- a/Source/WebKit/UIProcess/API/mac/WKView.mm
>+++ b/Source/WebKit/UIProcess/API/mac/WKView.mm
>@@ -38,6 +38,7 @@
> #import "WebBackForwardListItem.h"
> #import "WebKit2Initialize.h"
> #import "WebPageGroup.h"
>+#import "WebPageProxy.h"
> #import "WebPreferencesKeys.h"
> #import "WebProcessPool.h"
> #import "WebViewImpl.h"
>diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>index 06226ea2ddb24a0a1930f93f7c18e4d8d9951fc6..cce5c4817a804917cdc199c1b0160e256e9be297 100644
>--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>+++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
>@@ -40,6 +40,7 @@
> #include "WebFullScreenManagerProxy.h"
> #include "WebInspectorProxy.h"
> #include "WebOpenPanelResultListenerProxy.h"
>+#include "WebPageProxy.h"
> #include "WebProcessPool.h"
> #include <JavaScriptCore/InspectorBackendDispatcher.h>
> #include <JavaScriptCore/InspectorFrontendRouter.h>
>diff --git a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
>index 991dc2fcff9d43c5e0876864cc280438d9e34a12..ec53dd6a5df402b2fd0ce01ac818c63495cf54d4 100644
>--- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp
>+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
>@@ -28,6 +28,7 @@
> 
> #include "VisitedLinkStoreMessages.h"
> #include "VisitedLinkTableControllerMessages.h"
>+#include "WebPageProxy.h"
> #include "WebProcessMessages.h"
> #include "WebProcessPool.h"
> #include "WebProcessProxy.h"
>@@ -99,16 +100,6 @@ void VisitedLinkStore::removeAll()
>     }
> }
> 
>-void VisitedLinkStore::webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&)
>-{
>-    // FIXME: Implement.
>-}
>-
>-void VisitedLinkStore::webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&)
>-{
>-    // FIXME: Implement.
>-}
>-
> void VisitedLinkStore::addVisitedLinkHashFromPage(PageIdentifier pageID, SharedStringHash linkHash)
> {
>     if (auto* webPageProxy = WebProcessProxy::webPage(pageID)) {
>diff --git a/Source/WebKit/UIProcess/VisitedLinkStore.h b/Source/WebKit/UIProcess/VisitedLinkStore.h
>index 02b49bac55e2486bd3e89a9ee88ea88336f1efc5..44693534481e2bf00d31426f20a87baebf9cfb98 100644
>--- a/Source/WebKit/UIProcess/VisitedLinkStore.h
>+++ b/Source/WebKit/UIProcess/VisitedLinkStore.h
>@@ -28,8 +28,7 @@
> #include "APIObject.h"
> #include "MessageReceiver.h"
> #include "SharedStringHashStore.h"
>-#include "WebPageProxy.h"
>-#include "WebProcessLifetimeObserver.h"
>+#include <WebCore/PageIdentifier.h>
> #include <wtf/Forward.h>
> #include <wtf/HashSet.h>
> #include <wtf/Identified.h>
>@@ -37,14 +36,13 @@
> 
> namespace WebKit {
> 
>-class WebPageProxy;
> class WebProcessProxy;
>     
>-class VisitedLinkStore final : public API::ObjectImpl<API::Object::Type::VisitedLinkStore>, private IPC::MessageReceiver, public WebProcessLifetimeObserver, public Identified<VisitedLinkStore>, private SharedStringHashStore::Client {
>+class VisitedLinkStore final : public API::ObjectImpl<API::Object::Type::VisitedLinkStore>, private IPC::MessageReceiver, public Identified<VisitedLinkStore>, private SharedStringHashStore::Client {
> public:
>     static Ref<VisitedLinkStore> create();
>+    VisitedLinkStore();
> 
>-    explicit VisitedLinkStore();
>     virtual ~VisitedLinkStore();
> 
>     void addProcess(WebProcessProxy&);
>@@ -59,10 +57,6 @@ private:
>     // IPC::MessageReceiver
>     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
> 
>-    // WebProcessLifetimeObserver
>-    void webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&) final;
>-    void webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&) final;
>-
>     // SharedStringHashStore::Client
>     void didInvalidateSharedMemory() final;
>     void didUpdateSharedStringHashes(const Vector<WebCore::SharedStringHash>& addedHashes, const Vector<WebCore::SharedStringHash>& removedHashes) final;
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 18ffde722c55a15e9cb13e9a545e5f85b7b9f394..0635a6d0be7e5793da06e03a1ef4a68a50ec7266 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -445,7 +445,6 @@ WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, Pag
>     if (!m_configuration->drawsBackground())
>         m_backgroundColor = Color(Color::transparent);
> 
>-    m_webProcessLifetimeTracker.addObserver(m_visitedLinkStore);
>     m_webProcessLifetimeTracker.addObserver(m_websiteDataStore);
> 
>     updateActivityState();
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 600dae26ebfd33131c972622617dfb501bde87cc..9969112d69b3c38c42c9f7a60a93a2cccd10e453 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -43,6 +43,7 @@
> #include "VisitedLinkStore.h"
> #include "WebContextClient.h"
> #include "WebContextConnectionClient.h"
>+#include "WebPreferencesStore.h"
> #include "WebProcessProxy.h"
> #include <WebCore/CrossSiteNavigationDataTransfer.h>
> #include <WebCore/ProcessIdentifier.h>
>@@ -100,6 +101,7 @@ class HighPerformanceGraphicsUsageSampler;
> class UIGamepad;
> class PerActivityStateCPUUsageSampler;
> class ServiceWorkerProcessProxy;
>+class SuspendedPageProxy;
> class WebAutomationSession;
> class WebContextSupplement;
> class WebPageGroup;
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>index eabeaba3a4c52be9b0b2089b89f45bf92c8ed137..0e97520d01afe5b5cb1b2ce1876c80526dabb40c 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>@@ -35,6 +35,7 @@
> #include "NetworkProcessMessages.h"
> #include "ShouldGrandfatherStatistics.h"
> #include "StorageAccessStatus.h"
>+#include "WebPageProxy.h"
> #include "WebProcessCache.h"
> #include "WebProcessMessages.h"
> #include "WebProcessPool.h"

Actions: View | Formatted Diff | Diff

Attachments on bug 199407: 373332 | 373333