Simplify ScreenCapturer interface.

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 102 matching lines @@
 // 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 Stop() OVERRIDE;
-  virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
   virtual void CaptureFrame() 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);
 
@@ skipping 93 matching lines @@
       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)
 {
 }
 
 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;
+  }
+
   ReleaseBuffers();
   UnregisterRefreshAndMoveHandlers();
   CGError err = CGDisplayRemoveReconfigurationCallback(
       ScreenCapturerMac::DisplaysReconfiguredCallback, this);
   if (err != kCGErrorSuccess) {
     LOG(ERROR) << "CGDisplayRemoveReconfigurationCallback " << err;
   }
 }
 
 bool ScreenCapturerMac::Init() {
@@ skipping 38 matching lines @@
                               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::Stop() {
-  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;
-  }
-}
-
-void ScreenCapturerMac::InvalidateRegion(const SkRegion& invalid_region) {
-  helper_.InvalidateRegion(invalid_region);
-}
-
 void ScreenCapturerMac::CaptureFrame() {
   // Only allow captures when the display configuration is not occurring.
   scoped_refptr<ScreenCaptureData> data;
 
   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).
@@ skipping 467 matching lines @@
     sk_rect = ScaleSkRect(sk_rect, desktop_config_.dip_to_pixel_scale);
     sk_rect.round(&skirect_array[i]);
 
     // Translate from local desktop to capturer framebuffer coordinates.
     skirect_array[i].offset(-desktop_config_.pixel_bounds.left(),
                             -desktop_config_.pixel_bounds.top());
   }
 
   SkRegion region;
   region.setRects(skirect_array, count);
-  InvalidateRegion(region);
+  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 76 matching lines @@
 
 // static
 scoped_ptr<ScreenCapturer> ScreenCapturer::Create() {
   scoped_ptr<ScreenCapturerMac> capturer(new ScreenCapturerMac());
   if (!capturer->Init())
     capturer.reset();
   return capturer.PassAs<ScreenCapturer>();
 }
 
 }  // namespace media