Changeset 234153 in webkit

Timestamp:

Jul 24, 2018 10:25:25 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Remove WebFramePolicyListenerProxy::invalidate
​https://bugs.webkit.org/show_bug.cgi?id=187833

Reviewed by Dean Jackson.

When we're invalidating the listener, calling ignore instead will at worst cause
an ignored message to be sent. The load will be cancelled either way.
Removing the invalidate method gets it closer to being a lambda.

• UIProcess/WebFramePolicyListenerProxy.cpp:

(WebKit::WebFramePolicyListenerProxy::invalidate): Deleted.

• UIProcess/WebFramePolicyListenerProxy.h:
• UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::webProcessWillShutDown):
(WebKit::WebFrameProxy::setUpPolicyListenerProxy):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebFramePolicyListenerProxy.cpp (modified) (1 diff)
• UIProcess/WebFramePolicyListenerProxy.h (modified) (1 diff)
• UIProcess/WebFrameProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-24  Alex Christensen  <achristensen@webkit.org>
+
+        Remove WebFramePolicyListenerProxy::invalidate
+        https://bugs.webkit.org/show_bug.cgi?id=187833
+
+        Reviewed by Dean Jackson.
+
+        When we're invalidating the listener, calling ignore instead will at worst cause
+        an ignored message to be sent.  The load will be cancelled either way.
+        Removing the invalidate method gets it closer to being a lambda.
+
+        * UIProcess/WebFramePolicyListenerProxy.cpp:
+        (WebKit::WebFramePolicyListenerProxy::invalidate): Deleted.
+        * UIProcess/WebFramePolicyListenerProxy.h:
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::webProcessWillShutDown):
+        (WebKit::WebFrameProxy::setUpPolicyListenerProxy):
+
 2018-07-24  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp

@@ -58 +58 @@
 }
 
-void WebFramePolicyListenerProxy::invalidate()
-{
-    m_frame = nullptr;
-}
-
 bool WebFramePolicyListenerProxy::isMainFrame() const
 {

trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h

@@ -69 +69 @@
     
     void setNavigation(Ref<API::Navigation>&&);
-    void invalidate();
     
     void changeWebsiteDataStore(WebsiteDataStore&);

trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp

@@ -66 +66 @@
 
     if (m_activeListener) {
-        m_activeListener->invalidate();
+        m_activeListener->ignore();
         m_activeListener = nullptr;
     }
@@ -192 +192 @@
 {
     if (m_activeListener)
-        m_activeListener->invalidate();
+        m_activeListener->ignore();
     m_activeListener = WebFramePolicyListenerProxy::create(this, listenerID, policyListenerType);
     return *static_cast<WebFramePolicyListenerProxy*>(m_activeListener.get());