summaryrefslogtreecommitdiffstats
path: root/WebCore/page/GeolocationController.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-05 14:36:32 +0100
committerBen Murdoch <benm@google.com>2011-05-10 15:38:30 +0100
commitf05b935882198ccf7d81675736e3aeb089c5113a (patch)
tree4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/page/GeolocationController.cpp
parent60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff)
downloadexternal_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip
external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz
external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/page/GeolocationController.cpp')
-rw-r--r--WebCore/page/GeolocationController.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/WebCore/page/GeolocationController.cpp b/WebCore/page/GeolocationController.cpp
index db4cc23..28d522d 100644
--- a/WebCore/page/GeolocationController.cpp
+++ b/WebCore/page/GeolocationController.cpp
@@ -78,6 +78,18 @@ void GeolocationController::removeObserver(Geolocation* observer)
}
}
+void GeolocationController::requestPermission(Geolocation* geolocation)
+{
+ if (m_client)
+ m_client->requestPermission(geolocation);
+}
+
+void GeolocationController::cancelPermissionRequest(Geolocation* geolocation)
+{
+ if (m_client)
+ m_client->cancelPermissionRequest(geolocation);
+}
+
void GeolocationController::positionChanged(GeolocationPosition* position)
{
m_lastPosition = position;