Revert 96327 - Switch over to using SkRegions to calculate dirty areas.

remoting/host/capturer_win.cc

 // Copyright (c) 2011 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/host/capturer.h"
 
 #include <windows.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "remoting/host/capturer_helper.h"
 #include "remoting/host/differ.h"
+#include "ui/gfx/rect.h"
 
 namespace remoting {
 
 namespace {
 
 // CapturerGdi captures 32bit RGB using GDI.
 //
 // CapturerGdi is double-buffered as required by Capturer. See
 // remoting/host/capturer.h.
 class CapturerGdi : public Capturer {
  public:
   CapturerGdi();
   virtual ~CapturerGdi();
 
   // Capturer interface.
   virtual void ScreenConfigurationChanged() OVERRIDE;
   virtual media::VideoFrame::Format pixel_format() const OVERRIDE;
-  virtual void ClearInvalidRegion() OVERRIDE;
-  virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
+  virtual void ClearInvalidRects() OVERRIDE;
+  virtual void InvalidateRects(const InvalidRects& inval_rects) OVERRIDE;
   virtual void InvalidateScreen(const gfx::Size& size) OVERRIDE;
   virtual void InvalidateFullScreen() OVERRIDE;
-  virtual void CaptureInvalidRegion(CaptureCompletedCallback* callback)
-      OVERRIDE;
+  virtual void CaptureInvalidRects(CaptureCompletedCallback* callback) OVERRIDE;
   virtual const gfx::Size& size_most_recent() const OVERRIDE;
 
  private:
   struct VideoFrameBuffer {
     VideoFrameBuffer(void* data, const gfx::Size& size, int bytes_per_pixel,
                      int bytes_per_row)
       : data(data), size(size), bytes_per_pixel(bytes_per_pixel),
         bytes_per_row(bytes_per_row) {
     }
     VideoFrameBuffer() {
       data = 0;
       size = gfx::Size(0, 0);
       bytes_per_pixel = 0;
       bytes_per_row = 0;
     }
     void* data;
     gfx::Size size;
     int bytes_per_pixel;
     int bytes_per_row;
   };
 
   // Make sure that the current buffer has the same size as the screen.
   void UpdateBufferCapture(const gfx::Size& size);
 
   // Allocate memory for a buffer of a given size, freeing any memory previously
   // allocated for that buffer.
   void ReallocateBuffer(int buffer_index, const gfx::Size& size);
 
-  void CalculateInvalidRegion();
-  void CaptureRegion(const SkRegion& region,
-                     CaptureCompletedCallback* callback);
+  void CalculateInvalidRects();
+  void CaptureRects(const InvalidRects& rects,
+                    CaptureCompletedCallback* callback);
 
   void ReleaseBuffers();
   // Generates an image in the current buffer.
   void CaptureImage();
 
   // Gets the current screen size and calls ScreenConfigurationChanged
   // if the screen size has changed.
   void MaybeChangeScreenConfiguration();
 
   // Gets the screen size.
   gfx::Size GetScreenSize();
 
   // A thread-safe list of invalid rectangles, and the size of the most
   // recently captured screen.
-  CapturerHelper helper_;
+  CapturerHelper helper;
 
   // There are two buffers for the screen images, as required by Capturer.
   static const int kNumBuffers = 2;
   VideoFrameBuffer buffers_[kNumBuffers];
 
   // Gdi specific information about screen.
   HDC desktop_dc_;
   HDC memory_dc_;
   HBITMAP target_bitmap_[kNumBuffers];
 
@@ skipping 34 matching lines @@
 }
 
 CapturerGdi::~CapturerGdi() {
   ReleaseBuffers();
 }
 
 media::VideoFrame::Format CapturerGdi::pixel_format() const {
   return pixel_format_;
 }
 
-void CapturerGdi::ClearInvalidRegion() {
-  helper_.ClearInvalidRegion();
+void CapturerGdi::ClearInvalidRects() {
+  helper.ClearInvalidRects();
 }
 
-void CapturerGdi::InvalidateRegion(const SkRegion& invalid_region) {
-  helper_.InvalidateRegion(invalid_region);
+void CapturerGdi::InvalidateRects(const InvalidRects& inval_rects) {
+  helper.InvalidateRects(inval_rects);
 }
 
 void CapturerGdi::InvalidateScreen(const gfx::Size& size) {
-  helper_.InvalidateScreen(size);
+  helper.InvalidateScreen(size);
 }
 
 void CapturerGdi::InvalidateFullScreen() {
-  helper_.InvalidateFullScreen();
+  helper.InvalidateFullScreen();
 }
 
-void CapturerGdi::CaptureInvalidRegion(CaptureCompletedCallback* callback) {
-  CalculateInvalidRegion();
-  SkRegion invalid_region;
-  helper_.SwapInvalidRegion(&invalid_region);
-  CaptureRegion(invalid_region, callback);
+void CapturerGdi::CaptureInvalidRects(CaptureCompletedCallback* callback) {
+  CalculateInvalidRects();
+  InvalidRects inval_rects;
+  helper.SwapInvalidRects(inval_rects);
+  CaptureRects(inval_rects, callback);
 }
 
 const gfx::Size& CapturerGdi::size_most_recent() const {
-  return helper_.size_most_recent();
+  return helper.size_most_recent();
 }
 
 void CapturerGdi::ReleaseBuffers() {
   for (int i = kNumBuffers - 1; i >= 0; i--) {
     if (target_bitmap_[i]) {
       DeleteObject(target_bitmap_[i]);
       target_bitmap_[i] = NULL;
     }
     if (buffers_[i].data) {
       DeleteObject(buffers_[i].data);
@@ skipping 66 matching lines @@
       CreateDIBSection(desktop_dc_, &bmi, DIB_RGB_COLORS,
                        static_cast<void**>(&buffers_[buffer_index].data),
                        NULL, 0);
   buffers_[buffer_index].size = gfx::Size(bmi.bmiHeader.biWidth,
                                           std::abs(bmi.bmiHeader.biHeight));
   buffers_[buffer_index].bytes_per_pixel = bmi.bmiHeader.biBitCount / 8;
   buffers_[buffer_index].bytes_per_row =
       bmi.bmiHeader.biSizeImage / std::abs(bmi.bmiHeader.biHeight);
 }
 
-void CapturerGdi::CalculateInvalidRegion() {
+void CapturerGdi::CalculateInvalidRects() {
   CaptureImage();
 
   const VideoFrameBuffer& current = buffers_[current_buffer_];
-  if (helper_.IsCaptureFullScreen(current.size))
+  if (helper.IsCaptureFullScreen(current.size))
     capture_fullscreen_ = true;
 
   if (capture_fullscreen_) {
     InvalidateScreen(current.size);
     capture_fullscreen_ = false;
     return;
   }
 
   // Find the previous and current screens.
   int prev_buffer_id = current_buffer_ - 1;
@@ skipping 14 matching lines @@
   // current screens.
   if (!differ_.get() ||
       (differ_->width() != current.size.width()) ||
       (differ_->height() != current.size.height()) ||
       (differ_->bytes_per_pixel() != current.bytes_per_pixel) ||
       (differ_->bytes_per_row() != current.bytes_per_row)) {
     differ_.reset(new Differ(current.size.width(), current.size.height(),
       current.bytes_per_pixel, current.bytes_per_row));
   }
 
-  SkRegion region;
-  differ_->CalcDirtyRegion(prev.data, current.data, &region);
+  InvalidRects rects;
+  differ_->CalcDirtyRects(prev.data, current.data, &rects);
 
-  InvalidateRegion(region);
+  InvalidateRects(rects);
 }
 
-void CapturerGdi::CaptureRegion(const SkRegion& region,
-                                CaptureCompletedCallback* callback) {
+void CapturerGdi::CaptureRects(const InvalidRects& rects,
+                               CaptureCompletedCallback* callback) {
   scoped_ptr<CaptureCompletedCallback> callback_deleter(callback);
 
   const VideoFrameBuffer& buffer = buffers_[current_buffer_];
   current_buffer_ = (current_buffer_ + 1) % kNumBuffers;
 
   DataPlanes planes;
   planes.data[0] = static_cast<uint8*>(buffer.data);
   planes.strides[0] = buffer.bytes_per_row;
 
   scoped_refptr<CaptureData> data(new CaptureData(planes,
                                                   buffer.size,
                                                   pixel_format_));
-  data->mutable_dirty_region() = region;
+  data->mutable_dirty_rects() = rects;
 
-  helper_.set_size_most_recent(data->size());
+  helper.set_size_most_recent(data->size());
 
   callback->Run(data);
 }
 
 void CapturerGdi::CaptureImage() {
   // Make sure the structures we use to capture the image have the correct size.
   UpdateBufferCapture(GetScreenSize());
 
   // Select the target bitmap into the memory dc.
   SelectObject(memory_dc_, target_bitmap_[current_buffer_]);
@@ skipping 10 matching lines @@
 }
 
 }  // namespace
 
 // static
 Capturer* Capturer::Create() {
   return new CapturerGdi();
 }
 
 }  // namespace remoting