| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_H_ |
| 6 #define CONTENT_RENDERER_RENDER_THREAD_H_ | 6 #define CONTENT_RENDERER_RENDER_THREAD_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 } | 55 } |
| 56 | 56 |
| 57 namespace WebKit { | 57 namespace WebKit { |
| 58 class WebStorageEventDispatcher; | 58 class WebStorageEventDispatcher; |
| 59 } | 59 } |
| 60 | 60 |
| 61 namespace v8 { | 61 namespace v8 { |
| 62 class Extension; | 62 class Extension; |
| 63 } | 63 } |
| 64 | 64 |
| 65 namespace webkit_glue { |
| 66 class WebThreadImpl; |
| 67 } |
| 68 |
| 65 // The RenderThreadBase is the minimal interface that a RenderView/Widget | 69 // The RenderThreadBase is the minimal interface that a RenderView/Widget |
| 66 // expects from a render thread. The interface basically abstracts a way to send | 70 // expects from a render thread. The interface basically abstracts a way to send |
| 67 // and receive messages. | 71 // and receive messages. |
| 68 // | 72 // |
| 69 // TODO(brettw): This has two different and opposing usage patterns which | 73 // TODO(brettw): This has two different and opposing usage patterns which |
| 70 // make it confusing. It can be accessed through RenderThread::current(), which | 74 // make it confusing. It can be accessed through RenderThread::current(), which |
| 71 // can be NULL during tests, or it can be passed as RenderThreadBase, which is | 75 // can be NULL during tests, or it can be passed as RenderThreadBase, which is |
| 72 // mocked during tests. It should be changed to RenderThread::current() | 76 // mocked during tests. It should be changed to RenderThread::current() |
| 73 // everywhere. | 77 // everywhere. |
| 74 // | 78 // |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 | 273 |
| 270 // The channel from the renderer process to the GPU process. | 274 // The channel from the renderer process to the GPU process. |
| 271 scoped_refptr<GpuChannelHost> gpu_channel_; | 275 scoped_refptr<GpuChannelHost> gpu_channel_; |
| 272 | 276 |
| 273 // A lazily initiated thread on which file operations are run. | 277 // A lazily initiated thread on which file operations are run. |
| 274 scoped_ptr<base::Thread> file_thread_; | 278 scoped_ptr<base::Thread> file_thread_; |
| 275 | 279 |
| 276 // Map of registered v8 extensions. The key is the extension name. | 280 // Map of registered v8 extensions. The key is the extension name. |
| 277 std::set<std::string> v8_extensions_; | 281 std::set<std::string> v8_extensions_; |
| 278 | 282 |
| 283 scoped_ptr<webkit_glue::WebThreadImpl> compositor_thread_; |
| 284 |
| 279 ObserverList<RenderProcessObserver> observers_; | 285 ObserverList<RenderProcessObserver> observers_; |
| 280 | 286 |
| 281 DISALLOW_COPY_AND_ASSIGN(RenderThread); | 287 DISALLOW_COPY_AND_ASSIGN(RenderThread); |
| 282 }; | 288 }; |
| 283 | 289 |
| 284 #endif // CONTENT_RENDERER_RENDER_THREAD_H_ | 290 #endif // CONTENT_RENDERER_RENDER_THREAD_H_ |
| OLD | NEW |