127661 2014-01-26 15:44:24 -0800 [New Multicolumn] Change the axis property to be a boolean like other isInline checks 2014-01-26 19:52:58 -0800 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 oldest_to_newest 972267 0 hyatt 2014-01-26 15:44:24 -0800 Change the axis property to be a boolean like other isInline checks. This makes it easier to share between the old/new multi-column and matches other uses of isInline/childrenInline() etc. in the engine. 972268 1 222290 hyatt 2014-01-26 15:45:09 -0800 Created attachment 222290 Patch 972269 2 222290 simon.fraser 2014-01-26 15:46:39 -0800 Comment on attachment 222290 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222290&action=review > Source/WebCore/rendering/RenderMultiColumnFlowThread.h:38 > - > + Added whitespace. 972307 3 hyatt 2014-01-26 19:52:58 -0800 Landed in r162822. 222290 2014-01-26 15:45:09 -0800 2014-01-26 15:46:39 -0800 Patch patch.txt text/plain 12711 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjgxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAxLTI2ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBDaGFu Z2UgdGhlIGF4aXMgcHJvcGVydHkgdG8gYmUgYSBib29sZWFuIGxpa2Ugb3RoZXIgaXNJbmxpbmUg Y2hlY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Mjc2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJlbmRlcmluZy9Db2x1bW5JbmZvLmg6CisgICAgICAgIChXZWJDb3JlOjpDb2x1bW5JbmZvOjpD b2x1bW5JbmZvKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbHVtbkluZm86OnByb2dyZXNzaW9uSXNJ bmxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6Q29sdW1uSW5mbzo6c2V0UHJvZ3Jlc3Npb25Jc0lu bGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrOjpwYWludENvbHVtblJ1bGVzKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrOjppbml0aWFsQmxvY2tPZmZzZXRGb3JQYWludGluZyk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6YmxvY2tEZWx0YUZvclBhaW50aW5nTmV4dENvbHVtbik6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2V0Q29tcHV0ZWRDb2x1bW5Db3VudEFuZFdp ZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjp1cGRhdGVDb2x1bW5JbmZvRnJv bVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb2x1bW5SZWN0QXQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFkanVzdFBvaW50VG9Db2x1bW5Db250ZW50 cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6YWRqdXN0UmVjdEZvckNvbHVtbnMp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFkanVzdEZvckNvbHVtbnMpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaDoKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9i amVjdDo6Y29sdW1uTnVtYmVyRm9yT2Zmc2V0KToKKwogMjAxNC0wMS0yNiAgQ2hyaXMgRmxlaXph Y2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBEaXNhYmxlIGFjY2Vzc2li aWxpdHkgYWZ0ZXIgZXZlcnkgdGVzdCBydW4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9Db2x1bW5JbmZvLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Nv bHVtbkluZm8uaAkocmV2aXNpb24gMTYyODA3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0NvbHVtbkluZm8uaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQCBwdWJsaWM6CiAg ICAgQ29sdW1uSW5mbygpCiAgICAgICAgIDogbV9kZXNpcmVkQ29sdW1uV2lkdGgoMCkKICAgICAg ICAgLCBtX2Rlc2lyZWRDb2x1bW5Db3VudCgxKQotICAgICAgICAsIG1fcHJvZ3Jlc3Npb25BeGlz KElubGluZUF4aXMpCisgICAgICAgICwgbV9wcm9ncmVzc2lvbklzSW5saW5lKHRydWUpCiAgICAg ICAgICwgbV9wcm9ncmVzc2lvbklzUmV2ZXJzZWQoZmFsc2UpCiAgICAgICAgICwgbV9jb2x1bW5D b3VudCgxKQogICAgICAgICAsIG1fY29sdW1uSGVpZ2h0KDApCkBAIC01NSwxMCArNTUsOCBAQCBw dWJsaWM6CiAgICAgdW5zaWduZWQgZGVzaXJlZENvbHVtbkNvdW50KCkgY29uc3QgeyByZXR1cm4g bV9kZXNpcmVkQ29sdW1uQ291bnQ7IH0KICAgICB2b2lkIHNldERlc2lyZWRDb2x1bW5Db3VudCh1 bnNpZ25lZCBjb3VudCkgeyBtX2Rlc2lyZWRDb2x1bW5Db3VudCA9IGNvdW50OyB9CiAKLSAgICBl bnVtIEF4aXMgeyBJbmxpbmVBeGlzLCBCbG9ja0F4aXMgfTsKLQotICAgIEF4aXMgcHJvZ3Jlc3Np b25BeGlzKCkgY29uc3QgeyByZXR1cm4gbV9wcm9ncmVzc2lvbkF4aXM7IH0KLSAgICB2b2lkIHNl dFByb2dyZXNzaW9uQXhpcyhBeGlzIHByb2dyZXNzaW9uQXhpcykgeyBtX3Byb2dyZXNzaW9uQXhp cyA9IHByb2dyZXNzaW9uQXhpczsgfQorICAgIGJvb2wgcHJvZ3Jlc3Npb25Jc0lubGluZSgpIGNv bnN0IHsgcmV0dXJuIG1fcHJvZ3Jlc3Npb25Jc0lubGluZTsgfQorICAgIHZvaWQgc2V0UHJvZ3Jl c3Npb25Jc0lubGluZShib29sIHByb2dyZXNzaW9uSXNJbmxpbmUpIHsgbV9wcm9ncmVzc2lvbklz SW5saW5lID0gcHJvZ3Jlc3Npb25Jc0lubGluZTsgfQogCiAgICAgYm9vbCBwcm9ncmVzc2lvbklz UmV2ZXJzZWQoKSBjb25zdCB7IHJldHVybiBtX3Byb2dyZXNzaW9uSXNSZXZlcnNlZDsgfQogICAg IHZvaWQgc2V0UHJvZ3Jlc3Npb25Jc1JldmVyc2VkKGJvb2wgcmV2ZXJzZWQpIHsgbV9wcm9ncmVz c2lvbklzUmV2ZXJzZWQgPSByZXZlcnNlZDsgfQpAQCAtMTA1LDcgKzEwMyw3IEBAIHB1YmxpYzoK IHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBtX2Rlc2lyZWRDb2x1bW5XaWR0aDsKICAgICB1bnNp Z25lZCBtX2Rlc2lyZWRDb2x1bW5Db3VudDsKLSAgICBBeGlzIG1fcHJvZ3Jlc3Npb25BeGlzOwor ICAgIGJvb2wgbV9wcm9ncmVzc2lvbklzSW5saW5lOwogICAgIGJvb2wgbV9wcm9ncmVzc2lvbklz UmV2ZXJzZWQ7CiAKICAgICB1bnNpZ25lZCBtX2NvbHVtbkNvdW50OwpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiAxNjI4MDcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y MjA5LDcgKzIyMDksNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpwYWludENvbHVtblJ1bGVzKFBhaW50 CiAKICAgICBib29sIGFudGlhbGlhcyA9IHNob3VsZEFudGlhbGlhc0xpbmVzKHBhaW50SW5mby5j b250ZXh0KTsKIAotICAgIGlmIChjb2xJbmZvLT5wcm9ncmVzc2lvbkF4aXMoKSA9PSBDb2x1bW5J bmZvOjpJbmxpbmVBeGlzKSB7CisgICAgaWYgKGNvbEluZm8tPnByb2dyZXNzaW9uSXNJbmxpbmUo KSkgewogICAgICAgICBib29sIGxlZnRUb1JpZ2h0ID0gc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGly ZWN0aW9uKCkgXiBjb2xJbmZvLT5wcm9ncmVzc2lvbklzUmV2ZXJzZWQoKTsKICAgICAgICAgTGF5 b3V0VW5pdCBjdXJyTG9naWNhbExlZnRPZmZzZXQgPSBsZWZ0VG9SaWdodCA/IExheW91dFVuaXQo KSA6IGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKICAgICAgICAgTGF5b3V0VW5pdCBydWxlQWRkID0g bG9naWNhbExlZnRPZmZzZXRGb3JDb250ZW50KCk7CkBAIC0yMjgyLDcgKzIyODIsNyBAQCBMYXlv dXRVbml0IFJlbmRlckJsb2NrOjppbml0aWFsQmxvY2tPZmZzCiB7CiAgICAgQ29sdW1uSW5mbyog Y29sSW5mbyA9IGNvbHVtbkluZm8oKTsKICAgICBMYXlvdXRVbml0IHJlc3VsdCA9IDA7Ci0gICAg aWYgKGNvbEluZm8tPnByb2dyZXNzaW9uQXhpcygpID09IENvbHVtbkluZm86OkJsb2NrQXhpcyAm JiBjb2xJbmZvLT5wcm9ncmVzc2lvbklzUmV2ZXJzZWQoKSkgeworICAgIGlmICghY29sSW5mby0+ cHJvZ3Jlc3Npb25Jc0lubGluZSgpICYmIGNvbEluZm8tPnByb2dyZXNzaW9uSXNSZXZlcnNlZCgp KSB7CiAgICAgICAgIExheW91dFJlY3QgY29sUmVjdCA9IGNvbHVtblJlY3RBdChjb2xJbmZvLCAw KTsKICAgICAgICAgcmVzdWx0ID0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNvbFJlY3Qu eSgpIDogY29sUmVjdC54KCk7CiAgICAgICAgIHJlc3VsdCAtPSBib3JkZXJBbmRQYWRkaW5nQmVm b3JlKCk7CkBAIC0yMjk3LDcgKzIyOTcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJsb2NrOjpibG9j a0RlbHRhRm9yUGFpCiAgICAgQ29sdW1uSW5mbyogY29sSW5mbyA9IGNvbHVtbkluZm8oKTsKICAg ICBMYXlvdXRVbml0IGJsb2NrRGVsdGEgPSAtY29sSW5mby0+Y29sdW1uSGVpZ2h0KCk7CiAgICAg TGF5b3V0VW5pdCBjb2xHYXAgPSBjb2x1bW5HYXAoKTsKLSAgICBpZiAoY29sSW5mby0+cHJvZ3Jl c3Npb25BeGlzKCkgPT0gQ29sdW1uSW5mbzo6QmxvY2tBeGlzKSB7CisgICAgaWYgKCFjb2xJbmZv LT5wcm9ncmVzc2lvbklzSW5saW5lKCkpIHsKICAgICAgICAgaWYgKCFjb2xJbmZvLT5wcm9ncmVz c2lvbklzUmV2ZXJzZWQoKSkKICAgICAgICAgICAgIGJsb2NrRGVsdGEgPSBjb2xHYXA7CiAgICAg ICAgIGVsc2UKQEAgLTM3MDYsNyArMzcwNiw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnNldENvbXB1 dGVkQ29sdW1uQ291bnQKICAgICAgICAgfQogICAgICAgICBpbmZvLT5zZXREZXNpcmVkQ29sdW1u Q291bnQoY291bnQpOwogICAgICAgICBpbmZvLT5zZXREZXNpcmVkQ29sdW1uV2lkdGgod2lkdGgp OwotICAgICAgICBpbmZvLT5zZXRQcm9ncmVzc2lvbkF4aXMoc3R5bGUoKS5oYXNJbmxpbmVDb2x1 bW5BeGlzKCkgPyBDb2x1bW5JbmZvOjpJbmxpbmVBeGlzIDogQ29sdW1uSW5mbzo6QmxvY2tBeGlz KTsKKyAgICAgICAgaW5mby0+c2V0UHJvZ3Jlc3Npb25Jc0lubGluZShzdHlsZSgpLmhhc0lubGlu ZUNvbHVtbkF4aXMoKSk7CiAgICAgICAgIGluZm8tPnNldFByb2dyZXNzaW9uSXNSZXZlcnNlZChz dHlsZSgpLmNvbHVtblByb2dyZXNzaW9uKCkgPT0gUmV2ZXJzZUNvbHVtblByb2dyZXNzaW9uKTsK ICAgICB9CiB9CkBAIC0zNzE5LDEwICszNzE5LDEwIEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0 ZUNvbHVtbkluZm9Gcm9tU3QKICAgICBDb2x1bW5JbmZvKiBpbmZvID0gZ0NvbHVtbkluZm9NYXAt PmdldCh0aGlzKTsKIAogICAgIGJvb2wgbmVlZHNMYXlvdXQgPSBmYWxzZTsKLSAgICBDb2x1bW5J bmZvOjpBeGlzIG9sZEF4aXMgPSBpbmZvLT5wcm9ncmVzc2lvbkF4aXMoKTsKLSAgICBDb2x1bW5J bmZvOjpBeGlzIG5ld0F4aXMgPSBzdHlsZS0+aGFzSW5saW5lQ29sdW1uQXhpcygpID8gQ29sdW1u SW5mbzo6SW5saW5lQXhpcyA6IENvbHVtbkluZm86OkJsb2NrQXhpczsKLSAgICBpZiAob2xkQXhp cyAhPSBuZXdBeGlzKSB7Ci0gICAgICAgIGluZm8tPnNldFByb2dyZXNzaW9uQXhpcyhuZXdBeGlz KTsKKyAgICBib29sIG9sZFByb2dyZXNzaW9uSXNJbmxpbmUgPSBpbmZvLT5wcm9ncmVzc2lvbklz SW5saW5lKCk7CisgICAgYm9vbCBuZXdQcm9ncmVzc2lvbklzSW5saW5lID0gc3R5bGUtPmhhc0lu bGluZUNvbHVtbkF4aXMoKTsKKyAgICBpZiAob2xkUHJvZ3Jlc3Npb25Jc0lubGluZSAhPSBuZXdQ cm9ncmVzc2lvbklzSW5saW5lKSB7CisgICAgICAgIGluZm8tPnNldFByb2dyZXNzaW9uSXNJbmxp bmUobmV3UHJvZ3Jlc3Npb25Jc0lubGluZSk7CiAgICAgICAgIG5lZWRzTGF5b3V0ID0gdHJ1ZTsK ICAgICB9CiAKQEAgLTM3NzUsNyArMzc3NSw3IEBAIExheW91dFJlY3QgUmVuZGVyQmxvY2s6OmNv bHVtblJlY3RBdChDb2wKICAgICBMYXlvdXRVbml0IGNvbExvZ2ljYWxUb3AgPSBib3JkZXJBbmRQ YWRkaW5nQmVmb3JlKCk7CiAgICAgTGF5b3V0VW5pdCBjb2xMb2dpY2FsTGVmdCA9IGxvZ2ljYWxM ZWZ0T2Zmc2V0Rm9yQ29udGVudCgpOwogICAgIExheW91dFVuaXQgY29sR2FwID0gY29sdW1uR2Fw KCk7Ci0gICAgaWYgKGNvbEluZm8tPnByb2dyZXNzaW9uQXhpcygpID09IENvbHVtbkluZm86Oklu bGluZUF4aXMpIHsKKyAgICBpZiAoY29sSW5mby0+cHJvZ3Jlc3Npb25Jc0lubGluZSgpKSB7CiAg ICAgICAgIGlmIChzdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSBeIGNvbEluZm8tPnBy b2dyZXNzaW9uSXNSZXZlcnNlZCgpKQogICAgICAgICAgICAgY29sTG9naWNhbExlZnQgKz0gaW5k ZXggKiAoY29sTG9naWNhbFdpZHRoICsgY29sR2FwKTsKICAgICAgICAgZWxzZQpAQCAtMzgxMSwx MCArMzgxMSwxMCBAQCB2b2lkIFJlbmRlckJsb2NrOjphZGp1c3RQb2ludFRvQ29sdW1uQ29uCiAg ICAgICAgIC8vIEFkZCBpbiBoYWxmIHRoZSBjb2x1bW4gZ2FwIHRvIHRoZSBsZWZ0IGFuZCByaWdo dCBvZiB0aGUgcmVjdC4KICAgICAgICAgTGF5b3V0UmVjdCBjb2xSZWN0ID0gY29sdW1uUmVjdEF0 KGNvbEluZm8sIGkpOwogICAgICAgICBmbGlwRm9yV3JpdGluZ01vZGUoY29sUmVjdCk7Ci0gICAg ICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IChjb2xJbmZvLT5wcm9ncmVzc2lv bkF4aXMoKSA9PSBDb2x1bW5JbmZvOjpJbmxpbmVBeGlzKSkgeworICAgICAgICBpZiAoaXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKSA9PSBjb2xJbmZvLT5wcm9ncmVzc2lvbklzSW5saW5lKCkpIHsK ICAgICAgICAgICAgIExheW91dFJlY3QgZ2FwQW5kQ29sdW1uUmVjdChjb2xSZWN0LngoKSAtIGhh bGZDb2xHYXAsIGNvbFJlY3QueSgpLCBjb2xSZWN0LndpZHRoKCkgKyBjb2xHYXAsIGNvbFJlY3Qu aGVpZ2h0KCkpOwogICAgICAgICAgICAgaWYgKHBvaW50LngoKSA+PSBnYXBBbmRDb2x1bW5SZWN0 LngoKSAmJiBwb2ludC54KCkgPCBnYXBBbmRDb2x1bW5SZWN0Lm1heFgoKSkgewotICAgICAgICAg ICAgICAgIGlmIChjb2xJbmZvLT5wcm9ncmVzc2lvbkF4aXMoKSA9PSBDb2x1bW5JbmZvOjpJbmxp bmVBeGlzKSB7CisgICAgICAgICAgICAgICAgaWYgKGNvbEluZm8tPnByb2dyZXNzaW9uSXNJbmxp bmUoKSkgewogICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogVGhlIGNsYW1waW5nIHRoYXQg Zm9sbG93cyBpcyBub3QgY29tcGxldGVseSByaWdodCBmb3IgcmlnaHQtdG8tbGVmdAogICAgICAg ICAgICAgICAgICAgICAvLyBjb250ZW50LgogICAgICAgICAgICAgICAgICAgICAvLyBDbGFtcCBl dmVyeXRoaW5nIGFib3ZlIHRoZSBjb2x1bW4gdG8gaXRzIHRvcCBsZWZ0LgpAQCAtMzgzNCw3ICsz ODM0LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6YWRqdXN0UG9pbnRUb0NvbHVtbkNvbgogICAgICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIC8vIFdlJ3JlIGluc2lkZSB0aGUgY29sdW1u LiAgVHJhbnNsYXRlIHRoZSB4IGFuZCB5IGludG8gb3VyIGNvbHVtbiBjb29yZGluYXRlIHNwYWNl LgotICAgICAgICAgICAgICAgIGlmIChjb2xJbmZvLT5wcm9ncmVzc2lvbkF4aXMoKSA9PSBDb2x1 bW5JbmZvOjpJbmxpbmVBeGlzKQorICAgICAgICAgICAgICAgIGlmIChjb2xJbmZvLT5wcm9ncmVz c2lvbklzSW5saW5lKCkpCiAgICAgICAgICAgICAgICAgICAgIHBvaW50Lm1vdmUoY29sdW1uUG9p bnQueCgpIC0gY29sUmVjdC54KCksICghc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k ZSgpID8gbG9naWNhbE9mZnNldCA6IC1sb2dpY2FsT2Zmc2V0KSk7CiAgICAgICAgICAgICAgICAg ZWxzZQogICAgICAgICAgICAgICAgICAgICBwb2ludC5tb3ZlKCghc3R5bGUoKS5pc0ZsaXBwZWRC bG9ja3NXcml0aW5nTW9kZSgpID8gbG9naWNhbE9mZnNldCA6IC1sb2dpY2FsT2Zmc2V0KSAtIGNv bFJlY3QueCgpICsgYm9yZGVyTGVmdCgpICsgcGFkZGluZ0xlZnQoKSwgMCk7CkBAIC0zODQyLDEx ICszODQyLDExIEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFkanVzdFBvaW50VG9Db2x1bW5Db24KICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gTW92ZSB0byB0aGUgbmV4dCBwb3NpdGlvbi4K LSAgICAgICAgICAgIGxvZ2ljYWxPZmZzZXQgKz0gY29sSW5mby0+cHJvZ3Jlc3Npb25BeGlzKCkg PT0gQ29sdW1uSW5mbzo6SW5saW5lQXhpcyA/IGNvbFJlY3QuaGVpZ2h0KCkgOiBjb2xSZWN0Lndp ZHRoKCk7CisgICAgICAgICAgICBsb2dpY2FsT2Zmc2V0ICs9IGNvbEluZm8tPnByb2dyZXNzaW9u SXNJbmxpbmUoKSA/IGNvbFJlY3QuaGVpZ2h0KCkgOiBjb2xSZWN0LndpZHRoKCk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBMYXlvdXRSZWN0IGdhcEFuZENvbHVtblJlY3QoY29sUmVj dC54KCksIGNvbFJlY3QueSgpIC0gaGFsZkNvbEdhcCwgY29sUmVjdC53aWR0aCgpLCBjb2xSZWN0 LmhlaWdodCgpICsgY29sR2FwKTsKICAgICAgICAgICAgIGlmIChwb2ludC55KCkgPj0gZ2FwQW5k Q29sdW1uUmVjdC55KCkgJiYgcG9pbnQueSgpIDwgZ2FwQW5kQ29sdW1uUmVjdC5tYXhZKCkpIHsK LSAgICAgICAgICAgICAgICBpZiAoY29sSW5mby0+cHJvZ3Jlc3Npb25BeGlzKCkgPT0gQ29sdW1u SW5mbzo6SW5saW5lQXhpcykgeworICAgICAgICAgICAgICAgIGlmIChjb2xJbmZvLT5wcm9ncmVz c2lvbklzSW5saW5lKCkpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoZSBjbGFt cGluZyB0aGF0IGZvbGxvd3MgaXMgbm90IGNvbXBsZXRlbHkgcmlnaHQgZm9yIHJpZ2h0LXRvLWxl ZnQKICAgICAgICAgICAgICAgICAgICAgLy8gY29udGVudC4KICAgICAgICAgICAgICAgICAgICAg Ly8gQ2xhbXAgZXZlcnl0aGluZyBhYm92ZSB0aGUgY29sdW1uIHRvIGl0cyB0b3AgbGVmdC4KQEAg LTM4NjYsNyArMzg2Niw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFkanVzdFBvaW50VG9Db2x1bW5D b24KICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAvLyBXZSdyZSBpbnNpZGUg dGhlIGNvbHVtbi4gIFRyYW5zbGF0ZSB0aGUgeCBhbmQgeSBpbnRvIG91ciBjb2x1bW4gY29vcmRp bmF0ZSBzcGFjZS4KLSAgICAgICAgICAgICAgICBpZiAoY29sSW5mby0+cHJvZ3Jlc3Npb25BeGlz KCkgPT0gQ29sdW1uSW5mbzo6SW5saW5lQXhpcykKKyAgICAgICAgICAgICAgICBpZiAoY29sSW5m by0+cHJvZ3Jlc3Npb25Jc0lubGluZSgpKQogICAgICAgICAgICAgICAgICAgICBwb2ludC5tb3Zl KCghc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpID8gbG9naWNhbE9mZnNldCA6 IC1sb2dpY2FsT2Zmc2V0KSwgY29sdW1uUG9pbnQueSgpIC0gY29sUmVjdC55KCkpOwogICAgICAg ICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgcG9pbnQubW92ZSgwLCAoIXN0eWxl KCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSA/IGxvZ2ljYWxPZmZzZXQgOiAtbG9naWNh bE9mZnNldCkgLSBjb2xSZWN0LnkoKSArIGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpKTsKQEAg LTM4NzQsNyArMzg3NCw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFkanVzdFBvaW50VG9Db2x1bW5D b24KICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgLy8gTW92ZSB0byB0aGUgbmV4dCBwb3Np dGlvbi4KLSAgICAgICAgICAgIGxvZ2ljYWxPZmZzZXQgKz0gY29sSW5mby0+cHJvZ3Jlc3Npb25B eGlzKCkgPT0gQ29sdW1uSW5mbzo6SW5saW5lQXhpcyA/IGNvbFJlY3Qud2lkdGgoKSA6IGNvbFJl Y3QuaGVpZ2h0KCk7CisgICAgICAgICAgICBsb2dpY2FsT2Zmc2V0ICs9IGNvbEluZm8tPnByb2dy ZXNzaW9uSXNJbmxpbmUoKSA/IGNvbFJlY3Qud2lkdGgoKSA6IGNvbFJlY3QuaGVpZ2h0KCk7CiAg ICAgICAgIH0KICAgICB9CiB9CkBAIC0zOTE1LDcgKzM5MTUsNyBAQCB2b2lkIFJlbmRlckJsb2Nr OjphZGp1c3RSZWN0Rm9yQ29sdW1ucyhMCiAgICAgICAgIExheW91dFJlY3QgY29sUmVjdCA9IGNv bHVtblJlY3RBdChjb2xJbmZvLCBzdGFydENvbHVtbik7CiAgICAgICAgIExheW91dFJlY3QgcmVw YWludFJlY3QgPSByOwogCi0gICAgICAgIGlmIChjb2xJbmZvLT5wcm9ncmVzc2lvbkF4aXMoKSA9 PSBDb2x1bW5JbmZvOjpJbmxpbmVBeGlzKSB7CisgICAgICAgIGlmIChjb2xJbmZvLT5wcm9ncmVz c2lvbklzSW5saW5lKCkpIHsKICAgICAgICAgICAgIGlmIChpc0hvcml6b250YWwpCiAgICAgICAg ICAgICAgICAgcmVwYWludFJlY3QubW92ZShjb2xSZWN0LngoKSAtIGxvZ2ljYWxMZWZ0T2Zmc2V0 LCAtIHN0YXRpY19jYXN0PGludD4oc3RhcnRDb2x1bW4pICogY29sSGVpZ2h0KTsKICAgICAgICAg ICAgIGVsc2UKQEAgLTM5OTAsNyArMzk5MCw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFkanVzdEZv ckNvbHVtbnMoTGF5b3UKICAgICAgICAgLy8gTm93IHdlJ3JlIGluIHRoZSBzYW1lIGNvb3JkaW5h dGUgc3BhY2UgYXMgdGhlIHBvaW50LiAgU2VlIGlmIGl0IGlzIGluc2lkZSB0aGUgcmVjdGFuZ2xl LgogICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgewogICAgICAgICAgICAg aWYgKHBvaW50LnkoKSA+PSBzbGljZVJlY3QueSgpICYmIHBvaW50LnkoKSA8IHNsaWNlUmVjdC5t YXhZKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoY29sSW5mby0+cHJvZ3Jlc3Npb25BeGlzKCkg PT0gQ29sdW1uSW5mbzo6SW5saW5lQXhpcykKKyAgICAgICAgICAgICAgICBpZiAoY29sSW5mby0+ cHJvZ3Jlc3Npb25Jc0lubGluZSgpKQogICAgICAgICAgICAgICAgICAgICBvZmZzZXQuZXhwYW5k KGNvbHVtblJlY3RBdChjb2xJbmZvLCBpKS54KCkgLSBsb2dpY2FsTGVmdCwgLWxvZ2ljYWxPZmZz ZXQpOwogICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgb2Zmc2V0LmV4 cGFuZCgwLCBjb2x1bW5SZWN0QXQoY29sSW5mbywgaSkueSgpIC0gbG9naWNhbE9mZnNldCAtIGJv cmRlckFuZFBhZGRpbmdCZWZvcmUoKSk7CkBAIC0zOTk4LDcgKzM5OTgsNyBAQCB2b2lkIFJlbmRl ckJsb2NrOjphZGp1c3RGb3JDb2x1bW5zKExheW91CiAgICAgICAgICAgICB9CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICBpZiAocG9pbnQueCgpID49IHNsaWNlUmVjdC54KCkgJiYgcG9p bnQueCgpIDwgc2xpY2VSZWN0Lm1heFgoKSkgewotICAgICAgICAgICAgICAgIGlmIChjb2xJbmZv LT5wcm9ncmVzc2lvbkF4aXMoKSA9PSBDb2x1bW5JbmZvOjpJbmxpbmVBeGlzKQorICAgICAgICAg ICAgICAgIGlmIChjb2xJbmZvLT5wcm9ncmVzc2lvbklzSW5saW5lKCkpCiAgICAgICAgICAgICAg ICAgICAgIG9mZnNldC5leHBhbmQoLWxvZ2ljYWxPZmZzZXQsIGNvbHVtblJlY3RBdChjb2xJbmZv LCBpKS55KCkgLSBsb2dpY2FsTGVmdCk7CiAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgICAgICBvZmZzZXQuZXhwYW5kKGNvbHVtblJlY3RBdChjb2xJbmZvLCBpKS54KCkgLSBs b2dpY2FsT2Zmc2V0IC0gYm9yZGVyQW5kUGFkZGluZ0JlZm9yZSgpLCAwKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhy ZWFkLmgJKHJldmlzaW9uIDE2MjgwNykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsNyArMzUsNyBA QCBjbGFzcyBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQgZmluYWwgCiBwdWJsaWM6CiAgICAg UmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkKERvY3VtZW50JiwgUGFzc1JlZjxSZW5kZXJTdHls ZT4pOwogICAgIH5SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQoKTsKLQorICAgIAogICAgIHVu c2lnbmVkIGNvbHVtbkNvdW50KCkgY29uc3QgeyByZXR1cm4gbV9jb2x1bW5Db3VudDsgfQogICAg IExheW91dFVuaXQgY29sdW1uV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbHVtbldpZHRoOyB9 CiAgICAgTGF5b3V0VW5pdCBjb2x1bW5IZWlnaHRBdmFpbGFibGUoKSBjb25zdCB7IHJldHVybiBt X2NvbHVtbkhlaWdodEF2YWlsYWJsZTsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDE2MjgwNykKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDY1LDcgKzEwNjUs NyBAQCBpbnQgUmVuZGVyT2JqZWN0Ojpjb2x1bW5OdW1iZXJGb3JPZmZzZXQoCiAgICAgICAgIHJl dHVybiBjb2x1bW5OdW1iZXI7CiAKICAgICBDb2x1bW5JbmZvKiBjb2x1bW5JbmZvID0gdmlldy5j b2x1bW5JbmZvKCk7Ci0gICAgaWYgKGNvbHVtbkluZm8gJiYgY29sdW1uSW5mby0+cHJvZ3Jlc3Np b25BeGlzKCkgPT0gQ29sdW1uSW5mbzo6QmxvY2tBeGlzKSB7CisgICAgaWYgKGNvbHVtbkluZm8g JiYgIWNvbHVtbkluZm8tPnByb2dyZXNzaW9uSXNJbmxpbmUoKSkgewogICAgICAgICBpZiAoIWNv bHVtbkluZm8tPnByb2dyZXNzaW9uSXNSZXZlcnNlZCgpKQogICAgICAgICAgICAgY29sdW1uTnVt YmVyID0gKHBhZ2luYXRpb24ucGFnZUxlbmd0aCArIHBhZ2luYXRpb24uZ2FwIC0gb2Zmc2V0KSAv IChwYWdpbmF0aW9uLnBhZ2VMZW5ndGggKyBwYWdpbmF0aW9uLmdhcCk7CiAgICAgICAgIGVsc2UK