| Summary: | [GTK] REGRESSION(167145): Many media tests fail | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Martin Robinson <mrobinson> | ||||||
| Component: | WebKitGTK | Assignee: | Martin Robinson <mrobinson> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | bfulgham, bunhere, calvaris, commit-queue, gyuyoung.kim, rakuco, sergio | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Bug Depends on: | 120956 | ||||||||
| Bug Blocks: | 131573 | ||||||||
| Attachments: |
|
||||||||
|
Description
Martin Robinson
2014-04-11 16:02:18 PDT
*** Bug 131570 has been marked as a duplicate of this bug. *** Created attachment 229174 [details]
Patch
I think we need the following changes:
1. Pull in the JS with the strings in it:
--- platform/gtk/RenderThemeGtk.cpp (revision 167146)
+++ platform/gtk/RenderThemeGtk.cpp (working copy)
@@ -763,6 +763,7 @@
String RenderThemeGtk::mediaControlsScript()
{
StringBuilder scriptBuilder;
+ scriptBuilder.append(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));
scriptBuilder.append(mediaControlsAppleJavaScript, sizeof(mediaControlsAppleJavaScript));
scriptBuilder.append(mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript));
return scriptBuilder.toString();
2. Treat mediaControlsLocalizedStrings as a USER_AGENT_SCRIPT:
--- PlatformGTK.cmake (revision 167146)
+++ PlatformGTK.cmake (working copy)
@@ -259,6 +259,7 @@
)
set(WebCore_USER_AGENT_SCRIPTS
+ ${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js
${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.js
${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsGtk.js
)
3. Make sure the mediaControlsLocalizedStrings.js file gets pulled into the UserAgentGeneratedScripts.cpp.
Comment on attachment 229174 [details]
Patch
Yes -- this looks like what I was thinking. r+ once you confirm the bots are happy.
Created attachment 229178 [details]
Patch
*** Bug 131568 has been marked as a duplicate of this bug. *** Please, fix EFL too with a similar patch. Committed r167170: <http://trac.webkit.org/changeset/167170> |