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

[eric.carlson at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 398f8979df80f1682f4c6d66ace9fa040c147da8
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 15:53:18 2009 +0000

    2009-10-22  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by John Sullivan.
    
            <rdar://problem/7322847>
            Pressing space bar key in full screen mode should pause movie but doesn't
    
            * WebView/WebVideoFullscreenHUDWindowController.mm:
            (-[WebVideoFullscreenHUDWindowController keyDown:]):  New, toggle playback on space key.
            (-[WebVideoFullscreenHUDWindowController windowDidLoad]): Play button action is now called togglePlaying.
            (-[WebVideoFullscreenHUDWindowController togglePlaying:]): Rename from playingChanged.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 9535f3e..d70564b 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-22  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/7322847>
+        Pressing space bar key in full screen mode should pause movie but doesn't
+
+        * WebView/WebVideoFullscreenHUDWindowController.mm:
+        (-[WebVideoFullscreenHUDWindowController keyDown:]):  New, toggle playback on space key.
+        (-[WebVideoFullscreenHUDWindowController windowDidLoad]): Play button action is now called togglePlaying.
+        (-[WebVideoFullscreenHUDWindowController togglePlaying:]): Rename from playingChanged.
+
 2009-10-22  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by NOBODY (build fix).
diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
index 17729d3..666ea10 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
@@ -39,6 +39,8 @@ using namespace std;
 
 @interface WebVideoFullscreenHUDWindowController (Private) <NSWindowDelegate>
 
+- (void)keyDown:(NSEvent *)event;
+
 - (void)updateTime;
 - (void)timelinePositionChanged:(id)sender;
 - (float)currentTime;
@@ -50,7 +52,7 @@ using namespace std;
 - (double)volume;
 - (void)setVolume:(double)volume;
 
-- (void)playingChanged:(id)sender;
+- (void)togglePlaying:(id)sender;
 - (BOOL)playing;
 - (void)setPlaying:(BOOL)playing;
 
@@ -165,11 +167,19 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
 }
 #endif
 
+- (void)keyDown:(NSEvent *)event
+{
+    if ([[event characters] isEqualToString:@" "])
+        [_playButton performClick:self];
+    else
+        [super keyDown:event];
+}
+
 - (id<WebVideoFullscreenHUDWindowControllerDelegate>)delegate
 {
     return _delegate;
 }
-     
+
 - (void)setDelegate:(id<WebVideoFullscreenHUDWindowControllerDelegate>)delegate
 {
     _delegate = delegate;
@@ -315,7 +325,7 @@ static NSTextField *createTimeTextField(NSRect frame)
     CGFloat center = (windowWidth - kButtonSize) / 2;
     _playButton = createControlWithMediaUIControlType(WKMediaUIControlPlayPauseButton, NSMakeRect(center, top - kButtonSize, kButtonSize, kButtonSize));
     [_playButton setTarget:self];
-    [_playButton setAction:@selector(playingChanged:)];
+    [_playButton setAction:@selector(togglePlaying:)];
     [contentView addSubview:_playButton];
 
     CGFloat closeToRight = windowWidth - 2 * kMargin - kButtonMiniSize;
@@ -472,7 +482,7 @@ static NSTextField *createTimeTextField(NSRect frame)
     [_playButton setIntValue:[self playing]];
 }
 
-- (void)playingChanged:(id)sender
+- (void)togglePlaying:(id)sender
 {
     BOOL nowPlaying = [self playing];
     [self setPlaying:!nowPlaying];

-- 
WebKit Debian packaging