diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit/mac/Misc/WebNSControlExtras.m | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit/mac/Misc/WebNSControlExtras.m')
| -rw-r--r-- | Source/WebKit/mac/Misc/WebNSControlExtras.m | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/WebKit/mac/Misc/WebNSControlExtras.m b/Source/WebKit/mac/Misc/WebNSControlExtras.m index b666131..dc91e23 100644 --- a/Source/WebKit/mac/Misc/WebNSControlExtras.m +++ b/Source/WebKit/mac/Misc/WebNSControlExtras.m @@ -44,7 +44,15 @@ NSWindow *window = [self window]; NSRect windowFrame = [window frame]; - windowFrame.size.height += heightDelta * [window userSpaceScaleFactor]; + + CGFloat userSpaceScaleFactor; +#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) + userSpaceScaleFactor = [window backingScaleFactor]; +#else + userSpaceScaleFactor = [window userSpaceScaleFactor]; +#endif + + windowFrame.size.height += heightDelta * userSpaceScaleFactor; [window setFrame:windowFrame display:NO]; } |