[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 dc2d2a1b672bd200d12f3de814c6bcb228234274
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 17:32:02 2009 +0000

    2009-10-15  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Simon Fraser.
    
            <rdar://problem/7295738> No way to mute/unmute a movie in full screen video mode
    
            * WebCore.Video.exp: Export muted and setMute.
    
    2009-10-15  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Simon Fraser.
    
            <rdar://problem/7295738> No way to mute/unmute a movie in full screen video mode
    
            * WebView/WebVideoFullscreenHUDWindowController.mm:
            (-[WebVideoFullscreenHUDWindowController setVolume:]): Unmute movie before changing volume.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1cf51b5..b68a770 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-15  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7295738> No way to mute/unmute a movie in full screen video mode
+
+        * WebCore.Video.exp: Export muted and setMute.
+
 2009-10-15  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/WebCore.Video.exp b/WebCore/WebCore.Video.exp
index 596fb4b..5d35698 100644
--- a/WebCore/WebCore.Video.exp
+++ b/WebCore/WebCore.Video.exp
@@ -3,6 +3,8 @@ __ZN7WebCore16HTMLMediaElement5pauseEv
 __ZNK7WebCore16HTMLMediaElement6volumeEv
 __ZNK7WebCore16HTMLMediaElement7canPlayEv
 __ZNK7WebCore16HTMLMediaElement8durationEv
+__ZNK7WebCore16HTMLMediaElement5mutedEv
+__ZN7WebCore16HTMLMediaElement8setMutedEb
 __ZN7WebCore16HTMLMediaElement9setVolumeEfRi
 __ZN7WebCore16HTMLMediaElement6rewindEf
 __ZN7WebCore16HTMLMediaElement10screenRectEv
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 18720ad..695c559 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-15  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        <rdar://problem/7295738> No way to mute/unmute a movie in full screen video mode
+
+        * WebView/WebVideoFullscreenHUDWindowController.mm:
+        (-[WebVideoFullscreenHUDWindowController setVolume:]): Unmute movie before changing volume.
+
 2009-10-14  Kevin Decker  <kdecker at apple.com>
 
         Unbreak the world.
diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
index 2edfccc..a57cf16 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
@@ -436,6 +436,8 @@ static NSTextField *createTimeTextField(NSRect frame)
     if (![_delegate mediaElement])
         return;
     WebCore::ExceptionCode e;
+    if ([_delegate mediaElement]->muted())
+        [_delegate mediaElement]->setMuted(false);
     [_delegate mediaElement]->setVolume(volume / [self maxVolume], e);
 }
 

-- 
WebKit Debian packaging