Remove DesktopFrame::shape().

webrtc/modules/desktop_capture/desktop_frame.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 38 matching lines @@
 
   // DPI of the screen being captured. May be set to zero, e.g. if DPI is
   // unknown.
   const DesktopVector& dpi() const { return dpi_; }
   void set_dpi(const DesktopVector& dpi) { dpi_ = dpi; }
 
   // Time taken to capture the frame in milliseconds.
   int64_t capture_time_ms() const { return capture_time_ms_; }
   void set_capture_time_ms(int64_t time_ms) { capture_time_ms_ = time_ms; }
 
-  // Optional shape for the frame. Frames may be shaped e.g. if
-  // capturing the contents of a shaped window.
-  const DesktopRegion* shape() const { return shape_.get(); }
-  void set_shape(DesktopRegion* shape) { shape_.reset(shape); }
-
   // Copies pixels from a buffer or another frame. |dest_rect| rect must lay
   // within bounds of this frame.
   void CopyPixelsFrom(uint8_t* src_buffer, int src_stride,
                       const DesktopRect& dest_rect);
   void CopyPixelsFrom(const DesktopFrame& src_frame,
                       const DesktopVector& src_pos,
                       const DesktopRect& dest_rect);
 
   // A helper to return the data pointer of a frame at the specified position.
   uint8_t* GetFrameDataAtPos(const DesktopVector& pos) const;
 
  protected:
   DesktopFrame(DesktopSize size,
                int stride,
                uint8_t* data,
                SharedMemory* shared_memory);
 
   const DesktopSize size_;
   const int stride_;
 
   // Ownership of the buffers is defined by the classes that inherit from this
   // class. They must guarantee that the buffer is not deleted before the frame
   // is deleted.
   uint8_t* const data_;
   SharedMemory* const shared_memory_;
 
   DesktopRegion updated_region_;
   DesktopVector dpi_;
   int64_t capture_time_ms_;
-  std::unique_ptr<DesktopRegion> shape_;
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrame);
 };
 
 // A DesktopFrame that stores data in the heap.
 class BasicDesktopFrame : public DesktopFrame {
  public:
   explicit BasicDesktopFrame(DesktopSize size);
   ~BasicDesktopFrame() override;
@@ skipping 23 matching lines @@
   ~SharedMemoryDesktopFrame() override;
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemoryDesktopFrame);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_FRAME_H_