[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric.carlson at apple.com
eric.carlson at apple.com
Wed Apr 7 23:53:01 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 462d43fa201de4db82097026deba4ff70037a944
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 21 01:44:04 2009 +0000
2009-11-20 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
<rdar://problem/7414396> Leopard & Tiger: Support closed caption in <video> element
* css/mediaControls.css:
Define closed caption toggle button.
* rendering/RenderMedia.cpp:
(WebCore::RenderMedia::updateControls):
Create closed caption toggle button in display order.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::shouldRenderMediaControlPart):
Don't require MediaControllerThemeQuickTime theme for captions toggle button.
No need to check if the movie has video, a closed captions track is a video
track.
2009-11-20 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
<rdar://problem/7414396> Leopard & Tiger: Support closed caption in <video> element
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceSnowLeopard.a:
* libWebKitSystemInterfaceTiger.a:
2009-11-20 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
<rdar://problem/7414396> Leopard & Tiger: Support closed caption in <video> element
Remove closed captions test from skipped list.
* platform/mac-leopard/Skipped:
* platform/mac-tiger/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51270 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6e3972f..d82fb9f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-20 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7414396> Leopard & Tiger: Support closed caption in <video> element
+
+ Remove closed captions test from skipped list.
+
+ * platform/mac-leopard/Skipped:
+ * platform/mac-tiger/Skipped:
+
2009-11-20 Chris Fleizach <cfleizach at apple.com>
Reviewed by Beth Dakin.
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 88e4dc9..05bf9d3 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -25,8 +25,5 @@ transforms/3d
media/media-fullscreen-inline.html
media/media-fullscreen-not-in-document.html
-# Requires media engine closed caption support
-media/media-captions.html
-
# Tests of accessibility functionality not supported on Leopard
accessibility/aria-list-and-listitem.html
diff --git a/LayoutTests/platform/mac-tiger/Skipped b/LayoutTests/platform/mac-tiger/Skipped
index 66eaaa4..1dd7a88 100644
--- a/LayoutTests/platform/mac-tiger/Skipped
+++ b/LayoutTests/platform/mac-tiger/Skipped
@@ -67,9 +67,6 @@ http/tests/loading/redirect-with-no-location-crash.html
media/media-fullscreen-inline.html
media/media-fullscreen-not-in-document.html
-# Requires media engine closed caption support
-media/media-captions.html
-
# Tests of accessibility functionality not supported on Tiger
accessibility/aria-list-and-listitem.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7625ba6..64b2be3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-20 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7414396> Leopard & Tiger: Support closed caption in <video> element
+
+ * css/mediaControls.css:
+ Define closed caption toggle button.
+
+ * rendering/RenderMedia.cpp:
+ (WebCore::RenderMedia::updateControls):
+ Create closed caption toggle button in display order.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::shouldRenderMediaControlPart):
+ Don't require MediaControllerThemeQuickTime theme for captions toggle button.
+ No need to check if the movie has video, a closed captions track is a video
+ track.
+
2009-11-20 Joseph Pecoraro <joepeck at webkit.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/css/mediaControls.css b/WebCore/css/mediaControls.css
index 12ca14a..de2c2fe 100644
--- a/WebCore/css/mediaControls.css
+++ b/WebCore/css/mediaControls.css
@@ -126,5 +126,8 @@ audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-co
}
audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button {
- display: none;
+ -webkit-appearance: media-toggle-closed-captions-button;
+ display: -webkit-box;
+ width: 16px;
+ height: 16px;
}
diff --git a/WebCore/rendering/RenderMedia.cpp b/WebCore/rendering/RenderMedia.cpp
index 9870566..2ff50df 100644
--- a/WebCore/rendering/RenderMedia.cpp
+++ b/WebCore/rendering/RenderMedia.cpp
@@ -334,7 +334,6 @@ void RenderMedia::updateControls()
createRewindButton();
createPlayButton();
createReturnToRealtimeButton();
- createToggleClosedCaptionsButton();
createStatusDisplay();
createTimelineContainer();
if (m_timelineContainer) {
@@ -344,6 +343,7 @@ void RenderMedia::updateControls()
}
createSeekBackButton();
createSeekForwardButton();
+ createToggleClosedCaptionsButton();
createFullscreenButton();
createMuteButton();
createVolumeSliderContainer();
diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index f2bdd7b..6304947 100644
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -1710,8 +1710,7 @@ bool RenderThemeMac::shouldRenderMediaControlPart(ControlPart part, Element* ele
if (part == MediaToggleClosedCaptionsButtonPart) {
// We rely on QTKit to render captions so don't enable the button unless it will be able to do so.
- HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(element);
- if (mediaControllerTheme() != MediaControllerThemeQuickTime || !element->hasTagName(videoTag) || !mediaElement->hasVideo())
+ if (!element->hasTagName(videoTag))
return false;
}
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 7bdd10e..a082bda 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-20 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7414396> Leopard & Tiger: Support closed caption in <video> element
+
+ * WebKitSystemInterface.h:
+ * libWebKitSystemInterfaceLeopard.a:
+ * libWebKitSystemInterfaceSnowLeopard.a:
+ * libWebKitSystemInterfaceTiger.a:
+
2009-11-19 Eric Carlson <eric.carlson at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 026af3a..f1bc523 100644
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -210,7 +210,8 @@ typedef enum {
WKMediaUIPartSliderThumb,
WKMediaUIPartRewindButton,
WKMediaUIPartSeekToRealtimeButton,
- WKMediaUIPartToggleClosedCaptionsButton,
+ WKMediaUIPartShowClosedCaptionsButton,
+ WKMediaUIPartHideClosedCaptionsButton,
WKMediaUIPartUnMuteButton,
WKMediaUIPartPauseButton,
WKMediaUIPartBackground,
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 17446cc..983fe1e 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index 946ddf9..cc32971 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a and b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a differ
diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a
index d717b85..55363bd 100644
Binary files a/WebKitLibraries/libWebKitSystemInterfaceTiger.a and b/WebKitLibraries/libWebKitSystemInterfaceTiger.a differ
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list