178607 2017-10-20 16:10:18 -0700 Fix conditions in HTMLSourceElement and HTMLTrackElement's insertedInto and removedFrom 2017-11-15 13:01:45 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa buildbot calvaris cdumez eric.carlson esprehn+autocc gyuyoung.kim philipj webkit-bug-importer oldest_to_newest 1362896 0 rniwa 2017-10-20 16:10:18 -0700 Right now, HTMLSourceElement and HTMLTrackElement's insertedInto and removedFrom contain obviously wrong code. Fix them as I've learned these elements are only effective when they're a direct child of HTMLMediaElement. 1362904 1 324462 rniwa 2017-10-20 16:15:49 -0700 Created attachment 324462 Cleanup 1362905 2 buildbot 2017-10-20 16:17:28 -0700 Attachment 324462 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1362906 3 324463 rniwa 2017-10-20 16:19:53 -0700 Created attachment 324463 Wrote change log 1362916 4 rniwa 2017-10-20 16:51:41 -0700 Thanks for the review! 1362926 5 rniwa 2017-10-20 17:03:20 -0700 Committed r223801: <https://trac.webkit.org/changeset/223801> 1372314 6 webkit-bug-importer 2017-11-15 13:01:45 -0800 <rdar://problem/35568638> 324462 2017-10-20 16:15:49 -0700 2017-10-20 16:19:52 -0700 Cleanup bug-178607-20171020161548.patch text/plain 4598 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMzc5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTEwLTIwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBjb25kaXRpb25zIGluIEhU TUxTb3VyY2VFbGVtZW50IGFuZCBIVE1MVHJhY2tFbGVtZW50J3MgaW5zZXJ0ZWRJbnRvIGFuZCBy ZW1vdmVkRnJvbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc4NjA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBodG1sL0hUTUxTb3VyY2VFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3VyY2VFbGVtZW50OjppbnNlcnRlZElu dG8pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNvdXJjZUVsZW1lbnQ6OnJlbW92ZWRGcm9tKToK KyAgICAgICAgKiBodG1sL0hUTUxUcmFja0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFRyYWNrRWxlbWVudDo6aW5zZXJ0ZWRJbnRvKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxU cmFja0VsZW1lbnQ6OnJlbW92ZWRGcm9tKToKKwogMjAxNy0xMC0yMCAgS2VpdGggTWlsbGVyICA8 a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggd2luZG93 cyBidWlsZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3Bw CShyZXZpc2lvbiAyMjM3OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVt ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYsOCArNjYsOCBAQCBSZWY8SFRNTFNvdXJjZUVs ZW1lbnQ+IEhUTUxTb3VyY2VFbGVtZW50CiBOb2RlOjpJbnNlcnRlZEludG9SZXN1bHQgSFRNTFNv dXJjZUVsZW1lbnQ6Omluc2VydGVkSW50byhJbnNlcnRpb25UeXBlIGluc2VydGlvblR5cGUsIENv bnRhaW5lck5vZGUmIHBhcmVudE9mSW5zZXJ0ZWRUcmVlKQogewogICAgIEhUTUxFbGVtZW50Ojpp bnNlcnRlZEludG8oaW5zZXJ0aW9uVHlwZSwgcGFyZW50T2ZJbnNlcnRlZFRyZWUpOwotICAgIC8v IEZJWE1FOiBUaGlzIGNvZGUgaXMgd3JvbmcgaWYgYW4gYW5jZXN0b3Igb2YgdGhlIHBhcmVudCBo YWQgYmVlbiBpbnNlcnRlZC4KLSAgICBpZiAoYXV0byogcGFyZW50ID0gcGFyZW50RWxlbWVudCgp KSB7CisgICAgUmVmUHRyPEVsZW1lbnQ+IHBhcmVudCA9IHBhcmVudEVsZW1lbnQoKTsKKyAgICBp ZiAocGFyZW50ID09ICZwYXJlbnRPZkluc2VydGVkVHJlZSkgewogI2lmIEVOQUJMRShWSURFTykK ICAgICAgICAgaWYgKGlzPEhUTUxNZWRpYUVsZW1lbnQ+KCpwYXJlbnQpKQogICAgICAgICAgICAg ZG93bmNhc3Q8SFRNTE1lZGlhRWxlbWVudD4oKnBhcmVudCkuc291cmNlV2FzQWRkZWQoKnRoaXMp OwpAQCAtODAsMjEgKzgwLDE3IEBAIE5vZGU6Okluc2VydGVkSW50b1Jlc3VsdCBIVE1MU291cmNl RWxlbWUKIH0KIAogdm9pZCBIVE1MU291cmNlRWxlbWVudDo6cmVtb3ZlZEZyb20oUmVtb3ZhbFR5 cGUgcmVtb3ZhbFR5cGUsIENvbnRhaW5lck5vZGUmIHBhcmVudE9mUmVtb3ZlZFRyZWUpCi17Ci0g ICAgLy8gRklYTUU6IFRoaXMgY29kZSBpcyB3cm9uZyBpZiBhbiBhbmNlc3RvciBvZiB0aGUgcGFy ZW50IGhhZCBiZWVuIHJlbW92ZWQuCi0gICAgUmVmUHRyPEVsZW1lbnQ+IHBhcmVudCA9IHBhcmVu dEVsZW1lbnQoKTsKLSAgICBpZiAoIXBhcmVudCAmJiBpczxFbGVtZW50PihwYXJlbnRPZlJlbW92 ZWRUcmVlKSkKLSAgICAgICAgcGFyZW50ID0gJmRvd25jYXN0PEVsZW1lbnQ+KHBhcmVudE9mUmVt b3ZlZFRyZWUpOwotICAgIGlmIChwYXJlbnQpIHsKK3sgICAgICAgIAorICAgIEhUTUxFbGVtZW50 OjpyZW1vdmVkRnJvbShyZW1vdmFsVHlwZSwgcGFyZW50T2ZSZW1vdmVkVHJlZSk7CisgICAgaWYg KCFwYXJlbnROb2RlKCkgJiYgaXM8RWxlbWVudD4ocGFyZW50T2ZSZW1vdmVkVHJlZSkpIHsKICNp ZiBFTkFCTEUoVklERU8pCi0gICAgICAgIGlmIChpczxIVE1MTWVkaWFFbGVtZW50PigqcGFyZW50 KSkKLSAgICAgICAgICAgIGRvd25jYXN0PEhUTUxNZWRpYUVsZW1lbnQ+KCpwYXJlbnQpLnNvdXJj ZVdhc1JlbW92ZWQoKnRoaXMpOworICAgICAgICBpZiAoaXM8SFRNTE1lZGlhRWxlbWVudD4ocGFy ZW50T2ZSZW1vdmVkVHJlZSkpCisgICAgICAgICAgICBkb3duY2FzdDxIVE1MTWVkaWFFbGVtZW50 PihwYXJlbnRPZlJlbW92ZWRUcmVlKS5zb3VyY2VXYXNSZW1vdmVkKCp0aGlzKTsKICAgICAgICAg ZWxzZQogI2VuZGlmCi0gICAgICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQp KQotICAgICAgICAgICAgZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50PigqcGFyZW50KS5zb3Vy Y2VzQ2hhbmdlZCgpOworICAgICAgICBpZiAoaXM8SFRNTFBpY3R1cmVFbGVtZW50PihwYXJlbnRP ZlJlbW92ZWRUcmVlKSkKKyAgICAgICAgICAgIGRvd25jYXN0PEhUTUxQaWN0dXJlRWxlbWVudD4o cGFyZW50T2ZSZW1vdmVkVHJlZSkuc291cmNlc0NoYW5nZWQoKTsKICAgICB9Ci0gICAgSFRNTEVs ZW1lbnQ6OnJlbW92ZWRGcm9tKHJlbW92YWxUeXBlLCBwYXJlbnRPZlJlbW92ZWRUcmVlKTsKIH0K IAogdm9pZCBIVE1MU291cmNlRWxlbWVudDo6c2NoZWR1bGVFcnJvckV2ZW50KCkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRyYWNrRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MVHJhY2tFbGVtZW50LmNwcAkocmV2aXNpb24gMjIzNzk1KQor KysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVHJhY2tFbGVtZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODAsMTMgKzgwLDEwIEBAIE5vZGU6Okluc2VydGVkSW50b1Jlc3VsdCBIVE1MVHJhY2tF bGVtZW4KIHsKICAgICBIVE1MRWxlbWVudDo6aW5zZXJ0ZWRJbnRvKGluc2VydGlvblR5cGUsIHBh cmVudE9mSW5zZXJ0ZWRUcmVlKTsKIAotICAgIC8vIEZJWE1FOiBUaGlzIGNvZGUgaXMgd3Jvbmcu IElmIEhUTUxUcmFja0VsZW1lbnQgY2FuIGJlIGFueSBkZXNjZW5kZW50IG9mIEhUTUxNZWRpYUVs ZW1lbnQsIHRoZW4gY2hlY2sgYW5jZXN0b3JzIG9mIHBhcmVudE9mSW5zZXJ0ZWRUcmVlLgotICAg IC8vIElmIEhUTUxNZWRpYUVsZW1lbnQgb25seSBzdXBwb3J0cyBIVE1MVHJhY2tFbGVtZW50IHdo aWNoIGlzIGFuIGltbWVkaWF0ZSBjaGlsZCwgdGhlbiBjaGVjayBwYXJlbnROb2RlKCkgaW5zdGVh ZC4KLSAgICBpZiAoaXM8SFRNTE1lZGlhRWxlbWVudD4ocGFyZW50T2ZJbnNlcnRlZFRyZWUpKQor ICAgIGlmIChwYXJlbnROb2RlKCkgPT0gJnBhcmVudE9mSW5zZXJ0ZWRUcmVlICYmIGlzPEhUTUxN ZWRpYUVsZW1lbnQ+KHBhcmVudE9mSW5zZXJ0ZWRUcmVlKSkgewogICAgICAgICBkb3duY2FzdDxI VE1MTWVkaWFFbGVtZW50PihwYXJlbnRPZkluc2VydGVkVHJlZSkuZGlkQWRkVGV4dFRyYWNrKCp0 aGlzKTsKLQotICAgIC8vIFNpbmNlIHdlJ3ZlIG1vdmVkIHRvIGEgbmV3IHBhcmVudCwgd2UgbWF5 IG5vdyBiZSBhYmxlIHRvIGxvYWQuCi0gICAgc2NoZWR1bGVMb2FkKCk7CisgICAgICAgIHNjaGVk dWxlTG9hZCgpOworICAgIH0KIAogICAgIHJldHVybiBJbnNlcnRlZEludG9SZXN1bHQ6OkRvbmU7 CiB9CkBAIC05NSw5ICs5Miw3IEBAIHZvaWQgSFRNTFRyYWNrRWxlbWVudDo6cmVtb3ZlZEZyb20o UmVtb3YKIHsKICAgICBIVE1MRWxlbWVudDo6cmVtb3ZlZEZyb20ocmVtb3ZhbFR5cGUsIHBhcmVu dE9mUmVtb3ZlZFRyZWUpOwogCi0gICAgLy8gRklYTUU6IFRoaXMgY29kZSBpcyB3cm9uZy4gSWYg SFRNTFRyYWNrRWxlbWVudCBjYW4gYmUgYW55IGRlc2NlbmRlbnQgb2YgSFRNTE1lZGlhRWxlbWVu dCwgdGhlbiBjaGVjayBhbmNlc3RvcnMgb2YgcGFyZW50T2ZJbnNlcnRlZFRyZWUuCi0gICAgLy8g SWYgSFRNTE1lZGlhRWxlbWVudCBvbmx5IHN1cHBvcnRzIEhUTUxUcmFja0VsZW1lbnQgd2hpY2gg aXMgYW4gaW1tZWRpYXRlIGNoaWxkLCB0aGVuIGNoZWNrIHBhcmVudE5vZGUoKSBpbnN0ZWFkLgot ICAgIGlmIChpczxIVE1MTWVkaWFFbGVtZW50PihwYXJlbnRPZlJlbW92ZWRUcmVlKSkKKyAgICBp ZiAoIXBhcmVudE5vZGUoKSAmJiBpczxIVE1MTWVkaWFFbGVtZW50PihwYXJlbnRPZlJlbW92ZWRU cmVlKSkKICAgICAgICAgZG93bmNhc3Q8SFRNTE1lZGlhRWxlbWVudD4ocGFyZW50T2ZSZW1vdmVk VHJlZSkuZGlkUmVtb3ZlVGV4dFRyYWNrKCp0aGlzKTsKIH0KIAo= 324463 2017-10-20 16:19:53 -0700 2017-10-20 16:47:58 -0700 Wrote change log bug-178607-20171020161953.patch text/plain 4962 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMzc5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE3LTEwLTIwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBjb25kaXRpb25zIGluIEhU TUxTb3VyY2VFbGVtZW50IGFuZCBIVE1MVHJhY2tFbGVtZW50J3MgaW5zZXJ0ZWRJbnRvIGFuZCBy ZW1vdmVkRnJvbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc4NjA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRml4ZWQgdGhlIGNvbmRpdGlvbnMgaW4gaW5zZXJ0ZWRJbnRvIGFuZCByZW1vdmVkRnJvbSBv ZiBIVE1MU291cmNlRWxlbWVudCBhbmQgSFRNTFRyYWNrRWxlbWVudCB0byBiZQorICAgICAgICBz ZW1hbnRpY2FsbHkgc2Vuc2lzYmxlLiBTaW5jZSB0aGVzZSBlbGVtZW50cyBhcmUgb25seSBmdW5j dGlvbmFsIHdoZW4gdGhlaXIgaW1tZWRpYXRlIHBhcmVudHMgYXJlCisgICAgICAgIEhUTUxNZWRp YUVsZW1lbnQgYW5kIEhUTUxQaWN0dXJlRWxlbWVudCwgd2UgaGF2ZSB0byBjaGVjayB0aGF0IGl0 cyBpbW1lZGlhdGUgcGFyZW50IGNoYW5nZWQsIG5vdCB3aGVuCisgICAgICAgIHNvbWUgb2YgaXRz IGFuY2VzdG9yIGhhZCBjaGFuZ2VkIGJ5IGluc2VydGlvbiBvciByZW1vdmFsLgorCisgICAgICAg ICogaHRtbC9IVE1MU291cmNlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU291 cmNlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3VyY2VF bGVtZW50OjpyZW1vdmVkRnJvbSk6CisgICAgICAgICogaHRtbC9IVE1MVHJhY2tFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmFja0VsZW1lbnQ6Omluc2VydGVkSW50byk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MVHJhY2tFbGVtZW50OjpyZW1vdmVkRnJvbSk6CisKIDIwMTct MTAtMjAgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgZml4IHdpbmRvd3MgYnVpbGQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxTb3VyY2VFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxTb3VyY2VFbGVtZW50LmNwcAkocmV2aXNpb24gMjIzNzk1KQorKysgU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MU291cmNlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY2LDggKzY2 LDggQEAgUmVmPEhUTUxTb3VyY2VFbGVtZW50PiBIVE1MU291cmNlRWxlbWVudAogTm9kZTo6SW5z ZXJ0ZWRJbnRvUmVzdWx0IEhUTUxTb3VyY2VFbGVtZW50OjppbnNlcnRlZEludG8oSW5zZXJ0aW9u VHlwZSBpbnNlcnRpb25UeXBlLCBDb250YWluZXJOb2RlJiBwYXJlbnRPZkluc2VydGVkVHJlZSkK IHsKICAgICBIVE1MRWxlbWVudDo6aW5zZXJ0ZWRJbnRvKGluc2VydGlvblR5cGUsIHBhcmVudE9m SW5zZXJ0ZWRUcmVlKTsKLSAgICAvLyBGSVhNRTogVGhpcyBjb2RlIGlzIHdyb25nIGlmIGFuIGFu Y2VzdG9yIG9mIHRoZSBwYXJlbnQgaGFkIGJlZW4gaW5zZXJ0ZWQuCi0gICAgaWYgKGF1dG8qIHBh cmVudCA9IHBhcmVudEVsZW1lbnQoKSkgeworICAgIFJlZlB0cjxFbGVtZW50PiBwYXJlbnQgPSBw YXJlbnRFbGVtZW50KCk7CisgICAgaWYgKHBhcmVudCA9PSAmcGFyZW50T2ZJbnNlcnRlZFRyZWUp IHsKICNpZiBFTkFCTEUoVklERU8pCiAgICAgICAgIGlmIChpczxIVE1MTWVkaWFFbGVtZW50Pigq cGFyZW50KSkKICAgICAgICAgICAgIGRvd25jYXN0PEhUTUxNZWRpYUVsZW1lbnQ+KCpwYXJlbnQp LnNvdXJjZVdhc0FkZGVkKCp0aGlzKTsKQEAgLTgwLDIxICs4MCwxNyBAQCBOb2RlOjpJbnNlcnRl ZEludG9SZXN1bHQgSFRNTFNvdXJjZUVsZW1lCiB9CiAKIHZvaWQgSFRNTFNvdXJjZUVsZW1lbnQ6 OnJlbW92ZWRGcm9tKFJlbW92YWxUeXBlIHJlbW92YWxUeXBlLCBDb250YWluZXJOb2RlJiBwYXJl bnRPZlJlbW92ZWRUcmVlKQotewotICAgIC8vIEZJWE1FOiBUaGlzIGNvZGUgaXMgd3JvbmcgaWYg YW4gYW5jZXN0b3Igb2YgdGhlIHBhcmVudCBoYWQgYmVlbiByZW1vdmVkLgotICAgIFJlZlB0cjxF bGVtZW50PiBwYXJlbnQgPSBwYXJlbnRFbGVtZW50KCk7Ci0gICAgaWYgKCFwYXJlbnQgJiYgaXM8 RWxlbWVudD4ocGFyZW50T2ZSZW1vdmVkVHJlZSkpCi0gICAgICAgIHBhcmVudCA9ICZkb3duY2Fz dDxFbGVtZW50PihwYXJlbnRPZlJlbW92ZWRUcmVlKTsKLSAgICBpZiAocGFyZW50KSB7Cit7ICAg ICAgICAKKyAgICBIVE1MRWxlbWVudDo6cmVtb3ZlZEZyb20ocmVtb3ZhbFR5cGUsIHBhcmVudE9m UmVtb3ZlZFRyZWUpOworICAgIGlmICghcGFyZW50Tm9kZSgpICYmIGlzPEVsZW1lbnQ+KHBhcmVu dE9mUmVtb3ZlZFRyZWUpKSB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgICAgICBpZiAoaXM8SFRN TE1lZGlhRWxlbWVudD4oKnBhcmVudCkpCi0gICAgICAgICAgICBkb3duY2FzdDxIVE1MTWVkaWFF bGVtZW50PigqcGFyZW50KS5zb3VyY2VXYXNSZW1vdmVkKCp0aGlzKTsKKyAgICAgICAgaWYgKGlz PEhUTUxNZWRpYUVsZW1lbnQ+KHBhcmVudE9mUmVtb3ZlZFRyZWUpKQorICAgICAgICAgICAgZG93 bmNhc3Q8SFRNTE1lZGlhRWxlbWVudD4ocGFyZW50T2ZSZW1vdmVkVHJlZSkuc291cmNlV2FzUmVt b3ZlZCgqdGhpcyk7CiAgICAgICAgIGVsc2UKICNlbmRpZgotICAgICAgICBpZiAoaXM8SFRNTFBp Y3R1cmVFbGVtZW50PigqcGFyZW50KSkKLSAgICAgICAgICAgIGRvd25jYXN0PEhUTUxQaWN0dXJl RWxlbWVudD4oKnBhcmVudCkuc291cmNlc0NoYW5nZWQoKTsKKyAgICAgICAgaWYgKGlzPEhUTUxQ aWN0dXJlRWxlbWVudD4ocGFyZW50T2ZSZW1vdmVkVHJlZSkpCisgICAgICAgICAgICBkb3duY2Fz dDxIVE1MUGljdHVyZUVsZW1lbnQ+KHBhcmVudE9mUmVtb3ZlZFRyZWUpLnNvdXJjZXNDaGFuZ2Vk KCk7CiAgICAgfQotICAgIEhUTUxFbGVtZW50OjpyZW1vdmVkRnJvbShyZW1vdmFsVHlwZSwgcGFy ZW50T2ZSZW1vdmVkVHJlZSk7CiB9CiAKIHZvaWQgSFRNTFNvdXJjZUVsZW1lbnQ6OnNjaGVkdWxl RXJyb3JFdmVudCgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUcmFja0VsZW1lbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRyYWNrRWxlbWVudC5j cHAJKHJldmlzaW9uIDIyMzc5NSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRyYWNrRWxl bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwLDEzICs4MCwxMCBAQCBOb2RlOjpJbnNlcnRl ZEludG9SZXN1bHQgSFRNTFRyYWNrRWxlbWVuCiB7CiAgICAgSFRNTEVsZW1lbnQ6Omluc2VydGVk SW50byhpbnNlcnRpb25UeXBlLCBwYXJlbnRPZkluc2VydGVkVHJlZSk7CiAKLSAgICAvLyBGSVhN RTogVGhpcyBjb2RlIGlzIHdyb25nLiBJZiBIVE1MVHJhY2tFbGVtZW50IGNhbiBiZSBhbnkgZGVz Y2VuZGVudCBvZiBIVE1MTWVkaWFFbGVtZW50LCB0aGVuIGNoZWNrIGFuY2VzdG9ycyBvZiBwYXJl bnRPZkluc2VydGVkVHJlZS4KLSAgICAvLyBJZiBIVE1MTWVkaWFFbGVtZW50IG9ubHkgc3VwcG9y dHMgSFRNTFRyYWNrRWxlbWVudCB3aGljaCBpcyBhbiBpbW1lZGlhdGUgY2hpbGQsIHRoZW4gY2hl Y2sgcGFyZW50Tm9kZSgpIGluc3RlYWQuCi0gICAgaWYgKGlzPEhUTUxNZWRpYUVsZW1lbnQ+KHBh cmVudE9mSW5zZXJ0ZWRUcmVlKSkKKyAgICBpZiAocGFyZW50Tm9kZSgpID09ICZwYXJlbnRPZklu c2VydGVkVHJlZSAmJiBpczxIVE1MTWVkaWFFbGVtZW50PihwYXJlbnRPZkluc2VydGVkVHJlZSkp IHsKICAgICAgICAgZG93bmNhc3Q8SFRNTE1lZGlhRWxlbWVudD4ocGFyZW50T2ZJbnNlcnRlZFRy ZWUpLmRpZEFkZFRleHRUcmFjaygqdGhpcyk7Ci0KLSAgICAvLyBTaW5jZSB3ZSd2ZSBtb3ZlZCB0 byBhIG5ldyBwYXJlbnQsIHdlIG1heSBub3cgYmUgYWJsZSB0byBsb2FkLgotICAgIHNjaGVkdWxl TG9hZCgpOworICAgICAgICBzY2hlZHVsZUxvYWQoKTsKKyAgICB9CiAKICAgICByZXR1cm4gSW5z ZXJ0ZWRJbnRvUmVzdWx0OjpEb25lOwogfQpAQCAtOTUsOSArOTIsNyBAQCB2b2lkIEhUTUxUcmFj a0VsZW1lbnQ6OnJlbW92ZWRGcm9tKFJlbW92CiB7CiAgICAgSFRNTEVsZW1lbnQ6OnJlbW92ZWRG cm9tKHJlbW92YWxUeXBlLCBwYXJlbnRPZlJlbW92ZWRUcmVlKTsKIAotICAgIC8vIEZJWE1FOiBU aGlzIGNvZGUgaXMgd3JvbmcuIElmIEhUTUxUcmFja0VsZW1lbnQgY2FuIGJlIGFueSBkZXNjZW5k ZW50IG9mIEhUTUxNZWRpYUVsZW1lbnQsIHRoZW4gY2hlY2sgYW5jZXN0b3JzIG9mIHBhcmVudE9m SW5zZXJ0ZWRUcmVlLgotICAgIC8vIElmIEhUTUxNZWRpYUVsZW1lbnQgb25seSBzdXBwb3J0cyBI VE1MVHJhY2tFbGVtZW50IHdoaWNoIGlzIGFuIGltbWVkaWF0ZSBjaGlsZCwgdGhlbiBjaGVjayBw YXJlbnROb2RlKCkgaW5zdGVhZC4KLSAgICBpZiAoaXM8SFRNTE1lZGlhRWxlbWVudD4ocGFyZW50 T2ZSZW1vdmVkVHJlZSkpCisgICAgaWYgKCFwYXJlbnROb2RlKCkgJiYgaXM8SFRNTE1lZGlhRWxl bWVudD4ocGFyZW50T2ZSZW1vdmVkVHJlZSkpCiAgICAgICAgIGRvd25jYXN0PEhUTUxNZWRpYUVs ZW1lbnQ+KHBhcmVudE9mUmVtb3ZlZFRyZWUpLmRpZFJlbW92ZVRleHRUcmFjaygqdGhpcyk7CiB9 CiAK