Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: content/browser/device_sensors/data_fetcher_shared_memory_base.cc

Issue 578863002: Fix the indirect pure virtual calls in DataFetcherSharedMemoryBase destructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unsigned 0 compilation Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/device_sensors/data_fetcher_shared_memory_base.cc
diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc
index 6a9b7d287d30eb19c5a26c59dff0b80b873ddfbe..4248fe5a9f300429899a4bc04a046c2c1f29591b 100644
--- a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc
+++ b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc
@@ -104,8 +104,7 @@ DataFetcherSharedMemoryBase::DataFetcherSharedMemoryBase()
}
DataFetcherSharedMemoryBase::~DataFetcherSharedMemoryBase() {
- StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
- StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION);
+ DCHECK_EQ(0u, started_consumers_);
// make sure polling thread stops asap.
if (polling_thread_)
@@ -163,6 +162,11 @@ bool DataFetcherSharedMemoryBase::StopFetchingDeviceData(
return true;
}
+void DataFetcherSharedMemoryBase::StopFetchingAllDeviceData() {
+ StopFetchingDeviceData(CONSUMER_TYPE_MOTION);
+ StopFetchingDeviceData(CONSUMER_TYPE_ORIENTATION);
+}
+
base::SharedMemoryHandle
DataFetcherSharedMemoryBase::GetSharedMemoryHandleForProcess(
ConsumerType consumer_type, base::ProcessHandle process) {
@@ -240,5 +244,4 @@ bool DataFetcherSharedMemoryBase::IsPollingTimerRunningForTesting() const {
return polling_thread_ ? polling_thread_->IsTimerRunning() : false;
}
-
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698