140738 2015-01-21 13:52:03 -0800 Simple line layout: Move nextTextFragment() to FlowContents class. 2015-01-21 14:51:02 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan mmaxfield oldest_to_newest 1063153 0 zalan 2015-01-21 13:52:03 -0800 This is in preparation to make FlowContens an iterator class. 1063158 1 245081 zalan 2015-01-21 13:56:57 -0800 Created attachment 245081 Patch 1063191 2 245081 commit-queue 2015-01-21 14:50:59 -0800 Comment on attachment 245081 Patch Clearing flags on attachment: 245081 Committed r178862: <http://trac.webkit.org/changeset/178862> 1063192 3 commit-queue 2015-01-21 14:51:02 -0800 All reviewed patches have been landed. Closing bug. 245081 2015-01-21 13:56:57 -0800 2015-01-21 14:50:59 -0800 Patch bug-140738-20150121135704.patch text/plain 16488 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQxNjIxNjIwOTg0MzM3 ZGFkNWNlODZmNTVkOWE4MWRjMzIyNWU2MS4uM2Y4MjY5ODNlM2ZlNzAyYWM4OGUyYmE4NDI1ZWUw ZjZmMDNkZTc1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTAxLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBNb3ZlIG5leHRUZXh0RnJhZ21lbnQoKSB0byBGbG93Q29udGVudHMgY2xhc3MuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA3MzgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBh cmF0aW9uIHRvIG1ha2UgRmxvd0NvbnRlbnRzIGFuIGl0ZXJhdG9yIGNsYXNzLgorICAgICAgICAK KyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5 b3V0OjpMaW5lU3RhdGU6OmFkZFVuY29tbWl0dGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBs ZUxpbmVMYXlvdXQ6OkxpbmVTdGF0ZTo6YWRkVW5jb21taXR0ZWRXaGl0ZXNwYWNlKToKKyAgICAg ICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OnJlbW92ZVRyYWlsaW5nV2hpdGVzcGFjZSk6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojppbml0aWFsaXplTmV3TGluZSk6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpzcGxpdEZyYWdtZW50VG9GaXRM aW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZUxpbmVSdW5z KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlRleHRGcmFnbWVudDo6VGV4 dEZyYWdtZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6 OlRleHRGcmFnbWVudDo6aXNFbXB0eSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpTaW1w bGVMaW5lTGF5b3V0OjpuZXh0RnJhZ21lbnQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNp bXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6bmV4dFRleHRGcmFnbWVudCk6CisgICAgICAg ICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaDoKKyAgICAgICAgKFdl YkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50OjpUZXh0 RnJhZ21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRl bnRzOjpUZXh0RnJhZ21lbnQ6OmlzRW1wdHkpOgorCiAyMDE1LTAxLTIwICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgRGlhZ25vc3RpY0xvZ2dpbmdD bGllbnQgY2FsbCBzaXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuY3BwCmluZGV4IDE1NWE4ZDgzNDMyZGFjZmU5YzBiNDdmMTI5MDhhZjRjMzY2MjkyN2Yu LjliYjM4NzJkOGZkMmMyZGU1ZTIwMzVhZWNmZWFmYmVmNDZkMzNkNGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKQEAgLTIyNiwzMCArMjI2LDYg QEAgc3RhdGljIGZsb2F0IGNvbXB1dGVMaW5lTGVmdChFVGV4dEFsaWduIHRleHRBbGlnbiwgZmxv YXQgYXZhaWxhYmxlV2lkdGgsIGZsb2F0IGMKICAgICByZXR1cm4gMDsKIH0KIAotc3RydWN0IFRl eHRGcmFnbWVudCB7Ci0gICAgVGV4dEZyYWdtZW50KCkgPSBkZWZhdWx0OwotICAgIFRleHRGcmFn bWVudCh1bnNpZ25lZCB0ZXh0U3RhcnQsIHVuc2lnbmVkIHRleHRFbmQsIGZsb2F0IHRleHRXaWR0 aCwgYm9vbCBpc1doaXRlc3BhY2VPbmx5KQotICAgICAgICA6IHN0YXJ0KHRleHRTdGFydCkKLSAg ICAgICAgLCBlbmQodGV4dEVuZCkKLSAgICAgICAgLCB0eXBlKGlzV2hpdGVzcGFjZU9ubHkgPyBX aGl0ZXNwYWNlIDogTm9uV2hpdGVzcGFjZSkKLSAgICAgICAgLCB3aWR0aCh0ZXh0V2lkdGgpCi0g ICAgewotICAgIH0KLQotICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0Ci0gICAgewotICAgICAgICBy ZXR1cm4gc3RhcnQgPT0gZW5kOwotICAgIH0KLQotICAgIGVudW0gVHlwZSB7IExpbmVCcmVhaywg V2hpdGVzcGFjZSwgTm9uV2hpdGVzcGFjZSB9OwotICAgIHVuc2lnbmVkIHN0YXJ0ID0gMDsKLSAg ICB1bnNpZ25lZCBlbmQgPSAwOwotICAgIFR5cGUgdHlwZSA9IE5vbldoaXRlc3BhY2U7Ci0gICAg Ym9vbCBpc0NvbGxhcHNlZCA9IGZhbHNlOwotICAgIGJvb2wgaXNCcmVha2FibGUgPSBmYWxzZTsK LSAgICBmbG9hdCB3aWR0aCA9IDA7Ci19OwotCiBzdHJ1Y3QgTGluZVN0YXRlIHsKICAgICBMaW5l U3RhdGUoKQogICAgICAgICA6IGF2YWlsYWJsZVdpZHRoKDApCkBAIC0yNzksMTkgKzI1NSwxOSBA QCBzdHJ1Y3QgTGluZVN0YXRlIHsKICAgICAgICAgdW5jb21taXR0ZWRXaWR0aCA9IDA7CiAgICAg fQogCi0gICAgdm9pZCBhZGRVbmNvbW1pdHRlZChjb25zdCBUZXh0RnJhZ21lbnQmIGZyYWdtZW50 KQorICAgIHZvaWQgYWRkVW5jb21taXR0ZWQoY29uc3QgRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21l bnQmIGZyYWdtZW50KQogICAgIHsKICAgICAgICAgdW5zaWduZWQgdW5jb21pdHRlZEZyYWdtZW50 TGVuZ3RoID0gZnJhZ21lbnQuZW5kIC0gdW5jb21taXR0ZWRFbmQ7CiAgICAgICAgIHVuY29tbWl0 dGVkV2lkdGggKz0gZnJhZ21lbnQud2lkdGg7CiAgICAgICAgIHVuY29tbWl0dGVkRW5kID0gZnJh Z21lbnQuZW5kOwogICAgICAgICBwb3NpdGlvbiA9IHVuY29tbWl0dGVkRW5kOwotICAgICAgICB0 cmFpbGluZ1doaXRlc3BhY2VXaWR0aCA9IGZyYWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50OjpX aGl0ZXNwYWNlID8gZnJhZ21lbnQud2lkdGggOiAwOwotICAgICAgICB0cmFpbGluZ1doaXRlc3Bh Y2VMZW5ndGggPSBmcmFnbWVudC50eXBlID09IFRleHRGcmFnbWVudDo6V2hpdGVzcGFjZSA/IHVu Y29taXR0ZWRGcmFnbWVudExlbmd0aCAgOiAwOworICAgICAgICB0cmFpbGluZ1doaXRlc3BhY2VX aWR0aCA9IGZyYWdtZW50LnR5cGUgPT0gRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQ6OldoaXRl c3BhY2UgPyBmcmFnbWVudC53aWR0aCA6IDA7CisgICAgICAgIHRyYWlsaW5nV2hpdGVzcGFjZUxl bmd0aCA9IGZyYWdtZW50LnR5cGUgPT0gRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQ6OldoaXRl c3BhY2UgPyB1bmNvbWl0dGVkRnJhZ21lbnRMZW5ndGggIDogMDsKICAgICB9CiAKICAgICB2b2lk IGFkZFVuY29tbWl0dGVkV2hpdGVzcGFjZShmbG9hdCB3aGl0ZXNwYWNlV2lkdGgpCiAgICAgewot ICAgICAgICBhZGRVbmNvbW1pdHRlZChUZXh0RnJhZ21lbnQodW5jb21taXR0ZWRFbmQsIHVuY29t bWl0dGVkRW5kICsgMSwgd2hpdGVzcGFjZVdpZHRoLCB0cnVlKSk7CisgICAgICAgIGFkZFVuY29t bWl0dGVkKEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50KHVuY29tbWl0dGVkRW5kLCB1bmNvbW1p dHRlZEVuZCArIDEsIHdoaXRlc3BhY2VXaWR0aCwgdHJ1ZSkpOwogICAgIH0KIAogICAgIHZvaWQg anVtcFRvKHVuc2lnbmVkIG5ld1Bvc2l0b24sIGZsb2F0IGxvZ2ljYWxSaWdodCkKQEAgLTM0Miw3 ICszMTgsNyBAQCBzdHJ1Y3QgTGluZVN0YXRlIHsKICAgICBmbG9hdCB0cmFpbGluZ1doaXRlc3Bh Y2VXaWR0aDsgLy8gVXNlIHRoaXMgdG8gcmVtb3ZlIHRyYWlsaW5nIHdoaXRlc3BhY2Ugd2l0aG91 dCByZS1tZXN1cmluZyB0aGUgdGV4dC4KICAgICBmbG9hdCB0cmFpbGluZ1doaXRlc3BhY2VMZW5n dGg7CiAKLSAgICBUZXh0RnJhZ21lbnQgb3ZlZmxvd2VkRnJhZ21lbnQ7CisgICAgRmxvd0NvbnRl bnRzOjpUZXh0RnJhZ21lbnQgb3ZlZmxvd2VkRnJhZ21lbnQ7CiB9OwogCiBzdGF0aWMgdm9pZCBy ZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UoTGluZVN0YXRlJiBsaW5lU3RhdGUsIExheW91dDo6UnVu VmVjdG9yJiBsaW5lUnVucywgY29uc3QgRmxvd0NvbnRlbnRzJiBmbG93Q29udGVudHMpCkBAIC0z NjUsOSArMzQxLDkgQEAgc3RhdGljIHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKExpbmVT dGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGkKICAgICAvLyB3ZSBkb24ndCBy ZW1vdmUgYW55IHdoaXRlc3BhY2UgYXQgYWxsLgogICAgIC8vIDIuIGZyb20gdGhpcyBsaW5lOiBy ZW1vdmUgd2hpdGVzcGFjZSwgdW5sZXNzIGl0J3MgdGhlIG9ubHkgZnJhZ21lbnQgb24gdGhlIGxp bmUgLXNvIHJlbW92aW5nIHRoZSB3aGl0ZXNhcGNlIHdvdWxkIHByb2R1Y2UgYW4gZW1wdHkgbGlu ZS4KICAgICBpZiAocHJlV3JhcCkgewotICAgICAgICBpZiAobGluZVN0YXRlLm92ZWZsb3dlZEZy YWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlICYmICFsaW5lU3RhdGUub3Zl Zmxvd2VkRnJhZ21lbnQuaXNFbXB0eSgpICYmIGxpbmVTdGF0ZS5hdmFpbGFibGVXaWR0aCA+PSBs aW5lU3RhdGUuY29tbWl0dGVkV2lkdGgpIHsKKyAgICAgICAgaWYgKGxpbmVTdGF0ZS5vdmVmbG93 ZWRGcmFnbWVudC50eXBlID09IEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNl ICYmICFsaW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQuaXNFbXB0eSgpICYmIGxpbmVTdGF0ZS5h dmFpbGFibGVXaWR0aCA+PSBsaW5lU3RhdGUuY29tbWl0dGVkV2lkdGgpIHsKICAgICAgICAgICAg IGxpbmVTdGF0ZS5wb3NpdGlvbiA9IGxpbmVTdGF0ZS5vdmVmbG93ZWRGcmFnbWVudC5lbmQ7Ci0g ICAgICAgICAgICBsaW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBUZXh0RnJhZ21lbnQoKTsK KyAgICAgICAgICAgIGxpbmVTdGF0ZS5vdmVmbG93ZWRGcmFnbWVudCA9IEZsb3dDb250ZW50czo6 VGV4dEZyYWdtZW50KCk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGxpbmVTdGF0ZS50cmFpbGlu Z1doaXRlc3BhY2VMZW5ndGgpIHsKICAgICAgICAgICAgIC8vIENoZWNrIGlmIHdlJ3ZlIGdvdCBv bmx5IHdoaXRlc3BhY2Ugb24gdGhpcyBsaW5lLgpAQCAtNDAxLDE3ICszNzcsMTcgQEAgc3RhdGlj IHZvaWQgaW5pdGlhbGl6ZU5ld0xpbmUoTGluZVN0YXRlJiBsaW5lU3RhdGUsIGNvbnN0IEZsb3dD b250ZW50cyYgZmxvd0NvbnQKICAgICAgICAgdW5zaWduZWQgc3BhY2VDb3VudCA9IDA7CiAgICAg ICAgIGxpbmVTdGF0ZS5qdW1wVG8oZmxvd0NvbnRlbnRzLnN0eWxlKCkuY29sbGFwc2VXaGl0ZXNw YWNlID8gZmxvd0NvbnRlbnRzLmZpbmROZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKGxpbmVTdGF0 ZS5wb3NpdGlvbiwgc3BhY2VDb3VudCkgOiBsaW5lU3RhdGUucG9zaXRpb24sIDApOwogICAgIH0K LSAgICBsaW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBUZXh0RnJhZ21lbnQoKTsKKyAgICBs aW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBGbG93Q29udGVudHM6OlRleHRGcmFnbWVudCgp OwogfQogCi1zdGF0aWMgVGV4dEZyYWdtZW50IHNwbGl0RnJhZ21lbnRUb0ZpdExpbmUoVGV4dEZy YWdtZW50JiBmcmFnbWVudFRvU3BsaXQsIGZsb2F0IGF2YWlsYWJsZVdpZHRoLCBib29sIGtlZXBB dExlYXN0T25lQ2hhcmFjdGVyLCBjb25zdCBGbG93Q29udGVudHMmIGZsb3dDb250ZW50cykKK3N0 YXRpYyBGbG93Q29udGVudHM6OlRleHRGcmFnbWVudCBzcGxpdEZyYWdtZW50VG9GaXRMaW5lKEZs b3dDb250ZW50czo6VGV4dEZyYWdtZW50JiBmcmFnbWVudFRvU3BsaXQsIGZsb2F0IGF2YWlsYWJs ZVdpZHRoLCBib29sIGtlZXBBdExlYXN0T25lQ2hhcmFjdGVyLCBjb25zdCBGbG93Q29udGVudHMm IGZsb3dDb250ZW50cykKIHsKICAgICAvLyBGYXN0IHBhdGggZm9yIHNpbmdsZSBjaGFyIGZyYWdt ZW50cy4KICAgICBpZiAoZnJhZ21lbnRUb1NwbGl0LnN0YXJ0ICsgMSA9PSBmcmFnbWVudFRvU3Bs aXQuZW5kKSB7CiAgICAgICAgIGlmIChrZWVwQXRMZWFzdE9uZUNoYXJhY3RlcikKLSAgICAgICAg ICAgIHJldHVybiBUZXh0RnJhZ21lbnQoKTsKKyAgICAgICAgICAgIHJldHVybiBGbG93Q29udGVu dHM6OlRleHRGcmFnbWVudCgpOwogCi0gICAgICAgIFRleHRGcmFnbWVudCBmcmFnbWVudEZvck5l eHRMaW5lKGZyYWdtZW50VG9TcGxpdCk7CisgICAgICAgIEZsb3dDb250ZW50czo6VGV4dEZyYWdt ZW50IGZyYWdtZW50Rm9yTmV4dExpbmUoZnJhZ21lbnRUb1NwbGl0KTsKICAgICAgICAgZnJhZ21l bnRUb1NwbGl0LmVuZCA9IGZyYWdtZW50VG9TcGxpdC5zdGFydDsKICAgICAgICAgZnJhZ21lbnRU b1NwbGl0LndpZHRoID0gMDsKICAgICAgICAgcmV0dXJuIGZyYWdtZW50Rm9yTmV4dExpbmU7CkBA IC00MzYsNyArNDEyLDcgQEAgc3RhdGljIFRleHRGcmFnbWVudCBzcGxpdEZyYWdtZW50VG9GaXRM aW5lKFRleHRGcmFnbWVudCYgZnJhZ21lbnRUb1NwbGl0LCBmbG9hdAogCiAgICAgaWYgKGtlZXBB dExlYXN0T25lQ2hhcmFjdGVyICYmIHJpZ2h0ID09IGZyYWdtZW50VG9TcGxpdC5zdGFydCkKICAg ICAgICAgKytyaWdodDsKLSAgICBUZXh0RnJhZ21lbnQgZnJhZ21lbnRGb3JOZXh0TGluZShmcmFn bWVudFRvU3BsaXQpOworICAgIEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50IGZyYWdtZW50Rm9y TmV4dExpbmUoZnJhZ21lbnRUb1NwbGl0KTsKICAgICBmcmFnbWVudFRvU3BsaXQuZW5kID0gcmln aHQ7CiAgICAgZnJhZ21lbnRUb1NwbGl0LndpZHRoID0gZnJhZ21lbnRUb1NwbGl0LmlzRW1wdHko KSA/IDAgOiBmbG93Q29udGVudHMudGV4dFdpZHRoKGZyYWdtZW50VG9TcGxpdC5zdGFydCwgcmln aHQsIDApOwogCkBAIC00NDUsNTcgKzQyMSwxNCBAQCBzdGF0aWMgVGV4dEZyYWdtZW50IHNwbGl0 RnJhZ21lbnRUb0ZpdExpbmUoVGV4dEZyYWdtZW50JiBmcmFnbWVudFRvU3BsaXQsIGZsb2F0CiAg ICAgcmV0dXJuIGZyYWdtZW50Rm9yTmV4dExpbmU7CiB9CiAKLXN0YXRpYyBUZXh0RnJhZ21lbnQg bmV4dEZyYWdtZW50KHVuc2lnbmVkIHByZXZpb3VzRnJhZ21lbnRFbmQsIGNvbnN0IEZsb3dDb250 ZW50cyYgZmxvd0NvbnRlbnRzLCBmbG9hdCB4UG9zaXRpb24pCi17Ci0gICAgLy8gQSBmcmFnbWVu dCBjYW4gZWl0aGVyIGJlCi0gICAgLy8gMS4gbmV3IGxpbmUgY2hhcmFjdGVyIHdoZW4gcHJlc2Vy dmVOZXdsaW5lIGlzIG9uIChub3QgY29uc2lkZXJlZCBhcyB3aGl0ZXNwYWNlKSBvcgotICAgIC8v IDIuIHdoaXRlc3BhY2UgKGNvbGxhc3BlZCwgbm9uLWNvbGxhcHNlZCBtdWx0aSBvciBzaW5nbGUp IG9yCi0gICAgLy8gMy4gbm9uLXdoaXRlc3BhY2UgY2hhcmFjdGVycy4KLSAgICBUZXh0RnJhZ21l bnQgZnJhZ21lbnQ7Ci0gICAgZnJhZ21lbnQuc3RhcnQgPSBwcmV2aW91c0ZyYWdtZW50RW5kOwot ICAgIGlmIChmbG93Q29udGVudHMuaXNMaW5lQnJlYWsoZnJhZ21lbnQuc3RhcnQpKSB7Ci0gICAg ICAgIGZyYWdtZW50LnR5cGUgPSBUZXh0RnJhZ21lbnQ6OkxpbmVCcmVhazsKLSAgICAgICAgZnJh Z21lbnQuZW5kID0gZnJhZ21lbnQuc3RhcnQgKyAxOwotICAgICAgICByZXR1cm4gZnJhZ21lbnQ7 Ci0gICAgfQotCi0gICAgY29uc3QgYXV0byYgc3R5bGUgPSBmbG93Q29udGVudHMuc3R5bGUoKTsK LSAgICB1bnNpZ25lZCBzcGFjZUNvdW50ID0gMDsKLSAgICB1bnNpZ25lZCB3aGl0ZXNwYWNlRW5k ID0gZmxvd0NvbnRlbnRzLmZpbmROZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKGZyYWdtZW50LnN0 YXJ0LCBzcGFjZUNvdW50KTsKLSAgICBBU1NFUlQoZnJhZ21lbnQuc3RhcnQgPD0gd2hpdGVzcGFj ZUVuZCk7Ci0gICAgaWYgKGZyYWdtZW50LnN0YXJ0ICE9IHdoaXRlc3BhY2VFbmQpIHsKLSAgICAg ICAgZnJhZ21lbnQudHlwZSA9IFRleHRGcmFnbWVudDo6V2hpdGVzcGFjZTsKLSAgICAgICAgZnJh Z21lbnQuZW5kID0gd2hpdGVzcGFjZUVuZDsKLSAgICAgICAgYm9vbCBtdWx0aXBsZVdoaXRlc3Bh Y2UgPSBmcmFnbWVudC5zdGFydCArIDEgPCBmcmFnbWVudC5lbmQ7Ci0gICAgICAgIGZyYWdtZW50 LmlzQ29sbGFwc2VkID0gbXVsdGlwbGVXaGl0ZXNwYWNlICYmIHN0eWxlLmNvbGxhcHNlV2hpdGVz cGFjZTsKLSAgICAgICAgZnJhZ21lbnQuaXNCcmVha2FibGUgPSAhZnJhZ21lbnQuaXNDb2xsYXBz ZWQgJiYgbXVsdGlwbGVXaGl0ZXNwYWNlOwotICAgICAgICBpZiAoZnJhZ21lbnQuaXNDb2xsYXBz ZWQpCi0gICAgICAgICAgICBmcmFnbWVudC53aWR0aCA9IHN0eWxlLnNwYWNlV2lkdGg7Ci0gICAg ICAgIGVsc2UgewotICAgICAgICAgICAgdW5zaWduZWQgZnJhZ21lbnRMZW5ndGggPSBmcmFnbWVu dC5lbmQgLSBmcmFnbWVudC5zdGFydDsKLSAgICAgICAgICAgIGlmIChmcmFnbWVudExlbmd0aCA9 PSBzcGFjZUNvdW50KQotICAgICAgICAgICAgICAgIGZyYWdtZW50LndpZHRoID0gZnJhZ21lbnRM ZW5ndGggKiBzdHlsZS5zcGFjZVdpZHRoOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgIGZyYWdtZW50LndpZHRoID0gZmxvd0NvbnRlbnRzLnRleHRXaWR0aChmcmFnbWVudC5zdGFy dCwgZnJhZ21lbnQuZW5kLCB4UG9zaXRpb24pOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBm cmFnbWVudDsKLSAgICB9Ci0KLSAgICBmcmFnbWVudC50eXBlID0gVGV4dEZyYWdtZW50OjpOb25X aGl0ZXNwYWNlOwotICAgIGZyYWdtZW50LmlzQnJlYWthYmxlID0gc3R5bGUuYnJlYWtXb3JkT25P dmVyZmxvdzsKLSAgICBmcmFnbWVudC5lbmQgPSBmbG93Q29udGVudHMuZmluZE5leHRCcmVha2Fi bGVQb3NpdGlvbihmcmFnbWVudC5zdGFydCArIDEpOwotICAgIGZyYWdtZW50LndpZHRoID0gZmxv d0NvbnRlbnRzLnRleHRXaWR0aChmcmFnbWVudC5zdGFydCwgZnJhZ21lbnQuZW5kLCB4UG9zaXRp b24pOwotICAgIHJldHVybiBmcmFnbWVudDsKLX0KLQogc3RhdGljIGJvb2wgY3JlYXRlTGluZVJ1 bnMoTGluZVN0YXRlJiBsaW5lU3RhdGUsIExheW91dDo6UnVuVmVjdG9yJiBsaW5lUnVucywgY29u c3QgRmxvd0NvbnRlbnRzJiBmbG93Q29udGVudHMpCiB7CiAgICAgY29uc3QgYXV0byYgc3R5bGUg PSBmbG93Q29udGVudHMuc3R5bGUoKTsKICAgICBib29sIGxpbmVDYW5CZVdyYXBwZWQgPSBzdHls ZS53cmFwTGluZXMgfHwgc3R5bGUuYnJlYWtXb3JkT25PdmVyZmxvdzsKICAgICB3aGlsZSAoIWZs b3dDb250ZW50cy5pc0VuZChsaW5lU3RhdGUucG9zaXRpb24pKSB7CiAgICAgICAgIC8vIEZpbmQg dGhlIG5leHQgdGV4dCBmcmFnbWVudC4gU3RhcnQgZnJvbSB0aGUgZW5kIG9mIHRoZSBwcmV2aW91 cyBmcmFnbWVudCAtY3VycmVudCBsaW5lIGVuZC4KLSAgICAgICAgVGV4dEZyYWdtZW50IGZyYWdt ZW50ID0gbmV4dEZyYWdtZW50KGxpbmVTdGF0ZS5wb3NpdGlvbiwgZmxvd0NvbnRlbnRzLCBsaW5l U3RhdGUud2lkdGgoKSk7Ci0gICAgICAgIGlmICgobGluZUNhbkJlV3JhcHBlZCAmJiAhbGluZVN0 YXRlLmZpdHMoZnJhZ21lbnQud2lkdGgpKSB8fCBmcmFnbWVudC50eXBlID09IFRleHRGcmFnbWVu dDo6TGluZUJyZWFrKSB7CisgICAgICAgIEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50IGZyYWdt ZW50ID0gZmxvd0NvbnRlbnRzLm5leHRUZXh0RnJhZ21lbnQobGluZVN0YXRlLnBvc2l0aW9uLCBs aW5lU3RhdGUud2lkdGgoKSk7CisgICAgICAgIGlmICgobGluZUNhbkJlV3JhcHBlZCAmJiAhbGlu ZVN0YXRlLmZpdHMoZnJhZ21lbnQud2lkdGgpKSB8fCBmcmFnbWVudC50eXBlID09IEZsb3dDb250 ZW50czo6VGV4dEZyYWdtZW50OjpMaW5lQnJlYWspIHsKICAgICAgICAgICAgIC8vIE92ZXJmbG93 IHdyYXBwaW5nIGJlaGF2aW91cjoKICAgICAgICAgICAgIC8vIDEuIE5ld2xpbmUgY2hhcmFjdGVy OiB3cmFwcyB0aGUgbGluZSB1bmxlc3MgaXQncyB0cmVhdGVkIGFzIHdoaXRlc3BhY2UuCiAgICAg ICAgICAgICAvLyAyLiBXaGl0ZXNhcGNlIGNvbGxhcHNlIG9uOiB3aGl0ZXNwYWNlIGlzIHNraXBw ZWQuCkBAIC01MDMsMTcgKzQzNiwxNyBAQCBzdGF0aWMgYm9vbCBjcmVhdGVMaW5lUnVucyhMaW5l U3RhdGUmIGxpbmVTdGF0ZSwgTGF5b3V0OjpSdW5WZWN0b3ImIGxpbmVSdW5zLCBjbwogICAgICAg ICAgICAgLy8gNC4gRmlyc3QsIG5vbi13aGl0ZXNwYWNlIGZyYWdtZW50IGlzIGVpdGhlciB3cmFw cGVkIG9yIGtlcHQgb24gdGhlIGxpbmUuIChkZXBlbmRzIG9uIG92ZXJmbG93LXdyYXApCiAgICAg ICAgICAgICAvLyA1LiBOb24td2hpdGVzcGFjZSBmcmFnbWVudCB3aGVuIHRoZXJlJ3MgYWxyZWFk eSBhbm90aGVyIGZyYWdtZW50IG9uIHRoZSBsaW5lIGdldHMgcHVzaGVkIHRvIHRoZSBuZXh0IGxp bmUuCiAgICAgICAgICAgICBib29sIGlzRmlyc3RGcmFnbWVudCA9ICFsaW5lU3RhdGUud2lkdGgo KTsKLSAgICAgICAgICAgIGlmIChmcmFnbWVudC50eXBlID09IFRleHRGcmFnbWVudDo6TGluZUJy ZWFrKSB7CisgICAgICAgICAgICBpZiAoZnJhZ21lbnQudHlwZSA9PSBGbG93Q29udGVudHM6OlRl eHRGcmFnbWVudDo6TGluZUJyZWFrKSB7CiAgICAgICAgICAgICAgICAgaWYgKGlzRmlyc3RGcmFn bWVudCkKICAgICAgICAgICAgICAgICAgICAgbGluZVN0YXRlLmFkZFVuY29tbWl0dGVkKGZyYWdt ZW50KTsKICAgICAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgLy8gTm8g bmVlZCB0byBhZGQgdGhlIG5ldyBsaW5lIGZyYWdtZW50IGlmIHRoZXJlJ3MgYWxyZWFkeSBjb250 ZW50IG9uIHRoZSBsaW5lLiBXZSBhcmUgYWJvdXQgdG8gY2xvc2UgdGhpcyBsaW5lIGFueXdheS4K ICAgICAgICAgICAgICAgICAgICAgKytsaW5lU3RhdGUucG9zaXRpb247CiAgICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgfSBlbHNlIGlmIChzdHlsZS5jb2xsYXBzZVdoaXRlc3BhY2UgJiYg ZnJhZ21lbnQudHlwZSA9PSBUZXh0RnJhZ21lbnQ6OldoaXRlc3BhY2UpIHsKKyAgICAgICAgICAg IH0gZWxzZSBpZiAoc3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlICYmIGZyYWdtZW50LnR5cGUgPT0g Rmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQ6OldoaXRlc3BhY2UpIHsKICAgICAgICAgICAgICAg ICAvLyBXaGl0ZXNwYWNlIGNvbGxhcHNlIGlzIG9uOiB3aGl0ZXNwYWNlIHRoYXQgZG9lc24ndCBm aXQgaXMgc2ltcGx5IHNraXBwZWQuCiAgICAgICAgICAgICAgICAgbGluZVN0YXRlLnBvc2l0aW9u ID0gZnJhZ21lbnQuZW5kOwotICAgICAgICAgICAgfSBlbHNlIGlmIChmcmFnbWVudC50eXBlID09 IFRleHRGcmFnbWVudDo6V2hpdGVzcGFjZSB8fCAoKGlzRmlyc3RGcmFnbWVudCAmJiBzdHlsZS5i cmVha1dvcmRPbk92ZXJmbG93KSB8fCAhc3R5bGUud3JhcExpbmVzKSkgeyAvLyAhc3R5bGUud3Jh cExpbmVzOiBidWcxMzgxMDIocHJlc2VydmUgZXhpc3RpbmcgYmVoYXZpb3IpCisgICAgICAgICAg ICB9IGVsc2UgaWYgKGZyYWdtZW50LnR5cGUgPT0gRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQ6 OldoaXRlc3BhY2UgfHwgKChpc0ZpcnN0RnJhZ21lbnQgJiYgc3R5bGUuYnJlYWtXb3JkT25PdmVy ZmxvdykgfHwgIXN0eWxlLndyYXBMaW5lcykpIHsgLy8gIXN0eWxlLndyYXBMaW5lczogYnVnMTM4 MTAyKHByZXNlcnZlIGV4aXN0aW5nIGJlaGF2aW9yKQogICAgICAgICAgICAgICAgIC8vIFdoaXRl c3BhY2UgY29sbGFwc2UgaXMgb2ZmIG9yIG5vbi13aGl0ZXNwYWNlIGNvbnRlbnQuIHNwbGl0IHRo ZSBmcmFnbWVudDsgKG1vZGlmaWVkKWZyYWdtZW50IC0+IHRoaXMgbGluZVN0YXRlLCBvdmVmbG93 ZWRGcmFnbWVudCAtPiBuZXh0IGxpbmUuCiAgICAgICAgICAgICAgICAgLy8gV2hlbiB0aGlzIGlz IHRoZSBvbmx5IChmaXJzdCkgZnJhZ21lbnQsIHRoZSBmaXJzdCBjaGFyYWN0ZXIgc3RheXMgb24g dGhlIGxpbmUsIGV2ZW4gaWYgaXQgZG9lcyBub3QgZml0LgogICAgICAgICAgICAgICAgIGxpbmVT dGF0ZS5vdmVmbG93ZWRGcmFnbWVudCA9IHNwbGl0RnJhZ21lbnRUb0ZpdExpbmUoZnJhZ21lbnQs IGxpbmVTdGF0ZS5hdmFpbGFibGVXaWR0aCAtIGxpbmVTdGF0ZS53aWR0aCgpLCBpc0ZpcnN0RnJh Z21lbnQsIGZsb3dDb250ZW50cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKaW5kZXggYjJmYzlhYmVlYzE1 NmEyYTQ1MjBmZjhmZTQ4NDFiOTk3ZmY4NzliOS4uOGI4Yzg1M2ZhNzBjNWMxMDRjMjM2Yjc1MWY1 M2VmMmI2MmI0N2ZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcApAQCAtNjYsNiArNjYsNDggQEAgRmxv d0NvbnRlbnRzOjpGbG93Q29udGVudHMoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93KQogewog fQogCitGbG93Q29udGVudHM6OlRleHRGcmFnbWVudCBGbG93Q29udGVudHM6Om5leHRUZXh0RnJh Z21lbnQodW5zaWduZWQgcG9zaXRpb24sIGZsb2F0IHhQb3NpdGlvbikgY29uc3QKK3sKKyAgICAv LyBBIGZyYWdtZW50IGNhbiBlaXRoZXIgYmUKKyAgICAvLyAxLiBuZXcgbGluZSBjaGFyYWN0ZXIg d2hlbiBwcmVzZXJ2ZU5ld2xpbmUgaXMgb24gKG5vdCBjb25zaWRlcmVkIGFzIHdoaXRlc3BhY2Up IG9yCisgICAgLy8gMi4gd2hpdGVzcGFjZSAoY29sbGFzcGVkLCBub24tY29sbGFwc2VkIG11bHRp IG9yIHNpbmdsZSkgb3IKKyAgICAvLyAzLiBub24td2hpdGVzcGFjZSBjaGFyYWN0ZXJzLgorICAg IFRleHRGcmFnbWVudCBmcmFnbWVudDsKKyAgICBmcmFnbWVudC5zdGFydCA9IHBvc2l0aW9uOwor ICAgIGlmIChpc0xpbmVCcmVhayhmcmFnbWVudC5zdGFydCkpIHsKKyAgICAgICAgZnJhZ21lbnQu dHlwZSA9IFRleHRGcmFnbWVudDo6TGluZUJyZWFrOworICAgICAgICBmcmFnbWVudC5lbmQgPSBm cmFnbWVudC5zdGFydCArIDE7CisgICAgICAgIHJldHVybiBmcmFnbWVudDsKKyAgICB9CisKKyAg ICB1bnNpZ25lZCBzcGFjZUNvdW50ID0gMDsKKyAgICB1bnNpZ25lZCB3aGl0ZXNwYWNlRW5kID0g ZmluZE5leHROb25XaGl0ZXNwYWNlUG9zaXRpb24oZnJhZ21lbnQuc3RhcnQsIHNwYWNlQ291bnQp OworICAgIEFTU0VSVChmcmFnbWVudC5zdGFydCA8PSB3aGl0ZXNwYWNlRW5kKTsKKyAgICBpZiAo ZnJhZ21lbnQuc3RhcnQgIT0gd2hpdGVzcGFjZUVuZCkgeworICAgICAgICBmcmFnbWVudC50eXBl ID0gVGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlOworICAgICAgICBmcmFnbWVudC5lbmQgPSB3aGl0 ZXNwYWNlRW5kOworICAgICAgICBib29sIG11bHRpcGxlV2hpdGVzcGFjZSA9IGZyYWdtZW50LnN0 YXJ0ICsgMSA8IGZyYWdtZW50LmVuZDsKKyAgICAgICAgZnJhZ21lbnQuaXNDb2xsYXBzZWQgPSBt dWx0aXBsZVdoaXRlc3BhY2UgJiYgbV9zdHlsZS5jb2xsYXBzZVdoaXRlc3BhY2U7CisgICAgICAg IGZyYWdtZW50LmlzQnJlYWthYmxlID0gIWZyYWdtZW50LmlzQ29sbGFwc2VkICYmIG11bHRpcGxl V2hpdGVzcGFjZTsKKyAgICAgICAgaWYgKGZyYWdtZW50LmlzQ29sbGFwc2VkKQorICAgICAgICAg ICAgZnJhZ21lbnQud2lkdGggPSBtX3N0eWxlLnNwYWNlV2lkdGg7CisgICAgICAgIGVsc2Ugewor ICAgICAgICAgICAgdW5zaWduZWQgZnJhZ21lbnRMZW5ndGggPSBmcmFnbWVudC5lbmQgLSBmcmFn bWVudC5zdGFydDsKKyAgICAgICAgICAgIGlmIChmcmFnbWVudExlbmd0aCA9PSBzcGFjZUNvdW50 KQorICAgICAgICAgICAgICAgIGZyYWdtZW50LndpZHRoID0gZnJhZ21lbnRMZW5ndGggKiBtX3N0 eWxlLnNwYWNlV2lkdGg7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZnJhZ21l bnQud2lkdGggPSB0ZXh0V2lkdGgoZnJhZ21lbnQuc3RhcnQsIGZyYWdtZW50LmVuZCwgeFBvc2l0 aW9uKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gZnJhZ21lbnQ7CisgICAgfQorCisgICAg ZnJhZ21lbnQudHlwZSA9IFRleHRGcmFnbWVudDo6Tm9uV2hpdGVzcGFjZTsKKyAgICBmcmFnbWVu dC5pc0JyZWFrYWJsZSA9IG1fc3R5bGUuYnJlYWtXb3JkT25PdmVyZmxvdzsKKyAgICBmcmFnbWVu dC5lbmQgPSBmaW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKGZyYWdtZW50LnN0YXJ0ICsgMSk7Cisg ICAgZnJhZ21lbnQud2lkdGggPSB0ZXh0V2lkdGgoZnJhZ21lbnQuc3RhcnQsIGZyYWdtZW50LmVu ZCwgeFBvc2l0aW9uKTsKKyAgICByZXR1cm4gZnJhZ21lbnQ7Cit9CisKIHRlbXBsYXRlIDx0eXBl bmFtZSBDaGFyYWN0ZXJUeXBlPgogc3RhdGljIHVuc2lnbmVkIG5leHRCcmVha2FibGVQb3NpdGlv bihMYXp5TGluZUJyZWFrSXRlcmF0b3ImIGxpbmVCcmVha0l0ZXJhdG9yLCBjb25zdCBGbG93Q29u dGVudHM6OlNlZ21lbnQmIHNlZ21lbnQsIHVuc2lnbmVkIHBvc2l0aW9uKQogewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRz LmgKaW5kZXggY2RmNThlZWMwMGE0MGYwOTZlYWFlODE5YThkYTYxZTVkNmZkMDMxZC4uNjQzNThh ZmY1YTA0MTQ1NTEwNjk0MzA5MmI2ZGI2MDE5MWFjZTMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oCkBAIC00 MCw3ICs0MCwzMSBAQCBjbGFzcyBGbG93Q29udGVudHMgewogcHVibGljOgogICAgIEZsb3dDb250 ZW50cyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmKTsKIAotICAgIHVuc2lnbmVkIGZpbmROZXh0QnJl YWthYmxlUG9zaXRpb24odW5zaWduZWQgcG9zaXRpb24pIGNvbnN0OworICAgIHN0cnVjdCBUZXh0 RnJhZ21lbnQgeworICAgICAgICBUZXh0RnJhZ21lbnQoKSA9IGRlZmF1bHQ7CisgICAgICAgIFRl eHRGcmFnbWVudCh1bnNpZ25lZCB0ZXh0U3RhcnQsIHVuc2lnbmVkIHRleHRFbmQsIGZsb2F0IHRl eHRXaWR0aCwgYm9vbCBpc1doaXRlc3BhY2VPbmx5KQorICAgICAgICAgICAgOiBzdGFydCh0ZXh0 U3RhcnQpCisgICAgICAgICAgICAsIGVuZCh0ZXh0RW5kKQorICAgICAgICAgICAgLCB0eXBlKGlz V2hpdGVzcGFjZU9ubHkgPyBXaGl0ZXNwYWNlIDogTm9uV2hpdGVzcGFjZSkKKyAgICAgICAgICAg ICwgd2lkdGgodGV4dFdpZHRoKQorICAgICAgICB7CisgICAgICAgIH0KKworICAgICAgICBib29s IGlzRW1wdHkoKSBjb25zdAorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gc3RhcnQgPT0g ZW5kOworICAgICAgICB9CisKKyAgICAgICAgZW51bSBUeXBlIHsgTGluZUJyZWFrLCBXaGl0ZXNw YWNlLCBOb25XaGl0ZXNwYWNlIH07CisgICAgICAgIHVuc2lnbmVkIHN0YXJ0ID0gMDsKKyAgICAg ICAgdW5zaWduZWQgZW5kID0gMDsKKyAgICAgICAgVHlwZSB0eXBlID0gTm9uV2hpdGVzcGFjZTsK KyAgICAgICAgYm9vbCBpc0NvbGxhcHNlZCA9IGZhbHNlOworICAgICAgICBib29sIGlzQnJlYWth YmxlID0gZmFsc2U7CisgICAgICAgIGZsb2F0IHdpZHRoID0gMDsKKyAgICB9OworCisgICAgVGV4 dEZyYWdtZW50IG5leHRUZXh0RnJhZ21lbnQodW5zaWduZWQgcG9zaXRpb24sIGZsb2F0IHhQb3Np dGlvbikgY29uc3Q7CiAgICAgdW5zaWduZWQgZmluZE5leHROb25XaGl0ZXNwYWNlUG9zaXRpb24o dW5zaWduZWQgcG9zaXRpb24sIHVuc2lnbmVkJiBzcGFjZUNvdW50KSBjb25zdDsKIAogICAgIGZs b2F0IHRleHRXaWR0aCh1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgZmxvYXQgeFBvc2l0aW9u KSBjb25zdDsKQEAgLTc2LDYgKzEwMCw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBTdHlsZSYgc3R5 bGUoKSBjb25zdCB7IHJldHVybiBtX3N0eWxlOyB9CiAKIHByaXZhdGU6CisgICAgdW5zaWduZWQg ZmluZE5leHRCcmVha2FibGVQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbikgY29uc3Q7CiAgICAg dW5zaWduZWQgc2VnbWVudEluZGV4Rm9yUG9zaXRpb24odW5zaWduZWQgcG9zaXRpb24pIGNvbnN0 OwogICAgIHVuc2lnbmVkIHNlZ21lbnRJbmRleEZvclBvc2l0aW9uU2xvdyh1bnNpZ25lZCBwb3Np dGlvbikgY29uc3Q7CiAK