Changeset 196732 in webkit

Timestamp:

Feb 17, 2016 5:03:28 PM (8 years ago)

Author:

andersca@apple.com

Message:

Remove WebContextSupplement::shouldTerminate, it's no longer used
​https://bugs.webkit.org/show_bug.cgi?id=154367

Reviewed by Sam Weinig.

• UIProcess/WebContextSupplement.h:

(WebKit::WebContextSupplement::shouldTerminate): Deleted.

• UIProcess/WebCookieManagerProxy.cpp:

(WebKit::WebCookieManagerProxy::shouldTerminate): Deleted.

• UIProcess/WebCookieManagerProxy.h:
• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::shouldTerminate): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContextSupplement.h (modified) (1 diff)
• UIProcess/WebCookieManagerProxy.cpp (modified) (1 diff)
• UIProcess/WebCookieManagerProxy.h (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-02-17  Anders Carlsson  <andersca@apple.com>
+
+        Remove WebContextSupplement::shouldTerminate, it's no longer used
+        https://bugs.webkit.org/show_bug.cgi?id=154367
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/WebContextSupplement.h:
+        (WebKit::WebContextSupplement::shouldTerminate): Deleted.
+        * UIProcess/WebCookieManagerProxy.cpp:
+        (WebKit::WebCookieManagerProxy::shouldTerminate): Deleted.
+        * UIProcess/WebCookieManagerProxy.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::shouldTerminate): Deleted.
+
 2016-02-17  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebContextSupplement.h

@@ -61 +61 @@
     }
 
-    virtual bool shouldTerminate(WebProcessProxy*) const
-    {
-        return true;
-    }
-
     WebProcessPool* processPool() const { return m_processPool; }
     void clearProcessPool() { m_processPool = nullptr; }

trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

@@ -82 +82 @@
     invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
     invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::ProcessExited);
-}
-
-bool WebCookieManagerProxy::shouldTerminate(WebProcessProxy*) const
-{
-    return true;
 }
 

trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h

@@ -93 +93 @@
     virtual void processDidClose(WebProcessProxy*) override;
     virtual void processDidClose(NetworkProcessProxy*) override;
-    virtual bool shouldTerminate(WebProcessProxy*) const override;
     virtual void refWebContextSupplement() override;
     virtual void derefWebContextSupplement() override;

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -683 +683 @@
         return false;
 
-    for (const auto& supplement : m_supplements.values()) {
-        if (!supplement->shouldTerminate(process))
-            return false;
-    }
-
     return true;
 }