Title: [234153] trunk/Source/WebKit
- Revision
- 234153
- Author
- [email protected]
- Date
- 2018-07-24 10:25:25 -0700 (Tue, 24 Jul 2018)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (234152 => 234153)
--- trunk/Source/WebKit/ChangeLog 2018-07-24 17:23:34 UTC (rev 234152)
+++ trunk/Source/WebKit/ChangeLog 2018-07-24 17:25:25 UTC (rev 234153)
@@ -1,3 +1,21 @@
+2018-07-24 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
WebFullScreenManagerProxy does not need to be ref counted
Modified: trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp (234152 => 234153)
--- trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp 2018-07-24 17:23:34 UTC (rev 234152)
+++ trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp 2018-07-24 17:25:25 UTC (rev 234153)
@@ -57,11 +57,6 @@
m_frame->changeWebsiteDataStore(websiteDataStore);
}
-void WebFramePolicyListenerProxy::invalidate()
-{
- m_frame = nullptr;
-}
-
bool WebFramePolicyListenerProxy::isMainFrame() const
{
if (!m_frame)
Modified: trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h (234152 => 234153)
--- trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h 2018-07-24 17:23:34 UTC (rev 234152)
+++ trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.h 2018-07-24 17:25:25 UTC (rev 234153)
@@ -68,7 +68,6 @@
uint64_t listenerID() const { return m_listenerID; }
void setNavigation(Ref<API::Navigation>&&);
- void invalidate();
void changeWebsiteDataStore(WebsiteDataStore&);
bool isMainFrame() const;
Modified: trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp (234152 => 234153)
--- trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2018-07-24 17:23:34 UTC (rev 234152)
+++ trunk/Source/WebKit/UIProcess/WebFrameProxy.cpp 2018-07-24 17:25:25 UTC (rev 234153)
@@ -65,7 +65,7 @@
m_page = nullptr;
if (m_activeListener) {
- m_activeListener->invalidate();
+ m_activeListener->ignore();
m_activeListener = nullptr;
}
}
@@ -191,7 +191,7 @@
WebFramePolicyListenerProxy& WebFrameProxy::setUpPolicyListenerProxy(uint64_t listenerID, PolicyListenerType policyListenerType)
{
if (m_activeListener)
- m_activeListener->invalidate();
+ m_activeListener->ignore();
m_activeListener = WebFramePolicyListenerProxy::create(this, listenerID, policyListenerType);
return *static_cast<WebFramePolicyListenerProxy*>(m_activeListener.get());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
