[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
simon.fraser at apple.com
simon.fraser at apple.com
Thu Oct 29 20:39:43 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit c210eac3a6bf79dcadfcfcb566e2ffe1b3da55ba
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 6 04:17:55 2009 +0000
2009-10-05 Simon Fraser <simon.fraser at apple.com>
More build fixes for Tiger.
* WebView/WebVideoFullscreenController.mm:
(-[WebVideoFullscreenWindow animationDidEnd:]):
* WebView/WebWindowAnimation.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49146 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 867ca0a..b8fe435 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -3,6 +3,14 @@
More build fixes for Tiger.
* WebView/WebVideoFullscreenController.mm:
+ (-[WebVideoFullscreenWindow animationDidEnd:]):
+ * WebView/WebWindowAnimation.m:
+
+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]):
diff --git a/WebKit/mac/WebView/WebVideoFullscreenController.mm b/WebKit/mac/WebView/WebVideoFullscreenController.mm
index f1b3355..7860f40 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenController.mm
@@ -404,10 +404,12 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
- (void)animationDidEnd:(NSAnimation *)animation
{
+#if !defined(BUILDING_ON_TIGER) // Animations are never threaded on Tiger.
if (![NSThread isMainThread]) {
[self performSelectorOnMainThread:@selector(animationDidEnd:) withObject:animation waitUntilDone:NO];
return;
}
+#endif
if (animation != _fullscreenAnimation)
return;
diff --git a/WebKit/mac/WebView/WebWindowAnimation.m b/WebKit/mac/WebView/WebWindowAnimation.m
index 8e56321..3ab64bf 100644
--- a/WebKit/mac/WebView/WebWindowAnimation.m
+++ b/WebKit/mac/WebView/WebWindowAnimation.m
@@ -52,6 +52,7 @@ static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
}
@implementation WebWindowScaleAnimation
+
- (id)init
{
self = [super init];
@@ -164,9 +165,11 @@ static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
[super stopAnimation];
[_subAnimation stopAnimation];
}
+
@end
@implementation WebWindowFadeAnimation
+
- (id)init
{
self = [super init];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list