131569 2014-04-11 16:02:18 -0700 [GTK] REGRESSION(167145): Many media tests fail 2014-04-11 16:55:02 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 120956 131573 1 mrobinson mrobinson bfulgham bunhere calvaris commit-queue gyuyoung.kim rakuco sergio oldest_to_newest 1000083 0 mrobinson 2014-04-11 16:02:18 -0700 Looks like we need to pull in the localized string JavaScript file 1000088 1 bfulgham 2014-04-11 16:04:53 -0700 *** Bug 131570 has been marked as a duplicate of this bug. *** 1000089 2 229174 mrobinson 2014-04-11 16:05:33 -0700 Created attachment 229174 Patch 1000093 3 bfulgham 2014-04-11 16:08:29 -0700 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. 1000094 4 229174 bfulgham 2014-04-11 16:09:07 -0700 Comment on attachment 229174 Patch Yes -- this looks like what I was thinking. r+ once you confirm the bots are happy. 1000108 5 229178 mrobinson 2014-04-11 16:37:47 -0700 Created attachment 229178 Patch 1000111 6 calvaris 2014-04-11 16:46:45 -0700 *** Bug 131568 has been marked as a duplicate of this bug. *** 1000113 7 calvaris 2014-04-11 16:48:45 -0700 Please, fix EFL too with a similar patch. 1000115 8 mrobinson 2014-04-11 16:49:57 -0700 Committed r167170: <http://trac.webkit.org/changeset/167170> 229174 2014-04-11 16:05:33 -0700 2014-04-11 16:37:41 -0700 Patch bug-131569-20140411160512.patch text/plain 2181 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzc5NzAxYzBmYjM1YTVi NWM1MmUzY2U1YTdiMzllMDI3MWUyYWVkNC4uZDE5Y2MxM2U1ZmNiMDU5NTBlN2RkMjhmY2NjZDE4 MmFmZTM2ODgxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTA0LTExICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O KDE2NzE0NSk6IE1hbnkgbWVkaWEgdGVzdHMgZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZTogQWRkIHRoZSBsb2Nh bGl6ZWQgc3RyaW5ncyBmaWxlIHRvIHRoZSBsaXN0IG9mIHVzZXIgYWdlbnQgc2NyaXB0cy4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVHdGs6Om1lZGlhQ29udHJvbHNTY3JpcHQpOiBJbmNsdWRlIHRoZSBsb2Nh bGl6ZWQgc3RyaW5ncyBmaWxlIGluIHRoZSBzY3JpcHQgYm9keS4KKwogMjAxNC0wNC0xMSAgQmVt IEpvbmVzLUJleSAgPGJqb25lc2JlQGFkb2JlLmNvbT4KIAogICAgICAgICBDbGVhciBzaWJsaW5n IGZsb2F0cyB3aGlsZSBzcGxpdHRpbmcgaW5saW5lIGZsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsuY21h a2UKaW5kZXggMmM3YTRiZWE2ZDQ0ZTlhMWViY2VkMmJlOWM2OWViNjIxYTlhZGVhOS4uOGQ1ZGYy NGUxNDQxZDE4MDBiMWFkMGQ3ZDA1ODc5MzIwMDU1NmJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsu Y21ha2UKQEAgLTI1OSw2ICsyNTksNyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX1VTRVJfQUdFTlRf U1RZTEVfU0hFRVRTCiApCiAKIHNldChXZWJDb3JlX1VTRVJfQUdFTlRfU0NSSVBUUworICAgICR7 V0VCQ09SRV9ESVJ9L0VuZ2xpc2gubHByb2ovbWVkaWFDb250cm9sc0xvY2FsaXplZFN0cmluZ3Mu anMKICAgICAke1dFQkNPUkVfRElSfS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9s c0FwcGxlLmpzCiAgICAgJHtXRUJDT1JFX0RJUn0vTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlh Q29udHJvbHNHdGsuanMKICkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGsuY3BwCmluZGV4IDU4MDUxY2NhNDRhZGY1OTBjNmI1OWMwNjFhNTJmYTQ4MjA0NGVm MDEuLjliM2ZkNzJhYmRjYjk3ODhlMzczM2Y1ZDI4MjllMjM2YTg1NWYzMmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtNzYzLDYgKzc2 Myw3IEBAIGludCBSZW5kZXJUaGVtZUd0azo6c2xpZGVyVGlja09mZnNldEZyb21UcmFja0NlbnRl cigpIGNvbnN0CiBTdHJpbmcgUmVuZGVyVGhlbWVHdGs6Om1lZGlhQ29udHJvbHNTY3JpcHQoKQog ewogICAgIFN0cmluZ0J1aWxkZXIgc2NyaXB0QnVpbGRlcjsKKyAgICBzY3JpcHRCdWlsZGVyLmFw cGVuZChtZWRpYUNvbnRyb2xzTG9jYWxpemVkU3RyaW5ncywgc2l6ZW9mKG1lZGlhQ29udHJvbHNM b2NhbGl6ZWRTdHJpbmdzKSk7CiAgICAgc2NyaXB0QnVpbGRlci5hcHBlbmQobWVkaWFDb250cm9s c0FwcGxlSmF2YVNjcmlwdCwgc2l6ZW9mKG1lZGlhQ29udHJvbHNBcHBsZUphdmFTY3JpcHQpKTsK ICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChtZWRpYUNvbnRyb2xzR3RrSmF2YVNjcmlwdCwgc2l6 ZW9mKG1lZGlhQ29udHJvbHNHdGtKYXZhU2NyaXB0KSk7CiAgICAgcmV0dXJuIHNjcmlwdEJ1aWxk ZXIudG9TdHJpbmcoKTsK 229178 2014-04-11 16:37:47 -0700 2014-04-11 16:39:30 -0700 Patch bug-131569-20140411163726.patch text/plain 2200 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzc5NzAxYzBmYjM1YTVi NWM1MmUzY2U1YTdiMzllMDI3MWUyYWVkNC4uYjEzMTA0NzFiMTAxMDI2NzMzMGUwN2RlYzYyMWI0 YTQ2MWU4ZWQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTA0LTExICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O KDE2NzE0NSk6IE1hbnkgbWVkaWEgdGVzdHMgZmFpbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJl bnQgRnVsZ2hhbS4KKworICAgICAgICAqIFBsYXRmb3JtR1RLLmNtYWtlOiBBZGQgdGhlIGxvY2Fs aXplZCBzdHJpbmdzIGZpbGUgdG8gdGhlIGxpc3Qgb2YgdXNlciBhZ2VudCBzY3JpcHRzLgorICAg ICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZUd0azo6bWVkaWFDb250cm9sc1NjcmlwdCk6IEluY2x1ZGUgdGhlIGxvY2Fs aXplZCBzdHJpbmdzIGZpbGUgaW4gdGhlIHNjcmlwdCBib2R5LgorCiAyMDE0LTA0LTExICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCiAgICAgICAgIENsZWFyIHNpYmxpbmcg ZmxvYXRzIHdoaWxlIHNwbGl0dGluZyBpbmxpbmUgZmxvdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvUGxhdGZvcm1HVEsuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFr ZQppbmRleCAyYzdhNGJlYTZkNDRlOWExZWJjZWQyYmU5YzY5ZWI2MjFhOWFkZWE5Li44ZDVkZjI0 ZTE0NDFkMTgwMGIxYWQwZDdkMDU4NzkzMjAwNTU2YmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5j bWFrZQpAQCAtMjU5LDYgKzI1OSw3IEBAIGxpc3QoQVBQRU5EIFdlYkNvcmVfVVNFUl9BR0VOVF9T VFlMRV9TSEVFVFMKICkKIAogc2V0KFdlYkNvcmVfVVNFUl9BR0VOVF9TQ1JJUFRTCisgICAgJHtX RUJDT1JFX0RJUn0vRW5nbGlzaC5scHJvai9tZWRpYUNvbnRyb2xzTG9jYWxpemVkU3RyaW5ncy5q cwogICAgICR7V0VCQ09SRV9ESVJ9L01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xz QXBwbGUuanMKICAgICAke1dFQkNPUkVfRElSfS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFD b250cm9sc0d0ay5qcwogKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJU aGVtZUd0ay5jcHAKaW5kZXggNTgwNTFjY2E0NGFkZjU5MGM2YjU5YzA2MWE1MmZhNDgyMDQ0ZWYw MS4uOGQwNjliNWIwMjIxMzQyOWFkNDI3MmJmNTc0NzM1ZmY2NDc1ZmUyZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC03NjMsNiArNzYz LDcgQEAgaW50IFJlbmRlclRoZW1lR3RrOjpzbGlkZXJUaWNrT2Zmc2V0RnJvbVRyYWNrQ2VudGVy KCkgY29uc3QKIFN0cmluZyBSZW5kZXJUaGVtZUd0azo6bWVkaWFDb250cm9sc1NjcmlwdCgpCiB7 CiAgICAgU3RyaW5nQnVpbGRlciBzY3JpcHRCdWlsZGVyOworICAgIHNjcmlwdEJ1aWxkZXIuYXBw ZW5kKG1lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzSmF2YVNjcmlwdCwgc2l6ZW9mKG1lZGlh Q29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzSmF2YVNjcmlwdCkpOwogICAgIHNjcmlwdEJ1aWxkZXIu YXBwZW5kKG1lZGlhQ29udHJvbHNBcHBsZUphdmFTY3JpcHQsIHNpemVvZihtZWRpYUNvbnRyb2xz QXBwbGVKYXZhU2NyaXB0KSk7CiAgICAgc2NyaXB0QnVpbGRlci5hcHBlbmQobWVkaWFDb250cm9s c0d0a0phdmFTY3JpcHQsIHNpemVvZihtZWRpYUNvbnRyb2xzR3RrSmF2YVNjcmlwdCkpOwogICAg IHJldHVybiBzY3JpcHRCdWlsZGVyLnRvU3RyaW5nKCk7Cg==