Move gfx::Display/Screen to display::Display/Screen in ui/base

ui/base/cursor/cursor_util.cc

 // Copyright 2014 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 "ui/base/cursor/cursor_util.h"
 
 #include "base/logging.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ skipping 22 matching lines @@
   bitmap->reset();
   bitmap->allocPixels(image_info);
   memcpy(bitmap->getPixels(), &buffer[0], buffer.size());
 
   return true;
 }
 
 } // namespace
 
 void ScaleAndRotateCursorBitmapAndHotpoint(float scale,
-                                           gfx::Display::Rotation rotation,
+                                           display::Display::Rotation rotation,
                                            SkBitmap* bitmap,
                                            gfx::Point* hotpoint) {
   // SkBitmapOperations::Rotate() needs the bitmap to have premultiplied alpha,
   // so convert bitmap alpha type if we are going to rotate.
   bool was_converted = false;
-  if (rotation != gfx::Display::ROTATE_0 &&
+  if (rotation != display::Display::ROTATE_0 &&
       bitmap->info().alphaType() == kUnpremul_SkAlphaType) {
     ConvertSkBitmapAlphaType(bitmap, kPremul_SkAlphaType);
     was_converted = true;
   }
 
   switch (rotation) {
-    case gfx::Display::ROTATE_0:
+    case display::Display::ROTATE_0:
       break;
-    case gfx::Display::ROTATE_90:
+    case display::Display::ROTATE_90:
       hotpoint->SetPoint(bitmap->height() - hotpoint->y(), hotpoint->x());
       *bitmap = SkBitmapOperations::Rotate(
           *bitmap, SkBitmapOperations::ROTATION_90_CW);
       break;
-    case gfx::Display::ROTATE_180:
+    case display::Display::ROTATE_180:
       hotpoint->SetPoint(
           bitmap->width() - hotpoint->x(), bitmap->height() - hotpoint->y());
       *bitmap = SkBitmapOperations::Rotate(
           *bitmap, SkBitmapOperations::ROTATION_180_CW);
       break;
-    case gfx::Display::ROTATE_270:
+    case display::Display::ROTATE_270:
       hotpoint->SetPoint(hotpoint->y(), bitmap->width() - hotpoint->x());
       *bitmap = SkBitmapOperations::Rotate(
           *bitmap, SkBitmapOperations::ROTATION_270_CW);
       break;
   }
 
   if (was_converted) {
     ConvertSkBitmapAlphaType(bitmap, kUnpremul_SkAlphaType);
   }
 
@@ skipping 11 matching lines @@
   *bitmap = skia::ImageOperations::Resize(
       *bitmap,
       skia::ImageOperations::RESIZE_BETTER,
       scaled_size.width(),
       scaled_size.height());
   *hotpoint = gfx::ScaleToFlooredPoint(*hotpoint, scale);
 }
 
 void GetImageCursorBitmap(int resource_id,
                           float scale,
-                          gfx::Display::Rotation rotation,
+                          display::Display::Rotation rotation,
                           gfx::Point* hotspot,
                           SkBitmap* bitmap) {
   const gfx::ImageSkia* image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(scale);
   // TODO(oshima): The cursor should use resource scale factor when
   // fractional scale factor is enabled. crbug.com/372212
   (*bitmap) = image_rep.sk_bitmap();
   ScaleAndRotateCursorBitmapAndHotpoint(
       scale / image_rep.scale(), rotation, bitmap, hotspot);
   // |image_rep| is owned by the resource bundle. So we do not need to free it.
 }
 
 void GetAnimatedCursorBitmaps(int resource_id,
                               float scale,
-                              gfx::Display::Rotation rotation,
+                              display::Display::Rotation rotation,
                               gfx::Point* hotspot,
                               std::vector<SkBitmap>* bitmaps) {
   // TODO(oshima|tdanderson): Support rotation and fractional scale factor.
   const gfx::ImageSkia* image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(scale);
   SkBitmap bitmap = image_rep.sk_bitmap();
   int frame_width = bitmap.height();
   int frame_height = frame_width;
   int total_width = bitmap.width();
@@ skipping 10 matching lines @@
     SkBitmap cropped = SkBitmapOperations::CreateTiledBitmap(
         bitmap, x_offset, 0, frame_width, frame_height);
     DCHECK_EQ(frame_width, cropped.width());
     DCHECK_EQ(frame_height, cropped.height());
 
     (*bitmaps)[frame] = cropped;
   }
 }
 
 }  // namespace ui