REGRESSION(167145): Many media tests fail
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Apr 2014 23:49:32 +0000 (23:49 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 11 Apr 2014 23:49:32 +0000 (23:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=131569

Reviewed by Brent Fulgham.

* PlatformGTK.cmake: Add the localized strings file to the list of user agent scripts.
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::mediaControlsScript): Include the localized strings file in the script body.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167170 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake
Source/WebCore/platform/gtk/RenderThemeGtk.cpp

index dbd4580..24ec7a9 100644 (file)
@@ -1,3 +1,14 @@
+2014-04-11  Martin Robinson  <mrobinson@igalia.com>
+
+        REGRESSION(167145): Many media tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=131569
+
+        Reviewed by Brent Fulgham.
+
+        * PlatformGTK.cmake: Add the localized strings file to the list of user agent scripts.
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::mediaControlsScript): Include the localized strings file in the script body.
+
 2014-04-11  Tim Horton  <timothy_horton@apple.com>
 
         [iOS WebKit2] Find-in-page indicator
index 2c7a4be..8d5df24 100644 (file)
@@ -259,6 +259,7 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
 )
 
 set(WebCore_USER_AGENT_SCRIPTS
+    ${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.js
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsGtk.js
 )
index 58051cc..8d069b5 100644 (file)
@@ -763,6 +763,7 @@ int RenderThemeGtk::sliderTickOffsetFromTrackCenter() const
 String RenderThemeGtk::mediaControlsScript()
 {
     StringBuilder scriptBuilder;
+    scriptBuilder.append(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));
     scriptBuilder.append(mediaControlsAppleJavaScript, sizeof(mediaControlsAppleJavaScript));
     scriptBuilder.append(mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript));
     return scriptBuilder.toString();