Diff
Modified: trunk/Source/WebKit2/ChangeLog (191064 => 191065)
--- trunk/Source/WebKit2/ChangeLog 2015-10-14 20:05:02 UTC (rev 191064)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-14 20:10:11 UTC (rev 191065)
@@ -1,3 +1,21 @@
+2015-10-14 Anders Carlsson <ander...@apple.com>
+
+ Remove a message that isn't used by anyone
+ https://bugs.webkit.org/show_bug.cgi?id=150136
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::didRemoveFrameFromHierarchy): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didRemoveFrameFromHierarchy): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::detachedFromParent2): Deleted.
+
2015-10-14 Alex Christensen <achristen...@webkit.org>
Add SPI for reloading without content blockers
Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (191064 => 191065)
--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2015-10-14 20:05:02 UTC (rev 191064)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2015-10-14 20:10:11 UTC (rev 191065)
@@ -71,7 +71,6 @@
// FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since it is replaced by didLayout.
virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
- virtual void didRemoveFrameFromHierarchy(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
virtual void didDisplayInsecureContentForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
virtual void didDetectXSSForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191064 => 191065)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-14 20:05:02 UTC (rev 191064)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-10-14 20:10:11 UTC (rev 191065)
@@ -1033,14 +1033,6 @@
m_client.didLayout(toAPI(&page), toWKLayoutMilestones(milestones), nullptr, m_client.base.clientInfo);
}
- virtual void didRemoveFrameFromHierarchy(WebPageProxy& page, WebFrameProxy& frame, API::Object* userData) override
- {
- if (!m_client.didRemoveFrameFromHierarchy)
- return;
-
- m_client.didRemoveFrameFromHierarchy(toAPI(&page), toAPI(&frame), toAPI(userData), m_client.base.clientInfo);
- }
-
virtual void didDisplayInsecureContentForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Object* userData) override
{
if (!m_client.didDisplayInsecureContentForFrame)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191064 => 191065)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-14 20:05:02 UTC (rev 191064)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-14 20:10:11 UTC (rev 191065)
@@ -3182,16 +3182,6 @@
m_loaderClient->didLayout(*this, static_cast<LayoutMilestones>(layoutMilestones));
}
-void WebPageProxy::didRemoveFrameFromHierarchy(uint64_t frameID, const UserData& userData)
-{
- PageClientProtector protector(m_pageClient);
-
- WebFrameProxy* frame = m_process->webFrame(frameID);
- MESSAGE_CHECK(frame);
-
- m_loaderClient->didRemoveFrameFromHierarchy(*this, *frame, m_process->transformHandlesToObjects(userData.object()).get());
-}
-
void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, const UserData& userData)
{
PageClientProtector protector(m_pageClient);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (191064 => 191065)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-14 20:05:02 UTC (rev 191064)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-14 20:10:11 UTC (rev 191065)
@@ -1115,7 +1115,6 @@
void didReceiveTitleForFrame(uint64_t frameID, const String&, const UserData&);
void didFirstLayoutForFrame(uint64_t frameID, const UserData&);
void didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, const UserData&);
- void didRemoveFrameFromHierarchy(uint64_t frameID, const UserData&);
void didDisplayInsecureContentForFrame(uint64_t frameID, const UserData&);
void didRunInsecureContentForFrame(uint64_t frameID, const UserData&);
void didDetectXSSForFrame(uint64_t frameID, const UserData&);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (191064 => 191065)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-10-14 20:05:02 UTC (rev 191064)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-10-14 20:10:11 UTC (rev 191065)
@@ -137,7 +137,6 @@
DidFirstLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
DidLayout(uint32_t type)
- DidRemoveFrameFromHierarchy(uint64_t frameID, WebKit::UserData userData)
DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::UserData userData)
DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
DidRunInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (191064 => 191065)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-14 20:05:02 UTC (rev 191064)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-14 20:10:11 UTC (rev 191065)
@@ -144,9 +144,6 @@
// Notify the bundle client.
webPage->injectedBundleLoaderClient().didRemoveFrameFromHierarchy(webPage, m_frame, userData);
-
- // Notify the UIProcess.
- webPage->send(Messages::WebPageProxy::DidRemoveFrameFromHierarchy(m_frame->frameID(), UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
}
void WebFrameLoaderClient::detachedFromParent3()
