diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebCore/platform/PlatformScreen.h | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebCore/platform/PlatformScreen.h')
| -rw-r--r-- | Source/WebCore/platform/PlatformScreen.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h index a9acb5dd0..827801b44 100644 --- a/Source/WebCore/platform/PlatformScreen.h +++ b/Source/WebCore/platform/PlatformScreen.h @@ -31,13 +31,8 @@ #include <wtf/RefPtr.h> #if PLATFORM(MAC) -#ifdef __OBJC__ - @class NSScreen; - @class NSWindow; -#else - class NSScreen; - class NSWindow; -#endif +OBJC_CLASS NSScreen; +OBJC_CLASS NSWindow; #endif typedef uint32_t PlatformDisplayID; @@ -45,6 +40,7 @@ typedef uint32_t PlatformDisplayID; namespace WebCore { class FloatRect; + class FrameView; class Widget; int screenHorizontalDPI(Widget*); @@ -53,19 +49,14 @@ namespace WebCore { int screenDepthPerComponent(Widget*); bool screenIsMonochrome(Widget*); - FloatRect screenRect(Widget*); - FloatRect screenAvailableRect(Widget*); - -#if PLATFORM(CHROMIUM) - // Measured in frames per second. 0 if the refresh rate is unknown, or not applicable. - double screenRefreshRate(Widget*); -#endif + FloatRect screenRect(FrameView*); + FloatRect screenAvailableRect(FrameView*); #if PLATFORM(MAC) NSScreen *screenForWindow(NSWindow *); - FloatRect toUserSpace(const NSRect&, NSWindow *destination); - NSRect toDeviceSpace(const FloatRect&, NSWindow *source); + FloatRect toUserSpace(const NSRect&, NSWindow *destination, float deviceScaleFactor); + NSRect toDeviceSpace(const FloatRect&, NSWindow *source, float deviceScaleFactor); NSPoint flipScreenPoint(const NSPoint&, NSScreen *); #endif |