Diff
Modified: trunk/Source/WebKit2/ChangeLog (141709 => 141710)
--- trunk/Source/WebKit2/ChangeLog 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-03 01:11:02 UTC (rev 141710)
@@ -1,3 +1,23 @@
+2013-02-02 Sam Weinig <s...@webkit.org>
+
+ Convert CustomProtocolManagerProxy, CustomProtocolManager and AuthenticationManager to be non-LegacyReceivers
+ https://bugs.webkit.org/show_bug.cgi?id=108757
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/Authentication/AuthenticationManager.cpp:
+ * Shared/Authentication/AuthenticationManager.h:
+ (AuthenticationManager):
+ * Shared/Authentication/AuthenticationManager.messages.in:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h:
+ (CustomProtocolManager):
+ * Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
+ * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
+ (CustomProtocolManagerProxy):
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in:
+ * UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
+
2013-02-02 Christophe Dumez <christophe.du...@intel.com>
[EFL][WK2] Use C API inside ewk_file_chooser_request
Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (141709 => 141710)
--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2013-02-03 01:11:02 UTC (rev 141710)
@@ -63,11 +63,6 @@
m_process->addMessageReceiver(Messages::AuthenticationManager::messageReceiverName(), this);
}
-void AuthenticationManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
-{
- didReceiveAuthenticationManagerMessage(connection, decoder);
-}
-
uint64_t AuthenticationManager::establishIdentifierForChallenge(const WebCore::AuthenticationChallenge& authenticationChallenge)
{
uint64_t challengeID = generateAuthenticationChallengeID();
Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h (141709 => 141710)
--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2013-02-03 01:11:02 UTC (rev 141710)
@@ -66,7 +66,6 @@
private:
// CoreIPC::MessageReceiver
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- void didReceiveAuthenticationManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
bool tryUsePlatformCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const PlatformCertificateInfo&);
Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in (141709 => 141710)
--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.messages.in 2013-02-03 01:11:02 UTC (rev 141710)
@@ -20,7 +20,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-messages -> AuthenticationManager LegacyReceiver {
+messages -> AuthenticationManager {
void UseCredentialForChallenge(uint64_t challengeID, WebCore::Credential credential, WebKit::PlatformCertificateInfo certificate);
void ContinueWithoutCredentialForChallenge(uint64_t challengeID);
void CancelChallenge(uint64_t challengeID);
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h (141709 => 141710)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2013-02-03 01:11:02 UTC (rev 141710)
@@ -84,7 +84,6 @@
// CoreIPC::MessageReceiver
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
- void didReceiveCustomProtocolManagerMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
void didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError&);
void didLoadData(uint64_t customProtocolID, const CoreIPC::DataReference&);
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in (141709 => 141710)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in 2013-02-03 01:11:02 UTC (rev 141710)
@@ -22,7 +22,7 @@
#if ENABLE(CUSTOM_PROTOCOLS)
-messages -> CustomProtocolManager LegacyReceiver {
+messages -> CustomProtocolManager {
DidFailWithError(uint64_t customProtocolID, WebCore::ResourceError error)
DidLoadData(uint64_t customProtocolID, CoreIPC::DataReference data)
DidReceiveResponse(uint64_t customProtocolID, WebCore::ResourceResponse response, uint32_t cacheStoragePolicy)
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm (141709 => 141710)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm 2013-02-03 01:11:02 UTC (rev 141710)
@@ -174,11 +174,6 @@
return m_registeredSchemes.contains(scheme);
}
-void CustomProtocolManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
-{
- didReceiveCustomProtocolManagerMessage(connection, decoder);
-}
-
void CustomProtocolManager::didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError& error)
{
WKCustomProtocol *protocol = protocolForID(customProtocolID);
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h (141709 => 141710)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2013-02-03 01:11:02 UTC (rev 141710)
@@ -28,17 +28,14 @@
#if ENABLE(CUSTOM_PROTOCOLS)
+#include "MessageReceiver.h"
+
#if PLATFORM(MAC)
#include <wtf/HashMap.h>
#include <wtf/RetainPtr.h>
OBJC_CLASS WKCustomProtocolLoader;
#endif
-namespace CoreIPC {
-class Connection;
-class MessageDecoder;
-} // namespace CoreIPC
-
namespace WebCore {
class ResourceRequest;
} // namespace WebCore
@@ -47,17 +44,17 @@
class ChildProcessProxy;
-class CustomProtocolManagerProxy {
+class CustomProtocolManagerProxy : public CoreIPC::MessageReceiver {
public:
explicit CustomProtocolManagerProxy(ChildProcessProxy*);
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
void startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest&);
void stopLoading(uint64_t customProtocolID);
-private:
- void didReceiveCustomProtocolManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+ // CoreIPC::MessageReceiver
+ virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+private:
ChildProcessProxy* m_childProcessProxy;
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in (141709 => 141710)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in 2013-02-03 01:11:02 UTC (rev 141710)
@@ -22,7 +22,7 @@
#if ENABLE(CUSTOM_PROTOCOLS)
-messages -> CustomProtocolManagerProxy LegacyReceiver {
+messages -> CustomProtocolManagerProxy {
StartLoading(uint64_t customProtocolID, WebCore::ResourceRequest request)
StopLoading(uint64_t customProtocolID)
}
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm (141709 => 141710)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm 2013-02-03 00:14:41 UTC (rev 141709)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm 2013-02-03 01:11:02 UTC (rev 141710)
@@ -127,11 +127,6 @@
ASSERT(m_childProcessProxy);
}
-void CustomProtocolManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)
-{
- didReceiveCustomProtocolManagerProxyMessage(connection, decoder);
-}
-
void CustomProtocolManagerProxy::startLoading(uint64_t customProtocolID, const ResourceRequest& coreRequest)
{
NSURLRequest *request = coreRequest.nsURLRequest();
