Move screen capturers to remoting/capturer.

remoting/host/video_frame_capturer_win.cc

Index: remoting/host/video_frame_capturer_win.cc
diff --git a/remoting/host/video_frame_capturer_win.cc b/remoting/host/video_frame_capturer_win.cc
deleted file mode 100644
index 65a3c196792a84f9397f879cac75fb3496900663..0000000000000000000000000000000000000000
--- a/remoting/host/video_frame_capturer_win.cc
+++ /dev/null
@@ -1,627 +0,0 @@
-// 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 "remoting/host/video_frame_capturer.h"
-
-#include <windows.h>
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/file_path.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/scoped_native_library.h"
-#include "base/time.h"
-#include "base/utf_string_conversions.h"
-#include "base/win/scoped_gdi_object.h"
-#include "base/win/scoped_hdc.h"
-#include "remoting/base/capture_data.h"
-#include "remoting/base/shared_buffer_factory.h"
-#include "remoting/host/differ.h"
-#include "remoting/host/video_frame.h"
-#include "remoting/host/video_frame_capturer_helper.h"
-#include "remoting/host/video_frame_queue.h"
-#include "remoting/host/win/desktop.h"
-#include "remoting/host/win/scoped_thread_desktop.h"
-#include "remoting/proto/control.pb.h"
-#include "third_party/skia/include/core/SkColorPriv.h"
-
-namespace remoting {
-
-namespace {
-
-// Constants from dwmapi.h.
-const UINT DWM_EC_DISABLECOMPOSITION = 0;
-const UINT DWM_EC_ENABLECOMPOSITION = 1;
-
-typedef HRESULT (WINAPI * DwmEnableCompositionFunc)(UINT);
-
-const char kDwmapiLibraryName[] = "dwmapi";
-
-// Pixel colors used when generating cursor outlines.
-const uint32 kPixelBgraBlack = 0xff000000;
-const uint32 kPixelBgraWhite = 0xffffffff;
-const uint32 kPixelBgraTransparent = 0x00000000;
-
-// A class representing a full-frame pixel buffer.
-class VideoFrameWin : public VideoFrame {
- public:
-  VideoFrameWin(HDC desktop_dc, const SkISize& size,
-                SharedBufferFactory* shared_buffer_factory);
-  virtual ~VideoFrameWin();
-
-  // Returns handle of the device independent bitmap representing this frame
-  // buffer to GDI.
-  HBITMAP GetBitmap();
-
- private:
-  // Allocates a device independent bitmap representing this frame buffer to
-  // GDI.
-  void AllocateBitmap(HDC desktop_dc, const SkISize& size);
-
-  // Handle of the device independent bitmap representing this frame buffer to
-  // GDI.
-  base::win::ScopedBitmap bitmap_;
-
-  // Used to allocate shared memory buffers if set.
-  SharedBufferFactory* shared_buffer_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(VideoFrameWin);
-};
-
-// VideoFrameCapturerWin captures 32bit RGB using GDI.
-//
-// VideoFrameCapturerWin is double-buffered as required by VideoFrameCapturer.
-// See remoting/host/video_frame_capturer.h.
-class VideoFrameCapturerWin : public VideoFrameCapturer {
- public:
-  VideoFrameCapturerWin();
-  explicit VideoFrameCapturerWin(SharedBufferFactory* shared_buffer_factory);
-  virtual ~VideoFrameCapturerWin();
-
-  // Overridden from VideoFrameCapturer:
-  virtual void Start(Delegate* delegate) OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual media::VideoFrame::Format pixel_format() const OVERRIDE;
-  virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
-  virtual void CaptureFrame() OVERRIDE;
-  virtual const SkISize& size_most_recent() const OVERRIDE;
-
- private:
-  // Make sure that the device contexts match the screen configuration.
-  void PrepareCaptureResources();
-
-  // Creates a CaptureData instance wrapping the current framebuffer and
-  // notifies |delegate_|.
-  void CaptureRegion(const SkRegion& region,
-                     const base::Time& capture_start_time);
-
-  // Captures the current screen contents into the current buffer.
-  void CaptureImage();
-
-  // Expand the cursor shape to add a white outline for visibility against
-  // dark backgrounds.
-  void AddCursorOutline(int width, int height, uint32* dst);
-
-  // Capture the current cursor shape.
-  void CaptureCursor();
-
-  // Used to allocate shared memory buffers if set.
-  SharedBufferFactory* shared_buffer_factory_;
-
-  Delegate* delegate_;
-
-  // A thread-safe list of invalid rectangles, and the size of the most
-  // recently captured screen.
-  VideoFrameCapturerHelper helper_;
-
-  // Snapshot of the last cursor bitmap we sent to the client. This is used
-  // to diff against the current cursor so we only send a cursor-change
-  // message when the shape has changed.
-  scoped_array<uint8> last_cursor_;
-  SkISize last_cursor_size_;
-
-  ScopedThreadDesktop desktop_;
-
-  // GDI resources used for screen capture.
-  scoped_ptr<base::win::ScopedGetDC> desktop_dc_;
-  base::win::ScopedCreateDC memory_dc_;
-
-  // Queue of the frames buffers.
-  VideoFrameQueue queue_;
-
-  // Rectangle describing the bounds of the desktop device context.
-  SkIRect desktop_dc_rect_;
-
-  // Format of pixels returned in buffer.
-  media::VideoFrame::Format pixel_format_;
-
-  // Class to calculate the difference between two screen bitmaps.
-  scoped_ptr<Differ> differ_;
-
-  base::ScopedNativeLibrary dwmapi_library_;
-  DwmEnableCompositionFunc composition_func_;
-
-  DISALLOW_COPY_AND_ASSIGN(VideoFrameCapturerWin);
-};
-
-// 3780 pixels per meter is equivalent to 96 DPI, typical on desktop monitors.
-static const int kPixelsPerMeter = 3780;
-// 32 bit RGBA is 4 bytes per pixel.
-static const int kBytesPerPixel = 4;
-
-VideoFrameWin::VideoFrameWin(
-    HDC desktop_dc,
-    const SkISize& size,
-    SharedBufferFactory* shared_buffer_factory)
-    : shared_buffer_factory_(shared_buffer_factory) {
-  // Allocate a shared memory buffer.
-  uint32 buffer_size = size.width() * size.height() * kBytesPerPixel;
-  if (shared_buffer_factory_) {
-    scoped_refptr<SharedBuffer> shared_buffer =
-        shared_buffer_factory_->CreateSharedBuffer(buffer_size);
-    CHECK(shared_buffer->ptr() != NULL);
-    set_shared_buffer(shared_buffer);
-  }
-
-  AllocateBitmap(desktop_dc, size);
-}
-
-VideoFrameWin::~VideoFrameWin() {
-  if (shared_buffer())
-    shared_buffer_factory_->ReleaseSharedBuffer(shared_buffer());
-}
-
-HBITMAP VideoFrameWin::GetBitmap() {
-  return bitmap_;
-}
-
-void VideoFrameWin::AllocateBitmap(HDC desktop_dc, const SkISize& size) {
-  int bytes_per_row = size.width() * kBytesPerPixel;
-
-  // Describe a device independent bitmap (DIB) that is the size of the desktop.
-  BITMAPINFO bmi;
-  memset(&bmi, 0, sizeof(bmi));
-  bmi.bmiHeader.biHeight = -size.height();
-  bmi.bmiHeader.biWidth = size.width();
-  bmi.bmiHeader.biPlanes = 1;
-  bmi.bmiHeader.biBitCount = kBytesPerPixel * 8;
-  bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader);
-  bmi.bmiHeader.biSizeImage = bytes_per_row * size.height();
-  bmi.bmiHeader.biXPelsPerMeter = kPixelsPerMeter;
-  bmi.bmiHeader.biYPelsPerMeter = kPixelsPerMeter;
-
-  // Create the DIB, and store a pointer to its pixel buffer.
-  HANDLE section_handle = NULL;
-  if (shared_buffer())
-    section_handle = shared_buffer()->handle();
-  void* data = NULL;
-  bitmap_ = CreateDIBSection(desktop_dc, &bmi, DIB_RGB_COLORS, &data,
-                             section_handle, 0);
-
-  // TODO(wez): Cope gracefully with failure (crbug.com/157170).
-  CHECK(bitmap_ != NULL);
-  CHECK(data != NULL);
-
-  set_pixels(reinterpret_cast<uint8*>(data));
-  set_dimensions(SkISize::Make(bmi.bmiHeader.biWidth,
-                               std::abs(bmi.bmiHeader.biHeight)));
-  set_bytes_per_row(
-      bmi.bmiHeader.biSizeImage / std::abs(bmi.bmiHeader.biHeight));
-}
-
-VideoFrameCapturerWin::VideoFrameCapturerWin()
-    : shared_buffer_factory_(NULL),
-      delegate_(NULL),
-      last_cursor_size_(SkISize::Make(0, 0)),
-      desktop_dc_rect_(SkIRect::MakeEmpty()),
-      pixel_format_(media::VideoFrame::RGB32),
-      composition_func_(NULL) {
-}
-
-VideoFrameCapturerWin::VideoFrameCapturerWin(
-    SharedBufferFactory* shared_buffer_factory)
-    : shared_buffer_factory_(shared_buffer_factory),
-      delegate_(NULL),
-      last_cursor_size_(SkISize::Make(0, 0)),
-      desktop_dc_rect_(SkIRect::MakeEmpty()),
-      pixel_format_(media::VideoFrame::RGB32),
-      composition_func_(NULL) {
-}
-
-VideoFrameCapturerWin::~VideoFrameCapturerWin() {
-}
-
-media::VideoFrame::Format VideoFrameCapturerWin::pixel_format() const {
-  return pixel_format_;
-}
-
-void VideoFrameCapturerWin::InvalidateRegion(const SkRegion& invalid_region) {
-  helper_.InvalidateRegion(invalid_region);
-}
-
-void VideoFrameCapturerWin::CaptureFrame() {
-  base::Time capture_start_time = base::Time::Now();
-
-  // Force the system to power-up display hardware, if it has been suspended.
-  SetThreadExecutionState(ES_DISPLAY_REQUIRED);
-
-  // Make sure the GDI capture resources are up-to-date.
-  PrepareCaptureResources();
-
-  // Copy screen bits to the current buffer.
-  CaptureImage();
-
-  const VideoFrame* current_buffer = queue_.current_frame();
-  const VideoFrame* last_buffer = queue_.previous_frame();
-  if (last_buffer) {
-    // Make sure the differencer is set up correctly for these previous and
-    // current screens.
-    if (!differ_.get() ||
-        (differ_->width() != current_buffer->dimensions().width()) ||
-        (differ_->height() != current_buffer->dimensions().height()) ||
-        (differ_->bytes_per_row() != current_buffer->bytes_per_row())) {
-      differ_.reset(new Differ(current_buffer->dimensions().width(),
-                               current_buffer->dimensions().height(),
-                               kBytesPerPixel,
-                               current_buffer->bytes_per_row()));
-    }
-
-    // Calculate difference between the two last captured frames.
-    SkRegion region;
-    differ_->CalcDirtyRegion(last_buffer->pixels(), current_buffer->pixels(),
-                             &region);
-    InvalidateRegion(region);
-  } else {
-    // No previous frame is available. Invalidate the whole screen.
-    helper_.InvalidateScreen(current_buffer->dimensions());
-  }
-
-  // Wrap the captured frame into CaptureData structure and invoke
-  // the completion callback.
-  SkRegion invalid_region;
-  helper_.SwapInvalidRegion(&invalid_region);
-  CaptureRegion(invalid_region, capture_start_time);
-
-  // Check for cursor shape update.
-  CaptureCursor();
-}
-
-const SkISize& VideoFrameCapturerWin::size_most_recent() const {
-  return helper_.size_most_recent();
-}
-
-void VideoFrameCapturerWin::Start(Delegate* delegate) {
-  DCHECK(delegate_ == NULL);
-
-  delegate_ = delegate;
-
-  // Load dwmapi.dll dynamically since it is not available on XP.
-  if (!dwmapi_library_.is_valid()) {
-    FilePath path(base::GetNativeLibraryName(UTF8ToUTF16(kDwmapiLibraryName)));
-    dwmapi_library_.Reset(base::LoadNativeLibrary(path, NULL));
-  }
-
-  if (dwmapi_library_.is_valid() && composition_func_ == NULL) {
-    composition_func_ = static_cast<DwmEnableCompositionFunc>(
-        dwmapi_library_.GetFunctionPointer("DwmEnableComposition"));
-  }
-
-  // Vote to disable Aero composited desktop effects while capturing. Windows
-  // will restore Aero automatically if the process exits. This has no effect
-  // under Windows 8 or higher.  See crbug.com/124018.
-  if (composition_func_ != NULL) {
-    (*composition_func_)(DWM_EC_DISABLECOMPOSITION);
-  }
-}
-
-void VideoFrameCapturerWin::Stop() {
-  // Restore Aero.
-  if (composition_func_ != NULL) {
-    (*composition_func_)(DWM_EC_ENABLECOMPOSITION);
-  }
-
-  delegate_ = NULL;
-}
-
-void VideoFrameCapturerWin::PrepareCaptureResources() {
-  // Switch to the desktop receiving user input if different from the current
-  // one.
-  scoped_ptr<Desktop> input_desktop = Desktop::GetInputDesktop();
-  if (input_desktop.get() != NULL && !desktop_.IsSame(*input_desktop)) {
-    // Release GDI resources otherwise SetThreadDesktop will fail.
-    desktop_dc_.reset();
-    memory_dc_.Set(NULL);
-
-    // If SetThreadDesktop() fails, the thread is still assigned a desktop.
-    // So we can continue capture screen bits, just from the wrong desktop.
-    desktop_.SetThreadDesktop(input_desktop.Pass());
-  }
-
-  // If the display bounds have changed then recreate GDI resources.
-  // TODO(wez): Also check for pixel format changes.
-  SkIRect screen_rect(SkIRect::MakeXYWH(
-      GetSystemMetrics(SM_XVIRTUALSCREEN),
-      GetSystemMetrics(SM_YVIRTUALSCREEN),
-      GetSystemMetrics(SM_CXVIRTUALSCREEN),
-      GetSystemMetrics(SM_CYVIRTUALSCREEN)));
-  if (screen_rect != desktop_dc_rect_) {
-    desktop_dc_.reset();
-    memory_dc_.Set(NULL);
-    desktop_dc_rect_.setEmpty();
-  }
-
-  if (desktop_dc_.get() == NULL) {
-    DCHECK(memory_dc_.Get() == NULL);
-
-    // Create GDI device contexts to capture from the desktop into memory.
-    desktop_dc_.reset(new base::win::ScopedGetDC(NULL));
-    memory_dc_.Set(CreateCompatibleDC(*desktop_dc_));
-    desktop_dc_rect_ = screen_rect;
-
-    // Make sure the frame buffers will be reallocated.
-    queue_.SetAllFramesNeedUpdate();
-
-    helper_.ClearInvalidRegion();
-  }
-}
-
-void VideoFrameCapturerWin::CaptureRegion(
-    const SkRegion& region,
-    const base::Time& capture_start_time) {
-  const VideoFrame* current_buffer = queue_.current_frame();
-
-  DataPlanes planes;
-  planes.data[0] = current_buffer->pixels();
-  planes.strides[0] = current_buffer->bytes_per_row();
-
-  scoped_refptr<CaptureData> data(new CaptureData(planes,
-                                                  current_buffer->dimensions(),
-                                                  pixel_format_));
-  data->mutable_dirty_region() = region;
-  data->set_shared_buffer(current_buffer->shared_buffer());
-
-  helper_.set_size_most_recent(data->size());
-
-  queue_.DoneWithCurrentFrame();
-
-  data->set_capture_time_ms(
-      (base::Time::Now() - capture_start_time).InMillisecondsRoundedUp());
-  delegate_->OnCaptureCompleted(data);
-}
-
-void VideoFrameCapturerWin::CaptureImage() {
-  // 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()) {
-    DCHECK(desktop_dc_.get() != NULL);
-    DCHECK(memory_dc_.Get() != NULL);
-    // Windows requires DIB sections' rows to start DWORD-aligned, which is
-    // implicit when working with RGB32 pixels.
-    DCHECK_EQ(pixel_format_, media::VideoFrame::RGB32);
-
-    SkISize size = SkISize::Make(desktop_dc_rect_.width(),
-                                 desktop_dc_rect_.height());
-    scoped_ptr<VideoFrameWin> buffer(
-        new VideoFrameWin(*desktop_dc_, size, shared_buffer_factory_));
-    queue_.ReplaceCurrentFrame(buffer.PassAs<VideoFrame>());
-  }
-
-  // Select the target bitmap into the memory dc and copy the rect from desktop
-  // to memory.
-  VideoFrameWin* current = static_cast<VideoFrameWin*>(queue_.current_frame());
-  HGDIOBJ previous_object = SelectObject(memory_dc_, current->GetBitmap());
-  if (previous_object != NULL) {
-    BitBlt(memory_dc_,
-           0, 0, desktop_dc_rect_.width(), desktop_dc_rect_.height(),
-           *desktop_dc_,
-           desktop_dc_rect_.x(), desktop_dc_rect_.y(),
-           SRCCOPY | CAPTUREBLT);
-
-    // Select back the previously selected object to that the device contect
-    // could be destroyed independently of the bitmap if needed.
-    SelectObject(memory_dc_, previous_object);
-  }
-}
-
-void VideoFrameCapturerWin::AddCursorOutline(int width,
-                                             int height,
-                                             uint32* dst) {
-  for (int y = 0; y < height; y++) {
-    for (int x = 0; x < width; x++) {
-      // If this is a transparent pixel (bgr == 0 and alpha = 0), check the
-      // neighbor pixels to see if this should be changed to an outline pixel.
-      if (*dst == kPixelBgraTransparent) {
-        // Change to white pixel if any neighbors (top, bottom, left, right)
-        // are black.
-        if ((y > 0 && dst[-width] == kPixelBgraBlack) ||
-            (y < height - 1 && dst[width] == kPixelBgraBlack) ||
-            (x > 0 && dst[-1] == kPixelBgraBlack) ||
-            (x < width - 1 && dst[1] == kPixelBgraBlack)) {
-          *dst = kPixelBgraWhite;
-        }
-      }
-      dst++;
-    }
-  }
-}
-
-void VideoFrameCapturerWin::CaptureCursor() {
-  CURSORINFO cursor_info;
-  cursor_info.cbSize = sizeof(CURSORINFO);
-  if (!GetCursorInfo(&cursor_info)) {
-    VLOG(3) << "Unable to get cursor info. Error = " << GetLastError();
-    return;
-  }
-
-  // Note that this does not need to be freed.
-  HCURSOR hcursor = cursor_info.hCursor;
-  ICONINFO iinfo;
-  if (!GetIconInfo(hcursor, &iinfo)) {
-    VLOG(3) << "Unable to get cursor icon info. Error = " << GetLastError();
-    return;
-  }
-  int hotspot_x = iinfo.xHotspot;
-  int hotspot_y = iinfo.yHotspot;
-
-  // Get the cursor bitmap.
-  base::win::ScopedBitmap hbitmap;
-  BITMAP bitmap;
-  bool color_bitmap;
-  if (iinfo.hbmColor) {
-    // Color cursor bitmap.
-    color_bitmap = true;
-    hbitmap.Set((HBITMAP)CopyImage(iinfo.hbmColor, IMAGE_BITMAP, 0, 0,
-                                   LR_CREATEDIBSECTION));
-    if (!hbitmap.Get()) {
-      VLOG(3) << "Unable to copy color cursor image. Error = "
-              << GetLastError();
-      return;
-    }
-
-    // Free the color and mask bitmaps since we only need our copy.
-    DeleteObject(iinfo.hbmColor);
-    DeleteObject(iinfo.hbmMask);
-  } else {
-    // Black and white (xor) cursor.
-    color_bitmap = false;
-    hbitmap.Set(iinfo.hbmMask);
-  }
-
-  if (!GetObject(hbitmap.Get(), sizeof(BITMAP), &bitmap)) {
-    VLOG(3) << "Unable to get cursor bitmap. Error = " << GetLastError();
-    return;
-  }
-
-  int width = bitmap.bmWidth;
-  int height = bitmap.bmHeight;
-  // For non-color cursors, the mask contains both an AND and an XOR mask and
-  // the height includes both. Thus, the width is correct, but we need to
-  // divide by 2 to get the correct mask height.
-  if (!color_bitmap) {
-    height /= 2;
-  }
-  int data_size = height * width * kBytesPerPixel;
-
-  scoped_ptr<protocol::CursorShapeInfo> cursor_proto(
-      new protocol::CursorShapeInfo());
-  cursor_proto->mutable_data()->resize(data_size);
-  uint8* cursor_dst_data = const_cast<uint8*>(reinterpret_cast<const uint8*>(
-      cursor_proto->mutable_data()->data()));
-
-  // Copy/convert cursor bitmap into format needed by chromotocol.
-  int row_bytes = bitmap.bmWidthBytes;
-  if (color_bitmap) {
-    if (bitmap.bmPlanes != 1 || bitmap.bmBitsPixel != 32) {
-      VLOG(3) << "Unsupported color cursor format. Error = " << GetLastError();
-      return;
-    }
-
-    // Copy across colour cursor imagery.
-    // CursorShapeInfo stores imagery top-down, and premultiplied
-    // by the alpha channel, whereas windows stores them bottom-up
-    // and not premultiplied.
-    uint8* cursor_src_data = reinterpret_cast<uint8*>(bitmap.bmBits);
-    uint8* src = cursor_src_data + ((height - 1) * row_bytes);
-    uint8* dst = cursor_dst_data;
-    for (int row = 0; row < height; ++row) {
-      for (int column = 0; column < width; ++column) {
-        dst[0] = SkAlphaMul(src[0], src[3]);
-        dst[1] = SkAlphaMul(src[1], src[3]);
-        dst[2] = SkAlphaMul(src[2], src[3]);
-        dst[3] = src[3];
-        dst += kBytesPerPixel;
-        src += kBytesPerPixel;
-      }
-      src -= row_bytes + (width * kBytesPerPixel);
-    }
-  } else {
-    if (bitmap.bmPlanes != 1 || bitmap.bmBitsPixel != 1) {
-      VLOG(3) << "Unsupported cursor mask format. Error = " << GetLastError();
-      return;
-    }
-
-    // x2 because there are 2 masks in the bitmap: AND and XOR.
-    int mask_bytes = height * row_bytes * 2;
-    scoped_array<uint8> mask(new uint8[mask_bytes]);
-    if (!GetBitmapBits(hbitmap.Get(), mask_bytes, mask.get())) {
-      VLOG(3) << "Unable to get cursor mask bits. Error = " << GetLastError();
-      return;
-    }
-    uint8* and_mask = mask.get();
-    uint8* xor_mask = mask.get() + height * row_bytes;
-    uint8* dst = cursor_dst_data;
-    bool add_outline = false;
-    for (int y = 0; y < height; y++) {
-      for (int x = 0; x < width; x++) {
-        int byte = y * row_bytes + x / 8;
-        int bit = 7 - x % 8;
-        int and = and_mask[byte] & (1 << bit);
-        int xor = xor_mask[byte] & (1 << bit);
-
-        // The two cursor masks combine as follows:
-        //  AND  XOR   Windows Result  Our result   RGB  Alpha
-        //   0    0    Black           Black         00    ff
-        //   0    1    White           White         ff    ff
-        //   1    0    Screen          Transparent   00    00
-        //   1    1    Reverse-screen  Black         00    ff
-        // Since we don't support XOR cursors, we replace the "Reverse Screen"
-        // with black. In this case, we also add an outline around the cursor
-        // so that it is visible against a dark background.
-        int rgb = (!and && xor) ? 0xff : 0x00;
-        int alpha = (and && !xor) ? 0x00 : 0xff;
-        *dst++ = rgb;
-        *dst++ = rgb;
-        *dst++ = rgb;
-        *dst++ = alpha;
-        if (and && xor) {
-          add_outline = true;
-        }
-      }
-    }
-    if (add_outline) {
-      AddCursorOutline(width, height,
-                       reinterpret_cast<uint32*>(cursor_dst_data));
-    }
-  }
-
-  // Compare the current cursor with the last one we sent to the client. If
-  // they're the same, then don't bother sending the cursor again.
-  if (last_cursor_size_.equals(width, height) &&
-      memcmp(last_cursor_.get(), cursor_dst_data, data_size) == 0) {
-    return;
-  }
-
-  VLOG(3) << "Sending updated cursor: " << width << "x" << height;
-
-  cursor_proto->set_width(width);
-  cursor_proto->set_height(height);
-  cursor_proto->set_hotspot_x(hotspot_x);
-  cursor_proto->set_hotspot_y(hotspot_y);
-
-  // Record the last cursor image that we sent to the client.
-  last_cursor_.reset(new uint8[data_size]);
-  memcpy(last_cursor_.get(), cursor_dst_data, data_size);
-  last_cursor_size_ = SkISize::Make(width, height);
-
-  delegate_->OnCursorShapeChanged(cursor_proto.Pass());
-}
-
-}  // namespace
-
-// static
-scoped_ptr<VideoFrameCapturer> VideoFrameCapturer::Create() {
-  return scoped_ptr<VideoFrameCapturer>(new VideoFrameCapturerWin());
-}
-
-// static
-scoped_ptr<VideoFrameCapturer> VideoFrameCapturer::CreateWithFactory(
-    SharedBufferFactory* shared_buffer_factory) {
-  scoped_ptr<VideoFrameCapturerWin> capturer(
-      new VideoFrameCapturerWin(shared_buffer_factory));
-  return capturer.PassAs<VideoFrameCapturer>();
-}
-
-}  // namespace remoting