[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
jer.noble at apple.com
jer.noble at apple.com
Fri Jan 21 15:09:37 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit bf7656ceb48f24ba980546357b42644106e2f18f
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 7 23:57:09 2011 +0000
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
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 93c4c9a..5bd9ff5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,13 @@
2011-01-07 Jer Noble <jer.noble at apple.com>
+ 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 <jer.noble at apple.com>
+
Fix the Leopard build: Replace CoreAnimation SL-only functions
with Leopard equivalents.
diff --git a/WebKit/mac/WebView/WebFullScreenController.mm b/WebKit/mac/WebView/WebFullScreenController.mm
index 0cb9fb9..a958e90 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;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list