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

Unified Diff: remoting/host/single_window_desktop_environment.cc

Issue 1673723002: Use IpcVideoFrameCapturer on network thread instead of capturer thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/single_window_desktop_environment.h ('k') | remoting/host/win/session_desktop_environment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/single_window_desktop_environment.cc
diff --git a/remoting/host/single_window_desktop_environment.cc b/remoting/host/single_window_desktop_environment.cc
index d120932cdb537cf4ed1aae7f9a788e0732cef194..0f2b148003412e30d75d49f93dbc40d2def3b36a 100644
--- a/remoting/host/single_window_desktop_environment.cc
+++ b/remoting/host/single_window_desktop_environment.cc
@@ -29,6 +29,7 @@ class SingleWindowDesktopEnvironment : public BasicDesktopEnvironment {
friend class SingleWindowDesktopEnvironmentFactory;
SingleWindowDesktopEnvironment(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+ scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
webrtc::WindowId window_id,
@@ -70,27 +71,29 @@ SingleWindowDesktopEnvironment::CreateInputInjector() {
SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+ scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
webrtc::WindowId window_id,
bool supports_touch_events)
: BasicDesktopEnvironment(caller_task_runner,
+ video_capture_task_runner,
input_task_runner,
ui_task_runner,
supports_touch_events),
- window_id_(window_id) {
-}
+ window_id_(window_id) {}
SingleWindowDesktopEnvironmentFactory::SingleWindowDesktopEnvironmentFactory(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+ scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
webrtc::WindowId window_id)
: BasicDesktopEnvironmentFactory(caller_task_runner,
+ video_capture_task_runner,
input_task_runner,
ui_task_runner),
- window_id_(window_id) {
-}
+ window_id_(window_id) {}
SingleWindowDesktopEnvironmentFactory::
~SingleWindowDesktopEnvironmentFactory() {
@@ -100,13 +103,9 @@ scoped_ptr<DesktopEnvironment> SingleWindowDesktopEnvironmentFactory::Create(
base::WeakPtr<ClientSessionControl> client_session_control) {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
- scoped_ptr<SingleWindowDesktopEnvironment> desktop_environment(
- new SingleWindowDesktopEnvironment(caller_task_runner(),
- input_task_runner(),
- ui_task_runner(),
- window_id_,
- supports_touch_events()));
- return std::move(desktop_environment);
+ return make_scoped_ptr(new SingleWindowDesktopEnvironment(
+ caller_task_runner(), video_capture_task_runner(), input_task_runner(),
+ ui_task_runner(), window_id_, supports_touch_events()));
}
} // namespace remoting
« no previous file with comments | « remoting/host/single_window_desktop_environment.h ('k') | remoting/host/win/session_desktop_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698