2009-10-15 Eric Carlson <eric.carlson@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@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: https://svn.webkit.org/repository/webkit/trunk@49636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1cf51b5284e0c62439c59b34a7a85ddbe00c5bbe..b68a77032dca25ebc862de91f8871c294616403a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-15  Eric Carlson  <eric.carlson@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@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/WebCore/WebCore.Video.exp b/WebCore/WebCore.Video.exp
index 596fb4b2a1f2146a08c1671cd9e0b24f2b5b1d1d..5d356983d459bc56ab3246f80a2caf930f5f0a0a 100644 (file)
--- 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 18720ad568b1d9ae9e2c17b40645df2a87543d45..695c559452e47107b3fe4f9f65e2bd6faf1d4716 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-15  Eric Carlson  <eric.carlson@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@apple.com>
 
         Unbreak the world.

diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
index 2edfccc15d9277631395fef7dc7f588d16df2d61..a57cf16b268a2ea498b45c4df1f790d6d1e06a7c 100644 (file)
--- 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);
 }