Changeset 167170 in webkit

Timestamp:

Apr 11, 2014 4:49:32 PM (10 years ago)

Author:

Martin Robinson

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (1 diff)
• platform/gtk/RenderThemeGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/PlatformGTK.cmake

@@ -260 +260 @@
 
 set(WebCore_USER_AGENT_SCRIPTS
+    ${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.js
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsGtk.js

trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp

@@ -764 +764 @@
 {
     StringBuilder scriptBuilder;
+    scriptBuilder.append(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));
     scriptBuilder.append(mediaControlsAppleJavaScript, sizeof(mediaControlsAppleJavaScript));
     scriptBuilder.append(mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript));