Rename gfx::Display/Screen to display::Display/Screen in content/

content/common/cursors/webcursor_ozone.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 "content/common/cursors/webcursor.h"
 
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/cursor_util.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
@@ skipping 22 matching lines @@
                               bitmap.height());
 
   ui::ScaleAndRotateCursorBitmapAndHotpoint(scale, rotation_, &bitmap,
                                             &hotspot);
 
   platform_cursor_ =
       ui::CursorFactoryOzone::GetInstance()->CreateImageCursor(bitmap, hotspot);
   return platform_cursor_;
 }
 
-void WebCursor::SetDisplayInfo(const gfx::Display& display) {
+void WebCursor::SetDisplayInfo(const display::Display& display) {
   if (rotation_ == display.rotation() &&
       device_scale_factor_ == display.device_scale_factor() &&
       maximum_cursor_size_ == display.maximum_cursor_size())
     return;
   device_scale_factor_ = display.device_scale_factor();
   rotation_ = display.rotation();
   maximum_cursor_size_ = display.maximum_cursor_size();
   // TODO(oshima): Identify if it's possible to remove this check here and move
   // the kDefaultMaxCursor{Width,Height} constants to a single place.
   // crbug.com/603512
   if (maximum_cursor_size_.width() == 0 || maximum_cursor_size_.height() == 0)
     maximum_cursor_size_ =
         gfx::Size(kDefaultMaxCursorWidth, kDefaultMaxCursorHeight);
   if (platform_cursor_)
     ui::CursorFactoryOzone::GetInstance()->UnrefImageCursor(platform_cursor_);
   platform_cursor_ = NULL;
   // It is not necessary to recreate platform_cursor_ yet, since it will be
   // recreated on demand when GetPlatformCursor is called.
 }
 
 void WebCursor::InitPlatformData() {
   platform_cursor_ = NULL;
   device_scale_factor_ = 1.f;
-  rotation_ = gfx::Display::ROTATE_0;
+  rotation_ = display::Display::ROTATE_0;
   maximum_cursor_size_ =
       gfx::Size(kDefaultMaxCursorWidth, kDefaultMaxCursorHeight);
 }
 
 bool WebCursor::SerializePlatformData(base::Pickle* pickle) const {
   return true;
 }
 
 bool WebCursor::DeserializePlatformData(base::PickleIterator* iter) {
   return true;
@@ skipping 15 matching lines @@
     ui::CursorFactoryOzone::GetInstance()->UnrefImageCursor(platform_cursor_);
   platform_cursor_ = other.platform_cursor_;
   if (platform_cursor_)
     ui::CursorFactoryOzone::GetInstance()->RefImageCursor(platform_cursor_);
 
   device_scale_factor_ = other.device_scale_factor_;
   maximum_cursor_size_ = other.maximum_cursor_size_;
 }
 
 }  // namespace content