summaryrefslogtreecommitdiffstats
path: root/chrome/browser/in_process_webkit/webkit_thread.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/in_process_webkit/webkit_thread.h')
-rw-r--r--chrome/browser/in_process_webkit/webkit_thread.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/chrome/browser/in_process_webkit/webkit_thread.h b/chrome/browser/in_process_webkit/webkit_thread.h
index 97b1856..0d3b7c1 100644
--- a/chrome/browser/in_process_webkit/webkit_thread.h
+++ b/chrome/browser/in_process_webkit/webkit_thread.h
@@ -14,21 +14,14 @@
class BrowserWebKitClientImpl;
-// This is an object that represents WebKit's "main" thread within the browser
-// process. It should be instantiated and destroyed on the UI thread
-// before/after the IO thread is created/destroyed. All other usage should be
-// on the IO thread. If the browser is being run in --single-process mode, a
-// thread will never be spun up.
+// This creates a WebKit main thread on instantiation (if not in
+// --single-process mode) on construction and kills it on deletion.
class WebKitThread {
public:
// Called from the UI thread.
WebKitThread();
~WebKitThread();
- // Creates the WebKit thread if it hasn't been already created. Only call
- // from the IO thread. Only do fast-path work here.
- void EnsureInitialized();
-
private:
// Must be private so that we can carefully control its lifetime.
class InternalWebKitThread : public ChromeThread {
@@ -45,12 +38,7 @@ class WebKitThread {
scoped_ptr<BrowserWebKitClientImpl> webkit_client_;
};
- // Returns the WebKit thread's message loop or NULL if we're in
- // --single-process mode. Do slow-path initialization work here.
- MessageLoop* InitializeThread();
-
- // Pointer to the actual WebKitThread. NULL if not yet started. Only modify
- // from the IO thread while the WebKit thread is not running.
+ // Pointer to the actual WebKitThread.
scoped_ptr<InternalWebKitThread> webkit_thread_;
DISALLOW_COPY_AND_ASSIGN(WebKitThread);