140417 2015-01-13 16:02:36 -0800 Simple line layout: Refactor TextFragment class. 2015-01-13 21:04:17 -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 1060984 0 zalan 2015-01-13 16:02:36 -0800 ssia. 1060987 1 244560 zalan 2015-01-13 16:11:15 -0800 Created attachment 244560 Patch 1060990 2 244560 kling 2015-01-13 16:17:03 -0800 Comment on attachment 244560 Patch r=me 1061024 3 244568 zalan 2015-01-13 18:12:56 -0800 Created attachment 244568 Patch 1061069 4 244568 commit-queue 2015-01-13 21:04:06 -0800 Comment on attachment 244568 Patch Clearing flags on attachment: 244568 Committed r178407: <http://trac.webkit.org/changeset/178407> 1061070 5 commit-queue 2015-01-13 21:04:17 -0800 All reviewed patches have been landed. Closing bug. 244560 2015-01-13 16:11:15 -0800 2015-01-13 18:12:52 -0800 Patch Patch.txt text/plain 9052 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4YjkwMjBlLi5hYjhkMjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTUtMDEtMTMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAorICAgICAg ICBTaW1wbGUgbGluZSBsYXlvdXQ6IFJlZmFjdG9yIFRleHRGcmFnbWVudCBjbGFzcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDQxNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZSB0ZXh0 IGZyYWdtZW50IHR5cGUgYW5kIHVzZSBjbGFzcyBtZW1iZXIgaW5pdGlhbGl6ZXJzLgorCisgICAg ICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6 VGV4dEZyYWdtZW50OjpUZXh0RnJhZ21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGlu ZUxheW91dDo6TGluZVN0YXRlOjphZGRVbmNvbW1pdHRlZCk6CisgICAgICAgIChXZWJDb3JlOjpT aW1wbGVMaW5lTGF5b3V0OjpyZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UpOgorICAgICAgICAoV2Vi Q29yZTo6U2ltcGxlTGluZUxheW91dDo6bmV4dEZyYWdtZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OlNpbXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZUxpbmVSdW5zKToKKworMjAxNS0wMS0xMyAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCiAgICAgICAgIFNpbXBsZSBsaW5lIGxheW91dDog UmVmYWN0b3IgU2ltcGxlTGluZUxheW91dDo6bmV4dEZyYWdtZW50KCkuCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA0MDcKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCmluZGV4IGYzOTFiNzcuLjkwZTlj YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAK QEAgLTIyNywyNCArMjI3LDExIEBAIHN0YXRpYyBmbG9hdCBjb21wdXRlTGluZUxlZnQoRVRleHRB bGlnbiB0ZXh0QWxpZ24sIGZsb2F0IGF2YWlsYWJsZVdpZHRoLCBmbG9hdCBjCiB9CiAKIHN0cnVj dCBUZXh0RnJhZ21lbnQgewotICAgIFRleHRGcmFnbWVudCgpCi0gICAgICAgIDogc3RhcnQoMCkK LSAgICAgICAgLCBpc0NvbGxhcHNlZFdoaXRlc3BhY2UoZmFsc2UpCi0gICAgICAgICwgZW5kKDAp Ci0gICAgICAgICwgaXNXaGl0ZXNwYWNlT25seShmYWxzZSkKLSAgICAgICAgLCBpc0JyZWFrYWJs ZShmYWxzZSkKLSAgICAgICAgLCBpc0xpbmVCcmVhayhmYWxzZSkKLSAgICAgICAgLCB3aWR0aCgw KQotICAgIHsKLSAgICB9Ci0KKyAgICBUZXh0RnJhZ21lbnQoKSA9IGRlZmF1bHQ7CiAgICAgVGV4 dEZyYWdtZW50KHVuc2lnbmVkIHRleHRTdGFydCwgdW5zaWduZWQgdGV4dEVuZCwgZmxvYXQgdGV4 dFdpZHRoLCBib29sIGlzV2hpdGVzcGFjZU9ubHkpCiAgICAgICAgIDogc3RhcnQodGV4dFN0YXJ0 KQotICAgICAgICAsIGlzQ29sbGFwc2VkV2hpdGVzcGFjZShmYWxzZSkKICAgICAgICAgLCBlbmQo dGV4dEVuZCkKLSAgICAgICAgLCBpc1doaXRlc3BhY2VPbmx5KGlzV2hpdGVzcGFjZU9ubHkpCi0g ICAgICAgICwgaXNCcmVha2FibGUoZmFsc2UpCi0gICAgICAgICwgaXNMaW5lQnJlYWsoZmFsc2Up CisgICAgICAgICwgdHlwZShpc1doaXRlc3BhY2VPbmx5ID8gV2hpdGVzcGFjZSA6IE5vbldoaXRl c3BhY2UpCiAgICAgICAgICwgd2lkdGgodGV4dFdpZHRoKQogICAgIHsKICAgICB9CkBAIC0yNTQs MTMgKzI0MSwxMyBAQCBzdHJ1Y3QgVGV4dEZyYWdtZW50IHsKICAgICAgICAgcmV0dXJuIHN0YXJ0 ID09IGVuZDsKICAgICB9CiAKLSAgICB1bnNpZ25lZCBzdGFydCA6IDMxOwotICAgIGJvb2wgaXND b2xsYXBzZWRXaGl0ZXNwYWNlIDogMTsKLSAgICB1bnNpZ25lZCBlbmQgOiAzMTsKLSAgICBib29s IGlzV2hpdGVzcGFjZU9ubHkgOiAxOwotICAgIGJvb2wgaXNCcmVha2FibGU7Ci0gICAgYm9vbCBp c0xpbmVCcmVhazsKLSAgICBmbG9hdCB3aWR0aDsKKyAgICBlbnVtIFR5cGUgeyBMaW5lQnJlYWss IFdoaXRlc3BhY2UsIE5vbldoaXRlc3BhY2UgfTsKKyAgICB1bnNpZ25lZCBzdGFydCA9IDA7Cisg ICAgdW5zaWduZWQgZW5kID0gMDsKKyAgICBUeXBlIHR5cGUgPSBOb25XaGl0ZXNwYWNlOworICAg IGJvb2wgaXNDb2xsYXBzZWQgPSBmYWxzZTsKKyAgICBib29sIGlzQnJlYWthYmxlID0gZmFsc2U7 CisgICAgZmxvYXQgd2lkdGggPSAwOwogfTsKIAogc3RydWN0IExpbmVTdGF0ZSB7CkBAIC0yOTgs OCArMjg1LDggQEAgc3RydWN0IExpbmVTdGF0ZSB7CiAgICAgICAgIHVuY29tbWl0dGVkV2lkdGgg Kz0gZnJhZ21lbnQud2lkdGg7CiAgICAgICAgIHVuY29tbWl0dGVkRW5kID0gZnJhZ21lbnQuZW5k OwogICAgICAgICBwb3NpdGlvbiA9IHVuY29tbWl0dGVkRW5kOwotICAgICAgICB0cmFpbGluZ1do aXRlc3BhY2VXaWR0aCA9IGZyYWdtZW50LmlzV2hpdGVzcGFjZU9ubHkgPyBmcmFnbWVudC53aWR0 aCA6IDA7Ci0gICAgICAgIHRyYWlsaW5nV2hpdGVzcGFjZUxlbmd0aCA9IGZyYWdtZW50LmlzV2hp dGVzcGFjZU9ubHkgPyB1bmNvbWl0dGVkRnJhZ21lbnRMZW5ndGggIDogMDsKKyAgICAgICAgdHJh aWxpbmdXaGl0ZXNwYWNlV2lkdGggPSBmcmFnbWVudC50eXBlID09IFRleHRGcmFnbWVudDo6V2hp dGVzcGFjZSA/IGZyYWdtZW50LndpZHRoIDogMDsKKyAgICAgICAgdHJhaWxpbmdXaGl0ZXNwYWNl TGVuZ3RoID0gZnJhZ21lbnQudHlwZSA9PSBUZXh0RnJhZ21lbnQ6OldoaXRlc3BhY2UgPyB1bmNv bWl0dGVkRnJhZ21lbnRMZW5ndGggIDogMDsKICAgICB9CiAKICAgICB2b2lkIGFkZFVuY29tbWl0 dGVkV2hpdGVzcGFjZShmbG9hdCB3aGl0ZXNwYWNlV2lkdGgpCkBAIC0zNzgsNyArMzY1LDcgQEAg c3RhdGljIHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKExpbmVTdGF0ZSYgbGluZVN0YXRl LCBMYXlvdXQ6OlJ1blZlY3RvciYgbGkKICAgICAvLyB3ZSBkb24ndCByZW1vdmUgYW55IHdoaXRl c3BhY2UgYXQgYWxsLgogICAgIC8vIDIuIGZyb20gdGhpcyBsaW5lOiByZW1vdmUgd2hpdGVzcGFj ZSwgdW5sZXNzIGl0J3MgdGhlIG9ubHkgZnJhZ21lbnQgb24gdGhlIGxpbmUgLXNvIHJlbW92aW5n IHRoZSB3aGl0ZXNhcGNlIHdvdWxkIHByb2R1Y2UgYW4gZW1wdHkgbGluZS4KICAgICBpZiAocHJl V3JhcCkgewotICAgICAgICBpZiAobGluZVN0YXRlLm92ZWZsb3dlZEZyYWdtZW50LmlzV2hpdGVz cGFjZU9ubHkgJiYgIWxpbmVTdGF0ZS5vdmVmbG93ZWRGcmFnbWVudC5pc0VtcHR5KCkgJiYgbGlu ZVN0YXRlLmF2YWlsYWJsZVdpZHRoID49IGxpbmVTdGF0ZS5jb21taXR0ZWRXaWR0aCkgeworICAg ICAgICBpZiAobGluZVN0YXRlLm92ZWZsb3dlZEZyYWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50 OjpXaGl0ZXNwYWNlICYmICFsaW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQuaXNFbXB0eSgpICYm IGxpbmVTdGF0ZS5hdmFpbGFibGVXaWR0aCA+PSBsaW5lU3RhdGUuY29tbWl0dGVkV2lkdGgpIHsK ICAgICAgICAgICAgIGxpbmVTdGF0ZS5wb3NpdGlvbiA9IGxpbmVTdGF0ZS5vdmVmbG93ZWRGcmFn bWVudC5lbmQ7CiAgICAgICAgICAgICBsaW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBUZXh0 RnJhZ21lbnQoKTsKICAgICAgICAgfQpAQCAtNDY3LDcgKzQ1NCw3IEBAIHN0YXRpYyBUZXh0RnJh Z21lbnQgbmV4dEZyYWdtZW50KHVuc2lnbmVkIHByZXZpb3VzRnJhZ21lbnRFbmQsIGNvbnN0IEZs b3dDb250ZW50CiAgICAgVGV4dEZyYWdtZW50IGZyYWdtZW50OwogICAgIGZyYWdtZW50LnN0YXJ0 ID0gcHJldmlvdXNGcmFnbWVudEVuZDsKICAgICBpZiAoZmxvd0NvbnRlbnRzLmlzTGluZUJyZWFr KGZyYWdtZW50LnN0YXJ0KSkgewotICAgICAgICBmcmFnbWVudC5pc0xpbmVCcmVhayA9IHRydWU7 CisgICAgICAgIGZyYWdtZW50LnR5cGUgPSBUZXh0RnJhZ21lbnQ6OkxpbmVCcmVhazsKICAgICAg ICAgZnJhZ21lbnQuZW5kID0gZnJhZ21lbnQuc3RhcnQgKyAxOwogICAgICAgICByZXR1cm4gZnJh Z21lbnQ7CiAgICAgfQpAQCAtNDc3LDEyICs0NjQsMTIgQEAgc3RhdGljIFRleHRGcmFnbWVudCBu ZXh0RnJhZ21lbnQodW5zaWduZWQgcHJldmlvdXNGcmFnbWVudEVuZCwgY29uc3QgRmxvd0NvbnRl bnQKICAgICB1bnNpZ25lZCB3aGl0ZXNwYWNlRW5kID0gZmxvd0NvbnRlbnRzLmZpbmROZXh0Tm9u V2hpdGVzcGFjZVBvc2l0aW9uKGZyYWdtZW50LnN0YXJ0LCBzcGFjZUNvdW50KTsKICAgICBBU1NF UlQoZnJhZ21lbnQuc3RhcnQgPD0gd2hpdGVzcGFjZUVuZCk7CiAgICAgaWYgKGZyYWdtZW50LnN0 YXJ0ICE9IHdoaXRlc3BhY2VFbmQpIHsKLSAgICAgICAgZnJhZ21lbnQuaXNXaGl0ZXNwYWNlT25s eSA9IHRydWU7CisgICAgICAgIGZyYWdtZW50LnR5cGUgPSBUZXh0RnJhZ21lbnQ6OldoaXRlc3Bh Y2U7CiAgICAgICAgIGZyYWdtZW50LmVuZCA9IHdoaXRlc3BhY2VFbmQ7CiAgICAgICAgIGJvb2wg bXVsdGlwbGVXaGl0ZXNwYWNlID0gZnJhZ21lbnQuc3RhcnQgKyAxIDwgZnJhZ21lbnQuZW5kOwot ICAgICAgICBmcmFnbWVudC5pc0NvbGxhcHNlZFdoaXRlc3BhY2UgPSBtdWx0aXBsZVdoaXRlc3Bh Y2UgJiYgc3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlOwotICAgICAgICBmcmFnbWVudC5pc0JyZWFr YWJsZSA9ICFmcmFnbWVudC5pc0NvbGxhcHNlZFdoaXRlc3BhY2UgJiYgbXVsdGlwbGVXaGl0ZXNw YWNlOwotICAgICAgICBpZiAoZnJhZ21lbnQuaXNDb2xsYXBzZWRXaGl0ZXNwYWNlKQorICAgICAg ICBmcmFnbWVudC5pc0NvbGxhcHNlZCA9IG11bHRpcGxlV2hpdGVzcGFjZSAmJiBzdHlsZS5jb2xs YXBzZVdoaXRlc3BhY2U7CisgICAgICAgIGZyYWdtZW50LmlzQnJlYWthYmxlID0gIWZyYWdtZW50 LmlzQ29sbGFwc2VkICYmIG11bHRpcGxlV2hpdGVzcGFjZTsKKyAgICAgICAgaWYgKGZyYWdtZW50 LmlzQ29sbGFwc2VkKQogICAgICAgICAgICAgZnJhZ21lbnQud2lkdGggPSBzdHlsZS5zcGFjZVdp ZHRoOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIHVuc2lnbmVkIGZyYWdtZW50TGVuZ3Ro ID0gZnJhZ21lbnQuZW5kIC0gZnJhZ21lbnQuc3RhcnQ7CkBAIC00OTQsNiArNDgxLDcgQEAgc3Rh dGljIFRleHRGcmFnbWVudCBuZXh0RnJhZ21lbnQodW5zaWduZWQgcHJldmlvdXNGcmFnbWVudEVu ZCwgY29uc3QgRmxvd0NvbnRlbnQKICAgICAgICAgcmV0dXJuIGZyYWdtZW50OwogICAgIH0KIAor ICAgIGZyYWdtZW50LnR5cGUgPSBUZXh0RnJhZ21lbnQ6Ok5vbldoaXRlc3BhY2U7CiAgICAgZnJh Z21lbnQuaXNCcmVha2FibGUgPSBzdHlsZS5icmVha1dvcmRPbk92ZXJmbG93OwogICAgIGZyYWdt ZW50LmVuZCA9IGZsb3dDb250ZW50cy5maW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKGZyYWdtZW50 LnN0YXJ0ICsgMSk7CiAgICAgZnJhZ21lbnQud2lkdGggPSBmbG93Q29udGVudHMudGV4dFdpZHRo KGZyYWdtZW50LnN0YXJ0LCBmcmFnbWVudC5lbmQsIHhQb3NpdGlvbik7CkBAIC01MDcsNyArNDk1 LDcgQEAgc3RhdGljIGJvb2wgY3JlYXRlTGluZVJ1bnMoTGluZVN0YXRlJiBsaW5lU3RhdGUsIExh eW91dDo6UnVuVmVjdG9yJiBsaW5lUnVucywgY28KICAgICB3aGlsZSAoIWZsb3dDb250ZW50cy5p c0VuZChsaW5lU3RhdGUucG9zaXRpb24pKSB7CiAgICAgICAgIC8vIEZpbmQgdGhlIG5leHQgdGV4 dCBmcmFnbWVudC4gU3RhcnQgZnJvbSB0aGUgZW5kIG9mIHRoZSBwcmV2aW91cyBmcmFnbWVudCAt Y3VycmVudCBsaW5lIGVuZC4KICAgICAgICAgVGV4dEZyYWdtZW50IGZyYWdtZW50ID0gbmV4dEZy YWdtZW50KGxpbmVTdGF0ZS5wb3NpdGlvbiwgZmxvd0NvbnRlbnRzLCBsaW5lU3RhdGUud2lkdGgo KSk7Ci0gICAgICAgIGlmICgobGluZUNhbkJlV3JhcHBlZCAmJiAhbGluZVN0YXRlLmZpdHMoZnJh Z21lbnQud2lkdGgpKSB8fCBmcmFnbWVudC5pc0xpbmVCcmVhaykgeworICAgICAgICBpZiAoKGxp bmVDYW5CZVdyYXBwZWQgJiYgIWxpbmVTdGF0ZS5maXRzKGZyYWdtZW50LndpZHRoKSkgfHwgZnJh Z21lbnQudHlwZSA9PSBUZXh0RnJhZ21lbnQ6OkxpbmVCcmVhaykgewogICAgICAgICAgICAgLy8g T3ZlcmZsb3cgd3JhcHBpbmcgYmVoYXZpb3VyOgogICAgICAgICAgICAgLy8gMS4gTmV3bGluZSBj aGFyYWN0ZXI6IHdyYXBzIHRoZSBsaW5lIHVubGVzcyBpdCdzIHRyZWF0ZWQgYXMgd2hpdGVzcGFj ZS4KICAgICAgICAgICAgIC8vIDIuIFdoaXRlc2FwY2UgY29sbGFwc2Ugb246IHdoaXRlc3BhY2Ug aXMgc2tpcHBlZC4KQEAgLTUxNSwxNyArNTAzLDE3IEBAIHN0YXRpYyBib29sIGNyZWF0ZUxpbmVS dW5zKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMsIGNv CiAgICAgICAgICAgICAvLyA0LiBGaXJzdCwgbm9uLXdoaXRlc3BhY2UgZnJhZ21lbnQgaXMgZWl0 aGVyIHdyYXBwZWQgb3Iga2VwdCBvbiB0aGUgbGluZS4gKGRlcGVuZHMgb24gb3ZlcmZsb3ctd3Jh cCkKICAgICAgICAgICAgIC8vIDUuIE5vbi13aGl0ZXNwYWNlIGZyYWdtZW50IHdoZW4gdGhlcmUn cyBhbHJlYWR5IGFub3RoZXIgZnJhZ21lbnQgb24gdGhlIGxpbmUgZ2V0cyBwdXNoZWQgdG8gdGhl IG5leHQgbGluZS4KICAgICAgICAgICAgIGJvb2wgaXNGaXJzdEZyYWdtZW50ID0gIWxpbmVTdGF0 ZS53aWR0aCgpOwotICAgICAgICAgICAgaWYgKGZyYWdtZW50LmlzTGluZUJyZWFrKSB7CisgICAg ICAgICAgICBpZiAoZnJhZ21lbnQudHlwZSA9PSBUZXh0RnJhZ21lbnQ6OkxpbmVCcmVhaykgewog ICAgICAgICAgICAgICAgIGlmIChpc0ZpcnN0RnJhZ21lbnQpCiAgICAgICAgICAgICAgICAgICAg IGxpbmVTdGF0ZS5hZGRVbmNvbW1pdHRlZChmcmFnbWVudCk7CiAgICAgICAgICAgICAgICAgZWxz ZSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIE5vIG5lZWQgdG8gYWRkIHRoZSBuZXcgbGluZSBm cmFnbWVudCBpZiB0aGVyZSdzIGFscmVhZHkgY29udGVudCBvbiB0aGUgbGluZS4gV2UgYXJlIGFi b3V0IHRvIGNsb3NlIHRoaXMgbGluZSBhbnl3YXkuCiAgICAgICAgICAgICAgICAgICAgICsrbGlu ZVN0YXRlLnBvc2l0aW9uOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBp ZiAoc3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlICYmIGZyYWdtZW50LmlzV2hpdGVzcGFjZU9ubHkp IHsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlICYmIGZy YWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlKSB7CiAgICAgICAgICAgICAg ICAgLy8gV2hpdGVzcGFjZSBjb2xsYXBzZSBpcyBvbjogd2hpdGVzcGFjZSB0aGF0IGRvZXNuJ3Qg Zml0IGlzIHNpbXBseSBza2lwcGVkLgogICAgICAgICAgICAgICAgIGxpbmVTdGF0ZS5wb3NpdGlv biA9IGZyYWdtZW50LmVuZDsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoZnJhZ21lbnQuaXNXaGl0 ZXNwYWNlT25seSB8fCAoKGlzRmlyc3RGcmFnbWVudCAmJiBzdHlsZS5icmVha1dvcmRPbk92ZXJm bG93KSB8fCAhc3R5bGUud3JhcExpbmVzKSkgeyAvLyAhc3R5bGUud3JhcExpbmVzOiBidWcxMzgx MDIocHJlc2VydmUgZXhpc3RpbmcgYmVoYXZpb3IpCisgICAgICAgICAgICB9IGVsc2UgaWYgKGZy YWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlIHx8ICgoaXNGaXJzdEZyYWdt ZW50ICYmIHN0eWxlLmJyZWFrV29yZE9uT3ZlcmZsb3cpIHx8ICFzdHlsZS53cmFwTGluZXMpKSB7 IC8vICFzdHlsZS53cmFwTGluZXM6IGJ1ZzEzODEwMihwcmVzZXJ2ZSBleGlzdGluZyBiZWhhdmlv cikKICAgICAgICAgICAgICAgICAvLyBXaGl0ZXNwYWNlIGNvbGxhcHNlIGlzIG9mZiBvciBub24t d2hpdGVzcGFjZSBjb250ZW50LiBzcGxpdCB0aGUgZnJhZ21lbnQ7IChtb2RpZmllZClmcmFnbWVu dCAtPiB0aGlzIGxpbmVTdGF0ZSwgb3ZlZmxvd2VkRnJhZ21lbnQgLT4gbmV4dCBsaW5lLgogICAg ICAgICAgICAgICAgIC8vIFdoZW4gdGhpcyBpcyB0aGUgb25seSAoZmlyc3QpIGZyYWdtZW50LCB0 aGUgZmlyc3QgY2hhcmFjdGVyIHN0YXlzIG9uIHRoZSBsaW5lLCBldmVuIGlmIGl0IGRvZXMgbm90 IGZpdC4KICAgICAgICAgICAgICAgICBsaW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBzcGxp dEZyYWdtZW50VG9GaXRMaW5lKGZyYWdtZW50LCBsaW5lU3RhdGUuYXZhaWxhYmxlV2lkdGggLSBs aW5lU3RhdGUud2lkdGgoKSwgaXNGaXJzdEZyYWdtZW50LCBmbG93Q29udGVudHMpOwpAQCAtNTQz LDcgKzUzMSw3IEBAIHN0YXRpYyBib29sIGNyZWF0ZUxpbmVSdW5zKExpbmVTdGF0ZSYgbGluZVN0 YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMsIGNvCiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgfQogICAgICAgICAvLyBXaGVuIHRoZSBjdXJyZW50IGZyYWdtZW50IGlzIGNvbGxh cHNlZCB3aGl0ZXNwYWNlLCB3ZSBuZWVkIHRvIGNyZWF0ZSBhIHJ1biBmb3Igd2hhdCB3ZSd2ZSBw cm9jZXNzZWQgc28gZmFyLgotICAgICAgICBpZiAoZnJhZ21lbnQuaXNDb2xsYXBzZWRXaGl0ZXNw YWNlKSB7CisgICAgICAgIGlmIChmcmFnbWVudC5pc0NvbGxhcHNlZCkgewogICAgICAgICAgICAg Ly8gT25lIHRyYWlsaW5nIHdoaXRlc3BhY2UgdG8gcHJlc2VydmUuCiAgICAgICAgICAgICBsaW5l U3RhdGUuYWRkVW5jb21taXR0ZWRXaGl0ZXNwYWNlKHN0eWxlLnNwYWNlV2lkdGgpOwogICAgICAg ICAgICAgbGluZVN0YXRlLmNvbW1pdEFuZENyZWF0ZVJ1bihsaW5lUnVucyk7Cg== 244568 2015-01-13 18:12:56 -0800 2015-01-13 21:04:06 -0800 Patch bug-140417-20150113181301.patch text/plain 9139 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4Mzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTllYmY3NTFiZGJkYzk4 MTg2OTJjMGQ4NTI0ODk4Y2RhYjg1MjdlNS4uYTVjMjgyYzE0MTc3OWU3NTI5YzBiMzMyMjM0ZGE0 MDVkZjI3ZGYzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTAxLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBSZWZhY3RvciBUZXh0RnJhZ21lbnQgY2xhc3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA0MTcKKworICAgICAgICBSZXZpZXdlZCBieSBBbmRy ZWFzIEtsaW5nLgorCisgICAgICAgIEludHJvZHVjZSB0ZXh0IGZyYWdtZW50IHR5cGUgYW5kIHVz ZSBjbGFzcyBtZW1iZXIgaW5pdGlhbGl6ZXJzLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5j dGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6VGV4dEZyYWdtZW50OjpUZXh0RnJh Z21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6TGluZVN0YXRlOjph ZGRVbmNvbW1pdHRlZCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpyZW1v dmVUcmFpbGluZ1doaXRlc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91 dDo6bmV4dEZyYWdtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNy ZWF0ZUxpbmVSdW5zKToKKwogMjAxNS0wMS0xMyAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBw bGUuY29tPgogCiAgICAgICAgIFtVbnJldmlld2VkXSBXaW5kb3dzIGJ1aWxkIGZpeCBhZnRlciBy MTc4MzkwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3Bw CmluZGV4IGYzOTFiNzc3NDZmMDA5YzMzZjAxYTUwNzkzZDVlNDU2NmNmYmU2NzYuLjkwZTljYzZi ZTM1ZWVlZGY2MTEyZTAzYTU0MWY2NzMyMmJiNzVkYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKQEAgLTIyNywyNCArMjI3LDExIEBAIHN0YXRp YyBmbG9hdCBjb21wdXRlTGluZUxlZnQoRVRleHRBbGlnbiB0ZXh0QWxpZ24sIGZsb2F0IGF2YWls YWJsZVdpZHRoLCBmbG9hdCBjCiB9CiAKIHN0cnVjdCBUZXh0RnJhZ21lbnQgewotICAgIFRleHRG cmFnbWVudCgpCi0gICAgICAgIDogc3RhcnQoMCkKLSAgICAgICAgLCBpc0NvbGxhcHNlZFdoaXRl c3BhY2UoZmFsc2UpCi0gICAgICAgICwgZW5kKDApCi0gICAgICAgICwgaXNXaGl0ZXNwYWNlT25s eShmYWxzZSkKLSAgICAgICAgLCBpc0JyZWFrYWJsZShmYWxzZSkKLSAgICAgICAgLCBpc0xpbmVC cmVhayhmYWxzZSkKLSAgICAgICAgLCB3aWR0aCgwKQotICAgIHsKLSAgICB9Ci0KKyAgICBUZXh0 RnJhZ21lbnQoKSA9IGRlZmF1bHQ7CiAgICAgVGV4dEZyYWdtZW50KHVuc2lnbmVkIHRleHRTdGFy dCwgdW5zaWduZWQgdGV4dEVuZCwgZmxvYXQgdGV4dFdpZHRoLCBib29sIGlzV2hpdGVzcGFjZU9u bHkpCiAgICAgICAgIDogc3RhcnQodGV4dFN0YXJ0KQotICAgICAgICAsIGlzQ29sbGFwc2VkV2hp dGVzcGFjZShmYWxzZSkKICAgICAgICAgLCBlbmQodGV4dEVuZCkKLSAgICAgICAgLCBpc1doaXRl c3BhY2VPbmx5KGlzV2hpdGVzcGFjZU9ubHkpCi0gICAgICAgICwgaXNCcmVha2FibGUoZmFsc2Up Ci0gICAgICAgICwgaXNMaW5lQnJlYWsoZmFsc2UpCisgICAgICAgICwgdHlwZShpc1doaXRlc3Bh Y2VPbmx5ID8gV2hpdGVzcGFjZSA6IE5vbldoaXRlc3BhY2UpCiAgICAgICAgICwgd2lkdGgodGV4 dFdpZHRoKQogICAgIHsKICAgICB9CkBAIC0yNTQsMTMgKzI0MSwxMyBAQCBzdHJ1Y3QgVGV4dEZy YWdtZW50IHsKICAgICAgICAgcmV0dXJuIHN0YXJ0ID09IGVuZDsKICAgICB9CiAKLSAgICB1bnNp Z25lZCBzdGFydCA6IDMxOwotICAgIGJvb2wgaXNDb2xsYXBzZWRXaGl0ZXNwYWNlIDogMTsKLSAg ICB1bnNpZ25lZCBlbmQgOiAzMTsKLSAgICBib29sIGlzV2hpdGVzcGFjZU9ubHkgOiAxOwotICAg IGJvb2wgaXNCcmVha2FibGU7Ci0gICAgYm9vbCBpc0xpbmVCcmVhazsKLSAgICBmbG9hdCB3aWR0 aDsKKyAgICBlbnVtIFR5cGUgeyBMaW5lQnJlYWssIFdoaXRlc3BhY2UsIE5vbldoaXRlc3BhY2Ug fTsKKyAgICB1bnNpZ25lZCBzdGFydCA9IDA7CisgICAgdW5zaWduZWQgZW5kID0gMDsKKyAgICBU eXBlIHR5cGUgPSBOb25XaGl0ZXNwYWNlOworICAgIGJvb2wgaXNDb2xsYXBzZWQgPSBmYWxzZTsK KyAgICBib29sIGlzQnJlYWthYmxlID0gZmFsc2U7CisgICAgZmxvYXQgd2lkdGggPSAwOwogfTsK IAogc3RydWN0IExpbmVTdGF0ZSB7CkBAIC0yOTgsOCArMjg1LDggQEAgc3RydWN0IExpbmVTdGF0 ZSB7CiAgICAgICAgIHVuY29tbWl0dGVkV2lkdGggKz0gZnJhZ21lbnQud2lkdGg7CiAgICAgICAg IHVuY29tbWl0dGVkRW5kID0gZnJhZ21lbnQuZW5kOwogICAgICAgICBwb3NpdGlvbiA9IHVuY29t bWl0dGVkRW5kOwotICAgICAgICB0cmFpbGluZ1doaXRlc3BhY2VXaWR0aCA9IGZyYWdtZW50Lmlz V2hpdGVzcGFjZU9ubHkgPyBmcmFnbWVudC53aWR0aCA6IDA7Ci0gICAgICAgIHRyYWlsaW5nV2hp dGVzcGFjZUxlbmd0aCA9IGZyYWdtZW50LmlzV2hpdGVzcGFjZU9ubHkgPyB1bmNvbWl0dGVkRnJh Z21lbnRMZW5ndGggIDogMDsKKyAgICAgICAgdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGggPSBmcmFn bWVudC50eXBlID09IFRleHRGcmFnbWVudDo6V2hpdGVzcGFjZSA/IGZyYWdtZW50LndpZHRoIDog MDsKKyAgICAgICAgdHJhaWxpbmdXaGl0ZXNwYWNlTGVuZ3RoID0gZnJhZ21lbnQudHlwZSA9PSBU ZXh0RnJhZ21lbnQ6OldoaXRlc3BhY2UgPyB1bmNvbWl0dGVkRnJhZ21lbnRMZW5ndGggIDogMDsK ICAgICB9CiAKICAgICB2b2lkIGFkZFVuY29tbWl0dGVkV2hpdGVzcGFjZShmbG9hdCB3aGl0ZXNw YWNlV2lkdGgpCkBAIC0zNzgsNyArMzY1LDcgQEAgc3RhdGljIHZvaWQgcmVtb3ZlVHJhaWxpbmdX aGl0ZXNwYWNlKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGkKICAg ICAvLyB3ZSBkb24ndCByZW1vdmUgYW55IHdoaXRlc3BhY2UgYXQgYWxsLgogICAgIC8vIDIuIGZy b20gdGhpcyBsaW5lOiByZW1vdmUgd2hpdGVzcGFjZSwgdW5sZXNzIGl0J3MgdGhlIG9ubHkgZnJh Z21lbnQgb24gdGhlIGxpbmUgLXNvIHJlbW92aW5nIHRoZSB3aGl0ZXNhcGNlIHdvdWxkIHByb2R1 Y2UgYW4gZW1wdHkgbGluZS4KICAgICBpZiAocHJlV3JhcCkgewotICAgICAgICBpZiAobGluZVN0 YXRlLm92ZWZsb3dlZEZyYWdtZW50LmlzV2hpdGVzcGFjZU9ubHkgJiYgIWxpbmVTdGF0ZS5vdmVm bG93ZWRGcmFnbWVudC5pc0VtcHR5KCkgJiYgbGluZVN0YXRlLmF2YWlsYWJsZVdpZHRoID49IGxp bmVTdGF0ZS5jb21taXR0ZWRXaWR0aCkgeworICAgICAgICBpZiAobGluZVN0YXRlLm92ZWZsb3dl ZEZyYWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlICYmICFsaW5lU3RhdGUu b3ZlZmxvd2VkRnJhZ21lbnQuaXNFbXB0eSgpICYmIGxpbmVTdGF0ZS5hdmFpbGFibGVXaWR0aCA+ PSBsaW5lU3RhdGUuY29tbWl0dGVkV2lkdGgpIHsKICAgICAgICAgICAgIGxpbmVTdGF0ZS5wb3Np dGlvbiA9IGxpbmVTdGF0ZS5vdmVmbG93ZWRGcmFnbWVudC5lbmQ7CiAgICAgICAgICAgICBsaW5l U3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBUZXh0RnJhZ21lbnQoKTsKICAgICAgICAgfQpAQCAt NDY3LDcgKzQ1NCw3IEBAIHN0YXRpYyBUZXh0RnJhZ21lbnQgbmV4dEZyYWdtZW50KHVuc2lnbmVk IHByZXZpb3VzRnJhZ21lbnRFbmQsIGNvbnN0IEZsb3dDb250ZW50CiAgICAgVGV4dEZyYWdtZW50 IGZyYWdtZW50OwogICAgIGZyYWdtZW50LnN0YXJ0ID0gcHJldmlvdXNGcmFnbWVudEVuZDsKICAg ICBpZiAoZmxvd0NvbnRlbnRzLmlzTGluZUJyZWFrKGZyYWdtZW50LnN0YXJ0KSkgewotICAgICAg ICBmcmFnbWVudC5pc0xpbmVCcmVhayA9IHRydWU7CisgICAgICAgIGZyYWdtZW50LnR5cGUgPSBU ZXh0RnJhZ21lbnQ6OkxpbmVCcmVhazsKICAgICAgICAgZnJhZ21lbnQuZW5kID0gZnJhZ21lbnQu c3RhcnQgKyAxOwogICAgICAgICByZXR1cm4gZnJhZ21lbnQ7CiAgICAgfQpAQCAtNDc3LDEyICs0 NjQsMTIgQEAgc3RhdGljIFRleHRGcmFnbWVudCBuZXh0RnJhZ21lbnQodW5zaWduZWQgcHJldmlv dXNGcmFnbWVudEVuZCwgY29uc3QgRmxvd0NvbnRlbnQKICAgICB1bnNpZ25lZCB3aGl0ZXNwYWNl RW5kID0gZmxvd0NvbnRlbnRzLmZpbmROZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKGZyYWdtZW50 LnN0YXJ0LCBzcGFjZUNvdW50KTsKICAgICBBU1NFUlQoZnJhZ21lbnQuc3RhcnQgPD0gd2hpdGVz cGFjZUVuZCk7CiAgICAgaWYgKGZyYWdtZW50LnN0YXJ0ICE9IHdoaXRlc3BhY2VFbmQpIHsKLSAg ICAgICAgZnJhZ21lbnQuaXNXaGl0ZXNwYWNlT25seSA9IHRydWU7CisgICAgICAgIGZyYWdtZW50 LnR5cGUgPSBUZXh0RnJhZ21lbnQ6OldoaXRlc3BhY2U7CiAgICAgICAgIGZyYWdtZW50LmVuZCA9 IHdoaXRlc3BhY2VFbmQ7CiAgICAgICAgIGJvb2wgbXVsdGlwbGVXaGl0ZXNwYWNlID0gZnJhZ21l bnQuc3RhcnQgKyAxIDwgZnJhZ21lbnQuZW5kOwotICAgICAgICBmcmFnbWVudC5pc0NvbGxhcHNl ZFdoaXRlc3BhY2UgPSBtdWx0aXBsZVdoaXRlc3BhY2UgJiYgc3R5bGUuY29sbGFwc2VXaGl0ZXNw YWNlOwotICAgICAgICBmcmFnbWVudC5pc0JyZWFrYWJsZSA9ICFmcmFnbWVudC5pc0NvbGxhcHNl ZFdoaXRlc3BhY2UgJiYgbXVsdGlwbGVXaGl0ZXNwYWNlOwotICAgICAgICBpZiAoZnJhZ21lbnQu aXNDb2xsYXBzZWRXaGl0ZXNwYWNlKQorICAgICAgICBmcmFnbWVudC5pc0NvbGxhcHNlZCA9IG11 bHRpcGxlV2hpdGVzcGFjZSAmJiBzdHlsZS5jb2xsYXBzZVdoaXRlc3BhY2U7CisgICAgICAgIGZy YWdtZW50LmlzQnJlYWthYmxlID0gIWZyYWdtZW50LmlzQ29sbGFwc2VkICYmIG11bHRpcGxlV2hp dGVzcGFjZTsKKyAgICAgICAgaWYgKGZyYWdtZW50LmlzQ29sbGFwc2VkKQogICAgICAgICAgICAg ZnJhZ21lbnQud2lkdGggPSBzdHlsZS5zcGFjZVdpZHRoOwogICAgICAgICBlbHNlIHsKICAgICAg ICAgICAgIHVuc2lnbmVkIGZyYWdtZW50TGVuZ3RoID0gZnJhZ21lbnQuZW5kIC0gZnJhZ21lbnQu c3RhcnQ7CkBAIC00OTQsNiArNDgxLDcgQEAgc3RhdGljIFRleHRGcmFnbWVudCBuZXh0RnJhZ21l bnQodW5zaWduZWQgcHJldmlvdXNGcmFnbWVudEVuZCwgY29uc3QgRmxvd0NvbnRlbnQKICAgICAg ICAgcmV0dXJuIGZyYWdtZW50OwogICAgIH0KIAorICAgIGZyYWdtZW50LnR5cGUgPSBUZXh0RnJh Z21lbnQ6Ok5vbldoaXRlc3BhY2U7CiAgICAgZnJhZ21lbnQuaXNCcmVha2FibGUgPSBzdHlsZS5i cmVha1dvcmRPbk92ZXJmbG93OwogICAgIGZyYWdtZW50LmVuZCA9IGZsb3dDb250ZW50cy5maW5k TmV4dEJyZWFrYWJsZVBvc2l0aW9uKGZyYWdtZW50LnN0YXJ0ICsgMSk7CiAgICAgZnJhZ21lbnQu d2lkdGggPSBmbG93Q29udGVudHMudGV4dFdpZHRoKGZyYWdtZW50LnN0YXJ0LCBmcmFnbWVudC5l bmQsIHhQb3NpdGlvbik7CkBAIC01MDcsNyArNDk1LDcgQEAgc3RhdGljIGJvb2wgY3JlYXRlTGlu ZVJ1bnMoTGluZVN0YXRlJiBsaW5lU3RhdGUsIExheW91dDo6UnVuVmVjdG9yJiBsaW5lUnVucywg Y28KICAgICB3aGlsZSAoIWZsb3dDb250ZW50cy5pc0VuZChsaW5lU3RhdGUucG9zaXRpb24pKSB7 CiAgICAgICAgIC8vIEZpbmQgdGhlIG5leHQgdGV4dCBmcmFnbWVudC4gU3RhcnQgZnJvbSB0aGUg ZW5kIG9mIHRoZSBwcmV2aW91cyBmcmFnbWVudCAtY3VycmVudCBsaW5lIGVuZC4KICAgICAgICAg VGV4dEZyYWdtZW50IGZyYWdtZW50ID0gbmV4dEZyYWdtZW50KGxpbmVTdGF0ZS5wb3NpdGlvbiwg Zmxvd0NvbnRlbnRzLCBsaW5lU3RhdGUud2lkdGgoKSk7Ci0gICAgICAgIGlmICgobGluZUNhbkJl V3JhcHBlZCAmJiAhbGluZVN0YXRlLmZpdHMoZnJhZ21lbnQud2lkdGgpKSB8fCBmcmFnbWVudC5p c0xpbmVCcmVhaykgeworICAgICAgICBpZiAoKGxpbmVDYW5CZVdyYXBwZWQgJiYgIWxpbmVTdGF0 ZS5maXRzKGZyYWdtZW50LndpZHRoKSkgfHwgZnJhZ21lbnQudHlwZSA9PSBUZXh0RnJhZ21lbnQ6 OkxpbmVCcmVhaykgewogICAgICAgICAgICAgLy8gT3ZlcmZsb3cgd3JhcHBpbmcgYmVoYXZpb3Vy OgogICAgICAgICAgICAgLy8gMS4gTmV3bGluZSBjaGFyYWN0ZXI6IHdyYXBzIHRoZSBsaW5lIHVu bGVzcyBpdCdzIHRyZWF0ZWQgYXMgd2hpdGVzcGFjZS4KICAgICAgICAgICAgIC8vIDIuIFdoaXRl c2FwY2UgY29sbGFwc2Ugb246IHdoaXRlc3BhY2UgaXMgc2tpcHBlZC4KQEAgLTUxNSwxNyArNTAz LDE3IEBAIHN0YXRpYyBib29sIGNyZWF0ZUxpbmVSdW5zKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBM YXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMsIGNvCiAgICAgICAgICAgICAvLyA0LiBGaXJzdCwg bm9uLXdoaXRlc3BhY2UgZnJhZ21lbnQgaXMgZWl0aGVyIHdyYXBwZWQgb3Iga2VwdCBvbiB0aGUg bGluZS4gKGRlcGVuZHMgb24gb3ZlcmZsb3ctd3JhcCkKICAgICAgICAgICAgIC8vIDUuIE5vbi13 aGl0ZXNwYWNlIGZyYWdtZW50IHdoZW4gdGhlcmUncyBhbHJlYWR5IGFub3RoZXIgZnJhZ21lbnQg b24gdGhlIGxpbmUgZ2V0cyBwdXNoZWQgdG8gdGhlIG5leHQgbGluZS4KICAgICAgICAgICAgIGJv b2wgaXNGaXJzdEZyYWdtZW50ID0gIWxpbmVTdGF0ZS53aWR0aCgpOwotICAgICAgICAgICAgaWYg KGZyYWdtZW50LmlzTGluZUJyZWFrKSB7CisgICAgICAgICAgICBpZiAoZnJhZ21lbnQudHlwZSA9 PSBUZXh0RnJhZ21lbnQ6OkxpbmVCcmVhaykgewogICAgICAgICAgICAgICAgIGlmIChpc0ZpcnN0 RnJhZ21lbnQpCiAgICAgICAgICAgICAgICAgICAgIGxpbmVTdGF0ZS5hZGRVbmNvbW1pdHRlZChm cmFnbWVudCk7CiAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIC8v IE5vIG5lZWQgdG8gYWRkIHRoZSBuZXcgbGluZSBmcmFnbWVudCBpZiB0aGVyZSdzIGFscmVhZHkg Y29udGVudCBvbiB0aGUgbGluZS4gV2UgYXJlIGFib3V0IHRvIGNsb3NlIHRoaXMgbGluZSBhbnl3 YXkuCiAgICAgICAgICAgICAgICAgICAgICsrbGluZVN0YXRlLnBvc2l0aW9uOwogICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBpZiAoc3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNl ICYmIGZyYWdtZW50LmlzV2hpdGVzcGFjZU9ubHkpIHsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAo c3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlICYmIGZyYWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50 OjpXaGl0ZXNwYWNlKSB7CiAgICAgICAgICAgICAgICAgLy8gV2hpdGVzcGFjZSBjb2xsYXBzZSBp cyBvbjogd2hpdGVzcGFjZSB0aGF0IGRvZXNuJ3QgZml0IGlzIHNpbXBseSBza2lwcGVkLgogICAg ICAgICAgICAgICAgIGxpbmVTdGF0ZS5wb3NpdGlvbiA9IGZyYWdtZW50LmVuZDsKLSAgICAgICAg ICAgIH0gZWxzZSBpZiAoZnJhZ21lbnQuaXNXaGl0ZXNwYWNlT25seSB8fCAoKGlzRmlyc3RGcmFn bWVudCAmJiBzdHlsZS5icmVha1dvcmRPbk92ZXJmbG93KSB8fCAhc3R5bGUud3JhcExpbmVzKSkg eyAvLyAhc3R5bGUud3JhcExpbmVzOiBidWcxMzgxMDIocHJlc2VydmUgZXhpc3RpbmcgYmVoYXZp b3IpCisgICAgICAgICAgICB9IGVsc2UgaWYgKGZyYWdtZW50LnR5cGUgPT0gVGV4dEZyYWdtZW50 OjpXaGl0ZXNwYWNlIHx8ICgoaXNGaXJzdEZyYWdtZW50ICYmIHN0eWxlLmJyZWFrV29yZE9uT3Zl cmZsb3cpIHx8ICFzdHlsZS53cmFwTGluZXMpKSB7IC8vICFzdHlsZS53cmFwTGluZXM6IGJ1ZzEz ODEwMihwcmVzZXJ2ZSBleGlzdGluZyBiZWhhdmlvcikKICAgICAgICAgICAgICAgICAvLyBXaGl0 ZXNwYWNlIGNvbGxhcHNlIGlzIG9mZiBvciBub24td2hpdGVzcGFjZSBjb250ZW50LiBzcGxpdCB0 aGUgZnJhZ21lbnQ7IChtb2RpZmllZClmcmFnbWVudCAtPiB0aGlzIGxpbmVTdGF0ZSwgb3ZlZmxv d2VkRnJhZ21lbnQgLT4gbmV4dCBsaW5lLgogICAgICAgICAgICAgICAgIC8vIFdoZW4gdGhpcyBp cyB0aGUgb25seSAoZmlyc3QpIGZyYWdtZW50LCB0aGUgZmlyc3QgY2hhcmFjdGVyIHN0YXlzIG9u IHRoZSBsaW5lLCBldmVuIGlmIGl0IGRvZXMgbm90IGZpdC4KICAgICAgICAgICAgICAgICBsaW5l U3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQgPSBzcGxpdEZyYWdtZW50VG9GaXRMaW5lKGZyYWdtZW50 LCBsaW5lU3RhdGUuYXZhaWxhYmxlV2lkdGggLSBsaW5lU3RhdGUud2lkdGgoKSwgaXNGaXJzdEZy YWdtZW50LCBmbG93Q29udGVudHMpOwpAQCAtNTQzLDcgKzUzMSw3IEBAIHN0YXRpYyBib29sIGNy ZWF0ZUxpbmVSdW5zKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGlu ZVJ1bnMsIGNvCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAvLyBXaGVu IHRoZSBjdXJyZW50IGZyYWdtZW50IGlzIGNvbGxhcHNlZCB3aGl0ZXNwYWNlLCB3ZSBuZWVkIHRv IGNyZWF0ZSBhIHJ1biBmb3Igd2hhdCB3ZSd2ZSBwcm9jZXNzZWQgc28gZmFyLgotICAgICAgICBp ZiAoZnJhZ21lbnQuaXNDb2xsYXBzZWRXaGl0ZXNwYWNlKSB7CisgICAgICAgIGlmIChmcmFnbWVu dC5pc0NvbGxhcHNlZCkgewogICAgICAgICAgICAgLy8gT25lIHRyYWlsaW5nIHdoaXRlc3BhY2Ug dG8gcHJlc2VydmUuCiAgICAgICAgICAgICBsaW5lU3RhdGUuYWRkVW5jb21taXR0ZWRXaGl0ZXNw YWNlKHN0eWxlLnNwYWNlV2lkdGgpOwogICAgICAgICAgICAgbGluZVN0YXRlLmNvbW1pdEFuZENy ZWF0ZVJ1bihsaW5lUnVucyk7Cg==