Remove shaped desktop support from remoting host and client.

remoting/client/plugin/pepper_video_renderer_3d.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/pepper_video_renderer_3d.h"
 
 #include <math.h>
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/stl_util.h"
 #include "ppapi/c/pp_codecs.h"
 #include "ppapi/c/ppb_opengles2.h"
 #include "ppapi/c/ppb_video_decoder.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/lib/gl/include/GLES2/gl2.h"
 #include "ppapi/lib/gl/include/GLES2/gl2ext.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/performance_tracker.h"
 #include "remoting/protocol/session_config.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 
 namespace remoting {
 
 // The implementation here requires that the decoder allocates at least 3
 // pictures. PPB_VideoDecoder didn't support this parameter prior to
 // 1.1, so we have to pass 0 for backwards compatibility with older versions of
 // the browser. Currently all API implementations allocate more than 3 buffers
 // by default.
 //
 // TODO(sergeyu): Change this to 3 once PPB_VideoDecoder v1.1 is enabled on
@@ skipping 181 matching lines @@
                                     packet->format().y_dpi());
     if (!frame_dpi_.equals(frame_dpi)) {
       frame_dpi_ = frame_dpi;
       resolution_changed = true;
     }
   }
 
   if (resolution_changed)
     event_handler_->OnVideoSize(frame_size_, frame_dpi_);
 
-  // Process the frame shape, if supplied.
-  if (packet->has_use_desktop_shape()) {
-    if (packet->use_desktop_shape()) {
-      scoped_ptr<webrtc::DesktopRegion> shape(new webrtc::DesktopRegion);
-      for (int i = 0; i < packet->desktop_shape_rects_size(); ++i) {
-        Rect remoting_rect = packet->desktop_shape_rects(i);
-        shape->AddRect(webrtc::DesktopRect::MakeXYWH(
-            remoting_rect.x(), remoting_rect.y(), remoting_rect.width(),
-            remoting_rect.height()));
-      }
-      if (!frame_shape_ || !frame_shape_->Equals(*shape)) {
-        frame_shape_ = std::move(shape);
-        event_handler_->OnVideoShape(frame_shape_.get());
-      }
-    } else if (frame_shape_) {
-      frame_shape_ = nullptr;
-      event_handler_->OnVideoShape(nullptr);
-    }
-  }
-
   // Report the dirty region, for debugging, if requested.
   if (debug_dirty_region_) {
     webrtc::DesktopRegion dirty_region;
     for (int i = 0; i < packet->dirty_rects_size(); ++i) {
       Rect remoting_rect = packet->dirty_rects(i);
       dirty_region.AddRect(webrtc::DesktopRect::MakeXYWH(
           remoting_rect.x(), remoting_rect.y(),
           remoting_rect.width(), remoting_rect.height()));
     }
     event_handler_->OnVideoFrameDirtyRegion(dirty_region);
@@ skipping 271 matching lines @@
   gles2_if_->AttachShader(graphics_.pp_resource(), shader_program_, shader);
   gles2_if_->DeleteShader(graphics_.pp_resource(), shader);
 }
 
 void PepperVideoRenderer3D::CheckGLError() {
   GLenum error = gles2_if_->GetError(graphics_.pp_resource());
   CHECK_EQ(error, static_cast<GLenum>(GL_NO_ERROR)) << "GL error: " << error;
 }
 
 }  // namespace remoting