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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
124 // routed to the RenderThread according to the routing IDs of the messages. | 124 // routed to the RenderThread according to the routing IDs of the messages. |
125 // The routing IDs correspond to RenderView instances. | 125 // The routing IDs correspond to RenderView instances. |
126 class CONTENT_EXPORT RenderThreadImpl | 126 class CONTENT_EXPORT RenderThreadImpl |
127 : public RenderThread, | 127 : public RenderThread, |
128 public ChildThreadImpl, | 128 public ChildThreadImpl, |
129 public GpuChannelHostFactory, | 129 public GpuChannelHostFactory, |
130 NON_EXPORTED_BASE(public CompositorDependencies) { | 130 NON_EXPORTED_BASE(public CompositorDependencies) { |
131 public: | 131 public: |
132 static RenderThreadImpl* current(); | 132 static RenderThreadImpl* current(); |
133 | 133 |
134 RenderThreadImpl(); | 134 RenderThreadImpl(scoped_ptr<RendererScheduler> renderer_scheduler); |
Ryan Sleevi
2015/03/06 17:55:23
This should be explicit.
Sami
2015/03/06 18:08:40
Thanks, fixed.
| |
135 // Constructor that's used when running in single process mode. | 135 // Constructor that's used when running in single process mode. |
136 explicit RenderThreadImpl(const std::string& channel_name); | 136 explicit RenderThreadImpl(const std::string& channel_name, |
137 scoped_ptr<RendererScheduler> renderer_scheduler); | |
137 // Constructor that's used in RendererMain. | 138 // Constructor that's used in RendererMain. |
138 explicit RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop); | 139 explicit RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop, |
140 scoped_ptr<RendererScheduler> renderer_scheduler); | |
139 ~RenderThreadImpl() override; | 141 ~RenderThreadImpl() override; |
140 void Shutdown() override; | 142 void Shutdown() override; |
141 | 143 |
142 // When initializing WebKit, ensure that any schemes needed for the content | 144 // When initializing WebKit, ensure that any schemes needed for the content |
143 // module are registered properly. Static to allow sharing with tests. | 145 // module are registered properly. Static to allow sharing with tests. |
144 static void RegisterSchemes(); | 146 static void RegisterSchemes(); |
145 | 147 |
146 // Notify V8 that the date/time configuration of the system might have | 148 // Notify V8 that the date/time configuration of the system might have |
147 // changed. | 149 // changed. |
148 static void NotifyTimezoneChange(); | 150 static void NotifyTimezoneChange(); |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
628 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 630 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
629 }; | 631 }; |
630 | 632 |
631 #if defined(COMPILER_MSVC) | 633 #if defined(COMPILER_MSVC) |
632 #pragma warning(pop) | 634 #pragma warning(pop) |
633 #endif | 635 #endif |
634 | 636 |
635 } // namespace content | 637 } // namespace content |
636 | 638 |
637 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 639 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
OLD | NEW |