diff options
| author | rnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:25:43 +0000 |
|---|---|---|
| committer | rnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:25:43 +0000 |
| commit | 32793338010caebb42a4f32801b025c26be388fd (patch) | |
| tree | ebd92c6275a49a77b0963b7ec20dd1113d75e7cb /content/browser/in_process_webkit/webkit_thread.cc | |
| parent | 8506e424b0106af9ac60351951cb6f2048810370 (diff) | |
| download | chromium_src-32793338010caebb42a4f32801b025c26be388fd.zip chromium_src-32793338010caebb42a4f32801b025c26be388fd.tar.gz chromium_src-32793338010caebb42a4f32801b025c26be388fd.tar.bz2 | |
Revert "Refactor BaseTimer to avoid spamming the MessageLoop with orphaned tasks."
This reverts commit r128412, which is causing DCHECKs in thread
destruction in media unittests.
BUG=119714,119750
TBR=sky@chromium.org,petermayo@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9839059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/in_process_webkit/webkit_thread.cc')
| -rw-r--r-- | content/browser/in_process_webkit/webkit_thread.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc index db0cd07..bb1ae40 100644 --- a/content/browser/in_process_webkit/webkit_thread.cc +++ b/content/browser/in_process_webkit/webkit_thread.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -66,10 +66,6 @@ void WebKitThread::InternalWebKitThread::Init() { void WebKitThread::InternalWebKitThread::CleanUp() { DCHECK(webkit_platform_support_.get()); WebKit::shutdown(); - // Delete BrowserWebKitPlatformSupportImpl now while on the same thread that - // constructed it. (This prevents the WebKit shared timer from being destroyed - // on a different thread than the one using it.) - webkit_platform_support_.reset(); } } // namespace content |