[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 650f8e737c105e018fd71a669b5e73d2ce0bb0de
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 03:58:43 2009 +0000

    2009-10-05  Simon Fraser  <simon.fraser at apple.com>
    
            More build fixes for Tiger.
    
            * WebView/WebVideoFullscreenController.mm:
            * WebView/WebVideoFullscreenHUDWindowController.mm:
            (-[WebVideoFullscreenHUDWindow initWithContentRect:styleMask:backing:defer:]):
            (-[WebVideoFullscreenHUDWindowController scheduleTimeUpdate]):
            (-[WebVideoFullscreenHUDWindowController fadeWindowIn]):
            (-[WebVideoFullscreenHUDWindowController fadeWindowOut]):
            (-[WebVideoFullscreenHUDWindowController closeWindow]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49143 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 9b154cb..867ca0a 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,17 @@
 2009-10-05  Simon Fraser  <simon.fraser at apple.com>
 
+        More build fixes for Tiger.
+
+        * WebView/WebVideoFullscreenController.mm:
+        * WebView/WebVideoFullscreenHUDWindowController.mm:
+        (-[WebVideoFullscreenHUDWindow initWithContentRect:styleMask:backing:defer:]):
+        (-[WebVideoFullscreenHUDWindowController scheduleTimeUpdate]):
+        (-[WebVideoFullscreenHUDWindowController fadeWindowIn]):
+        (-[WebVideoFullscreenHUDWindowController fadeWindowOut]):
+        (-[WebVideoFullscreenHUDWindowController closeWindow]):
+
+2009-10-05  Simon Fraser  <simon.fraser at apple.com>
+
         Build fixes for Tiger.
 
         * WebView/WebVideoFullscreenHUDWindowController.h:
diff --git a/WebKit/mac/WebView/WebVideoFullscreenController.mm b/WebKit/mac/WebView/WebVideoFullscreenController.mm
index ab1f114..f1b3355 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenController.mm
@@ -36,14 +36,12 @@
 #import "WebVideoFullscreenController.h"
 #import "WebVideoFullscreenHUDWindowController.h"
 #import "WebKitSystemInterface.h"
+#import "WebTypesInternal.h"
 #import "WebWindowAnimation.h"
 
 SOFT_LINK_FRAMEWORK(QTKit)
-
-
 SOFT_LINK_CLASS(QTKit, QTMovieView)
 
-
 @interface WebVideoFullscreenWindow : NSWindow
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER)
 <NSAnimationDelegate>
diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
index d0767a8..2edfccc 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
@@ -29,16 +29,11 @@
 
 #import <QTKit/QTKit.h>
 #import "WebKitSystemInterface.h"
+#import "WebTypesInternal.h"
 #import <wtf/RetainPtr.h>
 
 #define HAVE_MEDIA_CONTROL (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD))
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-#define WebNSUInteger unsigned int
-#else
-#define WebNSUInteger NSUInteger
-#endif
-
 @interface WebVideoFullscreenHUDWindowController (Private) <NSWindowDelegate>
 
 - (void)updateTime;
@@ -75,7 +70,7 @@
 
 @implementation WebVideoFullscreenHUDWindow
 
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(WebNSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
+- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
 {
     UNUSED_PARAM(aStyle);
     self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:flag];
@@ -189,7 +184,11 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
 
     // Note that this creates a retain cycle between the window and us.
     _timelineUpdateTimer = [[NSTimer timerWithTimeInterval:0.25 target:self selector:@selector(updateTime) userInfo:nil repeats:YES] retain];
+#if defined(BUILDING_ON_TIGER)
+    [[NSRunLoop currentRunLoop] addTimer:_timelineUpdateTimer forMode:(NSString*)kCFRunLoopCommonModes];
+#else
     [[NSRunLoop currentRunLoop] addTimer:_timelineUpdateTimer forMode:NSRunLoopCommonModes];
+#endif
 }
 
 - (void)unscheduleTimeUpdate
@@ -208,7 +207,11 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
         [window setAlphaValue:0];
 
     [window makeKeyAndOrderFront:self];
+#if defined(BUILDING_ON_TIGER)
+    [window setAlphaValue:1];
+#else
     [[window animator] setAlphaValue:1];
+#endif
     [self scheduleTimeUpdate];
 
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fadeWindowOut) object:nil];
@@ -219,7 +222,11 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
 - (void)fadeWindowOut
 {
     [NSCursor setHiddenUntilMouseMoves:YES];
+#if defined(BUILDING_ON_TIGER)
+    [[self window] setAlphaValue:0];
+#else
     [[[self window] animator] setAlphaValue:0];
+#endif
     [self performSelector:@selector(unscheduleTimeUpdate) withObject:nil afterDelay:1];
 }
 
@@ -230,8 +237,8 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
     NSWindow *window = [self window];
 #if !defined(BUILDING_ON_TIGER)
     [[window contentView] removeTrackingArea:_area];
-#endif
     [self setArea:nil];
+#endif
     [window close];
     [window setDelegate:nil];
     [self setWindow:nil];

-- 
WebKit Debian packaging