Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_mac.mm |
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm |
| index 16c3eed41318699302431743426758278a7a5cd2..7408ae19a590733ec0cd67cdaa08c006277cbc2f 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
| @@ -48,6 +48,7 @@ |
| #include "third_party/skia/include/core/SkColor.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/gfx/point.h" |
| #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
| #include "ui/surface/io_surface_support_mac.h" |
| @@ -74,10 +75,6 @@ using WebKit::WebGestureEvent; |
| + (void)removeMonitor:(id)eventMonitor; |
| @end |
| -@interface NSScreen (LionAPI) |
| -- (CGFloat)backingScaleFactor; |
| -@end |
| - |
| @interface NSWindow (LionAPI) |
| - (CGFloat)backingScaleFactor; |
| @end |
| @@ -110,17 +107,7 @@ static inline int ToWebKitModifiers(NSUInteger flags) { |
| } |
| static float ScaleFactor(NSView* view) { |
| - if (NSWindow* window = [view window]) { |
| - if ([window respondsToSelector:@selector(backingScaleFactor)]) |
| - return [window backingScaleFactor]; |
| - return [window userSpaceScaleFactor]; |
| - } |
| - if (NSScreen* screen = [NSScreen mainScreen]) { |
| - if ([screen respondsToSelector:@selector(backingScaleFactor)]) |
| - return [screen backingScaleFactor]; |
| - return [screen userSpaceScaleFactor]; |
| - } |
| - return 1; |
| + return ui::GetScaleFactorScale(ui::GetScaleFactorForNativeView(view)); |
|
Nico
2012/08/02 21:26:52
doesn't GetScaleFactorForNativeView() return a sca
mazda
2012/08/02 22:42:24
GetScaleFactorForNativeView returns ScaleFactor (e
Nico
2012/08/02 22:43:16
Ah, ok. Might make sense if it's needed in more pl
|
| } |
| // Private methods: |