Avoids the use of "namespace using-directives" in a few places....

skia/ext/platform_device_mac.cc

 // Copyright (c) 2006-2008 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 "skia/ext/bitmap_platform_device_mac.h"
 
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkTypes.h"
 #include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 
-// TODO(brettw) remove this when the gfx namespaces are all removed.
-using namespace gfx;
-
 namespace {
 
 // Constrains position and size to fit within available_size.
 bool constrain(int available_size, int* position, int *size) {
   if (*position < 0) {
     *size += *position;
     *position = 0;
   }
   if (*size > 0 && *position < available_size) {
     int overflow = (*position + *size) - available_size;
@@ skipping 61 matching lines @@
 
 // static
 void PlatformDevice::LoadTransformToCGContext(CGContextRef context,
                                               const SkMatrix& matrix) {
   // CoreGraphics can concatenate transforms, but not reset the current one.
   // So in order to get the required behavior here, we need to first make
   // the current transformation matrix identity and only then load the new one.
 
   // Reset matrix to identity.
   CGAffineTransform orig_cg_matrix = CGContextGetCTM(context);
-  CGAffineTransform orig_cg_matrix_inv = CGAffineTransformInvert(orig_cg_matrix);
+  CGAffineTransform orig_cg_matrix_inv = CGAffineTransformInvert(
+      orig_cg_matrix);
   CGContextConcatCTM(context, orig_cg_matrix_inv);
 
   // assert that we have indeed returned to the identity Matrix.
   SkASSERT(CGAffineTransformIsIdentity(CGContextGetCTM(context)));
 
   // Convert xform to CG-land.
   // Our coordinate system is flipped to match WebKit's so we need to modify
   // the xform to match that.
   SkMatrix transformed_matrix = matrix;
   SkScalar sy = matrix.getScaleY() * (SkScalar)-1;
   transformed_matrix.setScaleY(sy);
   size_t height = CGBitmapContextGetHeight(context);
   SkScalar ty = -matrix.getTranslateY(); // y axis is flipped.
   transformed_matrix.setTranslateY(ty + (SkScalar)height);
 
-  CGAffineTransform cg_matrix = SkMatrixToCGAffineTransform(transformed_matrix);
+  CGAffineTransform cg_matrix = gfx::SkMatrixToCGAffineTransform(
+      transformed_matrix);
 
   // Load final transform into context.
   CGContextConcatCTM(context, cg_matrix);
 }
 
 // static
 void PlatformDevice::LoadClippingRegionToCGContext(
          CGContextRef context,
          const SkRegion& region,
          const SkMatrix& transformation) {
   if (region.isEmpty()) {
     // region can be empty, in which case everything will be clipped.
     SkRect rect;
     rect.setEmpty();
-    CGContextClipToRect(context, SkRectToCGRect(rect));
+    CGContextClipToRect(context, gfx::SkRectToCGRect(rect));
   } else if (region.isRect()) {
     // Do the transformation.
     SkRect rect;
     rect.set(region.getBounds());
     transformation.mapRect(&rect);
     SkIRect irect;
     rect.round(&irect);
-    CGContextClipToRect(context, SkIRectToCGRect(irect));
+    CGContextClipToRect(context, gfx::SkIRectToCGRect(irect));
   } else {
     // It is complex.
     SkPath path;
     region.getBoundaryPath(&path);
     // Clip. Note that windows clipping regions are not affected by the
     // transform so apply it manually.
     path.transform(transformation);
     // TODO(playmobil): Implement.
     SkASSERT(false);
     // LoadPathToDC(context, path);
     // hrgn = PathToRegion(context);
   }
 }
 
 }  // namespace skia