summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-03 00:30:47 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-03 00:30:47 +0000
commitc7cdaeb9549c38d91a885c1e1045c536354d8911 (patch)
tree8616f889dfa3e84da7ba80e92b3b0cdeece5f31a /content
parentc6464ad8b064fb8883c37b9eb3f20533f47a2aeb (diff)
downloadchromium_src-c7cdaeb9549c38d91a885c1e1045c536354d8911.zip
chromium_src-c7cdaeb9549c38d91a885c1e1045c536354d8911.tar.gz
chromium_src-c7cdaeb9549c38d91a885c1e1045c536354d8911.tar.bz2
Call Stop() from all destructors of base::Thread subclasses (except for a couple that ensure Stop() has already been called).
BUG=none TEST=none TBR=willchan,hans Review URL: https://codereview.chromium.org/11026019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/device_orientation/provider_impl.cc2
-rw-r--r--content/common/gpu/client/gl_helper.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/device_orientation/provider_impl.cc b/content/browser/device_orientation/provider_impl.cc
index e436869..b566cb0 100644
--- a/content/browser/device_orientation/provider_impl.cc
+++ b/content/browser/device_orientation/provider_impl.cc
@@ -16,7 +16,6 @@
namespace {
void DeleteThread(base::Thread* thread) {
- thread->Stop();
delete thread;
}
@@ -73,6 +72,7 @@ ProviderImpl::PollingThread::PollingThread(
}
ProviderImpl::PollingThread::~PollingThread() {
+ Stop();
}
void ProviderImpl::PollingThread::DoAddPollingDataType(DeviceData::Type type) {
diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc
index f5c6ce3..775a651 100644
--- a/content/common/gpu/client/gl_helper.cc
+++ b/content/common/gpu/client/gl_helper.cc
@@ -33,8 +33,11 @@ class GLHelperThread : public base::Thread {
GLHelperThread() : base::Thread(kGLHelperThreadName) {
Start();
}
- virtual ~GLHelperThread() {}
+ virtual ~GLHelperThread() {
+ Stop();
+ }
+ private:
DISALLOW_COPY_AND_ASSIGN(GLHelperThread);
};