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

Side by Side Diff: content/renderer/render_thread_impl.h

Issue 1550093002: Partial revert of 'Refactor CompositorWorkerManager' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 589
590 // The message loop of the renderer main thread. 590 // The message loop of the renderer main thread.
591 // This message loop should be destructed before the RenderThreadImpl 591 // This message loop should be destructed before the RenderThreadImpl
592 // shuts down Blink. 592 // shuts down Blink.
593 scoped_ptr<base::MessageLoop> main_message_loop_; 593 scoped_ptr<base::MessageLoop> main_message_loop_;
594 594
595 // A lazily initiated thread on which file operations are run. 595 // A lazily initiated thread on which file operations are run.
596 scoped_ptr<base::Thread> file_thread_; 596 scoped_ptr<base::Thread> file_thread_;
597 597
598 // May be null if overridden by ContentRendererClient. 598 // May be null if overridden by ContentRendererClient.
599 scoped_ptr<scheduler::WebThreadBase> compositor_thread_; 599 scoped_ptr<base::Thread> compositor_thread_;
600 600
601 // Utility class to provide GPU functionalities to media. 601 // Utility class to provide GPU functionalities to media.
602 scoped_ptr<content::RendererGpuVideoAcceleratorFactories> gpu_factories_; 602 scoped_ptr<content::RendererGpuVideoAcceleratorFactories> gpu_factories_;
603 603
604 // Thread for running multimedia operations (e.g., video decoding). 604 // Thread for running multimedia operations (e.g., video decoding).
605 scoped_ptr<base::Thread> media_thread_; 605 scoped_ptr<base::Thread> media_thread_;
606 606
607 // Will point to appropriate task runner after initialization, 607 // Will point to appropriate task runner after initialization,
608 // regardless of whether |compositor_thread_| is overriden. 608 // regardless of whether |compositor_thread_| is overriden.
609 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 609 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); 694 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
695 }; 695 };
696 696
697 #if defined(COMPILER_MSVC) 697 #if defined(COMPILER_MSVC)
698 #pragma warning(pop) 698 #pragma warning(pop)
699 #endif 699 #endif
700 700
701 } // namespace content 701 } // namespace content
702 702
703 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ 703 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698