126412 2014-01-02 16:37:37 -0800 [iOS] Upstream a bug fix for plugin-backed media elements 2014-01-07 16:39:25 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes oldest_to_newest 963961 0 aestes 2014-01-02 16:37:37 -0800 [iOS] Upstream a bug fix for plugin-backed media elements 963962 1 220268 aestes 2014-01-02 16:41:19 -0800 Created attachment 220268 [iOS] Upstream a bug fix for plugin-backed media elements 965249 2 aestes 2014-01-07 16:39:25 -0800 Committed r161469: <http://trac.webkit.org/changeset/161469> 220268 2014-01-02 16:41:19 -0800 2014-01-03 11:43:32 -0800 [iOS] Upstream a bug fix for plugin-backed media elements bug-126412-20140102164113.patch text/plain 7554 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggODZmYmVhMzE0 NTI0YTNmOGY1MDNkNDZjMjI5ODA3M2FkMmMwZjFmYS4uNDc5ZGY5NzAzYTM5YWQxNTg1ZDhmMTJm MDY4ZGFiNjEyNTRkNWNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE0 LTAxLTAyICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBbaU9TXSBV cHN0cmVhbSBhIGJ1ZyBmaXggZm9yIHBsdWdpbi1iYWNrZWQgbWVkaWEgZWxlbWVudHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjQxMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lZGlhIGVsZW1lbnRz IGJhY2tlZCBieSBwbHVnLWlucyBzaG91bGQgb3V0bGl2ZSBiZWluZyByZW1vdmVkIGZyb20gdGhl CisgICAgICAgIGRvY3VtZW50LCBsaWtlIHRoZWlyIG5hdGl2ZSBjb3VudGVycGFydHMgZG8uCisK KyAgICAgICAgKiBQbHVnaW5zL1dlYlBsdWdpbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBQbHVn aW5zL1dlYlBsdWdpbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW05TVmlldyBpc01lZGlhUGx1 Z0luUHJveHlWaWV3XSk6CisgICAgICAgICgtW05TVmlldyBzZXRJc01lZGlhUGx1Z0luUHJveHlW aWV3Ol0pOgorICAgICAgICAoLVtXZWJQbHVnaW5Db250cm9sbGVyIHBsdWdJblZpZXdXaXRoQXJn dW1lbnRzOmZyb21QbHVnaW5QYWNrYWdlOl0pOgorICAgICAgICAoLVtXZWJQbHVnaW5Db250cm9s bGVyIG1lZGlhUGx1Z0luUHJveHlWaWV3Q3JlYXRlZDpdKToKKyAgICAgICAgKC1bV2ViUGx1Z2lu Q29udHJvbGxlciBkZXN0cm95UGx1Z2luOl0pOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorICAgICAgICAocGx1Z2luVmlldyk6CisKKzIwMTQtMDEt MDIgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCiAgICAgICAgIFtpT1NdIENsZWFu IHVwIHNvbWUgZXhwb3J0ZWQgaGVhZGVycwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NDAzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L1BsdWdpbnMvV2ViUGx1Z2luQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lu cy9XZWJQbHVnaW5Db250cm9sbGVyLmgKaW5kZXggNGMxZjc0M2U3MzlmZjBhMmVjZjUwNWQxNGZh M2QzYjM3ZjM0NGFmMC4uOWVjMWRkNDQ3NTk4ZWI4MjY3MzFkZWRhZDhiNzNmNmRlN2YyODk0MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJQbHVnaW5Db250cm9sbGVy LmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJQbHVnaW5Db250cm9sbGVyLmgK QEAgLTUwLDcgKzUwLDcgQEAKICNlbmRpZgogfQogCi0rIChOU1ZpZXcgKilwbHVnSW5WaWV3V2l0 aEFyZ3VtZW50czooTlNEaWN0aW9uYXJ5ICopYXJndW1lbnRzIGZyb21QbHVnaW5QYWNrYWdlOihX ZWJQbHVnaW5QYWNrYWdlICopcGx1Z2luOworLSAoTlNWaWV3ICopcGx1Z0luVmlld1dpdGhBcmd1 bWVudHM6KE5TRGljdGlvbmFyeSAqKWFyZ3VtZW50cyBmcm9tUGx1Z2luUGFja2FnZTooV2ViUGx1 Z2luUGFja2FnZSAqKXBsdWdpbjsKICsgKEJPT0wpaXNQbHVnSW5WaWV3OihOU1ZpZXcgKil2aWV3 OwogCiAtIChpZClpbml0V2l0aERvY3VtZW50VmlldzooTlNWaWV3ICopdmlldzsKQEAgLTYwLDcg KzYwLDcgQEAKIC0gKHZvaWQpYWRkUGx1Z2luOihOU1ZpZXcgKil2aWV3OwogLSAodm9pZClkZXN0 cm95UGx1Z2luOihOU1ZpZXcgKil2aWV3OwogI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJ REVPKQotLSAodm9pZClwbHVnaW5WaWV3Q3JlYXRlZDooTlNWaWV3ICopdmlldzsKKy0gKHZvaWQp bWVkaWFQbHVnSW5Qcm94eVZpZXdDcmVhdGVkOihOU1ZpZXcgKil2aWV3OwogKyAodm9pZClwbHVn aW5WaWV3SGlkZGVuOihOU1ZpZXcgKil2aWV3OwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luQ29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luQ29udHJvbGxlci5tbQppbmRleCA4MTNhNTg4ZjEwZmMz ZTFjY2EwY2U4NzlhMGI2ZmVjZWIyMzEyNTJhLi5jZTUyZjE3Y2JmYjA0MjM3MWJiMzU0MjEwMDJl YWMzMzY1ZTgwNzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dlYlBs dWdpbkNvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJQbHVn aW5Db250cm9sbGVyLm1tCkBAIC0zMCw2ICszMCw3IEBACiAjaW1wb3J0ICJXZWJQbHVnaW5Db250 cm9sbGVyLmgiCiAKICNpbXBvcnQgIkRPTU5vZGVJbnRlcm5hbC5oIgorI2ltcG9ydCAiV2ViQmFz ZVBsdWdpblBhY2thZ2UuaCIKICNpbXBvcnQgIldlYkRhdGFTb3VyY2VJbnRlcm5hbC5oIgogI2lt cG9ydCAiV2ViRnJhbWVJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViRnJhbWVWaWV3LmgiCkBAIC0x MTcsMTcgKzExOCwzNiBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplQXVkaW9TZXNzaW9uKCkKIH0K ICNlbmRpZgogCisjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCitAaW50ZXJmYWNl IE5TVmlldyAoV2ViUGx1Z2luQ29udHJvbGxlckFkZGl0aW9ucykKK0Bwcm9wZXJ0eSAobm9uYXRv bWljKSBCT09MIGlzTWVkaWFQbHVnSW5Qcm94eVZpZXc7CitAZW5kCisKK0BpbXBsZW1lbnRhdGlv biBOU1ZpZXcgKFdlYlBsdWdpbkNvbnRyb2xsZXJBZGRpdGlvbnMpCisKKy0gKEJPT0wpaXNNZWRp YVBsdWdJblByb3h5VmlldworeworICAgIHJldHVybiBbKE5TTnVtYmVyICopb2JqY19nZXRBc3Nv Y2lhdGVkT2JqZWN0KHNlbGYsIEBzZWxlY3Rvcihpc01lZGlhUGx1Z0luUHJveHlWaWV3KSkgYm9v bFZhbHVlXTsKK30KKworLSAodm9pZClzZXRJc01lZGlhUGx1Z0luUHJveHlWaWV3OihCT09MKWlz TWVkaWFQbHVnSW5Qcm94eVZpZXcKK3sKKyAgICBvYmpjX3NldEFzc29jaWF0ZWRPYmplY3Qoc2Vs ZiwgQHNlbGVjdG9yKGlzTWVkaWFQbHVnSW5Qcm94eVZpZXcpLCBbTlNOdW1iZXIgbnVtYmVyV2l0 aEJvb2w6aXNNZWRpYVBsdWdJblByb3h5Vmlld10sIE9CSkNfQVNTT0NJQVRJT05fUkVUQUlOX05P TkFUT01JQyk7Cit9CisKK0BlbmQKKyNlbmRpZiAvLyBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9W SURFTykKKwogQGltcGxlbWVudGF0aW9uIFdlYlBsdWdpbkNvbnRyb2xsZXIKIAotKyAoTlNWaWV3 ICopcGx1Z0luVmlld1dpdGhBcmd1bWVudHM6KE5TRGljdGlvbmFyeSAqKWFyZ3VtZW50cyBmcm9t UGx1Z2luUGFja2FnZTooV2ViUGx1Z2luUGFja2FnZSAqKXBsdWdpblBhY2thZ2UKKy0gKE5TVmll dyAqKXBsdWdJblZpZXdXaXRoQXJndW1lbnRzOihOU0RpY3Rpb25hcnkgKilhcmd1bWVudHMgZnJv bVBsdWdpblBhY2thZ2U6KFdlYlBsdWdpblBhY2thZ2UgKilwbHVnaW5QYWNrYWdlCiB7CiAjaWYg UExBVEZPUk0oSU9TKQogICAgIGluaXRpYWxpemVBdWRpb1Nlc3Npb24oKTsKICNlbmRpZgogCiAg ICAgW3BsdWdpblBhY2thZ2UgbG9hZF07Ci0gICAgQ2xhc3Mgdmlld0ZhY3RvcnkgPSBbcGx1Z2lu UGFja2FnZSB2aWV3RmFjdG9yeV07Ci0gICAgCisKICAgICBOU1ZpZXcgKnZpZXcgPSBuaWw7CiAK ICNpZiBQTEFURk9STShJT1MpCkBAIC0xMzcsNiArMTU3LDcgQEAgKyAoTlNWaWV3ICopcGx1Z0lu Vmlld1dpdGhBcmd1bWVudHM6KE5TRGljdGlvbmFyeSAqKWFyZ3VtZW50cyBmcm9tUGx1Z2luUGFj a2FnZToKICAgICAgICAgdmlldyA9IFtbd2ViVmlldyBfVUlLaXREZWxlZ2F0ZUZvcndhcmRlcl0g d2ViVmlldzp3ZWJWaWV3IHBsdWdJblZpZXdXaXRoQXJndW1lbnRzOmFyZ3VtZW50cyBmcm9tUGx1 Z0luUGFja2FnZTpwbHVnaW5QYWNrYWdlXTsKICAgICB9CiAjZWxzZQorICAgIENsYXNzIHZpZXdG YWN0b3J5ID0gW3BsdWdpblBhY2thZ2Ugdmlld0ZhY3RvcnldOwogICAgIGlmIChbdmlld0ZhY3Rv cnkgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihwbHVnSW5WaWV3V2l0aEFyZ3VtZW50czop XSkgewogICAgICAgICBKU0M6OkpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BBbGxMb2NrcyhKU0RP TVdpbmRvd0Jhc2U6OmNvbW1vblZNKCkpOwogICAgICAgICB2aWV3ID0gW3ZpZXdGYWN0b3J5IHBs dWdJblZpZXdXaXRoQXJndW1lbnRzOmFyZ3VtZW50c107CkBAIC0xNDUsNyArMTY2LDcgQEAgKyAo TlNWaWV3ICopcGx1Z0luVmlld1dpdGhBcmd1bWVudHM6KE5TRGljdGlvbmFyeSAqKWFyZ3VtZW50 cyBmcm9tUGx1Z2luUGFja2FnZToKICAgICAgICAgdmlldyA9IFt2aWV3RmFjdG9yeSBwbHVnaW5W aWV3V2l0aEFyZ3VtZW50czphcmd1bWVudHNdOwogICAgIH0KICNlbmRpZgotICAgIAorCiAgICAg aWYgKHZpZXcgPT0gbmlsKSB7CiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgfQpAQCAtMTU0LDcg KzE3NSw3IEBAICsgKE5TVmlldyAqKXBsdWdJblZpZXdXaXRoQXJndW1lbnRzOihOU0RpY3Rpb25h cnkgKilhcmd1bWVudHMgZnJvbVBsdWdpblBhY2thZ2U6CiAgICAgICAgIHBsdWdpblZpZXdzID0g W1tOU011dGFibGVTZXQgYWxsb2NdIGluaXRdOwogICAgIH0KICAgICBbcGx1Z2luVmlld3MgYWRk T2JqZWN0OnZpZXddOwotICAgIAorCiAgICAgcmV0dXJuIHZpZXc7CiB9CiAKQEAgLTM0Nyw4ICsz NjgsOSBAQCAtICh2b2lkKXJlc3RvcmVQbHVnaW5zRnJvbUNhY2hlCiAjZW5kaWYgLy8gUExBVEZP Uk0oSU9TKQogCiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCi0tICh2b2lkKXBs dWdpblZpZXdDcmVhdGVkOihOU1ZpZXcgKil2aWV3CistICh2b2lkKW1lZGlhUGx1Z0luUHJveHlW aWV3Q3JlYXRlZDooTlNWaWV3ICopdmlldwogeworICAgIHZpZXcuaXNNZWRpYVBsdWdJblByb3h5 VmlldyA9IFlFUzsKICAgICBpZiAoIV92aWV3c05vdEluRG9jdW1lbnQpCiAgICAgICAgIF92aWV3 c05vdEluRG9jdW1lbnQ9IFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRdOwogICAgIGlmICgh W192aWV3c05vdEluRG9jdW1lbnQgY29udGFpbnNPYmplY3Q6dmlld10pCkBAIC00MjMsMTAgKzQ0 NSwxNSBAQCAtICh2b2lkKWFkZFBsdWdpbjooTlNWaWV3ICopdmlldwogLSAodm9pZClkZXN0cm95 UGx1Z2luOihOU1ZpZXcgKil2aWV3CiB7CiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklE RU8pCi0gICAgaWYgKFtfdmlld3MgY29udGFpbnNPYmplY3Q6dmlld10gfHwgW192aWV3c05vdElu RG9jdW1lbnQgY29udGFpbnNPYmplY3Q6dmlld10pIHsKLSNlbHNlCi0gICAgaWYgKFtfdmlld3Mg Y29udGFpbnNPYmplY3Q6dmlld10pIHsKKyAgICAvLyBkZXN0cm95UGx1Z2luOiBpcyBjYWxsZWQg d2hlbiBhIHBsdWctaW4gdmlldyBpcyByZW1vdmVkIGZyb20gaXRzIHBhcmVudAorICAgIC8vIHZp ZXcsIGJ1dCBuYXRpdmUgbWVkaWEgcGxheWVycyBjb250aW51ZSB0byBleGlzdCBldmVuIHdoZW4g dGhleSBhcmVuJ3QgaW4KKyAgICAvLyB0aGUgdmlldyBoaWVyYXJjaHkuIFNvIGlmIHRoaXMgcGx1 Zy1pbiB2aWV3IGlzIGEgcHJveHkgZm9yIGEgbmF0aXZlIG1lZGlhCisgICAgLy8gcGxheWVyLCBk b24ndCBkZXN0cm95IGl0IGhlcmUuCisgICAgaWYgKHZpZXcuaXNNZWRpYVBsdWdJblByb3h5Vmll dykKKyAgICAgICAgcmV0dXJuOwogI2VuZGlmCisKKyAgICBpZiAoW192aWV3cyBjb250YWluc09i amVjdDp2aWV3XSkgewogICAgICAgICBpZiAoX3N0YXJ0ZWQpCiAgICAgICAgICAgICBbc2VsZiBz dG9wT25lUGx1Z2luOnZpZXddOwogICAgICAgICBbc2VsZiBkZXN0cm95T25lUGx1Z2luOnZpZXdd OwpAQCAtNDQxLDkgKzQ2OCw2IEBAIC0gKHZvaWQpZGVzdHJveVBsdWdpbjooTlNWaWV3ICopdmll dwogICAgICAgICBbW19kb2N1bWVudFZpZXcgX3dlYlZpZXddIHJlbW92ZVBsdWdpbkluc3RhbmNl Vmlldzp2aWV3XTsKICNlbmRpZgogICAgICAgICBbX3ZpZXdzIHJlbW92ZU9iamVjdDp2aWV3XTsK LSNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykKLSAgICAgICAgW192aWV3c05vdElu RG9jdW1lbnQgcmVtb3ZlT2JqZWN0OnZpZXddOwotI2VuZGlmCiAgICAgfQogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50Lm1tCmluZGV4IDU0ZjNhNmQyNTcwYWE3MzI0ZWQ4MDZlOWFkYmU5MDBlYjIxNzc0ODUuLjAz YTJkMzVjZGUzYWRkMTcyMTU2YTFiOTI1ZDdjZTRhZDYwY2M1YTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1t CkBAIC0zNiw2ICszNiw3IEBACiAjaW1wb3J0ICJET01FbGVtZW50SW50ZXJuYWwuaCIKICNpbXBv cnQgIkRPTUhUTUxGb3JtRWxlbWVudEludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJCYWNrRm9yd2Fy ZExpc3QuaCIKKyNpbXBvcnQgIldlYkJhc2VQbHVnaW5QYWNrYWdlLmgiCiAjaW1wb3J0ICJXZWJD YWNoZWRGcmFtZVBsYXRmb3JtRGF0YS5oIgogI2ltcG9ydCAiV2ViQ2hyb21lQ2xpZW50LmgiCiAj aW1wb3J0ICJXZWJEYXRhU291cmNlSW50ZXJuYWwuaCIKQEAgLTE4MzcsOCArMTgzOCwxNyBAQCBz dGF0aWMgTlNWaWV3ICpwbHVnaW5WaWV3KFdlYkZyYW1lICpmcmFtZSwgV2ViUGx1Z2luUGFja2Fn ZSAqcGx1Z2luUGFja2FnZSwKICAgICAgICAgTE9HKFBsdWdpbnMsICJhcmd1bWVudHM6XG4lQCIs IGFyZ3VtZW50cyk7CiAgICAgfQogCi0gICAgdmlldyA9IFtXZWJQbHVnaW5Db250cm9sbGVyIHBs dWdJblZpZXdXaXRoQXJndW1lbnRzOmFyZ3VtZW50cyBmcm9tUGx1Z2luUGFja2FnZTpwbHVnaW5Q YWNrYWdlXTsKKyAgICB2aWV3ID0gW3BsdWdpbkNvbnRyb2xsZXIgcGx1Z0luVmlld1dpdGhBcmd1 bWVudHM6YXJndW1lbnRzIGZyb21QbHVnaW5QYWNrYWdlOnBsdWdpblBhY2thZ2VdOwogICAgIFth dHRyaWJ1dGVzIHJlbGVhc2VdOworCisgICAgaWYgKCF2aWV3KQorICAgICAgICByZXR1cm4gbmls OworCisjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCisgICAgRWxlbWVudCogbm9k ZSA9IGNvcmUoZWxlbWVudCk7CisgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjp2 aWRlb1RhZykgfHwgbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmF1ZGlvVGFnKSkKKyAgICAg ICAgW3BsdWdpbkNvbnRyb2xsZXIgbWVkaWFQbHVnSW5Qcm94eVZpZXdDcmVhdGVkOnZpZXddOwor I2VuZGlmCiAgICAgcmV0dXJuIHZpZXc7CiB9CiAK