From bf7656ceb48f24ba980546357b42644106e2f18f Mon Sep 17 00:00:00 2001 From: "jer.noble@apple.com" Date: Fri, 7 Jan 2011 23:57:09 +0000 Subject: [PATCH] Yet another Leopard build fix: NSRect and CGRect are not inter- changable in 32-bit. * WebView/WebFullScreenController.mm: (-[WebFullScreenController exitFullscreen]): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75288 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/mac/ChangeLog | 8 ++++++++ WebKit/mac/WebView/WebFullScreenController.mm | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog index 93c4c9a2b15..5bd9ff502f5 100644 --- a/WebKit/mac/ChangeLog +++ b/WebKit/mac/ChangeLog @@ -1,3 +1,11 @@ +2011-01-07 Jer Noble + + Yet another Leopard build fix: NSRect and CGRect are not inter- + changable in 32-bit. + + * WebView/WebFullScreenController.mm: + (-[WebFullScreenController exitFullscreen]): + 2011-01-07 Jer Noble Fix the Leopard build: Replace CoreAnimation SL-only functions diff --git a/WebKit/mac/WebView/WebFullScreenController.mm b/WebKit/mac/WebView/WebFullScreenController.mm index 0cb9fb9ad12..a958e908010 100644 --- a/WebKit/mac/WebView/WebFullScreenController.mm +++ b/WebKit/mac/WebView/WebFullScreenController.mm @@ -550,7 +550,7 @@ private: } NSView* animationView = [[self _fullscreenWindow] animationView]; - CGRect layerEndFrame = NSRectToCGRect([animationView convertRect:_initialFrame fromView:nil]); + CGRect layerEndFrame = NSRectToCGRect([animationView convertRect:NSRectFromCGRect(_initialFrame) fromView:nil]); // The _renderer might be NULL due to its ancestor being removed: CGRect layerStartFrame = CGRectZero; -- GitLab