GetScaleFactorForNativeView should return scale factor in float

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 <objc/runtime.h>
 #include <QuartzCore/QuartzCore.h>
 
 #include "base/basictypes.h"
@@ skipping 131 matching lines @@
           windowDelegateProtocol,
           @selector(windowDidChangeBackingProperties:),
           NO,
           YES);
 
   // If the protocol does not contain the method, the returned method
   // description is {NULL, NULL}
   return methodDescription.name != NULL || methodDescription.types != NULL;
 }
 
-static float ScaleFactorForView(NSView* view) {
-  return ui::GetImageScale(ui::GetScaleFactorForNativeView(view));
-}
-
 // Private methods:
 @interface RenderWidgetHostViewCocoa ()
 @property(nonatomic, assign) NSRange selectedRange;
 @property(nonatomic, assign) NSRange markedRange;
 
 + (BOOL)shouldAutohideCursorForEvent:(NSEvent*)event;
 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r;
 - (void)gotUnhandledWheelEvent;
 - (void)scrollOffsetPinnedToLeft:(BOOL)left toRight:(BOOL)right;
 - (void)setHasHorizontalScrollbar:(BOOL)has_horizontal_scrollbar;
@@ skipping 636 matching lines @@
 }
 
 int RenderWidgetHostViewMac::window_number() const {
   NSWindow* window = [cocoa_view_ window];
   if (!window)
     return -1;
   return [window windowNumber];
 }
 
 float RenderWidgetHostViewMac::ViewScaleFactor() const {
-  return ScaleFactorForView(cocoa_view_);
+  return ui::GetScaleFactorForNativeView(cocoa_view_);
 }
 
 void RenderWidgetHostViewMac::UpdateDisplayLink() {
   static bool is_vsync_disabled =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync);
   if (is_vsync_disabled)
     return;
 
   NSScreen* screen = [[cocoa_view_ window] screen];
   NSDictionary* screen_description = [screen deviceDescription];
@@ skipping 17 matching lines @@
   if (!display_link_->GetVSyncParameters(&timebase, &interval))
     return;
 
   render_widget_host_->UpdateVSyncParameters(timebase, interval);
 }
 
 void RenderWidgetHostViewMac::UpdateBackingStoreScaleFactor() {
   if (!render_widget_host_)
     return;
 
-  float new_scale_factor = ScaleFactorForView(cocoa_view_);
+  float new_scale_factor = ui::GetScaleFactorForNativeView(cocoa_view_);
   if (new_scale_factor == backing_store_scale_factor_)
     return;
   backing_store_scale_factor_ = new_scale_factor;
 
   render_widget_host_->NotifyScreenInfoChanged();
 }
 
 RenderWidgetHost* RenderWidgetHostViewMac::GetRenderWidgetHost() const {
   return render_widget_host_;
 }
@@ skipping 383 matching lines @@
         src_subrect, dst_size, callback, config);
     return;
   }
 
   if (config != SkBitmap::kARGB_8888_Config) {
     NOTIMPLEMENTED();
     callback.Run(false, SkBitmap());
   }
   base::ScopedClosureRunner scoped_callback_runner(
       base::Bind(callback, false, SkBitmap()));
-  float scale = ScaleFactorForView(cocoa_view_);
+  float scale = ui::GetScaleFactorForNativeView(cocoa_view_);
   gfx::Size dst_pixel_size = gfx::ToFlooredSize(
       gfx::ScaleSize(dst_size, scale));
   if (compositing_iosurface_ && compositing_iosurface_->HasIOSurface()) {
     ignore_result(scoped_callback_runner.Release());
     compositing_iosurface_->CopyTo(GetScaledOpenGLPixelRect(src_subrect),
                                    dst_pixel_size,
                                    callback);
   } else if (software_frame_manager_->HasCurrentFrame()) {
     gfx::Rect src_pixel_rect = gfx::ToEnclosingRect(gfx::ScaleRect(
         src_subrect,
@@ skipping 1227 matching lines @@
   self = [super initWithFrame:NSZeroRect];
   if (self) {
     self.acceptsTouchEvents = YES;
     editCommand_helper_.reset(new RenderWidgetHostViewMacEditCommandHelper);
     editCommand_helper_->AddEditingSelectorsToClass([self class]);
 
     renderWidgetHostView_.reset(r);
     canBeKeyView_ = YES;
     focusedPluginIdentifier_ = -1;
     renderWidgetHostView_->backing_store_scale_factor_ =
-        ScaleFactorForView(self);
+        ui::GetScaleFactorForNativeView(self);
 
     // OpenGL support:
     if ([self respondsToSelector:
         @selector(setWantsBestResolutionOpenGLSurface:)]) {
       [self setWantsBestResolutionOpenGLSurface:YES];
     }
     handlingGlobalFrameDidChange_ = NO;
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(globalFrameDidChange:)
@@ skipping 1916 matching lines @@
 }
 
 - (void)disableRendering {
   // Disable the fade-out animation as the layer is removed.
   ScopedCAActionDisabler disabler;
   [self removeFromSuperlayer];
   renderWidgetHostView_ = nil;
 }
 
 @end  // implementation SoftwareLayer