140776 2015-01-22 11:44:52 -0800 Simple line layout: Make trailing whitespace handling more explicit. 2015-01-22 13:54:48 -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 koivisto kondapallykalyan mmaxfield oldest_to_newest 1063415 0 zalan 2015-01-22 11:44:52 -0800 By introducing committed and uncommitted trailing whitespace. 1063416 1 245152 zalan 2015-01-22 11:49:23 -0800 Created attachment 245152 Patch 1063431 2 245152 koivisto 2015-01-22 13:16:46 -0800 Comment on attachment 245152 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245152&action=review > Source/WebCore/rendering/SimpleLineLayout.cpp:301 > + unsigned uncommittedStart = 0; { 0 } is more fashionable. 1063447 3 zalan 2015-01-22 13:54:48 -0800 Committed r178939: <http://trac.webkit.org/changeset/178939> 245152 2015-01-22 11:49:23 -0800 2015-01-22 13:32:01 -0800 Patch bug-140776-20150122114931.patch text/plain 9132 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4OTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUzZTU2OWQxYTIxNjc2 ODc2ZjhjZmUxNzljMDM2NWIxYTY4NTJhYS4uNjI3YzFhNjRhZjdjNjIzZGRhMWE5YjY1NGUxOTAw NmY1MGM2YjgzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBNYWtlIHRyYWlsaW5nIHdoaXRlc3BhY2UgaGFuZGxpbmcgbW9yZSBleHBsaWNpdC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDc3NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERpZmZlcmVudGlhdGUg YmV0d2VlbiBjb21taXR0ZWQgYW5kIHVuY29tbWl0dGVkIHRyYWlsaW5nIHdoaXRlc3BhY2UuCisg ICAgICAgIFRoaXMgZW5hYmxlcyBmdXJ0aGVyIGNsZWFudXAgaW4gcmVtb3ZlVHJhaWxpbmdXaGl0 ZXNwYWNlKCkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT aW1wbGVMaW5lTGF5b3V0OjpMaW5lU3RhdGU6OmNvbW1pdEFuZENyZWF0ZVJ1bik6CisgICAgICAg IChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpMaW5lU3RhdGU6OmFkZFVuY29tbWl0dGVkKToK KyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxpbmVTdGF0ZTo6aGFzV2hpdGVz cGFjZU9ubHkpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6TGluZVN0YXRl OjpyZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGlu ZUxheW91dDo6cmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlNp bXBsZUxpbmVMYXlvdXQ6OkxpbmVTdGF0ZTo6TGluZVN0YXRlKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxpbmVTdGF0ZTo6cmVtb3ZlQ29tbWl0dGVkVHJh aWxpbmdXaGl0ZXNwYWNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVM YXlvdXQ6OkxpbmVTdGF0ZTo6cmVzZXRUcmFpbGluZ1doaXRlc3BhY2UpOiBEZWxldGVkLgorCiAy MDE1LTAxLTIxICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIFNraXAgaXRlbXMgc3Bhbm5pbmcgZmxleCB0cmFja3Mg d2hlbiBzaXppbmcgY29udGVudCBiYXNlZCB0cmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAppbmRleCA5YmIzODcyZDhmZDJjMmRlNWUyMDM1YWVj ZmVhZmJlZjQ2ZDMzZDRkLi45YmYwNmU2ODQyMzQ3MjU2ODYwYTZiYzM3NzBjOGJkYzBkNzQyMTQ1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCkBA IC0yMjcsMjAgKzIyNyw2IEBAIHN0YXRpYyBmbG9hdCBjb21wdXRlTGluZUxlZnQoRVRleHRBbGln biB0ZXh0QWxpZ24sIGZsb2F0IGF2YWlsYWJsZVdpZHRoLCBmbG9hdCBjCiB9CiAKIHN0cnVjdCBM aW5lU3RhdGUgewotICAgIExpbmVTdGF0ZSgpCi0gICAgICAgIDogYXZhaWxhYmxlV2lkdGgoMCkK LSAgICAgICAgLCBsb2dpY2FsTGVmdE9mZnNldCgwKQotICAgICAgICAsIGxpbmVTdGFydFJ1bklu ZGV4KDApCi0gICAgICAgICwgdW5jb21taXR0ZWRTdGFydCgwKQotICAgICAgICAsIHVuY29tbWl0 dGVkRW5kKDApCi0gICAgICAgICwgdW5jb21taXR0ZWRXaWR0aCgwKQotICAgICAgICAsIGNvbW1p dHRlZFdpZHRoKDApCi0gICAgICAgICwgY29tbWl0dGVkTG9naWNhbFJpZ2h0KDApCi0gICAgICAg ICwgcG9zaXRpb24oMCkKLSAgICAgICAgLCB0cmFpbGluZ1doaXRlc3BhY2VXaWR0aCgwKQotICAg IHsKLSAgICB9Ci0KICAgICB2b2lkIGNvbW1pdEFuZENyZWF0ZVJ1bihMYXlvdXQ6OlJ1blZlY3Rv ciYgbGluZVJ1bnMpCiAgICAgewogICAgICAgICBpZiAodW5jb21taXR0ZWRTdGFydCA9PSB1bmNv bW1pdHRlZEVuZCkKQEAgLTI1MCw5ICsyMzYsMTMgQEAgc3RydWN0IExpbmVTdGF0ZSB7CiAgICAg ICAgIC8vIE1vdmUgdW5jb21taXR0ZWQgdG8gY29tbWl0dGVkLgogICAgICAgICBjb21taXR0ZWRX aWR0aCArPSB1bmNvbW1pdHRlZFdpZHRoOwogICAgICAgICBjb21taXR0ZWRMb2dpY2FsUmlnaHQg Kz0gY29tbWl0dGVkV2lkdGg7CisgICAgICAgIGNvbW1pdHRlZFRyYWlsaW5nV2hpdGVzcGFjZVdp ZHRoID0gdW5jb21pdHRlZFRyYWlsaW5nV2hpdGVzcGFjZVdpZHRoOworICAgICAgICBjb21taXR0 ZWRUcmFpbGluZ1doaXRlc3BhY2VMZW5ndGggPSB1bmNvbWl0dGVkVHJhaWxpbmdXaGl0ZXNwYWNl TGVuZ3RoOwogCiAgICAgICAgIHVuY29tbWl0dGVkU3RhcnQgPSB1bmNvbW1pdHRlZEVuZDsKICAg ICAgICAgdW5jb21taXR0ZWRXaWR0aCA9IDA7CisgICAgICAgIHVuY29taXR0ZWRUcmFpbGluZ1do aXRlc3BhY2VXaWR0aCA9IDA7CisgICAgICAgIHVuY29taXR0ZWRUcmFpbGluZ1doaXRlc3BhY2VM ZW5ndGggPSAwOwogICAgIH0KIAogICAgIHZvaWQgYWRkVW5jb21taXR0ZWQoY29uc3QgRmxvd0Nv bnRlbnRzOjpUZXh0RnJhZ21lbnQmIGZyYWdtZW50KQpAQCAtMjYxLDggKzI1MSw4IEBAIHN0cnVj dCBMaW5lU3RhdGUgewogICAgICAgICB1bmNvbW1pdHRlZFdpZHRoICs9IGZyYWdtZW50LndpZHRo OwogICAgICAgICB1bmNvbW1pdHRlZEVuZCA9IGZyYWdtZW50LmVuZDsKICAgICAgICAgcG9zaXRp b24gPSB1bmNvbW1pdHRlZEVuZDsKLSAgICAgICAgdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGggPSBm cmFnbWVudC50eXBlID09IEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlID8g ZnJhZ21lbnQud2lkdGggOiAwOwotICAgICAgICB0cmFpbGluZ1doaXRlc3BhY2VMZW5ndGggPSBm cmFnbWVudC50eXBlID09IEZsb3dDb250ZW50czo6VGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlID8g dW5jb21pdHRlZEZyYWdtZW50TGVuZ3RoICA6IDA7CisgICAgICAgIHVuY29taXR0ZWRUcmFpbGlu Z1doaXRlc3BhY2VXaWR0aCA9IGZyYWdtZW50LnR5cGUgPT0gRmxvd0NvbnRlbnRzOjpUZXh0RnJh Z21lbnQ6OldoaXRlc3BhY2UgPyBmcmFnbWVudC53aWR0aCA6IDA7CisgICAgICAgIHVuY29taXR0 ZWRUcmFpbGluZ1doaXRlc3BhY2VMZW5ndGggPSBmcmFnbWVudC50eXBlID09IEZsb3dDb250ZW50 czo6VGV4dEZyYWdtZW50OjpXaGl0ZXNwYWNlID8gdW5jb21pdHRlZEZyYWdtZW50TGVuZ3RoICA6 IDA7CiAgICAgfQogCiAgICAgdm9pZCBhZGRVbmNvbW1pdHRlZFdoaXRlc3BhY2UoZmxvYXQgd2hp dGVzcGFjZVdpZHRoKQpAQCAtMjgwLDYgKzI3MCwxMSBAQCBzdHJ1Y3QgTGluZVN0YXRlIHsKICAg ICAgICAgY29tbWl0dGVkTG9naWNhbFJpZ2h0ID0gbG9naWNhbFJpZ2h0OwogICAgIH0KIAorICAg IGJvb2wgaGFzV2hpdGVzcGFjZU9ubHkoKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIGNv bW1pdHRlZFRyYWlsaW5nV2hpdGVzcGFjZVdpZHRoICYmIGNvbW1pdHRlZFdpZHRoID09IGNvbW1p dHRlZFRyYWlsaW5nV2hpdGVzcGFjZVdpZHRoOworICAgIH0KKwogICAgIGZsb2F0IHdpZHRoKCkg Y29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiBjb21taXR0ZWRXaWR0aCArIHVuY29tbWl0dGVk V2lkdGg7CkBAIC0yOTAsMzUgKzI4NSwzMyBAQCBzdHJ1Y3QgTGluZVN0YXRlIHsKICAgICAgICAg cmV0dXJuIGF2YWlsYWJsZVdpZHRoID49IHdpZHRoKCkgKyBleHRyYTsKICAgICB9CiAKLSAgICB2 b2lkIHJlbW92ZUNvbW1pdHRlZFRyYWlsaW5nV2hpdGVzcGFjZSgpCi0gICAgewotICAgICAgICBB U1NFUlQoIXVuY29tbWl0dGVkV2lkdGgpOwotICAgICAgICBjb21taXR0ZWRXaWR0aCAtPSB0cmFp bGluZ1doaXRlc3BhY2VXaWR0aDsKLSAgICAgICAgY29tbWl0dGVkTG9naWNhbFJpZ2h0IC09IHRy YWlsaW5nV2hpdGVzcGFjZVdpZHRoOwotICAgIH0KLQotICAgIHZvaWQgcmVzZXRUcmFpbGluZ1do aXRlc3BhY2UoKQorICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKCkKICAgICB7Ci0g ICAgICAgIHRyYWlsaW5nV2hpdGVzcGFjZVdpZHRoID0gMDsKLSAgICAgICAgdHJhaWxpbmdXaGl0 ZXNwYWNlTGVuZ3RoID0gMDsKKyAgICAgICAgY29tbWl0dGVkV2lkdGggLT0gY29tbWl0dGVkVHJh aWxpbmdXaGl0ZXNwYWNlV2lkdGg7CisgICAgICAgIGNvbW1pdHRlZExvZ2ljYWxSaWdodCAtPSBj b21taXR0ZWRUcmFpbGluZ1doaXRlc3BhY2VXaWR0aDsKKyAgICAgICAgY29tbWl0dGVkVHJhaWxp bmdXaGl0ZXNwYWNlV2lkdGggPSAwOworICAgICAgICBjb21taXR0ZWRUcmFpbGluZ1doaXRlc3Bh Y2VMZW5ndGggPSAwOwogICAgIH0KIAotICAgIGZsb2F0IGF2YWlsYWJsZVdpZHRoOwotICAgIGZs b2F0IGxvZ2ljYWxMZWZ0T2Zmc2V0OwotICAgIHVuc2lnbmVkIGxpbmVTdGFydFJ1bkluZGV4OyAv LyBUaGUgcnVuIHRoYXQgdGhlIGxpbmUgc3RhcnRzIHdpdGguCi0KLSAgICB1bnNpZ25lZCB1bmNv bW1pdHRlZFN0YXJ0OwotICAgIHVuc2lnbmVkIHVuY29tbWl0dGVkRW5kOwotICAgIGZsb2F0IHVu Y29tbWl0dGVkV2lkdGg7Ci0gICAgZmxvYXQgY29tbWl0dGVkV2lkdGg7Ci0gICAgZmxvYXQgY29t bWl0dGVkTG9naWNhbFJpZ2h0OyAvLyBMYXN0IGNvbW1pdHRlZCBYIChjb29yZGluYXRlKSBwb3Np dGlvbi4KLQotICAgIHVuc2lnbmVkIHBvc2l0aW9uOwotCi0gICAgZmxvYXQgdHJhaWxpbmdXaGl0 ZXNwYWNlV2lkdGg7IC8vIFVzZSB0aGlzIHRvIHJlbW92ZSB0cmFpbGluZyB3aGl0ZXNwYWNlIHdp dGhvdXQgcmUtbWVzdXJpbmcgdGhlIHRleHQuCi0gICAgZmxvYXQgdHJhaWxpbmdXaGl0ZXNwYWNl TGVuZ3RoOwotCisgICAgZmxvYXQgYXZhaWxhYmxlV2lkdGggPSAwOworICAgIGZsb2F0IGxvZ2lj YWxMZWZ0T2Zmc2V0ID0gMDsKKyAgICB1bnNpZ25lZCBsaW5lU3RhcnRSdW5JbmRleCA9IDA7IC8v IFRoZSBydW4gdGhhdCB0aGUgbGluZSBzdGFydHMgd2l0aC4KKyAgICB1bnNpZ25lZCBwb3NpdGlv biA9IDA7CisgICAgCisgICAgdW5zaWduZWQgdW5jb21taXR0ZWRTdGFydCA9IDA7CisgICAgdW5z aWduZWQgdW5jb21taXR0ZWRFbmQgPSAwOworICAgIGZsb2F0IHVuY29tbWl0dGVkV2lkdGggPSAw OworICAgIGZsb2F0IGNvbW1pdHRlZFdpZHRoID0gMDsKKyAgICAKKyAgICBmbG9hdCBjb21taXR0 ZWRMb2dpY2FsUmlnaHQgPSAwOyAvLyBMYXN0IGNvbW1pdHRlZCBYIChjb29yZGluYXRlKSBwb3Np dGlvbi4KKyAgICBmbG9hdCBjb21taXR0ZWRUcmFpbGluZ1doaXRlc3BhY2VXaWR0aCA9IDA7IC8v IFVzZSB0aGlzIHRvIHJlbW92ZSB0cmFpbGluZyB3aGl0ZXNwYWNlIHdpdGhvdXQgcmUtbWVzdXJp bmcgdGhlIHRleHQuCisgICAgdW5zaWduZWQgY29tbWl0dGVkVHJhaWxpbmdXaGl0ZXNwYWNlTGVu Z3RoID0gMDsKKyAgICAKICAgICBGbG93Q29udGVudHM6OlRleHRGcmFnbWVudCBvdmVmbG93ZWRG cmFnbWVudDsKKworcHJpdmF0ZToKKyAgICBmbG9hdCB1bmNvbWl0dGVkVHJhaWxpbmdXaGl0ZXNw YWNlV2lkdGggPSAwOworICAgIHVuc2lnbmVkIHVuY29taXR0ZWRUcmFpbGluZ1doaXRlc3BhY2VM ZW5ndGggPSAwOwogfTsKIAogc3RhdGljIHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKExp bmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMsIGNvbnN0IEZs b3dDb250ZW50cyYgZmxvd0NvbnRlbnRzKQpAQCAtMzI2LDM2ICszMTksMzAgQEAgc3RhdGljIHZv aWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6 OlJ1blZlY3RvciYgbGkKICAgICBjb25zdCBhdXRvJiBzdHlsZSA9IGZsb3dDb250ZW50cy5zdHls ZSgpOwogICAgIGJvb2wgcHJlV3JhcCA9IHN0eWxlLndyYXBMaW5lcyAmJiAhc3R5bGUuY29sbGFw c2VXaGl0ZXNwYWNlOwogICAgIC8vIFRyYWlsaW5nIHdoaXRlc3BhY2UgZ2V0cyByZW1vdmVkIHdo ZW4gd2UgZWl0aGVyIGNvbGxhcHNlIHdoaXRlc3BhY2Ugb3IgcHJlLXdyYXAgaXMgcHJlc2VudC4K LSAgICBpZiAoIShzdHlsZS5jb2xsYXBzZVdoaXRlc3BhY2UgfHwgcHJlV3JhcCkpIHsKLSAgICAg ICAgbGluZVN0YXRlLnJlc2V0VHJhaWxpbmdXaGl0ZXNwYWNlKCk7CisgICAgaWYgKCEoc3R5bGUu Y29sbGFwc2VXaGl0ZXNwYWNlIHx8IHByZVdyYXApKQogICAgICAgICByZXR1cm47Ci0gICAgfQog CiAgICAgQVNTRVJUKGxpbmVSdW5zLnNpemUoKSk7CiAgICAgUnVuJiBsYXN0UnVuID0gbGluZVJ1 bnMubGFzdCgpOwogCiAgICAgdW5zaWduZWQgbGFzdFBvc2l0aW9uID0gbGluZVN0YXRlLnBvc2l0 aW9uOwogICAgIGJvb2wgdHJhaWxpbmdQcmVXcmFwV2hpdGVzcGFjZU5lZWRzVG9CZVJlbW92ZWQg PSBmYWxzZTsKLSAgICAvLyBXaGVuIHByZS13cmFwIGlzIHByZXNlbnQsIHRyYWlsaW5nIHdoaXRl c3BhY2UgbmVlZHMgdG8gYmUgcmVtb3ZlZDoKLSAgICAvLyAxLiBmcm9tIHRoZSAibmV4dCBsaW5l Ijogd2hlbiBhdCBsZWFzdCB0aGUgZmlyc3QgY2hhcmF0ZXIgZml0cy4gV2hlbiBldmVuIHRoZSBm aXJzdCB3aGl0ZXNwYWNlIGlzIHdpZGVyIHRoYXQgdGhlIGF2YWlsYWJsZSB3aWR0aCwKLSAgICAv LyB3ZSBkb24ndCByZW1vdmUgYW55IHdoaXRlc3BhY2UgYXQgYWxsLgotICAgIC8vIDIuIGZyb20g dGhpcyBsaW5lOiByZW1vdmUgd2hpdGVzcGFjZSwgdW5sZXNzIGl0J3MgdGhlIG9ubHkgZnJhZ21l bnQgb24gdGhlIGxpbmUgLXNvIHJlbW92aW5nIHRoZSB3aGl0ZXNhcGNlIHdvdWxkIHByb2R1Y2Ug YW4gZW1wdHkgbGluZS4KICAgICBpZiAocHJlV3JhcCkgeworICAgICAgICAvLyBTcGVjaWFsIG92 ZXJmbG93IHByZS13cmFwIGZyYWdtZW50IGhhbmRsaW5nOiBJZ25vcmUgdGhlIG92ZXJmbG93IHdo aXRlc3BhY2UgZnJhZ21lbnQgaWYgd2UgbWFuYWdlZCB0byBmaXQgYXQgbGVhc3Qgb25lIGNoYXJh Y3RlciBvbiB0aGlzIGxpbmUuCisgICAgICAgIC8vIFdoZW4gdGhlIGxpbmUgaXMgdG9vIHNob3J0 IHRvIGZpdCBvbmUgY2hhcmFjdGVyICh0aG91Z2h0IGl0IHN0aWxsIHN0YXlzIG9uIHRoZSBsaW5l KSB3ZSBrZWVwIHRoZSBvdmVyZmxvdyB3aGl0ZXNwYWNlIGNvbnRlbnQgYXMgaXQgaXMuCiAgICAg ICAgIGlmIChsaW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQudHlwZSA9PSBGbG93Q29udGVudHM6 OlRleHRGcmFnbWVudDo6V2hpdGVzcGFjZSAmJiAhbGluZVN0YXRlLm92ZWZsb3dlZEZyYWdtZW50 LmlzRW1wdHkoKSAmJiBsaW5lU3RhdGUuYXZhaWxhYmxlV2lkdGggPj0gbGluZVN0YXRlLmNvbW1p dHRlZFdpZHRoKSB7CiAgICAgICAgICAgICBsaW5lU3RhdGUucG9zaXRpb24gPSBsaW5lU3RhdGUu b3ZlZmxvd2VkRnJhZ21lbnQuZW5kOwogICAgICAgICAgICAgbGluZVN0YXRlLm92ZWZsb3dlZEZy YWdtZW50ID0gRmxvd0NvbnRlbnRzOjpUZXh0RnJhZ21lbnQoKTsKICAgICAgICAgfQotICAgICAg ICBpZiAobGluZVN0YXRlLnRyYWlsaW5nV2hpdGVzcGFjZUxlbmd0aCkgewotICAgICAgICAgICAg Ly8gQ2hlY2sgaWYgd2UndmUgZ290IG9ubHkgd2hpdGVzcGFjZSBvbiB0aGlzIGxpbmUuCi0gICAg ICAgICAgICB0cmFpbGluZ1ByZVdyYXBXaGl0ZXNwYWNlTmVlZHNUb0JlUmVtb3ZlZCA9ICEobGlu ZVN0YXRlLmNvbW1pdHRlZFdpZHRoID09IGxpbmVTdGF0ZS50cmFpbGluZ1doaXRlc3BhY2VXaWR0 aCk7Ci0gICAgICAgIH0KKyAgICAgICAgLy8gUmVtb3ZlIHdoaXRlc3BhY2UsIHVubGVzcyBpdCdz IHRoZSBvbmx5IGZyYWdtZW50IG9uIHRoZSBsaW5lIC1zbyByZW1vdmluZyB0aGUgd2hpdGVzYXBj ZSB3b3VsZCBwcm9kdWNlIGFuIGVtcHR5IGxpbmUuCisgICAgICAgIHRyYWlsaW5nUHJlV3JhcFdo aXRlc3BhY2VOZWVkc1RvQmVSZW1vdmVkID0gIWxpbmVTdGF0ZS5oYXNXaGl0ZXNwYWNlT25seSgp OwogICAgIH0KLSAgICBpZiAobGluZVN0YXRlLnRyYWlsaW5nV2hpdGVzcGFjZUxlbmd0aCAmJiAo c3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlIHx8IHRyYWlsaW5nUHJlV3JhcFdoaXRlc3BhY2VOZWVk c1RvQmVSZW1vdmVkKSkgewotICAgICAgICBsYXN0UnVuLmxvZ2ljYWxSaWdodCAtPSBsaW5lU3Rh dGUudHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGg7Ci0gICAgICAgIGxhc3RSdW4uZW5kIC09IGxpbmVT dGF0ZS50cmFpbGluZ1doaXRlc3BhY2VMZW5ndGg7CisgICAgaWYgKGxpbmVTdGF0ZS5jb21taXR0 ZWRUcmFpbGluZ1doaXRlc3BhY2VMZW5ndGggJiYgKHN0eWxlLmNvbGxhcHNlV2hpdGVzcGFjZSB8 fCB0cmFpbGluZ1ByZVdyYXBXaGl0ZXNwYWNlTmVlZHNUb0JlUmVtb3ZlZCkpIHsKKyAgICAgICAg bGFzdFJ1bi5sb2dpY2FsUmlnaHQgLT0gbGluZVN0YXRlLmNvbW1pdHRlZFRyYWlsaW5nV2hpdGVz cGFjZVdpZHRoOworICAgICAgICBsYXN0UnVuLmVuZCAtPSBsaW5lU3RhdGUuY29tbWl0dGVkVHJh aWxpbmdXaGl0ZXNwYWNlTGVuZ3RoOwogICAgICAgICBpZiAobGFzdFJ1bi5zdGFydCA9PSBsYXN0 UnVuLmVuZCkKICAgICAgICAgICAgIGxpbmVSdW5zLnJlbW92ZUxhc3QoKTsKLSAgICAgICAgbGlu ZVN0YXRlLnJlbW92ZUNvbW1pdHRlZFRyYWlsaW5nV2hpdGVzcGFjZSgpOworICAgICAgICBsaW5l U3RhdGUucmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKCk7CiAgICAgfQogCiAgICAgLy8gSWYgd2Ug c2tpcHBlZCBhbnkgd2hpdGVzcGFjZSBhbmQgbm93IHRoZSBsaW5lIGVuZCBpcyBhIGhhcmQgbmV3 bGluZSwgc2tpcCB0aGUgbmV3bGluZSB0b28gYXMgd2UgYXJlIHdyYXBwaW5nIHRoZSBsaW5lIGhl cmUgYWxyZWFkeS4K