OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 27 matching lines...) Expand all Loading... | |
38 struct FrameMsg_NewFrame_Params; | 38 struct FrameMsg_NewFrame_Params; |
39 struct ViewMsg_New_Params; | 39 struct ViewMsg_New_Params; |
40 struct ViewMsg_UpdateScrollbarTheme_Params; | 40 struct ViewMsg_UpdateScrollbarTheme_Params; |
41 struct WorkerProcessMsg_CreateWorker_Params; | 41 struct WorkerProcessMsg_CreateWorker_Params; |
42 | 42 |
43 namespace blink { | 43 namespace blink { |
44 class WebGamepads; | 44 class WebGamepads; |
45 class WebGraphicsContext3D; | 45 class WebGraphicsContext3D; |
46 class WebMediaStreamCenter; | 46 class WebMediaStreamCenter; |
47 class WebMediaStreamCenterClient; | 47 class WebMediaStreamCenterClient; |
48 class WebThread; | |
48 } | 49 } |
49 | 50 |
50 namespace base { | 51 namespace base { |
51 class SingleThreadTaskRunner; | 52 class SingleThreadTaskRunner; |
52 class Thread; | 53 class Thread; |
53 } | 54 } |
54 | 55 |
55 namespace cc { | 56 namespace cc { |
56 class ContextProvider; | 57 class ContextProvider; |
57 class TaskGraphRunner; | 58 class TaskGraphRunner; |
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
581 | 582 |
582 // The message loop of the renderer main thread. | 583 // The message loop of the renderer main thread. |
583 // This message loop should be destructed before the RenderThreadImpl | 584 // This message loop should be destructed before the RenderThreadImpl |
584 // shuts down Blink. | 585 // shuts down Blink. |
585 scoped_ptr<base::MessageLoop> main_message_loop_; | 586 scoped_ptr<base::MessageLoop> main_message_loop_; |
586 | 587 |
587 // A lazily initiated thread on which file operations are run. | 588 // A lazily initiated thread on which file operations are run. |
588 scoped_ptr<base::Thread> file_thread_; | 589 scoped_ptr<base::Thread> file_thread_; |
589 | 590 |
590 // May be null if overridden by ContentRendererClient. | 591 // May be null if overridden by ContentRendererClient. |
591 scoped_ptr<base::Thread> compositor_thread_; | 592 scoped_ptr<blink::WebThread> compositor_thread_; |
piman
2015/11/30 21:41:45
nit: make this the concrete type to avoid static_c
Ian Vollick
2015/12/01 04:00:04
Done.
| |
592 | 593 |
593 // Utility class to provide GPU functionalities to media. | 594 // Utility class to provide GPU functionalities to media. |
594 scoped_ptr<content::RendererGpuVideoAcceleratorFactories> gpu_factories_; | 595 scoped_ptr<content::RendererGpuVideoAcceleratorFactories> gpu_factories_; |
595 | 596 |
596 // Thread for running multimedia operations (e.g., video decoding). | 597 // Thread for running multimedia operations (e.g., video decoding). |
597 scoped_ptr<base::Thread> media_thread_; | 598 scoped_ptr<base::Thread> media_thread_; |
598 | 599 |
599 // Will point to appropriate task runner after initialization, | 600 // Will point to appropriate task runner after initialization, |
600 // regardless of whether |compositor_thread_| is overriden. | 601 // regardless of whether |compositor_thread_| is overriden. |
601 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; | 602 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
655 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 656 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
656 }; | 657 }; |
657 | 658 |
658 #if defined(COMPILER_MSVC) | 659 #if defined(COMPILER_MSVC) |
659 #pragma warning(pop) | 660 #pragma warning(pop) |
660 #endif | 661 #endif |
661 | 662 |
662 } // namespace content | 663 } // namespace content |
663 | 664 |
664 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 665 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
OLD | NEW |