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

Side by Side Diff: remoting/host/me2me_desktop_environment.cc

Issue 15927033: Add host-side rate-limiting to desktop resize events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Made unit-test less sensitive to timing. Created 7 years, 6 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 | Annotate | Revision Log
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 #include "remoting/host/me2me_desktop_environment.h" 5 #include "remoting/host/me2me_desktop_environment.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "media/video/capture/screen/screen_capturer.h" 9 #include "media/video/capture/screen/screen_capturer.h"
10 #include "remoting/host/client_session_control.h" 10 #include "remoting/host/client_session_control.h"
11 #include "remoting/host/curtain_mode.h" 11 #include "remoting/host/curtain_mode.h"
12 #include "remoting/host/desktop_resizer.h" 12 #include "remoting/host/desktop_resizer.h"
13 #include "remoting/host/host_window.h" 13 #include "remoting/host/host_window.h"
14 #include "remoting/host/host_window.h" 14 #include "remoting/host/host_window.h"
15 #include "remoting/host/host_window_proxy.h" 15 #include "remoting/host/host_window_proxy.h"
16 #include "remoting/host/local_input_monitor.h" 16 #include "remoting/host/local_input_monitor.h"
17 #include "remoting/host/resizing_host_observer.h" 17 #include "remoting/host/resizing_host_observer.h"
18 #include "remoting/host/screen_controls.h" 18 #include "remoting/host/screen_controls.h"
19 19
20 #if defined(OS_POSIX) 20 #if defined(OS_POSIX)
21 #include <sys/types.h> 21 #include <sys/types.h>
22 #include <unistd.h> 22 #include <unistd.h>
23 #endif // defined(OS_POSIX) 23 #endif // defined(OS_POSIX)
24 24
25 const char kRateLimitResizeRequests[] = "rateLimitResizeRequests";
26
25 namespace remoting { 27 namespace remoting {
26 28
27 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() { 29 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() {
28 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 30 DCHECK(caller_task_runner()->BelongsToCurrentThread());
29 } 31 }
30 32
31 scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { 33 scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() {
32 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 34 DCHECK(caller_task_runner()->BelongsToCurrentThread());
33 35
34 return scoped_ptr<ScreenControls>( 36 return scoped_ptr<ScreenControls>(
35 new ResizingHostObserver(DesktopResizer::Create())); 37 new ResizingHostObserver(DesktopResizer::Create()));
36 } 38 }
37 39
38 scoped_ptr<media::ScreenCapturer> 40 scoped_ptr<media::ScreenCapturer>
39 Me2MeDesktopEnvironment::CreateVideoCapturer() { 41 Me2MeDesktopEnvironment::CreateVideoCapturer() {
40 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 42 DCHECK(caller_task_runner()->BelongsToCurrentThread());
41 43
42 #if defined(OS_LINUX) 44 #if defined(OS_LINUX)
43 return media::ScreenCapturer::CreateWithXDamage(true); 45 return media::ScreenCapturer::CreateWithXDamage(true);
44 #else // !defined(OS_LINUX) 46 #else // !defined(OS_LINUX)
45 return media::ScreenCapturer::Create(); 47 return media::ScreenCapturer::Create();
46 #endif // !defined(OS_LINUX) 48 #endif // !defined(OS_LINUX)
47 } 49 }
48 50
51 std::string Me2MeDesktopEnvironment::GetCapabilities() const {
52 return kRateLimitResizeRequests;
53 }
54
49 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( 55 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
50 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 56 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
51 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 57 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
52 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 58 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
53 : BasicDesktopEnvironment(caller_task_runner, 59 : BasicDesktopEnvironment(caller_task_runner,
54 input_task_runner, 60 input_task_runner,
55 ui_task_runner) { 61 ui_task_runner) {
56 DCHECK(caller_task_runner->BelongsToCurrentThread()); 62 DCHECK(caller_task_runner->BelongsToCurrentThread());
57 } 63 }
58 64
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 return desktop_environment.PassAs<DesktopEnvironment>(); 148 return desktop_environment.PassAs<DesktopEnvironment>();
143 } 149 }
144 150
145 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { 151 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
146 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 152 DCHECK(caller_task_runner()->BelongsToCurrentThread());
147 153
148 curtain_enabled_ = enable; 154 curtain_enabled_ = enable;
149 } 155 }
150 156
151 } // namespace remoting 157 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698