Add display::GetDisplayNearestView

content/browser/renderer_host/render_widget_host_view_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 "content/browser/renderer_host/render_widget_host_view_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <objc/runtime.h>
 #include <OpenGL/gl.h>
 #include <QuartzCore/QuartzCore.h>
@@ skipping 57 matching lines @@
 #include "media/base/video_frame.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #import "ui/base/clipboard/clipboard_util_mac.h"
 #include "ui/base/cocoa/animation_utils.h"
 #import "ui/base/cocoa/appkit_utils.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/fullscreen_window_manager.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
-#include "ui/base/layout.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ skipping 593 matching lines @@
   pepper_fullscreen_window_.reset();
 }
 
 int RenderWidgetHostViewMac::window_number() const {
   NSWindow* window = [cocoa_view_ window];
   if (!window)
     return -1;
   return [window windowNumber];
 }
 
-float RenderWidgetHostViewMac::ViewScaleFactor() const {
-  return ui::GetScaleFactorForNativeView(cocoa_view_);
-}
-
 void RenderWidgetHostViewMac::UpdateDisplayLink() {
   static bool is_vsync_disabled =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGpuVsync);
   if (is_vsync_disabled)
     return;
 
   NSScreen* screen = [[cocoa_view_ window] screen];
   NSDictionary* screen_description = [screen deviceDescription];
   NSNumber* screen_number = [screen_description objectForKey:@"NSScreenNumber"];
@@ skipping 810 matching lines @@
 cc::FrameSinkId RenderWidgetHostViewMac::GetFrameSinkId() {
   return browser_compositor_->GetDelegatedFrameHost()->GetFrameSinkId();
 }
 
 cc::FrameSinkId RenderWidgetHostViewMac::FrameSinkIdAtPoint(
     cc::SurfaceHittestDelegate* delegate,
     const gfx::Point& point,
     gfx::Point* transformed_point) {
   // The surface hittest happens in device pixels, so we need to convert the
   // |point| from DIPs to pixels before hittesting.
-  float scale_factor = display::Screen::GetScreen()
-                           ->GetDisplayNearestWindow(cocoa_view_)
-                           .device_scale_factor();
+  float scale_factor = ui::GetScaleFactorForNativeView(cocoa_view_);
   gfx::Point point_in_pixels = gfx::ConvertPointToPixel(scale_factor, point);
   cc::SurfaceId id =
       browser_compositor_->GetDelegatedFrameHost()->SurfaceIdAtPoint(
           delegate, point_in_pixels, transformed_point);
   *transformed_point = gfx::ConvertPointToDIP(scale_factor, *transformed_point);
 
   // It is possible that the renderer has not yet produced a surface, in which
   // case we return our current namespace.
   if (!id.is_valid())
     return GetFrameSinkId();
@@ skipping 34 matching lines @@
     const ui::LatencyInfo& latency) {
   render_widget_host_->ForwardGestureEventWithLatencyInfo(event, latency);
 }
 
 bool RenderWidgetHostViewMac::TransformPointToLocalCoordSpace(
     const gfx::Point& point,
     const cc::SurfaceId& original_surface,
     gfx::Point* transformed_point) {
   // Transformations use physical pixels rather than DIP, so conversion
   // is necessary.
-  float scale_factor = display::Screen::GetScreen()
-                           ->GetDisplayNearestWindow(cocoa_view_)
-                           .device_scale_factor();
+  float scale_factor = ui::GetScaleFactorForNativeView(cocoa_view_);
   gfx::Point point_in_pixels = gfx::ConvertPointToPixel(scale_factor, point);
   if (!browser_compositor_->GetDelegatedFrameHost()
            ->TransformPointToLocalCoordSpace(point_in_pixels, original_surface,
                                              transformed_point))
     return false;
   *transformed_point = gfx::ConvertPointToDIP(scale_factor, *transformed_point);
   return true;
 }
 
 bool RenderWidgetHostViewMac::TransformPointToCoordSpaceForView(
@@ skipping 124 matching lines @@
 
 void RenderWidgetHostViewMac::OnDisplayAdded(const display::Display& display) {}
 
 void RenderWidgetHostViewMac::OnDisplayRemoved(
     const display::Display& display) {}
 
 void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t changed_metrics) {
   display::Screen* screen = display::Screen::GetScreen();
-  if (display.id() != screen->GetDisplayNearestWindow(cocoa_view_).id())
+  if (display.id() != screen->GetDisplayNearestView(cocoa_view_).id())
     return;
 
   if (changed_metrics & DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR) {
     RenderWidgetHostImpl* host =
         RenderWidgetHostImpl::From(GetRenderWidgetHost());
     if (host && host->delegate())
       host->delegate()->UpdateDeviceScaleFactor(display.device_scale_factor());
   }
 
   UpdateScreenInfo(cocoa_view_);
@@ skipping 1751 matching lines @@
 
 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
 // regions that are not draggable. (See ControlRegionView in
 // native_app_window_cocoa.mm). This requires the render host view to be
 // draggable by default.
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 
 @end