127483 2014-01-23 08:37:13 -0800 Merge Chromium TextTrack cleanups 2014-01-27 07:03:09 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson commit-queue esprehn+autocc gyuyoung.kim japhet jeremyj-wk jer.noble oldest_to_newest 971149 0 eric.carlson 2014-01-23 08:37:13 -0800 Merge some of the Chromium TextTrack cleanups that have happened since the fork. 971156 1 221986 eric.carlson 2014-01-23 08:50:00 -0800 Created attachment 221986 Proposed patch 971192 2 221986 darin 2014-01-23 09:46:53 -0800 Comment on attachment 221986 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=221986&action=review > Source/WebCore/html/HTMLTrackElement.h:91 > + bool canLoadUrl(const URL&); Should be named canLoadURL. > Source/WebCore/loader/TextTrackLoader.cpp:79 > + m_resource = 0; nullptr 972413 3 eric.carlson 2014-01-27 07:03:09 -0800 Committed r162836: http://trac.webkit.org/changeset/162836 221986 2014-01-23 08:50:00 -0800 2014-01-27 07:03:20 -0800 Proposed patch text_track_cleanup_patch_2.txt text/plain 14289 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjYwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTAxLTIzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1lcmdlIENocm9taXVt IFRleHRUcmFjayBjbGVhbnVwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3NDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTWVyZ2Ugc29tZSBUZXh0VHJhY2sgY2xlYW51cHM6CisgICAgICAgIGh0dHBz Oi8vY2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9ibGluay8rL2I1NzFiOWZiYzZl NjJlMDVhYTc3YTQwMmNmOGY0NDdlNjgxYjhlZTMKKyAgICAgICAgaHR0cHM6Ly9jaHJvbWl1bS5n b29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysvNmIxOTQwMTUxMjU4MTUwZWEwMWJjZjIx ZWJmZDk1OGUyYWYyNDdmNAorICAgICAgICBodHRwczovL2Nocm9taXVtLmdvb2dsZXNvdXJjZS5j b20vY2hyb21pdW0vYmxpbmsvKy8zOTdjMmEyZDk0MTZmNWMwZDc5YmNhMjJkNjk3OWYxNzRlZWZj Y2UyCisgICAgICAgIGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9i bGluay8rL2Y0MmFkOTNlMjVjNjMxMGIyYjAzMjdhYjdjZTVkODJkM2M0YTZjMWIKKyAgICAgICAg aHR0cHM6Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL2JsaW5rLysvZDU1YjUy YjUzYjdkYTA1YmJhNWZlMzc4YTQyNzgyNTBiOTM0NzQzMAorICAgICAgICBodHRwczovL2Nocm9t aXVtLmdvb2dsZXNvdXJjZS5jb20vY2hyb21pdW0vYmxpbmsvKy9jYWM3NjZlY2FhYWM0NzdhMDg4 NzlmMGIzMTU3ZDAzMjdjYzc1ZDk2CisgICAgICAgIGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291 cmNlLmNvbS9jaHJvbWl1bS9ibGluay8rLzYxOTdjZTI3ODY5NmNkZDUyZmMyYWQ4MTg5M2YzNjk0 OTI0NjhjYTAKKworICAgICAgICAqIGh0bWwvSFRNTFRyYWNrRWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MVHJhY2tFbGVtZW50Ojpsb2FkVGltZXJGaXJlZCk6IFJlbW92ZSB0aGUg TG9hZGFibGVUZXh0VHJhY2sqIHBhcmFtZXRlciwgaXQgaXNuJ3QgdXNlZC4KKyAgICAgICAgKFdl YkNvcmU6OkhUTUxUcmFja0VsZW1lbnQ6OmRpZENvbXBsZXRlTG9hZCk6IERpdHRvLgorICAgICAg ICAqIGh0bWwvSFRNTFRyYWNrRWxlbWVudC5oOiBkaWRDb21wbGV0ZUxvYWQgZG9lc24ndCBuZWVk IHRvIGJlIHZpcnR1YWwuCisKKyAgICAgICAgKiBodG1sL3RyYWNrL0xvYWRhYmxlVGV4dFRyYWNr LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxvYWRhYmxlVGV4dFRyYWNrOjpsb2FkVGltZXJGaXJl ZCk6IFBhc3MgYSByZWZlcmVuY2UsIG5vdCBhIHBvaW50ZXIuCisgICAgICAgIChXZWJDb3JlOjpM b2FkYWJsZVRleHRUcmFjazo6Y3VlTG9hZGluZ1N0YXJ0ZWQpOiBSZW1vdmVkLCBpdCB3YXNuJ3Qg dXNlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxvYWRhYmxlVGV4dFRyYWNrOjpjdWVMb2FkaW5nQ29t cGxldGVkKTogUGFzcyBhIHJlZmVyZW5jZSwgbm90IGEgcG9pbnRlci4KKyAgICAgICAgKiBodG1s L3RyYWNrL0xvYWRhYmxlVGV4dFRyYWNrLmg6IERlbGV0ZSBMb2FkYWJsZVRleHRUcmFja0NsaWVu dCwgaXQgaXMgbm8gbG9uZ2VyIHVzZWQuCisKKyAgICAgICAgKiBsb2FkZXIvVGV4dFRyYWNrTG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0xvYWRlcjo6VGV4dFRyYWNrTG9h ZGVyKTogVGFrZSBhIFRleHRUcmFja0xvYWRlckNsaWVudCByZWZlcmVuY2UuCisgICAgICAgIChX ZWJDb3JlOjpUZXh0VHJhY2tMb2FkZXI6On5UZXh0VHJhY2tMb2FkZXIpOiBSZW5hbWUgbV9jYWNo ZWRDdWVEYXRhIG1fcmVzb3VyY2UuCisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tMb2FkZXI6 OmN1ZUxvYWRUaW1lckZpcmVkKTogbV9jbGllbnQgaXMgYSByZWZlcmVuY2UuCisgICAgICAgIChX ZWJDb3JlOjpUZXh0VHJhY2tMb2FkZXI6OmNhbmNlbExvYWQpOiBtX2NhY2hlZEN1ZURhdGEgLT4g bV9yZXNvdXJjZS4KKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0xvYWRlcjo6cHJvY2Vzc05l d0N1ZURhdGEpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlRleHRUcmFja0xvYWRlcjo6ZGVw cmVjYXRlZERpZFJlY2VpdmVDYWNoZWRSZXNvdXJjZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29y ZTo6VGV4dFRyYWNrTG9hZGVyOjpub3RpZnlGaW5pc2hlZCk6IERpdHRvLgorICAgICAgICAoV2Vi Q29yZTo6VGV4dFRyYWNrTG9hZGVyOjpsb2FkKTogc2hvdWxkTG9hZEN1ZXMgd2FzIHJlbW92ZWQg ZnJvbSB0aGUgY2xpZW50IGludGVyZmFjZSBiZWNhdXNlCisgICAgICAgICAgICB0aGUgb25seSBp bXBsZW1lbnRhdGlvbiBhbHdheXMgcmV0dXJuZWQgdHJ1ZS4KKyAgICAgICAgKFdlYkNvcmU6OlRl eHRUcmFja0xvYWRlcjo6bmV3UmVnaW9uc1BhcnNlZCk6IG1fY2xpZW50IGlzIGEgcmVmZXJlbmNl CisgICAgICAgICogbG9hZGVyL1RleHRUcmFja0xvYWRlci5oOgorCisgICAgICAgICogbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hl ZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0KTogUmVtb3ZlIGFuIG91dGRhdGVkIGNvbW1lbnQu CisKIDIwMTQtMDEtMjMgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CiAKICAg ICAgICAgW0NTUyBSZWdpb25zXSBGaXggcG9zaXRpb25pbmcgY29tcG9zaXRlZCBsYXllcnMgd2hl biB0aGUgcmVnaW9uIGhhcyBvdmVyZmxvdzpoaWRkZW4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFRyYWNrRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MVHJhY2tFbGVtZW50LmNwcAkocmV2aXNpb24gMTYyNTUyKQorKysgU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MVHJhY2tFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE0LDcgKzIx NCw3IEBAIHZvaWQgSFRNTFRyYWNrRWxlbWVudDo6bG9hZFRpbWVyRmlyZWQoVGkKICAgICAvLyA4 LiBJZiB0aGUgdHJhY2sgZWxlbWVudCdzIHBhcmVudCBpcyBhIG1lZGlhIGVsZW1lbnQgdGhlbiBs ZXQgQ09SUyBtb2RlIGJlIHRoZSBzdGF0ZSBvZiB0aGUgcGFyZW50IG1lZGlhCiAgICAgLy8gZWxl bWVudCdzIGNyb3Nzb3JpZ2luIGNvbnRlbnQgYXR0cmlidXRlLiBPdGhlcndpc2UsIGxldCBDT1JT IG1vZGUgYmUgTm8gQ09SUy4KICAgICBpZiAoIWNhbkxvYWRVcmwodXJsKSkgewotICAgICAgICBk aWRDb21wbGV0ZUxvYWQoJmVuc3VyZVRyYWNrKCksIEhUTUxUcmFja0VsZW1lbnQ6OkZhaWx1cmUp OworICAgICAgICBkaWRDb21wbGV0ZUxvYWQoSFRNTFRyYWNrRWxlbWVudDo6RmFpbHVyZSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI0Niw3ICsyNDYsNyBAQCBib29sIEhUTUxUcmFj a0VsZW1lbnQ6OmNhbkxvYWRVcmwoY29uc3QgCiAgICAgcmV0dXJuIGRpc3BhdGNoQmVmb3JlTG9h ZEV2ZW50KHVybC5zdHJpbmcoKSk7CiB9CiAKLXZvaWQgSFRNTFRyYWNrRWxlbWVudDo6ZGlkQ29t cGxldGVMb2FkKExvYWRhYmxlVGV4dFRyYWNrKiwgTG9hZFN0YXR1cyBzdGF0dXMpCit2b2lkIEhU TUxUcmFja0VsZW1lbnQ6OmRpZENvbXBsZXRlTG9hZChMb2FkU3RhdHVzIHN0YXR1cykKIHsKICAg ICAvLyA0LjguMTAuMTIuMyBTb3VyY2luZyBvdXQtb2YtYmFuZCB0ZXh0IHRyYWNrcyAoY29udGlu dWVkKQogICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVHJhY2tFbGVtZW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVHJhY2tFbGVtZW50LmgJKHJl dmlzaW9uIDE2MjU1MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRyYWNrRWxlbWVudC5o CSh3b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNjaGVk dWxlTG9hZCgpOwogCiAgICAgZW51bSBMb2FkU3RhdHVzIHsgRmFpbHVyZSwgU3VjY2VzcyB9Owot ICAgIHZpcnR1YWwgdm9pZCBkaWRDb21wbGV0ZUxvYWQoTG9hZGFibGVUZXh0VHJhY2sqLCBMb2Fk U3RhdHVzKTsKKyAgICB2b2lkIGRpZENvbXBsZXRlTG9hZChMb2FkU3RhdHVzKTsKIAogICAgIGNv bnN0IEF0b21pY1N0cmluZyYgbWVkaWFFbGVtZW50Q3Jvc3NPcmlnaW5BdHRyaWJ1dGUoKSBjb25z dDsKIApAQCAtODgsNyArODgsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCB0ZXh0VHJh Y2tSZW1vdmVDdWUoVGV4dFRyYWNrKiwgUGFzc1JlZlB0cjxUZXh0VHJhY2tDdWU+KSBvdmVycmlk ZTsKIAogICAgIExvYWRhYmxlVGV4dFRyYWNrJiBlbnN1cmVUcmFjaygpOwotICAgIHZpcnR1YWwg Ym9vbCBjYW5Mb2FkVXJsKGNvbnN0IFVSTCYpOworICAgIGJvb2wgY2FuTG9hZFVybChjb25zdCBV UkwmKTsKIAogICAgIFJlZlB0cjxMb2FkYWJsZVRleHRUcmFjaz4gbV90cmFjazsKICAgICBUaW1l cjxIVE1MVHJhY2tFbGVtZW50PiBtX2xvYWRUaW1lcjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svTG9hZGFibGVUZXh0VHJhY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2h0bWwvdHJhY2svTG9hZGFibGVUZXh0VHJhY2suY3BwCShyZXZpc2lvbiAxNjI1NTIpCisr KyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0xvYWRhYmxlVGV4dFRyYWNrLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtOTQsOSArOTQsOSBAQCB2b2lkIExvYWRhYmxlVGV4dFRyYWNrOjpsb2FkVGlt ZXJGaXJlZChUCiAgICAgLy8gNC4gRG93bmxvYWQ6IElmIFVSTCBpcyBub3QgdGhlIGVtcHR5IHN0 cmluZywgcGVyZm9ybSBhIHBvdGVudGlhbGx5IENPUlMtZW5hYmxlZCBmZXRjaCBvZiBVUkwsIHdp dGggdGhlCiAgICAgLy8gbW9kZSBiZWluZyB0aGUgc3RhdGUgb2YgdGhlIG1lZGlhIGVsZW1lbnQn cyBjcm9zc29yaWdpbiBjb250ZW50IGF0dHJpYnV0ZSwgdGhlIG9yaWdpbiBiZWluZyB0aGUKICAg ICAvLyBvcmlnaW4gb2YgdGhlIG1lZGlhIGVsZW1lbnQncyBEb2N1bWVudCwgYW5kIHRoZSBkZWZh dWx0IG9yaWdpbiBiZWhhdmlvdXIgc2V0IHRvIGZhaWwuCi0gICAgbV9sb2FkZXIgPSBUZXh0VHJh Y2tMb2FkZXI6OmNyZWF0ZSh0aGlzLCBzdGF0aWNfY2FzdDxTY3JpcHRFeGVjdXRpb25Db250ZXh0 Kj4oJm1fdHJhY2tFbGVtZW50LT5kb2N1bWVudCgpKSk7CisgICAgbV9sb2FkZXIgPSBUZXh0VHJh Y2tMb2FkZXI6OmNyZWF0ZSgqdGhpcywgc3RhdGljX2Nhc3Q8U2NyaXB0RXhlY3V0aW9uQ29udGV4 dCo+KCZtX3RyYWNrRWxlbWVudC0+ZG9jdW1lbnQoKSkpOwogICAgIGlmICghbV9sb2FkZXItPmxv YWQobV91cmwsIG1fdHJhY2tFbGVtZW50LT5tZWRpYUVsZW1lbnRDcm9zc09yaWdpbkF0dHJpYnV0 ZSgpKSkKLSAgICAgICAgbV90cmFja0VsZW1lbnQtPmRpZENvbXBsZXRlTG9hZCh0aGlzLCBIVE1M VHJhY2tFbGVtZW50OjpGYWlsdXJlKTsKKyAgICAgICAgbV90cmFja0VsZW1lbnQtPmRpZENvbXBs ZXRlTG9hZChIVE1MVHJhY2tFbGVtZW50OjpGYWlsdXJlKTsKIH0KIAogdm9pZCBMb2FkYWJsZVRl eHRUcmFjazo6bmV3Q3Vlc0F2YWlsYWJsZShUZXh0VHJhY2tMb2FkZXIqIGxvYWRlcikKQEAgLTEx OCwxMSArMTE4LDYgQEAgdm9pZCBMb2FkYWJsZVRleHRUcmFjazo6bmV3Q3Vlc0F2YWlsYWJsZQog ICAgICAgICBjbGllbnQoKS0+dGV4dFRyYWNrQWRkQ3Vlcyh0aGlzLCBtX2N1ZXMuZ2V0KCkpOwog fQogCi12b2lkIExvYWRhYmxlVGV4dFRyYWNrOjpjdWVMb2FkaW5nU3RhcnRlZChUZXh0VHJhY2tM b2FkZXIqIGxvYWRlcikKLXsKLSAgICBBU1NFUlRfVU5VU0VEKGxvYWRlciwgbV9sb2FkZXIgPT0g bG9hZGVyKTsKLX0KLQogdm9pZCBMb2FkYWJsZVRleHRUcmFjazo6Y3VlTG9hZGluZ0NvbXBsZXRl ZChUZXh0VHJhY2tMb2FkZXIqIGxvYWRlciwgYm9vbCBsb2FkaW5nRmFpbGVkKQogewogICAgIEFT U0VSVF9VTlVTRUQobG9hZGVyLCBtX2xvYWRlciA9PSBsb2FkZXIpOwpAQCAtMTMwLDcgKzEyNSw3 IEBAIHZvaWQgTG9hZGFibGVUZXh0VHJhY2s6OmN1ZUxvYWRpbmdDb21wbGUKICAgICBpZiAoIW1f dHJhY2tFbGVtZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3RyYWNrRWxlbWVudC0+ZGlk Q29tcGxldGVMb2FkKHRoaXMsIGxvYWRpbmdGYWlsZWQgPyBIVE1MVHJhY2tFbGVtZW50OjpGYWls dXJlIDogSFRNTFRyYWNrRWxlbWVudDo6U3VjY2Vzcyk7CisgICAgbV90cmFja0VsZW1lbnQtPmRp ZENvbXBsZXRlTG9hZChsb2FkaW5nRmFpbGVkID8gSFRNTFRyYWNrRWxlbWVudDo6RmFpbHVyZSA6 IEhUTUxUcmFja0VsZW1lbnQ6OlN1Y2Nlc3MpOwogfQogCiAjaWYgRU5BQkxFKFdFQlZUVF9SRUdJ T05TKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9Mb2FkYWJsZVRleHRUcmFjay5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svTG9hZGFibGVUZXh0VHJh Y2suaAkocmV2aXNpb24gMTYyNTUyKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9Mb2Fk YWJsZVRleHRUcmFjay5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNywxNCArMzcsNiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBjbGFzcyBIVE1MVHJhY2tFbGVtZW50OwogY2xhc3MgTG9hZGFibGVUZXh0 VHJhY2s7CiAKLWNsYXNzIExvYWRhYmxlVGV4dFRyYWNrQ2xpZW50IDogcHVibGljIFRleHRUcmFj a0NsaWVudCB7Ci1wdWJsaWM6Ci0gICAgdmlydHVhbCB+TG9hZGFibGVUZXh0VHJhY2tDbGllbnQo KSB7IH0KLSAgICAKLSAgICB2aXJ0dWFsIGJvb2wgY2FuTG9hZFVybChMb2FkYWJsZVRleHRUcmFj ayosIGNvbnN0IFVSTCYpIHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCB2b2lkIGxvYWRp bmdDb21wbGV0ZWQoTG9hZGFibGVUZXh0VHJhY2sqLCBib29sIC8qIGxvYWRpbmdGYWlsZWQgKi8p IHsgfQotfTsKLQogY2xhc3MgTG9hZGFibGVUZXh0VHJhY2sgOiBwdWJsaWMgVGV4dFRyYWNrLCBw cml2YXRlIFRleHRUcmFja0xvYWRlckNsaWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NS ZWZQdHI8TG9hZGFibGVUZXh0VHJhY2s+IGNyZWF0ZShIVE1MVHJhY2tFbGVtZW50KiB0cmFjaywg Y29uc3QgU3RyaW5nJiBraW5kLCBjb25zdCBTdHJpbmcmIGxhYmVsLCBjb25zdCBTdHJpbmcmIGxh bmd1YWdlKQpAQCAtNjksOSArNjEsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgLy8gVGV4 dFRyYWNrTG9hZGVyQ2xpZW50Ci0gICAgdmlydHVhbCBib29sIHNob3VsZExvYWRDdWVzKFRleHRU cmFja0xvYWRlciopIG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIHZvaWQg bmV3Q3Vlc0F2YWlsYWJsZShUZXh0VHJhY2tMb2FkZXIqKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFs IHZvaWQgY3VlTG9hZGluZ1N0YXJ0ZWQoVGV4dFRyYWNrTG9hZGVyKikgb3ZlcnJpZGU7CiAgICAg dmlydHVhbCB2b2lkIGN1ZUxvYWRpbmdDb21wbGV0ZWQoVGV4dFRyYWNrTG9hZGVyKiwgYm9vbCBs b2FkaW5nRmFpbGVkKSBvdmVycmlkZTsKICNpZiBFTkFCTEUoV0VCVlRUX1JFR0lPTlMpCiAgICAg dmlydHVhbCB2b2lkIG5ld1JlZ2lvbnNBdmFpbGFibGUoVGV4dFRyYWNrTG9hZGVyKik7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGV4dFRyYWNrTG9hZGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGV4dFRyYWNrTG9hZGVyLmNwcAkocmV2aXNpb24gMTYy NTUyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1RleHRUcmFja0xvYWRlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQzLDcgKzQzLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIAot VGV4dFRyYWNrTG9hZGVyOjpUZXh0VHJhY2tMb2FkZXIoVGV4dFRyYWNrTG9hZGVyQ2xpZW50KiBj bGllbnQsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQpCitUZXh0VHJhY2tMb2FkZXI6 OlRleHRUcmFja0xvYWRlcihUZXh0VHJhY2tMb2FkZXJDbGllbnQmIGNsaWVudCwgU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCogY29udGV4dCkKICAgICA6IG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1f c2NyaXB0RXhlY3V0aW9uQ29udGV4dChjb250ZXh0KQogICAgICwgbV9jdWVMb2FkVGltZXIodGhp cywgJlRleHRUcmFja0xvYWRlcjo6Y3VlTG9hZFRpbWVyRmlyZWQpCkBAIC01NSw4ICs1NSw4IEBA IFRleHRUcmFja0xvYWRlcjo6VGV4dFRyYWNrTG9hZGVyKFRleHRUcmEKIAogVGV4dFRyYWNrTG9h ZGVyOjp+VGV4dFRyYWNrTG9hZGVyKCkKIHsKLSAgICBpZiAobV9jYWNoZWRDdWVEYXRhKQotICAg ICAgICBtX2NhY2hlZEN1ZURhdGEtPnJlbW92ZUNsaWVudCh0aGlzKTsKKyAgICBpZiAobV9yZXNv dXJjZSkKKyAgICAgICAgbV9yZXNvdXJjZS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwogfQogCiB2b2lk IFRleHRUcmFja0xvYWRlcjo6Y3VlTG9hZFRpbWVyRmlyZWQoVGltZXI8VGV4dFRyYWNrTG9hZGVy PiogdGltZXIpCkBAIC02NSwyNCArNjUsMjQgQEAgdm9pZCBUZXh0VHJhY2tMb2FkZXI6OmN1ZUxv YWRUaW1lckZpcmVkKAogICAgIAogICAgIGlmIChtX25ld0N1ZXNBdmFpbGFibGUpIHsKICAgICAg ICAgbV9uZXdDdWVzQXZhaWxhYmxlID0gZmFsc2U7Ci0gICAgICAgIG1fY2xpZW50LT5uZXdDdWVz QXZhaWxhYmxlKHRoaXMpOyAKKyAgICAgICAgbV9jbGllbnQubmV3Q3Vlc0F2YWlsYWJsZSh0aGlz KTsKICAgICB9CiAgICAgCiAgICAgaWYgKG1fc3RhdGUgPj0gRmluaXNoZWQpCi0gICAgICAgIG1f Y2xpZW50LT5jdWVMb2FkaW5nQ29tcGxldGVkKHRoaXMsIG1fc3RhdGUgPT0gRmFpbGVkKTsKKyAg ICAgICAgbV9jbGllbnQuY3VlTG9hZGluZ0NvbXBsZXRlZCh0aGlzLCBtX3N0YXRlID09IEZhaWxl ZCk7CiB9CiAKIHZvaWQgVGV4dFRyYWNrTG9hZGVyOjpjYW5jZWxMb2FkKCkKIHsKLSAgICBpZiAo bV9jYWNoZWRDdWVEYXRhKSB7Ci0gICAgICAgIG1fY2FjaGVkQ3VlRGF0YS0+cmVtb3ZlQ2xpZW50 KHRoaXMpOwotICAgICAgICBtX2NhY2hlZEN1ZURhdGEgPSAwOworICAgIGlmIChtX3Jlc291cmNl KSB7CisgICAgICAgIG1fcmVzb3VyY2UtPnJlbW92ZUNsaWVudCh0aGlzKTsKKyAgICAgICAgbV9y ZXNvdXJjZSA9IDA7CiAgICAgfQogfQogCiB2b2lkIFRleHRUcmFja0xvYWRlcjo6cHJvY2Vzc05l d0N1ZURhdGEoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQogewotICAgIEFTU0VSVChtX2NhY2hl ZEN1ZURhdGEgPT0gcmVzb3VyY2UpOworICAgIEFTU0VSVChtX3Jlc291cmNlID09IHJlc291cmNl KTsKICAgICAKICAgICBpZiAobV9zdGF0ZSA9PSBGYWlsZWQgfHwgIXJlc291cmNlLT5yZXNvdXJj ZUJ1ZmZlcigpKQogICAgICAgICByZXR1cm47CkBAIC0xMDYsNyArMTA2LDcgQEAgdm9pZCBUZXh0 VHJhY2tMb2FkZXI6OnByb2Nlc3NOZXdDdWVEYXRhKAogLy8gRklYTUU6IFRoaXMgaXMgYSB2ZXJ5 IHVudXN1YWwgcGF0dGVybiwgbm8gb3RoZXIgQ2FjaGVkUmVzb3VyY2VDbGllbnQgZG9lcyB0aGlz LiBSZWZhY3RvciB0byB1c2Ugbm90aWZ5RmluaXNoZWQoKSBpbnN0ZWFkLgogdm9pZCBUZXh0VHJh Y2tMb2FkZXI6OmRlcHJlY2F0ZWREaWRSZWNlaXZlQ2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3Vy Y2UqIHJlc291cmNlKQogewotICAgIEFTU0VSVChtX2NhY2hlZEN1ZURhdGEgPT0gcmVzb3VyY2Up OworICAgIEFTU0VSVChtX3Jlc291cmNlID09IHJlc291cmNlKTsKICAgICAKICAgICBpZiAoIXJl c291cmNlLT5yZXNvdXJjZUJ1ZmZlcigpKQogICAgICAgICByZXR1cm47CkBAIC0xMjQsNyArMTI0 LDcgQEAgdm9pZCBUZXh0VHJhY2tMb2FkZXI6OmNvcnNQb2xpY3lQcmV2ZW50ZQogCiB2b2lkIFRl eHRUcmFja0xvYWRlcjo6bm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQog ewotICAgIEFTU0VSVChtX2NhY2hlZEN1ZURhdGEgPT0gcmVzb3VyY2UpOworICAgIEFTU0VSVCht X3Jlc291cmNlID09IHJlc291cmNlKTsKIAogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHRvRG9j dW1lbnQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKICAgICBpZiAoIW1fY3Jvc3NPcmlnaW5N b2RlLmlzTnVsbCgpCkBAIC0xNTIsOSArMTUyLDYgQEAgYm9vbCBUZXh0VHJhY2tMb2FkZXI6Omxv YWQoY29uc3QgVVJMJiB1cgogewogICAgIGNhbmNlbExvYWQoKTsKIAotICAgIGlmICghbV9jbGll bnQtPnNob3VsZExvYWRDdWVzKHRoaXMpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBB U1NFUlQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT5pc0RvY3VtZW50KCkpOwogICAgIERvY3Vt ZW50KiBkb2N1bWVudCA9IHRvRG9jdW1lbnQobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKICAg ICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgY3VlUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QoZG9jdW1l bnQtPmNvbXBsZXRlVVJMKHVybCkpKTsKQEAgLTE3MiwxMSArMTY5LDExIEBAIGJvb2wgVGV4dFRy YWNrTG9hZGVyOjpsb2FkKGNvbnN0IFVSTCYgdXIKICAgICB9CiAKICAgICBDYWNoZWRSZXNvdXJj ZUxvYWRlciogY2FjaGVkUmVzb3VyY2VMb2FkZXIgPSBkb2N1bWVudC0+Y2FjaGVkUmVzb3VyY2VM b2FkZXIoKTsKLSAgICBtX2NhY2hlZEN1ZURhdGEgPSBjYWNoZWRSZXNvdXJjZUxvYWRlci0+cmVx dWVzdFRleHRUcmFjayhjdWVSZXF1ZXN0KTsKLSAgICBpZiAobV9jYWNoZWRDdWVEYXRhKQotICAg ICAgICBtX2NhY2hlZEN1ZURhdGEtPmFkZENsaWVudCh0aGlzKTsKLSAgICAKLSAgICBtX2NsaWVu dC0+Y3VlTG9hZGluZ1N0YXJ0ZWQodGhpcyk7CisgICAgbV9yZXNvdXJjZSA9IGNhY2hlZFJlc291 cmNlTG9hZGVyLT5yZXF1ZXN0VGV4dFRyYWNrKGN1ZVJlcXVlc3QpOworICAgIGlmICghbV9yZXNv dXJjZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgbV9yZXNvdXJjZS0+YWRkQ2xpZW50 KHRoaXMpOwogICAgIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMTkzLDcgKzE5MCw3IEBAIHZv aWQgVGV4dFRyYWNrTG9hZGVyOjpuZXdDdWVzUGFyc2VkKCkKICNpZiBFTkFCTEUoV0VCVlRUX1JF R0lPTlMpCiB2b2lkIFRleHRUcmFja0xvYWRlcjo6bmV3UmVnaW9uc1BhcnNlZCgpCiB7Ci0gICAg bV9jbGllbnQtPm5ld1JlZ2lvbnNBdmFpbGFibGUodGhpcyk7IAorICAgIG1fY2xpZW50Lm5ld1Jl Z2lvbnNBdmFpbGFibGUodGhpcyk7CiB9CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL1RleHRUcmFja0xvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xv YWRlci9UZXh0VHJhY2tMb2FkZXIuaAkocmV2aXNpb24gMTYyNTUyKQorKysgU291cmNlL1dlYkNv cmUvbG9hZGVyL1RleHRUcmFja0xvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSw5ICs0NSw3 IEBAIGNsYXNzIFRleHRUcmFja0xvYWRlckNsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+ VGV4dFRyYWNrTG9hZGVyQ2xpZW50KCkgeyB9CiAgICAgCi0gICAgdmlydHVhbCBib29sIHNob3Vs ZExvYWRDdWVzKFRleHRUcmFja0xvYWRlciopID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgbmV3Q3Vl c0F2YWlsYWJsZShUZXh0VHJhY2tMb2FkZXIqKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGN1ZUxv YWRpbmdTdGFydGVkKFRleHRUcmFja0xvYWRlciopID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgY3Vl TG9hZGluZ0NvbXBsZXRlZChUZXh0VHJhY2tMb2FkZXIqLCBib29sIGxvYWRpbmdGYWlsZWQpID0g MDsKICNpZiBFTkFCTEUoV0VCVlRUX1JFR0lPTlMpCiAgICAgdmlydHVhbCB2b2lkIG5ld1JlZ2lv bnNBdmFpbGFibGUoVGV4dFRyYWNrTG9hZGVyKikgPSAwOwpAQCAtNTgsNyArNTYsNyBAQCBjbGFz cyBUZXh0VHJhY2tMb2FkZXIgOiBwdWJsaWMgQ2FjaGVkUmVzCiAgICAgV1RGX01BS0VfTk9OQ09Q WUFCTEUoVGV4dFRyYWNrTG9hZGVyKTsgCiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8VGV4dFRyYWNrTG9hZGVyPiBjcmVhdGUoVGV4 dFRyYWNrTG9hZGVyQ2xpZW50KiBjbGllbnQsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRl eHQpCisgICAgc3RhdGljIFBhc3NPd25QdHI8VGV4dFRyYWNrTG9hZGVyPiBjcmVhdGUoVGV4dFRy YWNrTG9hZGVyQ2xpZW50JiBjbGllbnQsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQp CiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IFRleHRUcmFja0xvYWRlcihjbGll bnQsIGNvbnRleHQpKTsKICAgICB9CkBAIC04Myw3ICs4MSw3IEBAIHByaXZhdGU6CiAjZW5kaWYK ICAgICB2aXJ0dWFsIHZvaWQgZmlsZUZhaWxlZFRvUGFyc2UoKTsKICAgICAKLSAgICBUZXh0VHJh Y2tMb2FkZXIoVGV4dFRyYWNrTG9hZGVyQ2xpZW50KiwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCop OworICAgIFRleHRUcmFja0xvYWRlcihUZXh0VHJhY2tMb2FkZXJDbGllbnQmLCBTY3JpcHRFeGVj dXRpb25Db250ZXh0Kik7CiAgICAgCiAgICAgdm9pZCBwcm9jZXNzTmV3Q3VlRGF0YShDYWNoZWRS ZXNvdXJjZSopOwogICAgIHZvaWQgY3VlTG9hZFRpbWVyRmlyZWQoVGltZXI8VGV4dFRyYWNrTG9h ZGVyPiopOwpAQCAtOTEsOSArODksOSBAQCBwcml2YXRlOgogCiAgICAgZW51bSBTdGF0ZSB7IElk bGUsIExvYWRpbmcsIEZpbmlzaGVkLCBGYWlsZWQgfTsKICAgICAKLSAgICBUZXh0VHJhY2tMb2Fk ZXJDbGllbnQqIG1fY2xpZW50OworICAgIFRleHRUcmFja0xvYWRlckNsaWVudCYgbV9jbGllbnQ7 CiAgICAgT3duUHRyPFdlYlZUVFBhcnNlcj4gbV9jdWVQYXJzZXI7Ci0gICAgQ2FjaGVkUmVzb3Vy Y2VIYW5kbGU8Q2FjaGVkVGV4dFRyYWNrPiBtX2NhY2hlZEN1ZURhdGE7CisgICAgQ2FjaGVkUmVz b3VyY2VIYW5kbGU8Q2FjaGVkVGV4dFRyYWNrPiBtX3Jlc291cmNlOwogICAgIFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dDsKICAgICBUaW1lcjxUZXh0VHJh Y2tMb2FkZXI+IG1fY3VlTG9hZFRpbWVyOwogICAgIFN0cmluZyBtX2Nyb3NzT3JpZ2luTW9kZTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMTYyNTUyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzk5LDgg KzM5OSw2IEBAIGJvb2wgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNhblJlcXVlc3QoQ2EKICAgICAg ICAgYnJlYWs7CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIGNhc2UgQ2FjaGVkUmVzb3Vy Y2U6OlRleHRUcmFja1Jlc291cmNlOgotICAgICAgICAvLyBDdWVzIGFyZW4ndCBjYWxsZWQgb3V0 IGluIHRoZSBDUFMgc3BlYyB5ZXQsIGJ1dCB0aGV5IG9ubHkgd29yayB3aXRoIGEgbWVkaWEgZWxl bWVudAotICAgICAgICAvLyBzbyB1c2UgdGhlIG1lZGlhIHBvbGljeS4KICAgICAgICAgaWYgKCFz aG91bGRCeXBhc3NNYWluV29ybGRDb250ZW50U2VjdXJpdHlQb2xpY3kgJiYgIW1fZG9jdW1lbnQt PmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd01lZGlhRnJvbVNvdXJjZSh1cmwpKQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBicmVhazsK