Title: [137771] trunk/Source/WebCore
- Revision
- 137771
- Author
- [email protected]
- Date
- 2012-12-14 14:18:23 -0800 (Fri, 14 Dec 2012)
Log Message
Enable video caption controls on Windows.
https://bugs.webkit.org/show_bug.cgi?id=105045.
Reviewed by Eric Carlson.
Now that video tracks have been enabled on Windows, enable controls as well.
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
(WebCore::MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler):
* html/shadow/MediaControlElements.h:
* rendering/RenderThemeWin.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137770 => 137771)
--- trunk/Source/WebCore/ChangeLog 2012-12-14 22:13:54 UTC (rev 137770)
+++ trunk/Source/WebCore/ChangeLog 2012-12-14 22:18:23 UTC (rev 137771)
@@ -1,3 +1,18 @@
+2012-12-14 Roger Fong <[email protected]>
+
+ Enable video caption controls on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=105045.
+
+ Reviewed by Eric Carlson.
+
+ Now that video tracks have been enabled on Windows, enable controls as well.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement):
+ (WebCore::MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler):
+ * html/shadow/MediaControlElements.h:
+ * rendering/RenderThemeWin.h:
+
2012-12-14 Mark Lam <[email protected]>
Introducing the DatabaseStrategy and database servers.
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (137770 => 137771)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-12-14 22:13:54 UTC (rev 137770)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-12-14 22:18:23 UTC (rev 137771)
@@ -649,11 +649,11 @@
MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement(Document* document, MediaControls* controls)
: MediaControlInputElement(document, MediaShowClosedCaptionsButton)
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(WIN)
, m_controls(controls)
#endif
{
-#if !PLATFORM(MAC)
+#if !PLATFORM(MAC) && !PLATFORM(WIN)
UNUSED_PARAM(controls);
#endif
}
@@ -683,7 +683,7 @@
// UI. Not all ports may want the closed captions button to toggle a list of tracks, so
// we have to use #if.
// https://bugs.webkit.org/show_bug.cgi?id=101877
-#if !PLATFORM(MAC)
+#if !PLATFORM(MAC) && !PLATFORM(WIN)
mediaController()->setClosedCaptionsVisible(!mediaController()->closedCaptionsVisible());
setChecked(mediaController()->closedCaptionsVisible());
updateDisplayType();
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (137770 => 137771)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2012-12-14 22:13:54 UTC (rev 137770)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2012-12-14 22:18:23 UTC (rev 137771)
@@ -275,7 +275,7 @@
virtual const AtomicString& shadowPseudoId() const OVERRIDE;
virtual void defaultEventHandler(Event*) OVERRIDE;
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(WIN)
MediaControls* m_controls;
#endif
};
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (137770 => 137771)
--- trunk/Source/WebCore/rendering/RenderThemeWin.h 2012-12-14 22:13:54 UTC (rev 137770)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h 2012-12-14 22:18:23 UTC (rev 137771)
@@ -25,6 +25,7 @@
#define RenderThemeWin_h
#include "RenderTheme.h"
+#include <SafariTheme/SafariThemeConstants.h>
#if WIN32
typedef void* HANDLE;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
