Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(

1 files changed, 15 insertions, 9 deletions

diff --git a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h
index 8a1405d14..5c3dfae93 100644
--- a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h
+++ b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h
@@ -26,23 +26,31 @@
 #ifndef WebGeolocationManager_h
 #define WebGeolocationManager_h
 
-#include "MessageReceiver.h"
+#include "MessageID.h"
 #include "WebGeolocationPosition.h"
-#include <wtf/Forward.h>
-#include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
+#include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 
+namespace CoreIPC {
+class ArgumentDecoder;
+class Connection;
+}
+
 namespace WebCore {
 class Geolocation;
 }
 
+namespace WTF {
+class String;
+}
+
 namespace WebKit {
 
 class WebProcess;
 class WebPage;
 
-class WebGeolocationManager : private CoreIPC::MessageReceiver {
+class WebGeolocationManager {
     WTF_MAKE_NONCOPYABLE(WebGeolocationManager);
 public:
     explicit WebGeolocationManager(WebProcess*);
@@ -53,18 +61,16 @@ public:
 
     void requestPermission(WebCore::Geolocation*);
 
-private:
-    // CoreIPC::MessageReceiver
-    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*) OVERRIDE;
+    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
 
+private:
     // Implemented in generated WebGeolocationManagerMessageReceiver.cpp
     void didReceiveWebGeolocationManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
 
     void didChangePosition(const WebGeolocationPosition::Data&);
-    void didFailToDeterminePosition(const String& errorMessage);
+    void didFailToDeterminePosition(const WTF::String& errorMessage);
 
     WebProcess* m_process;
-    bool m_didAddMessageReceiver;
     HashSet<WebPage*> m_pageSet;
 };