Extend content::DesktopMediaID to allow Aura windows as capture sources.

content/browser/renderer_host/media/desktop_capture_device_ash.cc

 // Copyright 2013 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 "content/browser/renderer_host/media/desktop_capture_device_ash.h"
 
 #include "base/logging.h"
 #include "base/timer/timer.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ skipping 64 matching lines @@
 
   // The window associated with the desktop.
   aura::Window* desktop_window_;
 
   // The layer associated with the desktop.
   ui::Layer* desktop_layer_;
 
   // The timer that kicks off period captures.
   base::Timer timer_;
 
-  // The desktop id.
-  DesktopMediaID desktop_id_;
+  // The id of the window being captured.
+  const DesktopMediaID& window_id_;
 
   // Makes all the decisions about which frames to copy, and how.
   scoped_refptr<ThreadSafeCaptureOracle> oracle_proxy_;
 
   // YUV readback pipeline.
   scoped_ptr<content::ReadbackYUVInterface> yuv_readback_pipeline_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopVideoCaptureMachine);
 };
 
 DesktopVideoCaptureMachine::DesktopVideoCaptureMachine(
     const DesktopMediaID& source)
     : desktop_window_(NULL),
       desktop_layer_(NULL),
       timer_(true, true),
-      desktop_id_(source) {}
+      window_id_(source) {}
 
 DesktopVideoCaptureMachine::~DesktopVideoCaptureMachine() {}
 
 bool DesktopVideoCaptureMachine::Start(
     const scoped_refptr<ThreadSafeCaptureOracle>& oracle_proxy) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // TODO(hshi): get the correct display specified by |desktop_id_|.
-  const gfx::Display& primary_display =
-      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
-  desktop_window_ = gfx::Screen::GetNativeScreen()->GetWindowAtScreenPoint(
-          primary_display.bounds().CenterPoint())->GetRootWindow();
+  desktop_window_ = content::DesktopMediaID::GetAuraWindowById(window_id_);
   if (!desktop_window_)
     return false;
 
   // If the desktop layer is already destroyed then return failure.
   desktop_layer_ = desktop_window_->layer();
   if (!desktop_layer_)
     return false;
 
   DCHECK(oracle_proxy.get());
   oracle_proxy_ = oracle_proxy;
@@ skipping 61 matching lines @@
   const base::Time start_time = base::Time::Now();
   const VideoCaptureOracle::Event event =
       dirty ? VideoCaptureOracle::kCompositorUpdate
             : VideoCaptureOracle::kTimerPoll;
   if (oracle_proxy_->ObserveEventAndDecideCapture(
       event, start_time, &frame, &capture_frame_cb)) {
     scoped_ptr<cc::CopyOutputRequest> request =
         cc::CopyOutputRequest::CreateRequest(
             base::Bind(&DesktopVideoCaptureMachine::DidCopyOutput,
                        AsWeakPtr(), frame, start_time, capture_frame_cb));
-    gfx::Rect desktop_size = ui::ConvertRectToPixel(
-        desktop_layer_, desktop_layer_->bounds());
-    request->set_area(desktop_size);
+    gfx::Rect window_rect =
+        ui::ConvertRectToPixel(desktop_window_->layer(),
+                               gfx::Rect(desktop_window_->bounds().width(),
+                                         desktop_window_->bounds().height()));
+    request->set_area(window_rect);
     desktop_layer_->RequestCopyOfOutput(request.Pass());
   }
 }
 
 static void CopyOutputFinishedForVideo(
     base::Time start_time,
     const ThreadSafeCaptureOracle::CaptureFrameCallback& capture_frame_cb,
     scoped_ptr<cc::SingleReleaseCallback> release_callback,
     bool result) {
   release_callback->Run(0, false);
@@ skipping 90 matching lines @@
     : impl_(new VideoCaptureDeviceImpl(scoped_ptr<VideoCaptureMachine>(
         new DesktopVideoCaptureMachine(source)))) {}
 
 DesktopCaptureDeviceAsh::~DesktopCaptureDeviceAsh() {
   DVLOG(2) << "DesktopCaptureDeviceAsh@" << this << " destroying.";
 }
 
 // static
 media::VideoCaptureDevice* DesktopCaptureDeviceAsh::Create(
     const DesktopMediaID& source) {
-  // This implementation only supports screen capture.
-  if (source.type != DesktopMediaID::TYPE_SCREEN)
-    return NULL;
-
   return new DesktopCaptureDeviceAsh(source);
 }
 
 void DesktopCaptureDeviceAsh::AllocateAndStart(
     const media::VideoCaptureParams& params,
     scoped_ptr<Client> client) {
   DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
   impl_->AllocateAndStart(params, client.Pass());
 }
 
 void DesktopCaptureDeviceAsh::StopAndDeAllocate() {
   impl_->StopAndDeAllocate();
 }
 
 }  // namespace content