Fix ScreenCapturerMac handling of secondary configurations.

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>
@@ skipping 567 matching lines @@
     SkIRect display_bounds = display_config.pixel_bounds;
     display_bounds.offset(-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))
       continue;
 
     // Translate the region to be copied into display-relative coordinates.
-    copy_region.translate(-desktop_config_.pixel_bounds.left(),
-                          -desktop_config_.pixel_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() +
          (display_bounds.left() * src_bytes_per_pixel) +
          (display_bounds.top() * buffer.bytes_per_row());
 
     // Copy the dirty region from the display buffer into our desktop buffer.
     for(SkRegion::Iterator i(copy_region); !i.done(); i.next()) {
       CopyRect(display_base_address,
                src_bytes_per_row,
                out_ptr,
                buffer.bytes_per_row(),
                src_bytes_per_pixel,
                i.rect());
     }
   }
 }
 
 void ScreenCapturerMac::CgBlitPostLion(const ScreenCaptureFrame& buffer,
-                                           const SkRegion& region) {
+                                       const SkRegion& region) {
   const int buffer_height = buffer.dimensions().height();
 
   // 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);
   }
 
   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());
 
     // 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))
       continue;
 
     // Translate the region to be copied into display-relative coordinates.
-    copy_region.translate(-desktop_config_.pixel_bounds.left(),
-                          -desktop_config_.pixel_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(
@@ skipping 23 matching lines @@
 }
 
 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();
+  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()));
 
   // Make sure the frame buffers will be reallocated.
   queue_.SetAllFramesNeedUpdate();
 
   // CgBlitPostLion uses CGDisplayCreateImage() to snapshot each display's
@@ skipping 171 matching lines @@
 }
 
 // static
 scoped_ptr<ScreenCapturer> ScreenCapturer::CreateWithFactory(
     SharedBufferFactory* shared_buffer_factory) {
   NOTIMPLEMENTED();
   return scoped_ptr<ScreenCapturer>();
 }
 
 }  // namespace media