diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-03-12 14:19:21 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-03-18 16:05:29 +0000 |
| commit | c2ea7b1babdb7748e08a1f2442f13abac357d194 (patch) | |
| tree | bec21b22921b89e51ce1c5db11ae190d422de0b0 /src/core/location_provider_qt.cpp | |
| parent | a8935efa82457dd8a137224371284776d7024f32 (diff) | |
Fix geolocation (and slight cleanup)
Cleanup is mostly to avoid tripping on an assert when calling
GeolocationProvider::GetInstance() from outside the UI thread.
Change-Id: Id9c964c1cf952a7c867e5154dd2c05e17733a842
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/location_provider_qt.cpp')
| -rw-r--r-- | src/core/location_provider_qt.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/core/location_provider_qt.cpp b/src/core/location_provider_qt.cpp index e33179412..d17fc3d21 100644 --- a/src/core/location_provider_qt.cpp +++ b/src/core/location_provider_qt.cpp @@ -188,7 +188,7 @@ void QtPositioningHelper::timeout() inline void QtPositioningHelper::postToLocationProvider(const base::Closure &task) { - LocationProviderQt::messageLoop()->PostTask(FROM_HERE, task); + static_cast<content::GeolocationProviderImpl*>(content::GeolocationProvider::GetInstance())->message_loop()->PostTask(FROM_HERE, task); } LocationProviderQt::LocationProviderQt() @@ -203,7 +203,6 @@ LocationProviderQt::~LocationProviderQt() bool LocationProviderQt::StartProvider(bool highAccuracy) { - DCHECK(base::MessageLoop::current() == messageLoop()); QThread *guiThread = qApp->thread(); if (!m_positioningHelper) { m_positioningHelper = new QtPositioningHelper(this); @@ -216,7 +215,6 @@ bool LocationProviderQt::StartProvider(bool highAccuracy) void LocationProviderQt::StopProvider() { - DCHECK(base::MessageLoop::current() == messageLoop()); if (m_positioningHelper) BrowserThread::PostTask(BrowserThread::UI,FROM_HERE, base::Bind(&QtPositioningHelper::stop , base::Unretained(m_positioningHelper))); @@ -224,7 +222,6 @@ void LocationProviderQt::StopProvider() void LocationProviderQt::RequestRefresh() { - DCHECK(base::MessageLoop::current() == messageLoop()); if (m_positioningHelper) BrowserThread::PostTask(BrowserThread::UI,FROM_HERE, base::Bind(&QtPositioningHelper::refresh , base::Unretained(m_positioningHelper))); @@ -237,16 +234,10 @@ void LocationProviderQt::OnPermissionGranted() void LocationProviderQt::updatePosition(const content::Geoposition &position) { - DCHECK(base::MessageLoop::current() == messageLoop()); m_lastKnownPosition = position; NotifyCallback(position); } -base::MessageLoop *LocationProviderQt::messageLoop() -{ - return static_cast<content::GeolocationProviderImpl*>(content::GeolocationProvider::GetInstance())->message_loop(); -} - } // namespace QtWebEngineCore #include "location_provider_qt.moc" |