Use webrtc::DesktopCapturer for screen capturer implementation.

media/video/capture/screen/screen_capturer_mac.mm

 // Copyright (c) 2012 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 "media/video/capture/screen/screen_capturer.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <Cocoa/Cocoa.h>
 #include <dlfcn.h>
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #include <OpenGL/CGLMacro.h>
 #include <OpenGL/OpenGL.h>
 #include <stddef.h>
 #include <set>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_native_library.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "media/video/capture/screen/mac/desktop_configuration.h"
 #include "media/video/capture/screen/mac/scoped_pixel_buffer_object.h"
 #include "media/video/capture/screen/mouse_cursor_shape.h"
-#include "media/video/capture/screen/screen_capture_data.h"
-#include "media/video/capture/screen/screen_capture_frame.h"
 #include "media/video/capture/screen/screen_capture_frame_queue.h"
 #include "media/video/capture/screen/screen_capturer_helper.h"
-#include "skia/ext/skia_utils_mac.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 
 namespace media {
 
 namespace {
 
 // Definitions used to dynamic-link to deprecated OS 10.6 functions.
 const char* kApplicationServicesLibraryName =
     "/System/Library/Frameworks/ApplicationServices.framework/"
     "ApplicationServices";
 typedef void* (*CGDisplayBaseAddressFunc)(CGDirectDisplayID);
 typedef size_t (*CGDisplayBytesPerRowFunc)(CGDirectDisplayID);
 typedef size_t (*CGDisplayBitsPerPixelFunc)(CGDirectDisplayID);
 const char* kOpenGlLibraryName =
     "/System/Library/Frameworks/OpenGL.framework/OpenGL";
 typedef CGLError (*CGLSetFullScreenFunc)(CGLContextObj);
 
 // Standard Mac displays have 72dpi, but we report 96dpi for
 // consistency with Windows and Linux.
 const int kStandardDPI = 96;
 
-// skia/ext/skia_utils_mac.h only defines CGRectToSkRect().
-SkIRect CGRectToSkIRect(const CGRect& rect) {
-  SkIRect result;
-  gfx::CGRectToSkRect(rect).round(&result);
-  return result;
+// Scales all coordinates of an SkRect by a specified factor.

[Wez, 2013/04/26 18:48:14]

nit: Update comment

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

+webrtc::DesktopRect ScaleAndRoundCGRect(const CGRect& rect, float scale) {

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: Should |rect| be validated/sanitized before static_cast-ing it?

[Sergey Ulanov, 2013/05/07 22:25:50]

No, it comes from the OS.

+  return webrtc::DesktopRect::MakeLTRB(
+    static_cast<int>(rect.origin.x * scale),

[alexeypa (please no reviews), 2013/04/26 21:33:58]

I think you need an explicit floor() here and the line below. I'm not sure
whether it is specified in the standard that casting from a float to an integer
never tries to round it. 

[Sergey Ulanov, 2013/05/07 22:25:50]

Float->int cast just truncates the part after the floating point, so it should
work correctly, but only for positive numbers. Added floor()

+    static_cast<int>(rect.origin.y * scale),
+    static_cast<int>(ceil((rect.origin.x + rect.size.width) * scale)),
+    static_cast<int>(ceil((rect.origin.y + rect.size.height) * scale)));
 }
 
-// Scales all coordinates of an SkRect by a specified factor.
-SkRect ScaleSkRect(const SkRect& rect, float scale) {
-  SkRect result = {
-    rect.left() * scale, rect.top() * scale,
-    rect.right() * scale, rect.bottom() * scale
-  };
-  return result;
+webrtc::DesktopRect TranslateRect(const webrtc::DesktopRect& r,

[alexeypa (please no reviews), 2013/04/26 21:33:58]

webrtc::DesktopRect already has Translate() method.

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

+                                  int dx, int dy) {
+  return webrtc::DesktopRect::MakeXYWH(
+      r.left() + dx, r.top() + dx, r.width(), r.height());
 }
 
 // Copy pixels in the |rect| from |src_place| to |dest_plane|.
 void CopyRect(const uint8* src_plane,

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: There is similar remoting::CopyRGB32Rect in remoting/base/util.h. COnsider
moving it to media and getting rid of CopyRect here.

[Sergey Ulanov, 2013/05/07 22:25:50]

Not related to this CL.

               int src_plane_stride,
               uint8* dest_plane,
               int dest_plane_stride,
               int bytes_per_pixel,
-              const SkIRect& rect) {
+              const webrtc::DesktopRect& rect) {
   // Get the address of the starting point.
   const int src_y_offset = src_plane_stride * rect.top();
   const int dest_y_offset = dest_plane_stride * rect.top();
   const int x_offset = bytes_per_pixel * rect.left();
   src_plane += src_y_offset + x_offset;
   dest_plane += dest_y_offset + x_offset;
 
   // Copy pixels in the rectangle line by line.
   const int bytes_per_line = bytes_per_pixel * rect.width();
   const int height = rect.height();
   for (int i = 0 ; i < height; ++i) {
     memcpy(dest_plane, src_plane, bytes_per_line);
     src_plane += src_plane_stride;
     dest_plane += dest_plane_stride;
   }
 }
 
 // The amount of time allowed for displays to reconfigure.
 const int64 kDisplayConfigurationEventTimeoutInSeconds = 10;
 
-// A class representing a full-frame pixel buffer.
-class ScreenCaptureFrameMac : public ScreenCaptureFrame {
- public:
-  explicit ScreenCaptureFrameMac(const MacDesktopConfiguration& desktop_config);
-  virtual ~ScreenCaptureFrameMac();
-
-  const SkIPoint& dpi() const { return dpi_; }
-
- private:
-  // Allocated pixel buffer.
-  scoped_ptr<uint8[]> data_;
-
-  // DPI settings for this buffer.
-  SkIPoint dpi_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScreenCaptureFrameMac);
-};
-
 // A class to perform video frame capturing for mac.
 class ScreenCapturerMac : public ScreenCapturer {
  public:
   ScreenCapturerMac();
   virtual ~ScreenCapturerMac();
 
   bool Init();
 
   // Overridden from ScreenCapturer:
-  virtual void Start(Delegate* delegate) OVERRIDE;
-  virtual void CaptureFrame() OVERRIDE;
+  virtual void Start(Callback* callback) OVERRIDE;
+  virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE;
+  virtual void SetMouseShapeObserver(
+      MouseShapeObserver* mouse_shape_observer) OVERRIDE;
 
  private:
   void CaptureCursor();
 
-  void GlBlitFast(const ScreenCaptureFrame& buffer, const SkRegion& region);
-  void GlBlitSlow(const ScreenCaptureFrame& buffer);
-  void CgBlitPreLion(const ScreenCaptureFrame& buffer, const SkRegion& region);
-  void CgBlitPostLion(const ScreenCaptureFrame& buffer, const SkRegion& region);
+  void GlBlitFast(const webrtc::DesktopFrame& frame,
+                  const webrtc::DesktopRegion& region);
+  void GlBlitSlow(const webrtc::DesktopFrame& frame);
+  void CgBlitPreLion(const webrtc::DesktopFrame& frame,
+                     const webrtc::DesktopRegion& region);
+  void CgBlitPostLion(const webrtc::DesktopFrame& frame,
+                      const webrtc::DesktopRegion& region);
 
   // Called when the screen configuration is changed.
   void ScreenConfigurationChanged();
 
   bool RegisterRefreshAndMoveHandlers();
   void UnregisterRefreshAndMoveHandlers();
 
   void ScreenRefresh(CGRectCount count, const CGRect *rect_array);
   void ScreenUpdateMove(CGScreenUpdateMoveDelta delta,
                         size_t count,
                         const CGRect *rect_array);
   void DisplaysReconfigured(CGDirectDisplayID display,
                             CGDisplayChangeSummaryFlags flags);
   static void ScreenRefreshCallback(CGRectCount count,
                                     const CGRect *rect_array,
                                     void *user_parameter);
   static void ScreenUpdateMoveCallback(CGScreenUpdateMoveDelta delta,
                                        size_t count,
                                        const CGRect *rect_array,
                                        void *user_parameter);
   static void DisplaysReconfiguredCallback(CGDirectDisplayID display,
                                            CGDisplayChangeSummaryFlags flags,
                                            void *user_parameter);
 
   void ReleaseBuffers();
 
-  Delegate* delegate_;
+  Callback* callback_;
+  MouseShapeObserver* mouse_shape_observer_;
 
   CGLContextObj cgl_context_;
   ScopedPixelBufferObject pixel_buffer_object_;
 
   // Queue of the frames buffers.
   ScreenCaptureFrameQueue queue_;
 
   // Current display configuration.
   MacDesktopConfiguration desktop_config_;
 
   // A thread-safe list of invalid rectangles, and the size of the most
   // recently captured screen.
   ScreenCapturerHelper helper_;
 
   // Image of the last cursor that we sent to the client.
   base::mac::ScopedCFTypeRef<CGImageRef> current_cursor_;
 
   // Contains an invalid region from the previous capture.
-  SkRegion last_invalid_region_;
+  webrtc::DesktopRegion last_invalid_region_;
 
   // Used to ensure that frame captures do not take place while displays
   // are being reconfigured.
   base::WaitableEvent display_configuration_capture_event_;
 
   // Records the Ids of attached displays which are being reconfigured.
   // Accessed on the thread on which we are notified of display events.
   std::set<CGDirectDisplayID> reconfiguring_displays_;
 
   // Power management assertion to prevent the screen from sleeping.
   IOPMAssertionID power_assertion_id_display_;
 
   // Power management assertion to indicate that the user is active.
   IOPMAssertionID power_assertion_id_user_;
 
   // Dynamically link to deprecated APIs for Mac OS X 10.6 support.
   base::ScopedNativeLibrary app_services_library_;
   CGDisplayBaseAddressFunc cg_display_base_address_;
   CGDisplayBytesPerRowFunc cg_display_bytes_per_row_;
   CGDisplayBitsPerPixelFunc cg_display_bits_per_pixel_;
   base::ScopedNativeLibrary opengl_library_;
   CGLSetFullScreenFunc cgl_set_full_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenCapturerMac);
 };
 
-ScreenCaptureFrameMac::ScreenCaptureFrameMac(
+scoped_ptr<webrtc::DesktopFrame> CreateFrame(
     const MacDesktopConfiguration& desktop_config) {
-  SkISize size = SkISize::Make(desktop_config.pixel_bounds.width(),
-                               desktop_config.pixel_bounds.height());
-  set_bytes_per_row(size.width() * sizeof(uint32_t));
-  set_dimensions(size);
 
-  size_t buffer_size = size.width() * size.height() * sizeof(uint32_t);
-  data_.reset(new  uint8[buffer_size]);
-  set_pixels(data_.get());
+  webrtc::DesktopSize size(desktop_config.pixel_bounds.width(),
+                           desktop_config.pixel_bounds.height());
+  scoped_ptr<webrtc::DesktopFrame> frame(new webrtc::BasicDesktopFrame(size));
 
-  dpi_ = SkIPoint::Make(kStandardDPI * desktop_config.dip_to_pixel_scale,
-                        kStandardDPI * desktop_config.dip_to_pixel_scale);
-}
-
-ScreenCaptureFrameMac::~ScreenCaptureFrameMac() {
+  frame->set_dpi(webrtc::DesktopVector(
+      kStandardDPI * desktop_config.dip_to_pixel_scale,
+      kStandardDPI * desktop_config.dip_to_pixel_scale));
+  return frame.Pass();
 }
 
 ScreenCapturerMac::ScreenCapturerMac()
-    : delegate_(NULL),
+    : callback_(NULL),
+      mouse_shape_observer_(NULL),
       cgl_context_(NULL),
       display_configuration_capture_event_(false, true),
       power_assertion_id_display_(kIOPMNullAssertionID),
       power_assertion_id_user_(kIOPMNullAssertionID),
       cg_display_base_address_(NULL),
       cg_display_bytes_per_row_(NULL),
       cg_display_bits_per_pixel_(NULL),
-      cgl_set_full_screen_(NULL)
-{
+      cgl_set_full_screen_(NULL) {
 }
 
 ScreenCapturerMac::~ScreenCapturerMac() {
   if (power_assertion_id_display_ != kIOPMNullAssertionID) {
     IOPMAssertionRelease(power_assertion_id_display_);
     power_assertion_id_display_ = kIOPMNullAssertionID;
   }
   if (power_assertion_id_user_ != kIOPMNullAssertionID) {
     IOPMAssertionRelease(power_assertion_id_user_);
     power_assertion_id_user_ = kIOPMNullAssertionID;
@@ skipping 29 matching lines @@
     pixel_buffer_object_.Release();
     CGLDestroyContext(cgl_context_);
     cgl_context_ = NULL;
   }
   // The buffers might be in use by the encoder, so don't delete them here.
   // Instead, mark them as "needs update"; next time the buffers are used by
   // the capturer, they will be recreated if necessary.
   queue_.SetAllFramesNeedUpdate();
 }
 
-void ScreenCapturerMac::Start(Delegate* delegate) {
-  DCHECK(delegate_ == NULL);
+void ScreenCapturerMac::Start(Callback* callback) {
+  DCHECK(callback_ == NULL);

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: DCHECK(!callback_);

Add DCHECK(callback);

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

 
-  delegate_ = delegate;
+  callback_ = callback;
 
   // Create power management assertions to wake the display and prevent it from
   // going to sleep on user idle.
   // TODO(jamiewalch): Use IOPMAssertionDeclareUserActivity on 10.7.3 and above
   //                   instead of the following two assertions.
   IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep,
                               kIOPMAssertionLevelOn,
                               CFSTR("Chrome Remote Desktop connection active"),
                               &power_assertion_id_display_);
   // This assertion ensures that the display is woken up if it  already asleep
   // (as used by Apple Remote Desktop).
   IOPMAssertionCreateWithName(CFSTR("UserIsActive"),
                               kIOPMAssertionLevelOn,
                               CFSTR("Chrome Remote Desktop connection active"),
                               &power_assertion_id_user_);
 }
 
-void ScreenCapturerMac::CaptureFrame() {
-  // Only allow captures when the display configuration is not occurring.
-  scoped_refptr<ScreenCaptureData> data;
-
+void ScreenCapturerMac::Capture(
+    const webrtc::DesktopRegion& region_to_capture) {
   base::Time capture_start_time = base::Time::Now();
 
   // Wait until the display configuration is stable. If one or more displays
   // are reconfiguring then |display_configuration_capture_event_| will not be
   // set until the reconfiguration completes.
   // TODO(wez): Replace this with an early-exit (See crbug.com/104542).
   CHECK(display_configuration_capture_event_.TimedWait(
       base::TimeDelta::FromSeconds(
           kDisplayConfigurationEventTimeoutInSeconds)));
 
-  SkRegion region;
+  webrtc::DesktopRegion region;
   helper_.SwapInvalidRegion(&region);
 
   // If the current buffer is from an older generation then allocate a new one.
   // Note that we can't reallocate other buffers at this point, since the caller
   // may still be reading from them.
-  if (queue_.current_frame_needs_update()) {
-    scoped_ptr<ScreenCaptureFrameMac> buffer(
-        new ScreenCaptureFrameMac(desktop_config_));
-    queue_.ReplaceCurrentFrame(buffer.PassAs<ScreenCaptureFrame>());
-  }
+  if (queue_.current_frame_needs_update())
+    queue_.ReplaceCurrentFrame(CreateFrame(desktop_config_));
 
-  ScreenCaptureFrame* current_buffer = queue_.current_frame();
+  webrtc::DesktopFrame* current_frame = queue_.current_frame();
 
   bool flip = false;  // GL capturers need flipping.
   if (base::mac::IsOSLionOrLater()) {
     // Lion requires us to use their new APIs for doing screen capture. These
     // APIS currently crash on 10.6.8 if there is no monitor attached.
-    CgBlitPostLion(*current_buffer, region);
+    CgBlitPostLion(*current_frame, region);
   } else if (cgl_context_) {
     flip = true;
     if (pixel_buffer_object_.get() != 0) {
-      GlBlitFast(*current_buffer, region);
+      GlBlitFast(*current_frame, region);
     } else {
       // See comment in ScopedPixelBufferObject::Init about why the slow
       // path is always used on 10.5.
-      GlBlitSlow(*current_buffer);
+      GlBlitSlow(*current_frame);
     }
   } else {
-    CgBlitPreLion(*current_buffer, region);
+    CgBlitPreLion(*current_frame, region);
   }
 
-  uint8* buffer = current_buffer->pixels();
-  int stride = current_buffer->bytes_per_row();
+  uint8* buffer = current_frame->data();
+  int stride = current_frame->stride();
   if (flip) {
     stride = -stride;
-    buffer += (current_buffer->dimensions().height() - 1) *
-        current_buffer->bytes_per_row();
+    buffer += (current_frame->size().height() - 1) *
+        current_frame->stride();
   }
 
-  data = new ScreenCaptureData(buffer, stride, current_buffer->dimensions());
-  data->set_dpi(static_cast<ScreenCaptureFrameMac*>(current_buffer)->dpi());
-  data->mutable_dirty_region() = region;
+  webrtc::DesktopFrame* new_frame = queue_.EmitCurrentFrameAndMoveToNext();
+  *new_frame->mutable_updated_region() = region;
 
-  helper_.set_size_most_recent(data->size());
+  helper_.set_size_most_recent(new_frame->size());
 
   // Signal that we are done capturing data from the display framebuffer,
   // and accessing display structures.
   display_configuration_capture_event_.Signal();
 
-  // Capture the current cursor shape and notify |delegate_| if it has changed.
+  // Capture the current cursor shape and notify |callback_| if it has changed.
   CaptureCursor();
 
-  // Move the capture frame buffer queue on to the next buffer.
-  queue_.DoneWithCurrentFrame();
+  new_frame->set_capture_time_ms(
+      (base::Time::Now() - capture_start_time).InMillisecondsRoundedUp());
+  callback_->OnCaptureCompleted(new_frame);
+}
 
-  data->set_capture_time_ms(
-      (base::Time::Now() - capture_start_time).InMillisecondsRoundedUp());
-  delegate_->OnCaptureCompleted(data);
+void ScreenCapturerMac::SetMouseShapeObserver(
+      MouseShapeObserver* mouse_shape_observer) {
+  mouse_shape_observer_ = mouse_shape_observer;

[alexeypa (please no reviews), 2013/04/26 21:33:58]

DCHECK(!mouse_shape_observer_);
DCHECK(mouse_shape_observer);

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

 }
 
 void ScreenCapturerMac::CaptureCursor() {
   NSCursor* cursor = [NSCursor currentSystemCursor];
   if (cursor == nil) {
     return;
   }
 
   NSImage* nsimage = [cursor image];
   NSPoint hotspot = [cursor hotSpot];
@@ skipping 55 matching lines @@
       reinterpret_cast<const char*>(CFDataGetBytePtr(image_data_ref));
   int data_size = CFDataGetLength(image_data_ref);
 
   // Create a MouseCursorShape that describes the cursor and pass it to
   // the client.
   scoped_ptr<MouseCursorShape> cursor_shape(new MouseCursorShape());
   cursor_shape->size.set(size.width, size.height);
   cursor_shape->hotspot.set(hotspot.x, hotspot.y);
   cursor_shape->data.assign(cursor_src_data, cursor_src_data + data_size);
 
-  delegate_->OnCursorShapeChanged(cursor_shape.Pass());
+  if (mouse_shape_observer_)

[alexeypa (please no reviews), 2013/04/26 21:33:58]

Can it be NULL? Will it be better to force it to be not NULL and ignore the
passed shape in the callback?

[Sergey Ulanov, 2013/05/07 22:25:50]

Yes. The caller doesn't always care about mouse shape.

+    mouse_shape_observer_->OnCursorShapeChanged(cursor_shape.Pass());
 }
 
-void ScreenCapturerMac::GlBlitFast(const ScreenCaptureFrame& buffer,
-                                       const SkRegion& region) {
-  const int buffer_height = buffer.dimensions().height();
-  const int buffer_width = buffer.dimensions().width();
-
+void ScreenCapturerMac::GlBlitFast(const webrtc::DesktopFrame& frame,
+                                   const webrtc::DesktopRegion& region) {
   // Clip to the size of our current screen.
-  SkIRect clip_rect = SkIRect::MakeWH(buffer_width, buffer_height);
+  webrtc::DesktopRect clip_rect = webrtc::DesktopRect::MakeSize(frame.size());
   if (queue_.previous_frame()) {
     // We are doing double buffer for the capture data so we just need to copy
     // the invalid region from the previous capture in the current buffer.
     // TODO(hclam): We can reduce the amount of copying here by subtracting
     // |capturer_helper_|s region from |last_invalid_region_|.
     // http://crbug.com/92354
 
     // Since the image obtained from OpenGL is upside-down, need to do some
     // magic here to copy the correct rectangle.
-    const int y_offset = (buffer_height - 1) * buffer.bytes_per_row();
-    for(SkRegion::Iterator i(last_invalid_region_); !i.done(); i.next()) {
-      SkIRect copy_rect = i.rect();
-      if (copy_rect.intersect(clip_rect)) {
-        CopyRect(queue_.previous_frame()->pixels() + y_offset,
-                 -buffer.bytes_per_row(),
-                 buffer.pixels() + y_offset,
-                 -buffer.bytes_per_row(),
-                 4,  // Bytes for pixel for RGBA.
+    const int y_offset = (frame.size().width() - 1) * frame.stride();
+    for (webrtc::DesktopRegion::Iterator i(last_invalid_region_);
+         !i.IsAtEnd(); i.Advance()) {
+      webrtc::DesktopRect copy_rect = i.rect();

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: Make |copy_rect| a const reference?

[Sergey Ulanov, 2013/05/07 22:25:50]

It's mutated below.

+      copy_rect.IntersectWith(clip_rect);
+      if (!copy_rect.is_empty()) {
+        CopyRect(queue_.previous_frame()->data() + y_offset,
+                 -frame.stride(),
+                 frame.data() + y_offset,
+                 -frame.stride(),
+                 webrtc::DesktopFrame::kBytesPerPixel,
                  copy_rect);
       }
     }
   }
   last_invalid_region_ = region;
 
   CGLContextObj CGL_MACRO_CONTEXT = cgl_context_;
   glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pixel_buffer_object_.get());
-  glReadPixels(0, 0, buffer_width, buffer_height, GL_BGRA, GL_UNSIGNED_BYTE, 0);
+  glReadPixels(0, 0, frame.size().height(), frame.size().width(), GL_BGRA,

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: This call seems to assume that frame.stride() == frame.size().width() * 4.
IT might be worth mentioning this in webrtc::DesktopFrameBasic's description.

[Sergey Ulanov, 2013/05/07 22:25:50]

Yes, but it has be done in a separate CL in webrtc.

+               GL_UNSIGNED_BYTE, 0);
   GLubyte* ptr = static_cast<GLubyte*>(
       glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB));
   if (ptr == NULL) {
     // If the buffer can't be mapped, assume that it's no longer valid and
     // release it.
     pixel_buffer_object_.Release();
   } else {
     // Copy only from the dirty rects. Since the image obtained from OpenGL is
     // upside-down we need to do some magic here to copy the correct rectangle.
-    const int y_offset = (buffer_height - 1) * buffer.bytes_per_row();
-    for(SkRegion::Iterator i(region); !i.done(); i.next()) {
-      SkIRect copy_rect = i.rect();
-      if (copy_rect.intersect(clip_rect)) {
+    const int y_offset = (frame.size().width() - 1) * frame.stride();
+    for (webrtc::DesktopRegion::Iterator i(region);
+         !i.IsAtEnd(); i.Advance()) {
+      webrtc::DesktopRect copy_rect = i.rect();

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: Make |copy_rect| a const reference?

[Sergey Ulanov, 2013/05/07 22:25:50]

see my previous comment.

+      copy_rect.IntersectWith(clip_rect);
+      if (!copy_rect.is_empty()) {
         CopyRect(ptr + y_offset,
-           -buffer.bytes_per_row(),
-           buffer.pixels() + y_offset,
-           -buffer.bytes_per_row(),
-           4,  // Bytes for pixel for RGBA.
-           copy_rect);
+                 -frame.stride(),
+                 frame.data() + y_offset,
+                 -frame.stride(),
+                 webrtc::DesktopFrame::kBytesPerPixel,
+                 copy_rect);
       }
     }
   }
   if (!glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB)) {
     // If glUnmapBuffer returns false, then the contents of the data store are
     // undefined. This might be because the screen mode has changed, in which
     // case it will be recreated in ScreenConfigurationChanged, but releasing
     // the object here is the best option. Capturing will fall back on
     // GlBlitSlow until such time as the pixel buffer object is recreated.
     pixel_buffer_object_.Release();
   }
   glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
 }
 
-void ScreenCapturerMac::GlBlitSlow(const ScreenCaptureFrame& buffer) {
+void ScreenCapturerMac::GlBlitSlow(const webrtc::DesktopFrame& frame) {
   CGLContextObj CGL_MACRO_CONTEXT = cgl_context_;
   glReadBuffer(GL_FRONT);
   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
   glPixelStorei(GL_PACK_ALIGNMENT, 4);  // Force 4-byte alignment.
   glPixelStorei(GL_PACK_ROW_LENGTH, 0);
   glPixelStorei(GL_PACK_SKIP_ROWS, 0);
   glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
   // Read a block of pixels from the frame buffer.
-  glReadPixels(0, 0, buffer.dimensions().width(), buffer.dimensions().height(),
-               GL_BGRA, GL_UNSIGNED_BYTE, buffer.pixels());
+  glReadPixels(0, 0, frame.size().width(), frame.size().height(),
+               GL_BGRA, GL_UNSIGNED_BYTE, frame.data());
   glPopClientAttrib();
 }
 
-void ScreenCapturerMac::CgBlitPreLion(const ScreenCaptureFrame& buffer,
-                                          const SkRegion& region) {
-  const int buffer_height = buffer.dimensions().height();
-
+void ScreenCapturerMac::CgBlitPreLion(const webrtc::DesktopFrame& frame,
+                                      const webrtc::DesktopRegion& region) {
   // Copy the entire contents of the previous capture buffer, to capture over.
   // TODO(wez): Get rid of this as per crbug.com/145064, or implement
   // crbug.com/92354.
   if (queue_.previous_frame()) {
-    memcpy(buffer.pixels(),
-           queue_.previous_frame()->pixels(),
-           buffer.bytes_per_row() * buffer_height);
+    memcpy(frame.data(),
+           queue_.previous_frame()->data(),
+           frame.stride() * frame.size().width());

[alexeypa (please no reviews), 2013/04/26 21:33:58]

width() -> height()

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

   }
 
   for (size_t i = 0; i < desktop_config_.displays.size(); ++i) {
     const MacDisplayConfiguration& display_config = desktop_config_.displays[i];
 
     // Use deprecated APIs to determine the display buffer layout.
     DCHECK(cg_display_base_address_ && cg_display_bytes_per_row_ &&
         cg_display_bits_per_pixel_);
     uint8* display_base_address =
       reinterpret_cast<uint8*>((*cg_display_base_address_)(display_config.id));
     CHECK(display_base_address);
     int src_bytes_per_row = (*cg_display_bytes_per_row_)(display_config.id);
     int src_bytes_per_pixel =
         (*cg_display_bits_per_pixel_)(display_config.id) / 8;
 
     // Determine the display's position relative to the desktop, in pixels.
-    SkIRect display_bounds = display_config.pixel_bounds;
-    display_bounds.offset(-desktop_config_.pixel_bounds.left(),
-                          -desktop_config_.pixel_bounds.top());
+    webrtc::DesktopRect display_bounds = display_config.pixel_bounds;
+    display_bounds.Translate(-desktop_config_.pixel_bounds.left(),
+                             -desktop_config_.pixel_bounds.top());
 
     // Determine which parts of the blit region, if any, lay within the monitor.
-    SkRegion copy_region;
-    if (!copy_region.op(region, display_bounds, SkRegion::kIntersect_Op))
+    webrtc::DesktopRegion copy_region;
+    copy_region.IntersectWith(display_bounds);
+    if (copy_region.is_empty())

[alexeypa (please no reviews), 2013/04/26 21:33:58]

This will always be true because an empty |copy_region| is intersected with
another region. You need to assign |region| to |copy_region| first.

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

       continue;
 
     // Translate the region to be copied into display-relative coordinates.
-    copy_region.translate(-display_bounds.left(), -display_bounds.top());
+    copy_region.Translate(-display_bounds.left(), -display_bounds.top());
 
     // Calculate where in the output buffer the display's origin is.
-    uint8* out_ptr = buffer.pixels() +
+    uint8* out_ptr = frame.data() +
          (display_bounds.left() * src_bytes_per_pixel) +
-         (display_bounds.top() * buffer.bytes_per_row());
+         (display_bounds.top() * frame.stride());
 
     // Copy the dirty region from the display buffer into our desktop buffer.
-    for(SkRegion::Iterator i(copy_region); !i.done(); i.next()) {
+    for (webrtc::DesktopRegion::Iterator i(copy_region);
+         !i.IsAtEnd(); i.Advance()) {
       CopyRect(display_base_address,
                src_bytes_per_row,
                out_ptr,
-               buffer.bytes_per_row(),
+               frame.stride(),
                src_bytes_per_pixel,
                i.rect());
     }
   }
 }
 
-void ScreenCapturerMac::CgBlitPostLion(const ScreenCaptureFrame& buffer,
-                                       const SkRegion& region) {
-  const int buffer_height = buffer.dimensions().height();
-
+void ScreenCapturerMac::CgBlitPostLion(const webrtc::DesktopFrame& frame,
+                                       const webrtc::DesktopRegion& region) {
   // Copy the entire contents of the previous capture buffer, to capture over.
   // TODO(wez): Get rid of this as per crbug.com/145064, or implement
   // crbug.com/92354.
   if (queue_.previous_frame()) {
-    memcpy(buffer.pixels(),
-           queue_.previous_frame()->pixels(),
-           buffer.bytes_per_row() * buffer_height);
+    memcpy(frame.data(),
+           queue_.previous_frame()->data(),
+           frame.stride() * frame.size().width());

[alexeypa (please no reviews), 2013/04/26 21:33:58]

width() -> height().

[Sergey Ulanov, 2013/05/07 22:25:50]

Thanks for catching it!

   }
 
   for (size_t i = 0; i < desktop_config_.displays.size(); ++i) {
     const MacDisplayConfiguration& display_config = desktop_config_.displays[i];
 
     // Determine the display's position relative to the desktop, in pixels.
-    SkIRect display_bounds = display_config.pixel_bounds;
-    display_bounds.offset(-desktop_config_.pixel_bounds.left(),
-                          -desktop_config_.pixel_bounds.top());
+    webrtc::DesktopRect display_bounds = display_config.pixel_bounds;
+    display_bounds.Translate(-desktop_config_.pixel_bounds.left(),
+                             -desktop_config_.pixel_bounds.top());
 
     // Determine which parts of the blit region, if any, lay within the monitor.
-    SkRegion copy_region;
-    if (!copy_region.op(region, display_bounds, SkRegion::kIntersect_Op))
+    webrtc::DesktopRegion copy_region = region;
+    copy_region.IntersectWith(display_bounds);
+    if (copy_region.is_empty())

[alexeypa (please no reviews), 2013/04/26 21:33:58]

Same as above.

[Sergey Ulanov, 2013/05/07 22:25:50]

Here copy_region is set to region.

       continue;
 
     // Translate the region to be copied into display-relative coordinates.
-    copy_region.translate(-display_bounds.left(), -display_bounds.top());
+    copy_region.Translate(-display_bounds.left(), -display_bounds.top());
 
     // Create an image containing a snapshot of the display.
     base::mac::ScopedCFTypeRef<CGImageRef> image(
         CGDisplayCreateImage(display_config.id));
     if (image.get() == NULL)
       continue;
 
     // Request access to the raw pixel data via the image's DataProvider.
     CGDataProviderRef provider = CGImageGetDataProvider(image);
     base::mac::ScopedCFTypeRef<CFDataRef> data(
         CGDataProviderCopyData(provider));
     if (data.get() == NULL)
       continue;
 
     const uint8* display_base_address = CFDataGetBytePtr(data);
     int src_bytes_per_row = CGImageGetBytesPerRow(image);
     int src_bytes_per_pixel = CGImageGetBitsPerPixel(image) / 8;
 
     // Calculate where in the output buffer the display's origin is.
-    uint8* out_ptr = buffer.pixels() +
+    uint8* out_ptr = frame.data() +

[alexeypa (please no reviews), 2013/04/26 21:33:58]

This logic can be moved to DesktopFrame itself. The method will return a pointer
to the desired pixel (and DCHECK that the coordinates are in bounds at the same
time). 

[Sergey Ulanov, 2013/05/07 22:25:50]

Maybe, but it's not related to this CL.

         (display_bounds.left() * src_bytes_per_pixel) +
-        (display_bounds.top() * buffer.bytes_per_row());
+        (display_bounds.top() * frame.stride());
 
     // Copy the dirty region from the display buffer into our desktop buffer.
-    for (SkRegion::Iterator i(copy_region); !i.done(); i.next()) {
+    for (webrtc::DesktopRegion::Iterator i(copy_region);
+         !i.IsAtEnd(); i.Advance()) {
       CopyRect(display_base_address,
                src_bytes_per_row,
                out_ptr,
-               buffer.bytes_per_row(),
+               frame.stride(),
                src_bytes_per_pixel,
                i.rect());
     }
   }
 }
 
 void ScreenCapturerMac::ScreenConfigurationChanged() {
   // Release existing buffers, which will be of the wrong size.
   ReleaseBuffers();
 
   // Clear the dirty region, in case the display is down-sizing.
   helper_.ClearInvalidRegion();
 
   // Refresh the cached desktop configuration.
   desktop_config_ = MacDesktopConfiguration::GetCurrent(
       MacDesktopConfiguration::TopLeftOrigin);
 
   // Re-mark the entire desktop as dirty.
   helper_.InvalidateScreen(
-      SkISize::Make(desktop_config_.pixel_bounds.width(),
-                    desktop_config_.pixel_bounds.height()));
+      webrtc::DesktopSize(desktop_config_.pixel_bounds.width(),
+                          desktop_config_.pixel_bounds.height()));
 
   // Make sure the frame buffers will be reallocated.
   queue_.SetAllFramesNeedUpdate();
 
   // CgBlitPostLion uses CGDisplayCreateImage() to snapshot each display's
   // contents. Although the API exists in OS 10.6, it crashes the caller if
   // the machine has no monitor connected, so we fall back to depcreated APIs
   // when running on 10.6.
   if (base::mac::IsOSLionOrLater()) {
     LOG(INFO) << "Using CgBlitPostLion.";
@@ skipping 82 matching lines @@
 
 void ScreenCapturerMac::UnregisterRefreshAndMoveHandlers() {
   CGUnregisterScreenRefreshCallback(
       ScreenCapturerMac::ScreenRefreshCallback, this);
   CGScreenUnregisterMoveCallback(
       ScreenCapturerMac::ScreenUpdateMoveCallback, this);
 }
 
 void ScreenCapturerMac::ScreenRefresh(CGRectCount count,
                                       const CGRect* rect_array) {
-  if (desktop_config_.pixel_bounds.isEmpty()) {
+  if (desktop_config_.pixel_bounds.is_empty())
     return;
-  }
-  SkIRect skirect_array[count];
+
+  webrtc::DesktopRegion region;
 
   for (CGRectCount i = 0; i < count; ++i) {
-    SkRect sk_rect = gfx::CGRectToSkRect(rect_array[i]);
-
     // Convert from Density-Independent Pixel to physical pixel coordinates.
-    sk_rect = ScaleSkRect(sk_rect, desktop_config_.dip_to_pixel_scale);
-    sk_rect.round(&skirect_array[i]);
+    webrtc::DesktopRect rect =
+      ScaleAndRoundCGRect(rect_array[i], desktop_config_.dip_to_pixel_scale);
 
     // Translate from local desktop to capturer framebuffer coordinates.
-    skirect_array[i].offset(-desktop_config_.pixel_bounds.left(),
-                            -desktop_config_.pixel_bounds.top());
+    rect = TranslateRect(rect,

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: use DesktopRect::Translate() here

[Sergey Ulanov, 2013/05/07 22:25:50]

Done.

+                         -desktop_config_.pixel_bounds.left(),
+                         -desktop_config_.pixel_bounds.top());
+
+    region.AddRect(rect);
   }
 
-  SkRegion region;
-  region.setRects(skirect_array, count);

[alexeypa (please no reviews), 2013/04/26 21:33:58]

nit: SkRegion::setRects can be more optimal than adding rectangles in a loop.
How about adding SetRects to DesktopRegion? 

[Sergey Ulanov, 2013/05/07 22:25:50]

in skia setRects() is not faster - in fact it just calls op() for each rect, and
I doubt that it can actually be optimized to work faster.

   helper_.InvalidateRegion(region);
 }
 
 void ScreenCapturerMac::ScreenUpdateMove(CGScreenUpdateMoveDelta delta,
                                              size_t count,
                                              const CGRect* rect_array) {
   // Translate |rect_array| to identify the move's destination.
   CGRect refresh_rects[count];
   for (CGRectCount i = 0; i < count; ++i) {
     refresh_rects[i] = CGRectOffset(rect_array[i], delta.dX, delta.dY);
@@ skipping 28 matching lines @@
       // the reconfiguration handler itself).
       UnregisterRefreshAndMoveHandlers();
       RegisterRefreshAndMoveHandlers();
       ScreenConfigurationChanged();
       display_configuration_capture_event_.Signal();
     }
   }
 }
 
 void ScreenCapturerMac::ScreenRefreshCallback(CGRectCount count,
-                                                  const CGRect* rect_array,
-                                                  void* user_parameter) {
+                                              const CGRect* rect_array,
+                                              void* user_parameter) {
   ScreenCapturerMac* capturer = reinterpret_cast<ScreenCapturerMac*>(
       user_parameter);
-  if (capturer->desktop_config_.pixel_bounds.isEmpty()) {
+  if (capturer->desktop_config_.pixel_bounds.is_empty()) {
     capturer->ScreenConfigurationChanged();
   }
   capturer->ScreenRefresh(count, rect_array);
 }
 
 void ScreenCapturerMac::ScreenUpdateMoveCallback(
     CGScreenUpdateMoveDelta delta,
     size_t count,
     const CGRect* rect_array,
     void* user_parameter) {
   ScreenCapturerMac* capturer = reinterpret_cast<ScreenCapturerMac*>(
       user_parameter);
   capturer->ScreenUpdateMove(delta, count, rect_array);
 }
 
 void ScreenCapturerMac::DisplaysReconfiguredCallback(
     CGDirectDisplayID display,
     CGDisplayChangeSummaryFlags flags,
     void* user_parameter) {
   ScreenCapturerMac* capturer = reinterpret_cast<ScreenCapturerMac*>(
       user_parameter);
   capturer->DisplaysReconfigured(display, flags);
 }
 
 }  // namespace
 
-scoped_refptr<SharedBuffer> ScreenCapturer::Delegate::CreateSharedBuffer(
-    uint32 size) {
-  return scoped_refptr<SharedBuffer>();
-}
-
-void ScreenCapturer::Delegate::ReleaseSharedBuffer(
-    scoped_refptr<SharedBuffer> buffer) {
-}
-
 // static
 scoped_ptr<ScreenCapturer> ScreenCapturer::Create() {
   scoped_ptr<ScreenCapturerMac> capturer(new ScreenCapturerMac());
   if (!capturer->Init())
     capturer.reset();
   return capturer.PassAs<ScreenCapturer>();
 }
 
 }  // namespace media