[webkit-changes] [138680] trunk/Source

Wed, 02 Jan 2013 16:54:16 -0800

Title: [138680] trunk/Source
Revision
138680
Author
[email protected]
Date
2013-01-02 16:55:59 -0800 (Wed, 02 Jan 2013)

Log Message

AX: Chromium needs platform localized strings for media controls.
https://bugs.webkit.org/show_bug.cgi?id=105940

Patch by David Tseng <[email protected]> on 2013-01-02
Reviewed by Tony Chang.

Source/Platform:

* chromium/public/WebLocalizedString.h:

Source/WebKit/chromium:

* src/LocalizedStrings.cpp:
(WebCore::localizedMediaControlElementString):
(WebCore):
(WebCore::localizedMediaControlElementHelpText):

Modified Paths

Diff

Modified: trunk/Source/Platform/ChangeLog (138679 => 138680)


--- trunk/Source/Platform/ChangeLog	2013-01-03 00:53:34 UTC (rev 138679)
+++ trunk/Source/Platform/ChangeLog	2013-01-03 00:55:59 UTC (rev 138680)
@@ -1,3 +1,12 @@
+2013-01-02  David Tseng  <[email protected]>
+
+        AX: Chromium needs platform localized strings for media controls.
+        https://bugs.webkit.org/show_bug.cgi?id=105940
+
+        Reviewed by Tony Chang.
+
+        * chromium/public/WebLocalizedString.h:
+
 2012-12-24  Alexei Filippov  <[email protected]>
 
         Web Inspector: add async API for passing renderer process memory stats

Modified: trunk/Source/Platform/chromium/public/WebLocalizedString.h (138679 => 138680)


--- trunk/Source/Platform/chromium/public/WebLocalizedString.h	2013-01-03 00:53:34 UTC (rev 138679)
+++ trunk/Source/Platform/chromium/public/WebLocalizedString.h	2013-01-03 00:55:59 UTC (rev 138680)
@@ -46,6 +46,45 @@
         AXLinkActionVerb,
         AXLinkText,
         AXListMarkerText,
+        AXMediaAudioElement,
+        AXMediaAudioElementHelp,
+        AXMediaCurrentTimeDisplay,
+        AXMediaCurrentTimeDisplayHelp,
+        AXMediaDefault,
+        AXMediaEnterFullscreenButton,
+        AXMediaEnterFullscreenButtonHelp,
+        AXMediaExitFullscreenButton,
+        AXMediaExitFullscreenButtonHelp,
+        AXMediaHideClosedCaptionsButton,
+        AXMediaHideClosedCaptionsButtonHelp,
+        AXMediaMuteButton,
+        AXMediaMuteButtonHelp,
+        AXMediaPauseButton,
+        AXMediaPauseButtonHelp,
+        AXMediaPlayButton,
+        AXMediaPlayButtonHelp,
+        AXMediaReturnToRealTime,
+        AXMediaReturnToRealTimeHelp,
+        AXMediaRewindButton,
+        AXMediaRewindButtonHelp,
+        AXMediaSeekBackButton,
+        AXMediaSeekBackButtonHelp,
+        AXMediaSeekForwardButton,
+        AXMediaSeekForwardButtonHelp,
+        AXMediaShowClosedCaptionsButton,
+        AXMediaShowClosedCaptionsButtonHelp,
+        AXMediaSlider,
+        AXMediaSliderHelp,
+        AXMediaSliderThumb,
+        AXMediaSliderThumbHelp,
+        AXMediaStatusDisplay,
+        AXMediaStatusDisplayHelp,
+        AXMediaTimeRemainingDisplay,
+        AXMediaTimeRemainingDisplayHelp,
+        AXMediaUnMuteButton,
+        AXMediaUnMuteButtonHelp,
+        AXMediaVideoElement,
+        AXMediaVideoElementHelp,
         AXMillisecondFieldText,
         AXMinuteFieldText,
         AXMonthFieldText,

Modified: trunk/Source/WebKit/chromium/ChangeLog (138679 => 138680)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-01-03 00:53:34 UTC (rev 138679)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-01-03 00:55:59 UTC (rev 138680)
@@ -1,3 +1,15 @@
+2013-01-02  David Tseng  <[email protected]>
+
+        AX: Chromium needs platform localized strings for media controls.
+        https://bugs.webkit.org/show_bug.cgi?id=105940
+
+        Reviewed by Tony Chang.
+
+        * src/LocalizedStrings.cpp:
+        (WebCore::localizedMediaControlElementString):
+        (WebCore):
+        (WebCore::localizedMediaControlElementHelpText):
+
 2013-01-02  Mark Pilgrim  <[email protected]>
 
         [Chromium] Add Platform/chromium to include_dirs

Modified: trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp (138679 => 138680)


--- trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp	2013-01-03 00:53:34 UTC (rev 138679)
+++ trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp	2013-01-03 00:55:59 UTC (rev 138680)
@@ -418,16 +418,98 @@
 String textTrackNoLabelText() { return String(); }
 #endif
 
-String localizedMediaControlElementString(const String& /*name*/)
+String localizedMediaControlElementString(const String& name)
 {
-    // FIXME: to be fixed.
-    return String();
+    if (name == "AudioElement")
+        return query(WebLocalizedString::AXMediaAudioElement);
+    if (name == "VideoElement")
+        return query(WebLocalizedString::AXMediaVideoElement);
+    if (name == "MuteButton")
+        return query(WebLocalizedString::AXMediaMuteButton);
+    if (name == "UnMuteButton")
+        return query(WebLocalizedString::AXMediaUnMuteButton);
+    if (name == "PlayButton")
+        return query(WebLocalizedString::AXMediaPlayButton);
+    if (name == "PauseButton")
+        return query(WebLocalizedString::AXMediaPauseButton);
+    if (name == "Slider")
+        return query(WebLocalizedString::AXMediaSlider);
+    if (name == "SliderThumb")
+        return query(WebLocalizedString::AXMediaSliderThumb);
+    if (name == "RewindButton")
+        return query(WebLocalizedString::AXMediaRewindButton);
+    if (name == "ReturnToRealtimeButton")
+        return query(WebLocalizedString::AXMediaReturnToRealTime);
+    if (name == "CurrentTimeDisplay")
+        return query(WebLocalizedString::AXMediaCurrentTimeDisplay);
+    if (name == "TimeRemainingDisplay")
+        return query(WebLocalizedString::AXMediaTimeRemainingDisplay);
+    if (name == "StatusDisplay")
+        return query(WebLocalizedString::AXMediaStatusDisplay);
+    if (name == "EnterFullscreenButton")
+        return query(WebLocalizedString::AXMediaEnterFullscreenButton);
+    if (name == "ExitFullscreenButton")
+        return query(WebLocalizedString::AXMediaExitFullscreenButton);
+    if (name == "SeekForwardButton")
+        return query(WebLocalizedString::AXMediaSeekForwardButton);
+    if (name == "SeekBackButton")
+        return query(WebLocalizedString::AXMediaSeekBackButton);
+    if (name == "ShowClosedCaptionsButton")
+        return query(WebLocalizedString::AXMediaShowClosedCaptionsButton);
+    if (name == "HideClosedCaptionsButton")
+        return query(WebLocalizedString::AXMediaHideClosedCaptionsButton);
+
+    // FIXME: the ControlsPanel container should never be visible in the accessibility hierarchy.
+    if (name == "ControlsPanel")
+        return query(WebLocalizedString::AXMediaDefault);
+
+    ASSERT_NOT_REACHED();
+    return query(WebLocalizedString::AXMediaDefault);
 }
 
-String localizedMediaControlElementHelpText(const String& /*name*/)
+String localizedMediaControlElementHelpText(const String& name)
 {
-    // FIXME: to be fixed.
-    return String();
+    if (name == "AudioElement")
+        return query(WebLocalizedString::AXMediaAudioElementHelp);
+    if (name == "VideoElement")
+        return query(WebLocalizedString::AXMediaVideoElementHelp);
+    if (name == "MuteButton")
+        return query(WebLocalizedString::AXMediaMuteButtonHelp);
+    if (name == "UnMuteButton")
+        return query(WebLocalizedString::AXMediaUnMuteButtonHelp);
+    if (name == "PlayButton")
+        return query(WebLocalizedString::AXMediaPlayButtonHelp);
+    if (name == "PauseButton")
+        return query(WebLocalizedString::AXMediaPauseButtonHelp);
+    if (name == "Slider")
+        return query(WebLocalizedString::AXMediaSliderHelp);
+    if (name == "SliderThumb")
+        return query(WebLocalizedString::AXMediaSliderThumbHelp);
+    if (name == "RewindButton")
+        return query(WebLocalizedString::AXMediaRewindButtonHelp);
+    if (name == "ReturnToRealtimeButton")
+        return query(WebLocalizedString::AXMediaReturnToRealTimeHelp);
+    if (name == "CurrentTimeDisplay")
+        return query(WebLocalizedString::AXMediaCurrentTimeDisplayHelp);
+    if (name == "TimeRemainingDisplay")
+        return query(WebLocalizedString::AXMediaTimeRemainingDisplayHelp);
+    if (name == "StatusDisplay")
+        return query(WebLocalizedString::AXMediaStatusDisplayHelp);
+    if (name == "EnterFullscreenButton")
+        return query(WebLocalizedString::AXMediaEnterFullscreenButtonHelp);
+    if (name == "ExitFullscreenButton")
+        return query(WebLocalizedString::AXMediaExitFullscreenButtonHelp);
+    if (name == "SeekForwardButton")
+        return query(WebLocalizedString::AXMediaSeekForwardButtonHelp);
+    if (name == "SeekBackButton")
+        return query(WebLocalizedString::AXMediaSeekBackButtonHelp);
+    if (name == "ShowClosedCaptionsButton")
+        return query(WebLocalizedString::AXMediaShowClosedCaptionsButtonHelp);
+    if (name == "HideClosedCaptionsButton")
+        return query(WebLocalizedString::AXMediaHideClosedCaptionsButtonHelp);
+
+    ASSERT_NOT_REACHED();
+    return query(WebLocalizedString::AXMediaDefault);
 }
 
 String localizedMediaTimeDescription(float /*time*/)

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to