Title: [104515] branches/safari-534.54-branch/Source/WebKit2
Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (104514 => 104515)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-10 01:00:23 UTC (rev 104514)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-10 01:02:14 UTC (rev 104515)
@@ -1,3 +1,21 @@
+2011-1-9 Lucas Forschler <[email protected]>
+
+ Merge 102377
+
+ 2011-12-08 Jer Noble <[email protected]>
+
+ HiDPI: Switching a video element to full screen in HiDPI mode doesn't fit the screen correctly
+ https://bugs.webkit.org/show_bug.cgi?id=74119
+ rdar://problem/10356869
+
+ Reviewed by Darin Adler.
+
+ Use the Lion-only -[NSWindow convertRectToScreen:] function to convert between window
+ coordinates and screen coordinates.
+
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]):
+
2011-1-5 Lucas Forschler <[email protected]>
Merge 98781
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (104514 => 104515)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2012-01-10 01:00:23 UTC (rev 104514)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2012-01-10 01:02:14 UTC (rev 104515)
@@ -185,8 +185,13 @@
screen = [NSScreen mainScreen];
NSRect screenFrame = [screen frame];
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
NSRect webViewFrame = [_webView convertRectToBase:[_webView frame]];
webViewFrame.origin = [[_webView window] convertBaseToScreen:webViewFrame.origin];
+#else
+ NSRect webViewFrame = [[_webView window] convertRectToScreen:
+ [_webView convertRect:[_webView frame] toView:nil]];
+#endif
// In the case of a multi-monitor setup where the webView straddles two
// monitors, we must create a window large enough to contain the destination
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
