diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/UIProcess/WebGeolocationProvider.cpp | |
parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/UIProcess/WebGeolocationProvider.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/WebGeolocationProvider.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/WebKit2/UIProcess/WebGeolocationProvider.cpp b/Source/WebKit2/UIProcess/WebGeolocationProvider.cpp index c382235c7..cc5ddc183 100644 --- a/Source/WebKit2/UIProcess/WebGeolocationProvider.cpp +++ b/Source/WebKit2/UIProcess/WebGeolocationProvider.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2011, 2013 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -36,7 +36,7 @@ void WebGeolocationProvider::startUpdating(WebGeolocationManagerProxy* geolocati if (!m_client.startUpdating) return; - m_client.startUpdating(toAPI(geolocationManager), m_client.clientInfo); + m_client.startUpdating(toAPI(geolocationManager), m_client.base.clientInfo); } void WebGeolocationProvider::stopUpdating(WebGeolocationManagerProxy* geolocationManager) @@ -44,7 +44,15 @@ void WebGeolocationProvider::stopUpdating(WebGeolocationManagerProxy* geolocatio if (!m_client.stopUpdating) return; - m_client.stopUpdating(toAPI(geolocationManager), m_client.clientInfo); + m_client.stopUpdating(toAPI(geolocationManager), m_client.base.clientInfo); +} + +void WebGeolocationProvider::setEnableHighAccuracy(WebGeolocationManagerProxy* geolocationManager, bool enabled) +{ + if (!m_client.setEnableHighAccuracy) + return; + + m_client.setEnableHighAccuracy(toAPI(geolocationManager), enabled, m_client.base.clientInfo); } } // namespace WebKit |