Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit.org/repository/webkit/trunk@132191)

New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal

1 files changed, 2 insertions, 6 deletions

diff --git a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
index 4bd627c2f..46b846b4a 100644
--- a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
+++ b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "WebGeolocationManager.h"
 
+#include "WebGeolocationManagerMessages.h"
 #include "WebGeolocationManagerProxyMessages.h"
 #include "WebPage.h"
 #include "WebProcess.h"
@@ -41,8 +42,8 @@ namespace WebKit {
 
 WebGeolocationManager::WebGeolocationManager(WebProcess* process)
     : m_process(process)
-    , m_didAddMessageReceiver(false)
 {
+    m_process->addMessageReceiver(Messages::WebGeolocationManager::messageReceiverName(), this);
 }
 
 WebGeolocationManager::~WebGeolocationManager()
@@ -56,11 +57,6 @@ void WebGeolocationManager::didReceiveMessage(CoreIPC::Connection* connection, C
 
 void WebGeolocationManager::registerWebPage(WebPage* page)
 {
-    if (!m_didAddMessageReceiver) {
-        m_process->connection()->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebGeolocationManager, this);
-        m_didAddMessageReceiver = true;
-    }
-
     bool wasEmpty = m_pageSet.isEmpty();
 
     m_pageSet.add(page);