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

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 1827043004: Remove shaped desktop support from remoting host and client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/client/plugin/chromoting_instance.h ('k') | remoting/client/plugin/pepper_video_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index a7c56018ea132103e01d2d59867387b1acb8ea2e..af4954b0e21e2222466829793dae3e7e439319ee 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -56,6 +56,7 @@
#include "remoting/protocol/host_stub.h"
#include "remoting/protocol/transport_context.h"
#include "third_party/webrtc/base/helpers.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
#include "url/gurl.h"
namespace remoting {
@@ -355,31 +356,6 @@ void ChromotingInstance::OnVideoSize(const webrtc::DesktopSize& size,
PostLegacyJsonMessage("onDesktopSize", std::move(data));
}
-void ChromotingInstance::OnVideoShape(const webrtc::DesktopRegion* shape) {
- if ((shape && desktop_shape_ && shape->Equals(*desktop_shape_)) ||
- (!shape && !desktop_shape_)) {
- return;
- }
-
- scoped_ptr<base::DictionaryValue> shape_message(new base::DictionaryValue());
- if (shape) {
- desktop_shape_ = make_scoped_ptr(new webrtc::DesktopRegion(*shape));
- scoped_ptr<base::ListValue> rects_value(new base::ListValue());
- for (webrtc::DesktopRegion::Iterator i(*shape); !i.IsAtEnd(); i.Advance()) {
- const webrtc::DesktopRect& rect = i.rect();
- scoped_ptr<base::ListValue> rect_value(new base::ListValue());
- rect_value->AppendInteger(rect.left());
- rect_value->AppendInteger(rect.top());
- rect_value->AppendInteger(rect.width());
- rect_value->AppendInteger(rect.height());
- rects_value->Append(rect_value.release());
- }
- shape_message->Set("rects", rects_value.release());
- }
-
- PostLegacyJsonMessage("onDesktopShape", std::move(shape_message));
-}
-
void ChromotingInstance::OnVideoFrameDirtyRegion(
const webrtc::DesktopRegion& dirty_region) {
scoped_ptr<base::ListValue> rects_value(new base::ListValue());
« no previous file with comments | « remoting/client/plugin/chromoting_instance.h ('k') | remoting/client/plugin/pepper_video_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698