131739 2014-04-16 10:13:38 -0700 [New Multicolumn] Selection in gaps and blank spots doesn't work. 2014-04-16 17:28:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue esprehn+autocc glenn kondapallykalyan WebkitBugTracker oldest_to_newest 1001182 0 hyatt 2014-04-16 10:13:38 -0700 The selection for multi-column layout breaks down when in the gaps or blank spots of the block. positionForPoint has code to adjust the point to the correct column for the old multi-column code, but it has not been patched yet for the new multi-column code. 1001397 1 229498 hyatt 2014-04-16 16:47:54 -0700 Created attachment 229498 Patch 1001398 2 commit-queue 2014-04-16 16:50:46 -0700 Attachment 229498 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderMultiColumnSet.cpp:889: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/rendering/RenderMultiColumnSet.cpp:918: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] ERROR: Source/WebCore/rendering/RenderMultiColumnSet.cpp:954: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 3 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1001404 3 229498 enrica 2014-04-16 16:53:29 -0700 Comment on attachment 229498 Patch Looks good to me. 1001427 4 hyatt 2014-04-16 17:28:08 -0700 Landed in r167404. 229498 2014-04-16 16:47:54 -0700 2014-04-16 16:53:29 -0700 Patch patch.txt text/plain 11532 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzM5OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA0LTE2ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBTZWxl Y3Rpb24gZ2V0cyBjb25mdXNlZCB3aGVuIHRoZSBtb3VzZSBpcyBpbiB0aGUgY29sdW1uIGdhcHMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE3MzkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2Vs ZWN0aW9uR2Fwcyk6CisgICAgICAgIE1ha2Ugc3VyZSBub3QgdG8gcGFpbnQgc2VsZWN0aW9uIGdh cHMuIFRoaXMgbWF0Y2hlcyB0aGUgb2xkIG11bHRpLWNvbHVtbiBiZWhhdmlvci4gRXZlbiB0aG91 Z2gKKyAgICAgICAgc2VsZWN0aW9uIGdhcHMgKm5lYXJseSogd29yayB3aXRoIHRoZSBuZXcgbXVs dGktY29sdW1uIGNvZGUsIEkgYW0gZGlzYWJsaW5nIHRoZW0gc28gdGhhdCB3ZQorICAgICAgICBj YW4gdHVybiB0aGVtIG9uIHdpdGhvdXQgdmlzdWFsIHJlZ3Jlc3Npb25zLgorICAgICAgICAKKyAg ICAgICAgKFdlYkNvcmU6OmlzQ2hpbGRIaXRUZXN0Q2FuZGlkYXRlKToKKyAgICAgICAgRG9uJ3Qg YWxsb3cgaW4tZmxvdyBSZW5kZXJGbG93VGhyZWFkcyB0byBiZSBkZXNjZW5kZWQgaW50byBmcm9t IHBvc2l0aW9uRm9yUG9pbnQuIFdlIGFsd2F5cyB3YW50CisgICAgICAgIHRvIGxvb2sgb25seSBh dCB0aGUgc3Bhbm5lcnMgYW5kIGF0IHRoZSBzZXRzLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJN dWx0aUNvbHVtbkZsb3dUaHJlYWQ6Om5vZGVBdFBvaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmg6CisgICAgICAgIE92ZXJyaWRlIG5vZGVBdFBv aW50IHRvIGRpc2FsbG93IHRoZSBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQgZnJvbSBiZWlu ZyBjb25zaWRlcmVkIGZvciBoaXQKKyAgICAgICAgdGVzdGluZyB3aGVuIG5vIERPTSBub2RlIGlz IGZvdW5kLiBJdCdzIGJldHRlciB0byBqdXN0IGxldCBSZW5kZXJCbG9jaydzIHBvc2l0aW9uRm9y UG9pbnQgcnVuCisgICAgICAgIHRvIGRyaWxsIGJhY2sgZG93biBpbnRvIHRoZSBhcHByb3ByaWF0 ZSBjb2x1bW4gc2V0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0Ojpwb3NpdGlvbkZv clBvaW50KToKKyAgICAgICAgSW1wbGVtZW50IHBvc2l0aW9uRm9yUG9pbnQgZm9yIFJlbmRlck11 bHRpQ29sdW1uU2V0cy4gVGhpcyBpcyBhIHN0cmFpZ2h0LXVwIHBvcnQgb2YgdGhlCisgICAgICAg IG9sZCBtdWx0aS1jb2x1bW4gY29kZSdzIGFkanVzdFBvaW50VG9Db2x1bW5Db250ZW50cyBmdW5j dGlvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oOgorICAg ICAgICBBZGQgb3ZlcnJpZGUgb2YgcG9zaXRpb25Gb3JQb2ludC4KKwogMjAxNC0wNC0xNiAgWm9s dGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBWYW5pc2ggdW5uZWNl c3NhcnkgaW5jbHVkZXMgZnJvbSBTaGFwZXMue2h8Y3BwfQpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiAxNjczMzUpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDA2LDcg KzI0MDYsNyBAQCBHYXBSZWN0cyBSZW5kZXJCbG9jazo6c2VsZWN0aW9uR2FwcyhSZW5kCiAgICAg aWYgKCFpc1JlbmRlckJsb2NrRmxvdygpKSAvLyBGSVhNRTogTWFrZSBtdWx0aS1jb2x1bW4gc2Vs ZWN0aW9uIGdhcCBmaWxsaW5nIHdvcmsgc29tZWRheS4KICAgICAgICAgcmV0dXJuIHJlc3VsdDsK IAotICAgIGlmIChoYXNDb2x1bW5zKCkgfHwgaGFzVHJhbnNmb3JtKCkgfHwgc3R5bGUoKS5jb2x1 bW5TcGFuKCkpIHsKKyAgICBpZiAoaGFzQ29sdW1ucygpIHx8IGhhc1RyYW5zZm9ybSgpIHx8IHN0 eWxlKCkuY29sdW1uU3BhbigpIHx8IGlzSW5GbG93UmVuZGVyRmxvd1RocmVhZCgpKSB7CiAgICAg ICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbGVhcm4gaG93IHRvIGdhcCBmaWxsIG11bHRpcGxlIGNv bHVtbnMgYW5kIHRyYW5zZm9ybXMgZXZlbnR1YWxseS4KICAgICAgICAgbGFzdExvZ2ljYWxUb3Ag PSBibG9ja0RpcmVjdGlvbk9mZnNldChyb290QmxvY2ssIG9mZnNldEZyb21Sb290QmxvY2spICsg bG9naWNhbEhlaWdodCgpOwogICAgICAgICBsYXN0TG9naWNhbExlZnQgPSBsb2dpY2FsTGVmdFNl bGVjdGlvbk9mZnNldChyb290QmxvY2ssIGxvZ2ljYWxIZWlnaHQoKSwgY2FjaGUpOwpAQCAtMzE3 OCw3ICszMTc4LDcgQEAgVmlzaWJsZVBvc2l0aW9uIFJlbmRlckJsb2NrOjpwb3NpdGlvbkZvcgog CiBzdGF0aWMgaW5saW5lIGJvb2wgaXNDaGlsZEhpdFRlc3RDYW5kaWRhdGUoY29uc3QgUmVuZGVy Qm94JiBib3gpCiB7Ci0gICAgcmV0dXJuIGJveC5oZWlnaHQoKSAmJiBib3guc3R5bGUoKS52aXNp YmlsaXR5KCkgPT0gVklTSUJMRSAmJiAhYm94LmlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9u ZWQoKTsKKyAgICByZXR1cm4gYm94LmhlaWdodCgpICYmIGJveC5zdHlsZSgpLnZpc2liaWxpdHko KSA9PSBWSVNJQkxFICYmICFib3guaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpICYm ICFib3guaXNJbkZsb3dSZW5kZXJGbG93VGhyZWFkKCk7CiB9CiAKIC8vIFZhbGlkIGNhbmRpZGF0 ZXMgaW4gYSBGbG93VGhyZWFkIG11c3QgYmUgcmVuZGVyZWQgYnkgdGhlIHJlZ2lvbi4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVt bkZsb3dUaHJlYWQuY3BwCShyZXZpc2lvbiAxNjczMzUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjYsNiArMjYsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlJlbmRlck11bHRp Q29sdW1uRmxvd1RocmVhZC5oIgogCisjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgogI2luY2x1 ZGUgIkxheW91dFN0YXRlLmgiCiAjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5TZXQuaCIKICNp bmNsdWRlICJSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlci5oIgpAQCAtNjE4LDQg KzYxOSwxNiBAQCBib29sIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6aXNQYWdlCiAgICAg cmV0dXJuIGZhbHNlOwogfQogCitib29sIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6bm9k ZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJl c3VsdCwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBsb2NhdGlvbkluQ29udGFpbmVyLCBjb25zdCBM YXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24gaGl0VGVzdEFjdGlv bikKK3sKKyAgICAvLyBZb3UgY2Fubm90IGJlIGluc2lkZSBhbiBpbi1mbG93IFJlbmRlckZsb3dU aHJlYWQgd2l0aG91dCBhIGNvcnJlc3BvbmRpbmcgRE9NIG5vZGUuIEl0J3MgYmV0dGVyIHRvCisg ICAgLy8ganVzdCBsZXQgdGhlIGFuY2VzdG9yIGZpZ3VyZSBvdXQgd2hlcmUgd2UgYXJlIGluc3Rl YWQuCisgICAgaWYgKGhpdFRlc3RBY3Rpb24gPT0gSGl0VGVzdEJsb2NrQmFja2dyb3VuZCkKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIGJvb2wgaW5zaWRlID0gUmVuZGVyRmxvd1RocmVhZDo6 bm9kZUF0UG9pbnQocmVxdWVzdCwgcmVzdWx0LCBsb2NhdGlvbkluQ29udGFpbmVyLCBhY2N1bXVs YXRlZE9mZnNldCwgaGl0VGVzdEFjdGlvbik7CisgICAgaWYgKGluc2lkZSAmJiAhcmVzdWx0Lmlu bmVyTm9kZSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIGluc2lkZTsKK30K KwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxv d1RocmVhZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJN dWx0aUNvbHVtbkZsb3dUaHJlYWQuaAkocmV2aXNpb24gMTY3MzM1KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5oCSh3b3JraW5nIGNvcHkp CkBAIC05NCw2ICs5NCw4IEBAIHB1YmxpYzoKICAgICAKICAgICB2aXJ0dWFsIFJlbmRlclJlZ2lv biogbWFwRnJvbUZsb3dUb1JlZ2lvbihUcmFuc2Zvcm1TdGF0ZSYpIGNvbnN0IG92ZXJyaWRlOwog ICAgIAorICAgIHZpcnR1YWwgYm9vbCBub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYs IEhpdFRlc3RSZXN1bHQmLCBjb25zdCBIaXRUZXN0TG9jYXRpb24mIGxvY2F0aW9uSW5Db250YWlu ZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgSGl0VGVzdEFjdGlvbikg b3ZlcnJpZGU7CisKIHByaXZhdGU6CiAgICAgdmlydHVhbCBjb25zdCBjaGFyKiByZW5kZXJOYW1l KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGFkZFJlZ2lvblRvVGhyZWFkKFJl bmRlclJlZ2lvbiopIG92ZXJyaWRlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCShyZXZpc2lvbiAxNjczMzUpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC04NzcsNiArODc3LDEwMSBAQCB2b2lkIFJlbmRlck11bHRpQ29sdW1uU2V0OjphZGRP dmVyZmxvd0ZyCiAgICAgICAgIGFkZFZpc3VhbE92ZXJmbG93KGxhc3RSZWN0KTsKIH0KIAorVmlz aWJsZVBvc2l0aW9uIFJlbmRlck11bHRpQ29sdW1uU2V0Ojpwb3NpdGlvbkZvclBvaW50KGNvbnN0 IExheW91dFBvaW50JiBwaHlzaWNhbFBvaW50KQoreworICAgIC8vIERldGVybWluZSB3aGljaCBj b2x1bW5zIHdlIGludGVyc2VjdC4KKyAgICBMYXlvdXRVbml0IGNvbEdhcCA9IGNvbHVtbkdhcCgp OworICAgIExheW91dFVuaXQgaGFsZkNvbEdhcCA9IGNvbEdhcCAvIDI7CisgICAgTGF5b3V0UG9p bnQgY29sdW1uUG9pbnQoY29sdW1uUmVjdEF0KDApLmxvY2F0aW9uKCkpOworICAgIExheW91dFVu aXQgbG9naWNhbE9mZnNldCA9IDA7CisgICAgCisgICAgYm9vbCBwcm9ncmVzc2lvbklzSW5saW5l ID0gbXVsdGlDb2x1bW5GbG93VGhyZWFkKCktPnByb2dyZXNzaW9uSXNJbmxpbmUoKTsKKyAgIAor ICAgIExheW91dFBvaW50IHBvaW50ID0gcGh5c2ljYWxQb2ludDsKKyAgICAKKyAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgY29sdW1uQ291bnQoKTsgaSsrKSB7CisgICAgICAgIC8vIEFkZCBp biBoYWxmIHRoZSBjb2x1bW4gZ2FwIHRvIHRoZSBsZWZ0IGFuZCByaWdodCBvZiB0aGUgcmVjdC4K KyAgICAgICAgTGF5b3V0UmVjdCBjb2xSZWN0ID0gY29sdW1uUmVjdEF0KGkpOworICAgICAgICBm bGlwRm9yV3JpdGluZ01vZGUoY29sUmVjdCk7CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0 aW5nTW9kZSgpID09IHByb2dyZXNzaW9uSXNJbmxpbmUpIHsKKyAgICAgICAgICAgIExheW91dFJl Y3QgZ2FwQW5kQ29sdW1uUmVjdChjb2xSZWN0LngoKSAtIGhhbGZDb2xHYXAsIGNvbFJlY3QueSgp LCBjb2xSZWN0LndpZHRoKCkgKyBjb2xHYXAsIGNvbFJlY3QuaGVpZ2h0KCkpOworICAgICAgICAg ICAgaWYgKHBvaW50LngoKSA+PSBnYXBBbmRDb2x1bW5SZWN0LngoKSAmJiBwb2ludC54KCkgPCBn YXBBbmRDb2x1bW5SZWN0Lm1heFgoKSkgeworICAgICAgICAgICAgICAgIGlmIChwcm9ncmVzc2lv bklzSW5saW5lKSB7CisgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGUgY2xhbXBpbmcg dGhhdCBmb2xsb3dzIGlzIG5vdCBjb21wbGV0ZWx5IHJpZ2h0IGZvciByaWdodC10by1sZWZ0Cisg ICAgICAgICAgICAgICAgICAgIC8vIGNvbnRlbnQuCisgICAgICAgICAgICAgICAgICAgIC8vIENs YW1wIGV2ZXJ5dGhpbmcgYWJvdmUgdGhlIGNvbHVtbiB0byBpdHMgdG9wIGxlZnQuCisgICAgICAg ICAgICAgICAgICAgIGlmIChwb2ludC55KCkgPCBnYXBBbmRDb2x1bW5SZWN0LnkoKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgIHBvaW50ID0gZ2FwQW5kQ29sdW1uUmVjdC5sb2NhdGlvbigpOwor ICAgICAgICAgICAgICAgICAgICAvLyBDbGFtcCBldmVyeXRoaW5nIGJlbG93IHRoZSBjb2x1bW4g dG8gdGhlIG5leHQgY29sdW1uJ3MgdG9wIGxlZnQuIElmIHRoZXJlIGlzCisgICAgICAgICAgICAg ICAgICAgIC8vIG5vIG5leHQgY29sdW1uLCB0aGlzIHN0aWxsIG1hcHMgdG8ganVzdCBhZnRlciB0 aGlzIGNvbHVtbi4KKyAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAocG9pbnQueSgpID49IGdh cEFuZENvbHVtblJlY3QubWF4WSgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBwb2ludCA9 IGdhcEFuZENvbHVtblJlY3QubG9jYXRpb24oKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHBv aW50Lm1vdmUoMCwgZ2FwQW5kQ29sdW1uUmVjdC5oZWlnaHQoKSk7CisgICAgICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICBpZiAo cG9pbnQueCgpIDwgY29sUmVjdC54KCkpCisgICAgICAgICAgICAgICAgICAgICAgICBwb2ludC5z ZXRYKGNvbFJlY3QueCgpKTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAocG9pbnQueCgp ID49IGNvbFJlY3QubWF4WCgpKQorICAgICAgICAgICAgICAgICAgICAgICAgcG9pbnQuc2V0WChj b2xSZWN0Lm1heFgoKSAtIDEpOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAg IC8vIFdlJ3JlIGluc2lkZSB0aGUgY29sdW1uLiAgVHJhbnNsYXRlIHRoZSB4IGFuZCB5IGludG8g b3VyIGNvbHVtbiBjb29yZGluYXRlIHNwYWNlLgorICAgICAgICAgICAgICAgIGlmIChwcm9ncmVz c2lvbklzSW5saW5lKQorICAgICAgICAgICAgICAgICAgICBwb2ludC5tb3ZlKGNvbHVtblBvaW50 LngoKSAtIGNvbFJlY3QueCgpLCAoIXN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUo KSA/IGxvZ2ljYWxPZmZzZXQgOiAtbG9naWNhbE9mZnNldCkpOworICAgICAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICAgICAgcG9pbnQubW92ZSgoIXN0eWxlKCkuaXNGbGlwcGVkQmxv Y2tzV3JpdGluZ01vZGUoKSA/IGxvZ2ljYWxPZmZzZXQgOiAtbG9naWNhbE9mZnNldCkgLSBjb2xS ZWN0LngoKSArIGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCksIDApOworICAgICAgICAgICAg ICAgIAorICAgICAgICAgICAgICAgIExheW91dFJlY3QgcG9ydGlvbiA9IGZsb3dUaHJlYWRQb3J0 aW9uUmVjdCgpOworICAgICAgICAgICAgICAgIGZsaXBGb3JXcml0aW5nTW9kZShwb3J0aW9uKTsK KyAgICAgICAgICAgICAgICBwb2ludC5tb3ZlKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBM YXlvdXRVbml0KCkgOiBwb3J0aW9uLngoKSwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHBv cnRpb24ueSgpIDogTGF5b3V0VW5pdCgpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gbXVsdGlD b2x1bW5GbG93VGhyZWFkKCktPnBvc2l0aW9uRm9yUG9pbnQocG9pbnQpOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICAvLyBNb3ZlIHRvIHRoZSBuZXh0IHBvc2l0aW9uLgorICAgICAgICAg ICAgbG9naWNhbE9mZnNldCArPSBwcm9ncmVzc2lvbklzSW5saW5lID8gY29sUmVjdC5oZWlnaHQo KSA6IGNvbFJlY3Qud2lkdGgoKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIExheW91 dFJlY3QgZ2FwQW5kQ29sdW1uUmVjdChjb2xSZWN0LngoKSwgY29sUmVjdC55KCkgLSBoYWxmQ29s R2FwLCBjb2xSZWN0LndpZHRoKCksIGNvbFJlY3QuaGVpZ2h0KCkgKyBjb2xHYXApOworICAgICAg ICAgICAgaWYgKHBvaW50LnkoKSA+PSBnYXBBbmRDb2x1bW5SZWN0LnkoKSAmJiBwb2ludC55KCkg PCBnYXBBbmRDb2x1bW5SZWN0Lm1heFkoKSkgeworICAgICAgICAgICAgICAgIGlmIChwcm9ncmVz c2lvbklzSW5saW5lKSB7CisgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGUgY2xhbXBp bmcgdGhhdCBmb2xsb3dzIGlzIG5vdCBjb21wbGV0ZWx5IHJpZ2h0IGZvciByaWdodC10by1sZWZ0 CisgICAgICAgICAgICAgICAgICAgIC8vIGNvbnRlbnQuCisgICAgICAgICAgICAgICAgICAgIC8v IENsYW1wIGV2ZXJ5dGhpbmcgYWJvdmUgdGhlIGNvbHVtbiB0byBpdHMgdG9wIGxlZnQuCisgICAg ICAgICAgICAgICAgICAgIGlmIChwb2ludC54KCkgPCBnYXBBbmRDb2x1bW5SZWN0LngoKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgIHBvaW50ID0gZ2FwQW5kQ29sdW1uUmVjdC5sb2NhdGlvbigp OworICAgICAgICAgICAgICAgICAgICAvLyBDbGFtcCBldmVyeXRoaW5nIGJlbG93IHRoZSBjb2x1 bW4gdG8gdGhlIG5leHQgY29sdW1uJ3MgdG9wIGxlZnQuIElmIHRoZXJlIGlzCisgICAgICAgICAg ICAgICAgICAgIC8vIG5vIG5leHQgY29sdW1uLCB0aGlzIHN0aWxsIG1hcHMgdG8ganVzdCBhZnRl ciB0aGlzIGNvbHVtbi4KKyAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAocG9pbnQueCgpID49 IGdhcEFuZENvbHVtblJlY3QubWF4WCgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBwb2lu dCA9IGdhcEFuZENvbHVtblJlY3QubG9jYXRpb24oKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IHBvaW50Lm1vdmUoZ2FwQW5kQ29sdW1uUmVjdC53aWR0aCgpLCAwKTsKKyAgICAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIGlm IChwb2ludC55KCkgPCBjb2xSZWN0LnkoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHBvaW50 LnNldFkoY29sUmVjdC55KCkpOworICAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChwb2ludC55 KCkgPj0gY29sUmVjdC5tYXhZKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBwb2ludC5zZXRZ KGNvbFJlY3QubWF4WSgpIC0gMSk7CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAg ICAgLy8gV2UncmUgaW5zaWRlIHRoZSBjb2x1bW4uICBUcmFuc2xhdGUgdGhlIHggYW5kIHkgaW50 byBvdXIgY29sdW1uIGNvb3JkaW5hdGUgc3BhY2UuCisgICAgICAgICAgICAgICAgaWYgKHByb2dy ZXNzaW9uSXNJbmxpbmUpCisgICAgICAgICAgICAgICAgICAgIHBvaW50Lm1vdmUoKCFzdHlsZSgp LmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgPyBsb2dpY2FsT2Zmc2V0IDogLWxvZ2ljYWxP ZmZzZXQpLCBjb2x1bW5Qb2ludC55KCkgLSBjb2xSZWN0LnkoKSk7CisgICAgICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgICAgICBwb2ludC5tb3ZlKDAsICghc3R5bGUoKS5pc0ZsaXBw ZWRCbG9ja3NXcml0aW5nTW9kZSgpID8gbG9naWNhbE9mZnNldCA6IC1sb2dpY2FsT2Zmc2V0KSAt IGNvbFJlY3QueSgpICsgYm9yZGVyVG9wKCkgKyBwYWRkaW5nVG9wKCkpOworICAgICAgICAgICAg ICAgIAorICAgICAgICAgICAgICAgIExheW91dFJlY3QgcG9ydGlvbiA9IGZsb3dUaHJlYWRQb3J0 aW9uUmVjdCgpOworICAgICAgICAgICAgICAgIGZsaXBGb3JXcml0aW5nTW9kZShwb3J0aW9uKTsK KyAgICAgICAgICAgICAgICBwb2ludC5tb3ZlKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBM YXlvdXRVbml0KCkgOiBwb3J0aW9uLngoKSwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHBv cnRpb24ueSgpIDogTGF5b3V0VW5pdCgpKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAg ICAgICByZXR1cm4gbXVsdGlDb2x1bW5GbG93VGhyZWFkKCktPnBvc2l0aW9uRm9yUG9pbnQocG9p bnQpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBNb3ZlIHRvIHRoZSBuZXh0IHBv c2l0aW9uLgorICAgICAgICAgICAgbG9naWNhbE9mZnNldCArPSBwcm9ncmVzc2lvbklzSW5saW5l ID8gY29sUmVjdC53aWR0aCgpIDogY29sUmVjdC5oZWlnaHQoKTsKKyAgICAgICAgfQorICAgIH0K KworICAgIHJldHVybiBWaXNpYmxlUG9zaXRpb24oKTsKK30KKwogY29uc3QgY2hhciogUmVuZGVy TXVsdGlDb2x1bW5TZXQ6OnJlbmRlck5hbWUoKSBjb25zdAogeyAgICAKICAgICByZXR1cm4gIlJl bmRlck11bHRpQ29sdW1uU2V0IjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNdWx0aUNvbHVtblNldC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCShyZXZpc2lvbiAxNjczMzUpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaAkod29ya2luZyBjb3B5KQpAQCAt MTQwLDYgKzE0MCw4IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0UmVnaW9u Qm91bmRzRnJvbUZsb3dUaHJlYWRQb3J0aW9uUmVjdChjb25zdCBMYXlvdXRQb2ludCYgbGF5ZXJP ZmZzZXQsIExheW91dFJlY3QmIHJlZ2lvbkJvdW5kcykgb3ZlcnJpZGU7CiAKKyAgICB2aXJ0dWFs IFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbkZvclBvaW50KGNvbnN0IExheW91dFBvaW50Jikgb3Zl cnJpZGU7CisKICAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIHJlbmRlck5hbWUoKSBjb25zdDsKICAg ICAKICAgICB2b2lkIHBhaW50Q29sdW1uUnVsZXMoUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9p bnQmIHBhaW50T2Zmc2V0KTsK