- Revision
- 205590
- Author
- [email protected]
- Date
- 2016-09-07 23:49:16 -0700 (Wed, 07 Sep 2016)
Log Message
[GTK] Remove stale WebSoupRequestManager headers
https://bugs.webkit.org/show_bug.cgi?id=161691
Reviewed by Sergio Villar Senin.
WebSoupRequestManager, WebSoupRequestManagerProxy and WebSoupRequestManagerClient
classes were used to implement custom URI scheme support for Soup. This API and
the implementations of these classes were removed in r174584, but curiously the
headers went unnoticed. This patch removes them, as well as the
WebSoupRequestManagerProxy forwarding declaration in WKAPICastSoup.h.
* UIProcess/API/C/soup/WKAPICastSoup.h:
* UIProcess/soup/WebSoupRequestManagerClient.h: Removed.
* UIProcess/soup/WebSoupRequestManagerProxy.h: Removed.
(WebKit::WebSoupRequestManagerProxy::registeredURISchemes): Deleted.
* WebProcess/soup/WebSoupRequestManager.h: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205589 => 205590)
--- trunk/Source/WebKit2/ChangeLog 2016-09-08 06:44:42 UTC (rev 205589)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-08 06:49:16 UTC (rev 205590)
@@ -1,3 +1,22 @@
+2016-09-07 Zan Dobersek <[email protected]>
+
+ [GTK] Remove stale WebSoupRequestManager headers
+ https://bugs.webkit.org/show_bug.cgi?id=161691
+
+ Reviewed by Sergio Villar Senin.
+
+ WebSoupRequestManager, WebSoupRequestManagerProxy and WebSoupRequestManagerClient
+ classes were used to implement custom URI scheme support for Soup. This API and
+ the implementations of these classes were removed in r174584, but curiously the
+ headers went unnoticed. This patch removes them, as well as the
+ WebSoupRequestManagerProxy forwarding declaration in WKAPICastSoup.h.
+
+ * UIProcess/API/C/soup/WKAPICastSoup.h:
+ * UIProcess/soup/WebSoupRequestManagerClient.h: Removed.
+ * UIProcess/soup/WebSoupRequestManagerProxy.h: Removed.
+ (WebKit::WebSoupRequestManagerProxy::registeredURISchemes): Deleted.
+ * WebProcess/soup/WebSoupRequestManager.h: Removed.
+
2016-09-07 Simon Fraser <[email protected]>
Enable the <meter> element on iOS
Modified: trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h (205589 => 205590)
--- trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h 2016-09-08 06:44:42 UTC (rev 205589)
+++ trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h 2016-09-08 06:49:16 UTC (rev 205590)
@@ -33,7 +33,6 @@
namespace WebKit {
class WebSoupCustomProtocolRequestManager;
-class WebSoupRequestManagerProxy;
WK_ADD_API_MAPPING(WKSoupCustomProtocolRequestManagerRef, WebSoupCustomProtocolRequestManager)
Deleted: trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h (205589 => 205590)
--- trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h 2016-09-08 06:44:42 UTC (rev 205589)
+++ trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h 2016-09-08 06:49:16 UTC (rev 205590)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef WebSoupRequestManagerClient_h
-#define WebSoupRequestManagerClient_h
-
-#include "APIClient.h"
-#include "WKAPICast.h"
-#include "WKSoupRequestManager.h"
-
-namespace API {
-class URL;
-
-template<> struct ClientTraits<WKSoupRequestManagerClientBase> {
- typedef std::tuple<WKSoupRequestManagerClientV0> Versions;
-};
-}
-
-namespace WebKit {
-
-class WebSoupRequestManagerProxy;
-
-class WebSoupRequestManagerClient : public API::Client<WKSoupRequestManagerClientBase> {
-public:
- bool didReceiveURIRequest(WebSoupRequestManagerProxy*, API::URL*, WebPageProxy*, uint64_t requestID);
- void didFailToLoadURIRequest(WebSoupRequestManagerProxy*, uint64_t requestID);
-};
-
-} // namespace WebKit
-
-#endif // WebSoupRequestManagerClient_h
Deleted: trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h (205589 => 205590)
--- trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h 2016-09-08 06:44:42 UTC (rev 205589)
+++ trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h 2016-09-08 06:49:16 UTC (rev 205590)
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef WebSoupRequestManagerProxy_h
-#define WebSoupRequestManagerProxy_h
-
-#include "APIObject.h"
-#include "MessageReceiver.h"
-#include "WebContextSupplement.h"
-#include "WebSoupRequestManagerClient.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace API {
-class Data;
-}
-
-namespace WebKit {
-
-class WebProcessPool;
-
-class WebSoupRequestManagerProxy : public API::ObjectImpl<API::Object::Type::SoupRequestManager>, public WebContextSupplement, private IPC::MessageReceiver {
-public:
- static const char* supplementName();
-
- static PassRefPtr<WebSoupRequestManagerProxy> create(WebProcessPool*);
- virtual ~WebSoupRequestManagerProxy();
-
- void initializeClient(const WKSoupRequestManagerClientBase*);
-
- void registerURIScheme(const String& scheme);
- void didHandleURIRequest(const API::Data*, uint64_t contentLength, const String& mimeType, uint64_t requestID);
- void didReceiveURIRequestData(const API::Data*, uint64_t requestID);
- void didReceiveURIRequest(const String& uriString, WebPageProxy*, uint64_t requestID);
- void didFailURIRequest(const WebCore::ResourceError&, uint64_t requestID);
-
- const Vector<String>& registeredURISchemes() const { return m_registeredURISchemes; }
-
- using API::Object::ref;
- using API::Object::deref;
-
-private:
- WebSoupRequestManagerProxy(WebProcessPool*);
-
- // WebContextSupplement
- void contextDestroyed() override;
- void processDidClose(WebProcessProxy*) override;
- void refWebContextSupplement() override;
- void derefWebContextSupplement() override;
-
- // IPC::MessageReceiver
- void didReceiveMessage(IPC::Connection*, IPC::Decoder&) override;
-
- void didFailToLoadURIRequest(uint64_t requestID);
-
- WebSoupRequestManagerClient m_client;
- bool m_loadFailed;
- Vector<String> m_registeredURISchemes;
-};
-
-} // namespace WebKit
-
-#endif // WebSoupRequestManagerProxy_h
Deleted: trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h (205589 => 205590)
--- trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h 2016-09-08 06:44:42 UTC (rev 205589)
+++ trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h 2016-09-08 06:49:16 UTC (rev 205590)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef WebSoupRequestManager_h
-#define WebSoupRequestManager_h
-
-#include "DataReference.h"
-#include "MessageReceiver.h"
-#include "WebProcessSupplement.h"
-#include <WebCore/ResourceError.h>
-#include <memory>
-#include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/glib/GRefPtr.h>
-#include <wtf/text/WTFString.h>
-
-typedef struct _GInputStream GInputStream;
-typedef struct _GTask GTask;
-
-namespace WebKit {
-
-class WebProcess;
-struct WebSoupRequestAsyncData;
-
-class WebSoupRequestManager : public WebProcessSupplement, private IPC::MessageReceiver {
- WTF_MAKE_NONCOPYABLE(WebSoupRequestManager);
-public:
- explicit WebSoupRequestManager(WebProcess*);
- ~WebSoupRequestManager();
-
- static const char* supplementName();
-
- void send(GTask*);
- GInputStream* finish(GTask*, GError**);
-
- void registerURIScheme(const String& scheme);
-
-private:
- // IPC::MessageReceiver
- void didReceiveMessage(IPC::Connection*, IPC::Decoder&) override;
-
- void didHandleURIRequest(const IPC::DataReference&, uint64_t contentLength, const String& mimeType, uint64_t requestID);
- void didReceiveURIRequestData(const IPC::DataReference&, uint64_t requestID);
- void didFailURIRequest(const WebCore::ResourceError&, uint64_t requestID);
-
- WebProcess* m_process;
- GRefPtr<GPtrArray> m_schemes;
- HashMap<uint64_t, std::unique_ptr<WebSoupRequestAsyncData> > m_requestMap;
-};
-
-} // namespace WebKit
-
-#endif
