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

Unified Diff: content/browser/in_process_webkit/webkit_thread.cc

Issue 18414007: Remove unused WEBKIT_DEPRECATED thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/in_process_webkit/webkit_thread.cc
diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc
deleted file mode 100644
index f53413f405d2514cbfdb1478c78af2bc0e5d0fb6..0000000000000000000000000000000000000000
--- a/content/browser/in_process_webkit/webkit_thread.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2012 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.
-
-#include "content/browser/in_process_webkit/webkit_thread.h"
-
-#include "base/command_line.h"
-#include "content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h"
-#include "content/public/common/content_switches.h"
-#include "third_party/WebKit/public/web/WebKit.h"
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
-#include "webkit/glue/webkit_glue.h"
-
-namespace content {
-
-WebKitThread::WebKitThread() {
-}
-
-// This happens on the UI thread after the IO thread has been shut down.
-WebKitThread::~WebKitThread() {
- // We can't just check CurrentlyOn(BrowserThread::UI) because in unit tests,
- // MessageLoop::Current is sometimes NULL and other times valid and there's
- // no BrowserThread object. Can't check that CurrentlyOn is not IO since
- // some unit tests set that BrowserThread for other checks.
- DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
-}
-
-void WebKitThread::Initialize() {
- DCHECK(!webkit_thread_.get());
-
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) {
- // TODO(joth): As this cannot work in single process mode use of the
- // webkit thread is deprecated; see http://crbug.com/106839.
- return;
- }
-
- webkit_thread_.reset(new InternalWebKitThread);
- bool started = webkit_thread_->Start();
- DCHECK(started);
-}
-
-WebKitThread::InternalWebKitThread::InternalWebKitThread()
- : BrowserThreadImpl(BrowserThread::WEBKIT_DEPRECATED) {
-}
-
-WebKitThread::InternalWebKitThread::~InternalWebKitThread() {
- Stop();
-}
-
-void WebKitThread::InternalWebKitThread::Init() {
- DCHECK(!webkit_platform_support_.get());
- webkit_platform_support_.reset(new BrowserWebKitPlatformSupportImpl);
- WebKit::initializeWithoutV8(webkit_platform_support_.get());
- webkit_glue::EnableWebCoreLogChannels(
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kWebCoreLogChannels));
- // Exercise WebSecurityOrigin to get its underlying statics initialized.
- // TODO(michaeln): remove this when the following is landed.
- // https://bugs.webkit.org/show_bug.cgi?id=61145
- WebKit::WebSecurityOrigin::create(GURL("http://chromium.org"));
-
- // If possible, post initialization tasks to this thread (rather than doing
- // them now) so we don't block the UI thread any longer than we have to.
-}
-
-void WebKitThread::InternalWebKitThread::CleanUp() {
- DCHECK(webkit_platform_support_.get());
- WebKit::shutdownWithoutV8();
- // 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

Powered by Google App Engine
This is Rietveld 408576698