Title: [196732] trunk/Source/WebKit2
Revision
196732
Author
[email protected]
Date
2016-02-17 17:03:28 -0800 (Wed, 17 Feb 2016)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (196731 => 196732)


--- trunk/Source/WebKit2/ChangeLog	2016-02-18 00:42:36 UTC (rev 196731)
+++ trunk/Source/WebKit2/ChangeLog	2016-02-18 01:03:28 UTC (rev 196732)
@@ -1,3 +1,18 @@
+2016-02-17  Anders Carlsson  <[email protected]>
+
+        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  <[email protected]>
 
         RemoteInspector deadlocks if _WKAutomationDelegate creates/registers a target synchronously

Modified: trunk/Source/WebKit2/UIProcess/WebContextSupplement.h (196731 => 196732)


--- trunk/Source/WebKit2/UIProcess/WebContextSupplement.h	2016-02-18 00:42:36 UTC (rev 196731)
+++ trunk/Source/WebKit2/UIProcess/WebContextSupplement.h	2016-02-18 01:03:28 UTC (rev 196732)
@@ -60,11 +60,6 @@
     {
     }
 
-    virtual bool shouldTerminate(WebProcessProxy*) const
-    {
-        return true;
-    }
-
     WebProcessPool* processPool() const { return m_processPool; }
     void clearProcessPool() { m_processPool = nullptr; }
 

Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (196731 => 196732)


--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp	2016-02-18 00:42:36 UTC (rev 196731)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp	2016-02-18 01:03:28 UTC (rev 196732)
@@ -83,11 +83,6 @@
     invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::ProcessExited);
 }
 
-bool WebCookieManagerProxy::shouldTerminate(WebProcessProxy*) const
-{
-    return true;
-}
-
 void WebCookieManagerProxy::refWebContextSupplement()
 {
     API::Object::ref();

Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h (196731 => 196732)


--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h	2016-02-18 00:42:36 UTC (rev 196731)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h	2016-02-18 01:03:28 UTC (rev 196732)
@@ -92,7 +92,6 @@
     virtual void processPoolDestroyed() override;
     virtual void processDidClose(WebProcessProxy*) override;
     virtual void processDidClose(NetworkProcessProxy*) override;
-    virtual bool shouldTerminate(WebProcessProxy*) const override;
     virtual void refWebContextSupplement() override;
     virtual void derefWebContextSupplement() override;
 

Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (196731 => 196732)


--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-02-18 00:42:36 UTC (rev 196731)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-02-18 01:03:28 UTC (rev 196732)
@@ -682,11 +682,6 @@
     if (!m_processTerminationEnabled)
         return false;
 
-    for (const auto& supplement : m_supplements.values()) {
-        if (!supplement->shouldTerminate(process))
-            return false;
-    }
-
     return true;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to