remoting: Move CGRectToSkIRect() to the only file where it's called

remoting/host/capturer_mac.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 <ApplicationServices/ApplicationServices.h>
 #include <dlfcn.h>
 #include <OpenGL/CGLMacro.h>
 #include <OpenGL/OpenGL.h>
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "remoting/base/util.h"
 #include "remoting/host/capturer_helper.h"
-#include "skia/ext/skia_utils_mac.h"
 
 
 namespace remoting {
 
 namespace {
 
+SkIRect CGRectToSkIRect(const CGRect& rect) {
+  SkIRect sk_rect = {
+    SkScalarRound(rect.origin.x),
+    SkScalarRound(rect.origin.y),
+    SkScalarRound(rect.origin.x + rect.size.width),
+    SkScalarRound(rect.origin.y + rect.size.height)
+  };
+  return sk_rect;
+}
+
 #if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_5)
 // Possibly remove CapturerMac::CgBlitPreLion as well depending on performance
 // of CapturerMac::CgBlitPostLion on 10.6.
 #error No longer need to import CGDisplayCreateImage.
 #else
 // Declared here because CGDisplayCreateImage does not exist in the 10.5 SDK,
 // which we are currently compiling against, and it is required on 10.7 to do
 // screen capture.
 typedef CGImageRef (*CGDisplayCreateImageFunc)(CGDirectDisplayID displayID);
 #endif
@@ skipping 511 matching lines @@
   }
 }
 
 const SkISize& CapturerMac::size_most_recent() const {
   return helper_.size_most_recent();
 }
 
 void CapturerMac::ScreenRefresh(CGRectCount count, const CGRect *rect_array) {
   SkIRect skirect_array[count];
   for (CGRectCount i = 0; i < count; ++i) {
-    skirect_array[i] = gfx::CGRectToSkIRect(rect_array[i]);
+    skirect_array[i] = CGRectToSkIRect(rect_array[i]);
   }
   SkRegion region;
   region.setRects(skirect_array, count);
   InvalidateRegion(region);
 }
 
 void CapturerMac::ScreenUpdateMove(CGScreenUpdateMoveDelta delta,
                                    size_t count,
                                    const CGRect *rect_array) {
   SkIRect skirect_new_array[count];
   for (CGRectCount i = 0; i < count; ++i) {
     CGRect rect = rect_array[i];
     rect = CGRectOffset(rect, delta.dX, delta.dY);
-    skirect_new_array[i] = gfx::CGRectToSkIRect(rect);
+    skirect_new_array[i] = CGRectToSkIRect(rect);
   }
   SkRegion region;
   region.setRects(skirect_new_array, count);
   InvalidateRegion(region);
 }
 
 void CapturerMac::DisplaysReconfigured(CGDirectDisplayID display,
                                        CGDisplayChangeSummaryFlags flags) {
   if (display == CGMainDisplayID()) {
     if (flags & kCGDisplayBeginConfigurationFlag) {
@@ skipping 40 matching lines @@
 Capturer* Capturer::Create() {
   CapturerMac* capturer = new CapturerMac();
   if (!capturer->Init()) {
     delete capturer;
     capturer = NULL;
   }
   return capturer;
 }
 
 }  // namespace remoting