summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-16 14:56:46 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-16 14:57:30 +0200
commitb297e0fa5c217c9467033b7c8b46891a52870120 (patch)
tree43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
parent69d517dbfa69903d8593cc1737f0474b21e3251e (diff)
downloadqtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp')
-rw-r--r--Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
index 2aec5a727..f07c4060d 100644
--- a/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
+++ b/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp
@@ -41,7 +41,6 @@ namespace WebKit {
WebGeolocationManager::WebGeolocationManager(WebProcess* process)
: m_process(process)
- , m_didAddMessageReceiver(false)
{
}
@@ -56,11 +55,6 @@ void WebGeolocationManager::didReceiveMessage(CoreIPC::Connection* connection, C
void WebGeolocationManager::registerWebPage(WebPage* page)
{
- if (!m_didAddMessageReceiver) {
- m_process->connection()->addMessageReceiver(CoreIPC::MessageClassWebGeolocationManager, this);
- m_didAddMessageReceiver = true;
- }
-
bool wasEmpty = m_pageSet.isEmpty();
m_pageSet.add(page);
@@ -80,7 +74,7 @@ void WebGeolocationManager::unregisterWebPage(WebPage* page)
void WebGeolocationManager::didChangePosition(const WebGeolocationPosition::Data& data)
{
#if ENABLE(GEOLOCATION)
- RefPtr<GeolocationPosition> position = GeolocationPosition::create(data.timestamp, data.latitude, data.longitude, data.accuracy, data.canProvideAltitude, data.altitude, data.canProvideAltitudeAccuracy, data.altitudeAccuracy, data.canProvideHeading, data.heading, data.canProvideSpeed, data.speed);
+ RefPtr<GeolocationPosition> position = GeolocationPosition::create(data.timestamp, data.latitude, data.longitude, data.accuracy);
Vector<RefPtr<WebPage> > webPageCopy;
copyToVector(m_pageSet, webPageCopy);