127821 2014-01-28 18:25:03 -0800 [iOS] cleanup MediaPlayer.cpp 2014-01-29 09:31:28 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson commit-queue glenn jer.noble philipj oldest_to_newest 973244 0 eric.carlson 2014-01-28 18:25:03 -0800 Don't register MediaPlayerPrivateIOS unless the isVideoPluginProxyEnabled runtime setting is true. 973266 1 222547 eric.carlson 2014-01-28 19:53:08 -0800 Created attachment 222547 Proposed patch 973296 2 222547 jer.noble 2014-01-28 21:21:13 -0800 Comment on attachment 222547 Proposed patch r=me. The mac EWS bots are freaking out, but it looks unrelated. 973387 3 222547 commit-queue 2014-01-29 09:31:27 -0800 Comment on attachment 222547 Proposed patch Clearing flags on attachment: 222547 Committed r163023: <http://trac.webkit.org/changeset/163023> 973388 4 commit-queue 2014-01-29 09:31:28 -0800 All reviewed patches have been landed. Closing bug. 222547 2014-01-28 19:53:08 -0800 2014-01-29 09:31:26 -0800 Proposed patch patch_2.txt text/plain 3582 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Mjk5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAxLTI4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIGNsZWFudXAg TWVkaWFQbGF5ZXIuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjc4MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBEb24ndCByZWdpc3RlciBNZWRpYVBsYXllclByaXZhdGVJT1MgdW5sZXNzIHRoZSBy dW50aW1lIHNldHRpbmcgZm9yIG1lZGlhIHBsYXllciBwcm94eSBpcyBzZXQuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6IERvbid0IGRlZmluZSBQbGF0Zm9y bU1lZGlhRW5naW5lQ2xhc3NOYW1lIG9uIGlPUworICAgICAgICAoV2ViQ29yZTo6aW5zdGFsbGVk TWVkaWFFbmdpbmVzKTogRHJpdmUgYnkgY2xlYW51cCB0byByZXR1cm4gZWFybHkgaWYgcmVnaXN0 cmF0aW9uIGhhcworICAgICAgICAgICAgYWxyZWFkeSBoYXBwZW5lZC4KKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyOjpNZWRpYVBsYXllcik6IERvbid0IGZvcmNlLXJlZ2lzdGVyIHRoZSBm aXJzdCBtZWRpYSBlbmdpbmUgdW5sZXNzIAorICAgICAgICAgICAgaXNWaWRlb1BsdWdpblByb3h5 RW5hYmxlZCByZXR1cm5zIHRydWUuCisKIDIwMTQtMDEtMjggIFpvbHRhbiBIb3J2YXRoICA8em9s dGFuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0NTUyBTaGFwZXNdIEFkanVzdCBpbnNldCBzaXpp bmcgc3ludGF4IHRvIHRoZSBsYXRlc3Qgc3BlY2lmaWNhdGlvbgpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAkocmV2aXNpb24gMTYy OTU4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01Niw3ICs1Niw2IEBACiAjaWYgUExBVEZPUk0oTUFDKQogI2lm IFBMQVRGT1JNKElPUykKICNpbmNsdWRlICJNZWRpYVBsYXllclByaXZhdGVJT1MuaCIKLSNkZWZp bmUgUGxhdGZvcm1NZWRpYUVuZ2luZUNsYXNzTmFtZSBNZWRpYVBsYXllclByaXZhdGVJT1MKICNl bHNlCiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQuaCIKICNlbmRpZgpAQCAtMjA0 LDggKzIwMywxMCBAQCBzdGF0aWMgVmVjdG9yPE1lZGlhUGxheWVyRmFjdG9yeSo+JiBpbnN0CiAg ICAgICAgIHJldHVybiBpbnN0YWxsZWRFbmdpbmVzOwogICAgIH0KIAotICAgIGlmICghZW5naW5l c1F1ZXJpZWQpIHsKLSAgICAgICAgZW5naW5lc1F1ZXJpZWQgPSB0cnVlOworICAgIGlmIChlbmdp bmVzUXVlcmllZCkKKyAgICAgICAgcmV0dXJuIGluc3RhbGxlZEVuZ2luZXM7CisKKyAgICBlbmdp bmVzUXVlcmllZCA9IHRydWU7CiAKICNpZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykK ICAgICBpZiAoU2V0dGluZ3M6OmlzVmlkZW9QbHVnaW5Qcm94eUVuYWJsZWQoKSkKQEAgLTIxMywy OSArMjE0LDI2IEBAIHN0YXRpYyBWZWN0b3I8TWVkaWFQbGF5ZXJGYWN0b3J5Kj4mIGluc3QKICNl bmRpZgogCiAjaWYgVVNFKEFWRk9VTkRBVElPTikKLSAgICAgICAgaWYgKFNldHRpbmdzOjppc0FW Rm91bmRhdGlvbkVuYWJsZWQoKSkgeworICAgIGlmIChTZXR0aW5nczo6aXNBVkZvdW5kYXRpb25F bmFibGVkKCkpIHsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgICAgICBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpyZWdpc3Rlck1lZGlhRW5naW5lKGFkZE1lZGlhRW5naW5l KTsKKyAgICAgICAgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6cmVnaXN0ZXJN ZWRpYUVuZ2luZShhZGRNZWRpYUVuZ2luZSk7CiAjaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKLSAg ICAgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6cmVnaXN0ZXJN ZWRpYUVuZ2luZShhZGRNZWRpYUVuZ2luZSk7CisgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU291cmNlQVZGT2JqQzo6cmVnaXN0ZXJNZWRpYUVuZ2luZShhZGRNZWRpYUVuZ2luZSk7CiAj ZW5kaWYKICNlbGlmIFBMQVRGT1JNKFdJTikKLSAgICAgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbkNGOjpyZWdpc3Rlck1lZGlhRW5naW5lKGFkZE1lZGlhRW5naW5lKTsKKyAg ICAgICAgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6OnJlZ2lzdGVyTWVkaWFFbmdp bmUoYWRkTWVkaWFFbmdpbmUpOwogI2VuZGlmCi0gICAgICAgIH0KKyAgICB9CiAjZW5kaWYKIAot I2lmICFQTEFURk9STShJT1MpCi0jaWYgUExBVEZPUk0oTUFDKQotICAgICAgICBpZiAoU2V0dGlu Z3M6OmlzUVRLaXRFbmFibGVkKCkpCi0gICAgICAgICAgICBNZWRpYVBsYXllclByaXZhdGVRVEtp dDo6cmVnaXN0ZXJNZWRpYUVuZ2luZShhZGRNZWRpYUVuZ2luZSk7Ci0jZW5kaWYKKyNpZiBQTEFU Rk9STShNQUMpICYmICFQTEFURk9STShJT1MpCisgICAgaWYgKFNldHRpbmdzOjppc1FUS2l0RW5h YmxlZCgpKQorICAgICAgICBNZWRpYVBsYXllclByaXZhdGVRVEtpdDo6cmVnaXN0ZXJNZWRpYUVu Z2luZShhZGRNZWRpYUVuZ2luZSk7CiAjZW5kaWYKIAogI2lmIGRlZmluZWQoUGxhdGZvcm1NZWRp YUVuZ2luZUNsYXNzTmFtZSkKLSAgICAgICAgUGxhdGZvcm1NZWRpYUVuZ2luZUNsYXNzTmFtZTo6 cmVnaXN0ZXJNZWRpYUVuZ2luZShhZGRNZWRpYUVuZ2luZSk7CisgICAgUGxhdGZvcm1NZWRpYUVu Z2luZUNsYXNzTmFtZTo6cmVnaXN0ZXJNZWRpYUVuZ2luZShhZGRNZWRpYUVuZ2luZSk7CiAjZW5k aWYKLSAgICB9CiAKICAgICByZXR1cm4gaW5zdGFsbGVkRW5naW5lczsKIH0KQEAgLTM0Myw3ICsz NDEsNyBAQCBNZWRpYVBsYXllcjo6TWVkaWFQbGF5ZXIoTWVkaWFQbGF5ZXJDbGllCiB7CiAjaWYg RU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCiAgICAgVmVjdG9yPE1lZGlhUGxheWVyRmFj dG9yeSo+JiBlbmdpbmVzID0gaW5zdGFsbGVkTWVkaWFFbmdpbmVzKCk7Ci0gICAgaWYgKCFlbmdp bmVzLmlzRW1wdHkoKSkgeworICAgIGlmIChTZXR0aW5nczo6aXNWaWRlb1BsdWdpblByb3h5RW5h YmxlZCgpICYmICFlbmdpbmVzLmlzRW1wdHkoKSkgewogICAgICAgICBtX2N1cnJlbnRNZWRpYUVu Z2luZSA9IGVuZ2luZXNbMF07CiAgICAgICAgIG1fcHJpdmF0ZSA9IGVuZ2luZXNbMF0tPmNvbnN0 cnVjdG9yKHRoaXMpOwogICAgICAgICBpZiAobV9tZWRpYVBsYXllckNsaWVudCkK