[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jer.noble at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 514c1913d4bbd524eacb9d1766b1fc9d2c87aefc
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 23:39:19 2011 +0000

    Fix the Leopard build: Replace CoreAnimation SL-only functions
    with Leopard equivalents.
    
    * WebView/WebFullScreenController.mm:
    (+[CATransaction setDisableActions:]):
    (+[CATransaction setAnimationDuration:]):
    (-[WebFullScreenController _animationDuration]):
    (-[WebFullscreenWindow initWithContentRect:styleMask:backing:defer:]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 9a48549..93c4c9a 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-07  Jer Noble  <jer.noble at apple.com>
+
+        Fix the Leopard build: Replace CoreAnimation SL-only functions
+        with Leopard equivalents.
+
+        * WebView/WebFullScreenController.mm:
+        (+[CATransaction setDisableActions:]):
+        (+[CATransaction setAnimationDuration:]):
+        (-[WebFullScreenController _animationDuration]):
+        (-[WebFullscreenWindow initWithContentRect:styleMask:backing:defer:]):
+
 2010-12-21  Jer Noble  <jer.noble at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/mac/WebView/WebFullScreenController.mm b/WebKit/mac/WebView/WebFullScreenController.mm
index 800a650..0cb9fb9 100644
--- a/WebKit/mac/WebView/WebFullScreenController.mm
+++ b/WebKit/mac/WebView/WebFullScreenController.mm
@@ -58,6 +58,26 @@ static NSString* const isEnteringFullscreenKey = @"isEnteringFullscreen";
 
 using namespace WebCore;
 
+#if defined(BUILDING_ON_LEOPARD)
+ at interface CATransaction(SnowLeopardConvenienceFunctions)
++ (void)setDisableActions:(BOOL)flag;
++ (void)setAnimationDuration:(CFTimeInterval)dur;
+ at end
+
+ at implementation CATransaction(SnowLeopardConvenienceFunctions)
++ (void)setDisableActions:(BOOL)flag
+{
+    [self setValue:[NSNumber numberWithBool:flag] forKey:kCATransactionDisableActions];
+}
+
++ (void)setAnimationDuration:(CFTimeInterval)dur
+{
+    [self setValue:[NSNumber numberWithDouble:dur] forKey:kCATransactionAnimationDuration];
+}
+ at end
+
+#endif
+
 @interface WebFullscreenWindow : NSWindow
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER)
 <NSAnimationDelegate>
@@ -761,7 +781,7 @@ private:
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
     NSUInteger modifierFlags = [NSEvent modifierFlags];
 #else
-    NSUInteger modifierFlags = [[NSEvent currentEvent] modifierFlags];
+    NSUInteger modifierFlags = [[NSApp currentEvent] modifierFlags];
 #endif
     if ((modifierFlags & NSControlKeyMask) == NSControlKeyMask)
         duration *= 2;
@@ -791,7 +811,11 @@ private:
     [self setAcceptsMouseMovedEvents:YES];
     [self setReleasedWhenClosed:NO];
     [self setHasShadow:YES];
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
     [self setMovable:NO];
+#else
+    [self setMovableByWindowBackground:NO];
+#endif
     
     NSView* contentView = [self contentView];
     _animationView = [[NSView alloc] initWithFrame:[contentView bounds]];
@@ -804,7 +828,11 @@ private:
     
     _backgroundLayer = [[CALayer alloc] init];
     [contentLayer addSublayer:_backgroundLayer];
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
     [contentLayer setGeometryFlipped:YES];
+#else
+    [contentLayer setSublayerTransform:CATransform3DMakeScale(1, -1, 1)];
+#endif
     [contentLayer setOpacity:0];
     
     [_backgroundLayer setBackgroundColor:CGColorGetConstantColor(kCGColorBlack)];

-- 
WebKit Debian packaging