95251 2012-08-28 15:03:18 -0700 [New Multicolumn] Get column contents painting properly. 2012-08-29 10:08:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt eric webkit.review.bot oldest_to_newest 706768 0 hyatt 2012-08-28 15:03:18 -0700 Implement paintColumnContents for the new multicolumn implementation, so that columns finally render something besides rules. ;) 706781 1 161070 hyatt 2012-08-28 15:11:38 -0700 Created attachment 161070 Patch 706783 2 webkit.review.bot 2012-08-28 15:14:13 -0700 Attachment 161070 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/rendering/RenderMultiColumnSet.cpp:32: Use 'using namespace std;' instead of 'using std::min;'. [build/using_std] [4] Source/WebCore/rendering/RenderMultiColumnSet.cpp:33: Use 'using namespace std;' instead of 'using std::max;'. [build/using_std] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 706786 3 161070 simon.fraser 2012-08-28 15:14:53 -0700 Comment on attachment 161070 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161070&action=review > Source/WebCore/rendering/RenderMultiColumnSet.cpp:33 > +using std::min; > +using std::max; The cool kids are now just using std::max at the call sites, I'm told. 707580 4 hyatt 2012-08-29 10:08:56 -0700 Landed in r127008. 161070 2012-08-28 15:11:38 -0700 2012-08-28 15:14:53 -0700 Patch patch.txt text/plain 15070 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjkzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBACisyMDEyLTA4LTI4ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBJbXBs ZW1lbnQgY29sdW1uIGNvbnRlbnRzIHBhaW50aW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUyNTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGltcGxlbWVudHMgcGFpbnRDb2x1bW5D b250ZW50cyBmb3IgdGhlIG5ldyBtdWx0aWNvbHVtbiBibG9ja3MuIFRoZXJlIGFyZSBhIG51bWJl ciBvZgorICAgICAgICBpbXByb3ZlbWVudHMgbWFkZSBvdmVyIHRoZSBjdXJyZW50IG11bHRpLWNv bHVtbiBpbXBsZW1lbnRhdGlvbi4gVGhleSBpbmNsdWRlIHRoZSBmYWN0IHRoYXQgbGVmdAorICAg ICAgICBhbmQgcmlnaHQgY29sdW1ucyB3aWxsIG5vdyBiZSB1bmNsaXBwZWQsIHNvIGNvbnRlbnRz IG9mIGNvbHVtbnMgY2FuIGFjdHVhbGx5IHNwaWxsIG91dCBvZiB0aGUgYmxvY2sgbm93LgorICAg ICAgICBPdXRsaW5lcyBub3cgYWxzbyB3b3JrIHByb3Blcmx5LiBUaGUgY29udGVudHMgb2YgdGhl IGZpcnN0IGNvbHVtbiBhbmQgbGFzdCBjb2x1bW4gY2FuIGFsc28gbm93IG92ZXJmbG93CisgICAg ICAgIHZpc3VhbGx5IG91dCBvZiB0aGUgdG9wIGFuZCBib3R0b20gb2YgdGhvc2UgY29sdW1ucyBy ZXNwZWN0aXZlbHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmZsb3dUaHJlYWRQ b3J0aW9uUmVjdEF0KToKKyAgICAgICAgVGhpcyBtZXRob2QgcmV0dXJucyB0aGUgZXhhY3QgcG9y dGlvbiBvZiB0aGUgZmxvdyB0aHJlYWQgdGhhdCBtYXRjaGVzIHRoZSBjb2x1bW4gZGltZW5zaW9u cy4KKyAgICAgICAgVGhlIHdpZHRoIGFuZCBoZWlnaHQgYXJlIHRoZSBjb2x1bW4gd2lkdGggYW5k IGhlaWdodC4gSXQgaXMgZXF1aXZhbGVudCB0byBSZW5kZXJSZWdpb246OmZsb3dUaHJlYWRQb3J0 aW9uUmVjdCwKKyAgICAgICAgYnV0IGlzIGFwcGxpZWQgb25seSBmb3IgYSBzcGVjaWZpYyBjb2x1 bW4gaW4gdGhlIHNldC4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6 OmZsb3dUaHJlYWRQb3J0aW9uT3ZlcmZsb3dSZWN0KToKKyAgICAgICAgVGhpcyBtZXRob2QgZXhw YW5kcyB0aGUgZmxvd1RocmVhZFBvcnRpb25SZWN0IHRvIHVuY2xpcCB0aGUgZWRnZXMgb2YgbGVm dCBhbmQgcmlnaHQgY29sdW1ucywgdGhlIHRvcCBhbmQKKyAgICAgICAgYm90dG9tIGVkZ2VzIG9m IGZpcnN0IGFuZCBsYXN0IGNvbHVtbnMsIGFuZCBpdCBhbHNvIGV4cGFuZHMgdGhlIHBhaW50aW5n IHRvIGdvIGludG8gaGFsZiBvZiB0aGUgY29sdW1uCisgICAgICAgIGdhcC4gSXQgaXMgYW5hbG9n b3VzIHRvIFJlbmRlclJlZ2lvbjo6Zmxvd1RocmVhZFBvcnRpb25PdmVyZmxvd1JlY3QsIGJ1dCBp dCdzIGRvaW5nIHRoZSByaWdodCB0aGluZworICAgICAgICBmb3IgZWFjaCBpbmRpdmlkdWFsIGNv bHVtbi4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OnBhaW50Q29s dW1uQ29udGVudHMpOgorICAgICAgICBUaGUgaW1wbGVtZW50YXRpb24gb2YgY29sdW1uIGNvbnRl bnRzIHBhaW50aW5nLiBFYWNoIGNvbHVtbiBpcyBpdGVyYXRlZCBvdmVyLCBhbmQgdGhlIHR3byBy ZWN0cyBhYm92ZQorICAgICAgICBhcmUgY29tcHV0ZWQgYW5kIHBhc3NlZCBpbiB0byBSZW5kZXJG bG93VGhyZWFkOjpwYWludEZsb3dUaHJlYWRQb3J0aW9uSW5SZWdpb24uIFRoaXMgY29kZSBkb2Vz IHRoZSByaWdodAorICAgICAgICB0aGluZyB3aXRoIG9mZnNldHMgYW5kIGNsaXBwaW5nIHdoZW4g aGFuZGVkIHRoZXNlIHR3byByZWN0cyBhbmQgaGFuZGxlcyBhbGwgb2YgdGhlIHJlc3QuCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaDoKKyAgICAgICAgRGVjbGFy ZSB0aGUgbmV3IGZ1bmN0aW9ucyB0aGF0IHJldHVybiB0aGUgZmxvdyB0aHJlYWQgcG9ydGlvbiBy ZWN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZWdpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyUmVnaW9uOjpmbG93VGhyZWFkUG9ydGlvbk92ZXJmbG93UmVjdCk6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlZ2lvbjo6b3ZlcmZs b3dSZWN0Rm9yRmxvd1RocmVhZFBvcnRpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJS ZWdpb24uaDoKKyAgICAgICAgKFJlbmRlclJlZ2lvbik6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclJlZ2lvblNldC5jcHA6CisgICAgICAgIFJlZmFjdG9yIHRoaXMgc28gdGhhdCBpdCBjYW4g YmUgaW52b2tlZCBieSBjb2x1bW4gc2V0cyBhbmQgb3BlcmF0ZSBvbiB0aGUgZmlyc3QgYW5kIGxh c3QgY29sdW1ucyBpbnN0ZWFkCisgICAgICAgIG9mIG9ubHkgYmVpbmcgdGllZCB0byB0aGUgZmly c3QgYW5kIGxhc3QgcmVnaW9ucy4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVnaW9uU2V0 OjpleHBhbmRUb0VuY29tcGFzc0Zsb3dUaHJlYWRDb250ZW50c0lmTmVlZGVkKToKKyAgICAgICAg Rml4IGEgYnVnIGhlcmUgd2hlcmUgdGhlIGZsb3dUaHJlYWQueSgpIHNob3VsZCBub3QgaGF2ZSBi ZWVuIHN1YnRyYWN0ZWQuIFdlJ3JlIGluIGxvY2FsIGZsb3cgdGhyZWFkCisgICAgICAgIGNvb3Jk aW5hdGVzLgorCiAyMDEyLTA4LTI3ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1QGFkb2Jl LmNvbT4KIAogICAgICAgICBbQ1NTIEZpbHRlcnNdIEZpbHRlcnMgc2hvdWxkIHJlbmRlciB1c2lu ZyBzUkdCIHVudGlsIHRoZSBzcGVjaWZpY2F0aW9uIHNheXMgaG93IGl0IHdvcmtzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAJ KHJldmlzaW9uIDEyNjg5NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0 aUNvbHVtblNldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDkgQEAKICNpbmNsdWRl ICJSZW5kZXJNdWx0aUNvbHVtblNldC5oIgogI2luY2x1ZGUgIlJlbmRlck11bHRpQ29sdW1uQmxv Y2suaCIKIAordXNpbmcgc3RkOjptaW47Cit1c2luZyBzdGQ6Om1heDsKKwogbmFtZXNwYWNlIFdl YkNvcmUgewogCiBSZW5kZXJNdWx0aUNvbHVtblNldDo6UmVuZGVyTXVsdGlDb2x1bW5TZXQoTm9k ZSogbm9kZSwgUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCkKQEAgLTk2LDYgKzk5LDY1IEBA IExheW91dFJlY3QgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNvbHVtblIKICAgICByZXR1cm4gTGF5 b3V0UmVjdChjb2xMb2dpY2FsVG9wLCBjb2xMb2dpY2FsTGVmdCwgY29sTG9naWNhbEhlaWdodCwg Y29sTG9naWNhbFdpZHRoKTsKIH0KIAorTGF5b3V0UmVjdCBSZW5kZXJNdWx0aUNvbHVtblNldDo6 Zmxvd1RocmVhZFBvcnRpb25SZWN0QXQodW5zaWduZWQgaW5kZXgpIGNvbnN0Cit7CisgICAgTGF5 b3V0UmVjdCBwb3J0aW9uUmVjdCA9IGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpOworICAgIGlmIChp c0hvcml6b250YWxXcml0aW5nTW9kZSgpKQorICAgICAgICBwb3J0aW9uUmVjdCA9IExheW91dFJl Y3QocG9ydGlvblJlY3QueCgpLCBwb3J0aW9uUmVjdC55KCkgKyBpbmRleCAqIGNvbXB1dGVkQ29s dW1uSGVpZ2h0KCksIHBvcnRpb25SZWN0LndpZHRoKCksIGNvbXB1dGVkQ29sdW1uSGVpZ2h0KCkp OworICAgIGVsc2UKKyAgICAgICAgcG9ydGlvblJlY3QgPSBMYXlvdXRSZWN0KHBvcnRpb25SZWN0 LngoKSArIGluZGV4ICogY29tcHV0ZWRDb2x1bW5IZWlnaHQoKSwgcG9ydGlvblJlY3QueSgpLCBj b21wdXRlZENvbHVtbkhlaWdodCgpLCBwb3J0aW9uUmVjdC5oZWlnaHQoKSk7CisgICAgcmV0dXJu IHBvcnRpb25SZWN0OworfQorCitMYXlvdXRSZWN0IFJlbmRlck11bHRpQ29sdW1uU2V0OjpmbG93 VGhyZWFkUG9ydGlvbk92ZXJmbG93UmVjdChjb25zdCBMYXlvdXRSZWN0JiBwb3J0aW9uUmVjdCwg dW5zaWduZWQgaW5kZXgsIHVuc2lnbmVkIGNvbENvdW50LCBpbnQgY29sR2FwKSBjb25zdAorewor ICAgIC8vIFRoaXMgZnVuY3Rpb24gZGV0ZXJtaW5lcyB0aGUgcG9ydGlvbiBvZiB0aGUgZmxvdyB0 aHJlYWQgdGhhdCBwYWludHMgZm9yIHRoZSBjb2x1bW4uIEFsb25nIHRoZSBpbmxpbmUgYXhpcywg Y29sdW1ucyBhcmUKKyAgICAvLyB1bmNsaXBwZWQgYXQgb3V0c2lkZSBlZGdlcyAoaS5lLiwgdGhl IGZpcnN0IGFuZCBsYXN0IGNvbHVtbiBpbiB0aGUgc2V0KSwgYW5kIHRoZXkgY2xpcCB0byBoYWxm IHRoZSBjb2x1bW4KKyAgICAvLyBnYXAgYWxvbmcgaW50ZXJpb3IgZWRnZXMuCisgICAgLy8KKyAg ICAvLyBJbiB0aGUgYmxvY2sgZGlyZWN0aW9uLCB3ZSB3aWxsIG5vdCBjbGlwIG92ZXJmbG93IG91 dCBvZiB0aGUgdG9wIG9mIHRoZSBmaXJzdCBjb2x1bW4sIG9yIG91dCBvZiB0aGUgYm90dG9tIG9m CisgICAgLy8gdGhlIGxhc3QgY29sdW1uLiBUaGlzIGFwcGxpZXMgb25seSB0byB0aGUgdHJ1ZSBm aXJzdCBjb2x1bW4gYW5kIGxhc3QgY29sdW1uIGFjcm9zcyBhbGwgY29sdW1uIHNldHMuCisgICAg Ly8KKyAgICAvLyBGSVhNRTogRXZlbnR1YWxseSB3ZSB3aWxsIGtub3cgb3ZlcmZsb3cgb24gYSBw ZXItY29sdW1uIGJhc2lzLCBidXQgd2UgY2FuJ3QgZG8gdGhpcyB1bnRpbCB3ZSBoYXZlIGEgcGFp bnRpbmcKKyAgICAvLyBtb2RlIHRoYXQgdW5kZXJzdGFuZHMgbm90IHRvIHBhaW50IGNvbnRlbnRz IGZyb20gYSBwcmV2aW91cyBjb2x1bW4gaW4gdGhlIG92ZXJmbG93IGFyZWEgb2YgYSBmb2xsb3dp bmcgY29sdW1uLgorICAgIC8vIFRoaXMgcHJvYmxlbSBhcHBsaWVzIHRvIHJlZ2lvbnMgYW5kIHBh Z2VzIGFzIHdlbGwgYW5kIGlzIG5vdCB1bmlxdWUgdG8gY29sdW1ucy4KKyAgICBib29sIGlzRmly c3RDb2x1bW4gPSAhaW5kZXg7CisgICAgYm9vbCBpc0xhc3RDb2x1bW4gPSBpbmRleCA9PSBjb2xD b3VudCAtIDE7CisgICAgTGF5b3V0UmVjdCBvdmVyZmxvd1JlY3QocG9ydGlvblJlY3QpOworICAg IGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgIGlmIChpc0ZpcnN0Q29s dW1uKSB7CisgICAgICAgICAgICAvLyBTaGlmdCB0byB0aGUgbG9naWNhbCBsZWZ0IG92ZXJmbG93 IG9mIHRoZSBmbG93IHRocmVhZCB0byBtYWtlIHN1cmUgaXQncyBhbGwgY292ZXJlZC4KKyAgICAg ICAgICAgIG92ZXJmbG93UmVjdC5zaGlmdFhFZGdlVG8obWluKGZsb3dUaHJlYWQoKS0+dmlzdWFs T3ZlcmZsb3dSZWN0KCkueCgpLCBwb3J0aW9uUmVjdC54KCkpKTsKKyAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgIC8vIEV4cGFuZCBpbnRvIGhhbGYgb2YgdGhlIGxvZ2ljYWwgbGVmdCBjb2x1 bW4gZ2FwLgorICAgICAgICAgICAgb3ZlcmZsb3dSZWN0LnNoaWZ0WEVkZ2VUbyhwb3J0aW9uUmVj dC54KCkgLSBjb2xHYXAgLyAyKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoaXNMYXN0Q29sdW1u KSB7CisgICAgICAgICAgICAvLyBTaGlmdCB0byB0aGUgbG9naWNhbCByaWdodCBvdmVyZmxvdyBv ZiB0aGUgZmxvdyB0aHJlYWQgdG8gZW5zdXJlIGNvbnRlbnQgY2FuIHNwaWxsIG91dCBvZiB0aGUg Y29sdW1uLgorICAgICAgICAgICAgb3ZlcmZsb3dSZWN0LnNoaWZ0TWF4WEVkZ2VUbyhtYXgoZmxv d1RocmVhZCgpLT52aXN1YWxPdmVyZmxvd1JlY3QoKS5tYXhYKCksIHBvcnRpb25SZWN0Lm1heFgo KSkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gRXhwYW5kIGludG8gaGFsZiBv ZiB0aGUgbG9naWNhbCByaWdodCBjb2x1bW4gZ2FwLgorICAgICAgICAgICAgb3ZlcmZsb3dSZWN0 LnNoaWZ0TWF4WEVkZ2VUbyhwb3J0aW9uUmVjdC5tYXhYKCkgKyBjb2xHYXAgLyAyKTsKKyAgICAg ICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIGlmIChpc0ZpcnN0Q29sdW1uKSB7CisgICAgICAg ICAgICAvLyBTaGlmdCB0byB0aGUgbG9naWNhbCBsZWZ0IG92ZXJmbG93IG9mIHRoZSBmbG93IHRo cmVhZCB0byBtYWtlIHN1cmUgaXQncyBhbGwgY292ZXJlZC4KKyAgICAgICAgICAgIG92ZXJmbG93 UmVjdC5zaGlmdFlFZGdlVG8obWluKGZsb3dUaHJlYWQoKS0+dmlzdWFsT3ZlcmZsb3dSZWN0KCku eSgpLCBwb3J0aW9uUmVjdC55KCkpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8v IEV4cGFuZCBpbnRvIGhhbGYgb2YgdGhlIGxvZ2ljYWwgbGVmdCBjb2x1bW4gZ2FwLgorICAgICAg ICAgICAgb3ZlcmZsb3dSZWN0LnNoaWZ0WUVkZ2VUbyhwb3J0aW9uUmVjdC55KCkgLSBjb2xHYXAg LyAyKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoaXNMYXN0Q29sdW1uKSB7CisgICAgICAgICAg ICAvLyBTaGlmdCB0byB0aGUgbG9naWNhbCByaWdodCBvdmVyZmxvdyBvZiB0aGUgZmxvdyB0aHJl YWQgdG8gZW5zdXJlIGNvbnRlbnQgY2FuIHNwaWxsIG91dCBvZiB0aGUgY29sdW1uLgorICAgICAg ICAgICAgb3ZlcmZsb3dSZWN0LnNoaWZ0TWF4WUVkZ2VUbyhtYXgoZmxvd1RocmVhZCgpLT52aXN1 YWxPdmVyZmxvd1JlY3QoKS5tYXhZKCksIHBvcnRpb25SZWN0Lm1heFkoKSkpOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgLy8gRXhwYW5kIGludG8gaGFsZiBvZiB0aGUgbG9naWNhbCBy aWdodCBjb2x1bW4gZ2FwLgorICAgICAgICAgICAgb3ZlcmZsb3dSZWN0LnNoaWZ0TWF4WUVkZ2VU byhwb3J0aW9uUmVjdC5tYXhZKCkgKyBjb2xHYXAgLyAyKTsKKyAgICAgICAgfQorICAgIH0KKyAg ICByZXR1cm4gb3ZlcmZsb3dSZWN0Rm9yRmxvd1RocmVhZFBvcnRpb24ob3ZlcmZsb3dSZWN0LCBp c0ZpcnN0UmVnaW9uKCkgJiYgaXNGaXJzdENvbHVtbiwgaXNMYXN0UmVnaW9uKCkgJiYgaXNMYXN0 Q29sdW1uKTsKK30KKwogdm9pZCBSZW5kZXJNdWx0aUNvbHVtblNldDo6cGFpbnRSZXBsYWNlZChQ YWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQogewog ICAgIC8vIEZJWE1FOiBSZW5kZXJSZWdpb25zIGFyZSByZXBsYWNlZCBlbGVtZW50cyByaWdodCBu b3cgYW5kIHNvIHRoZXkgb25seSBwYWludCBpbiB0aGUgZm9yZWdyb3VuZCBwaGFzZS4KQEAgLTE2 NCw3ICsyMjYsNyBAQCB2b2lkIFJlbmRlck11bHRpQ29sdW1uU2V0OjpwYWludENvbHVtblJ1CiAg ICAgfQogfQogCi12b2lkIFJlbmRlck11bHRpQ29sdW1uU2V0OjpwYWludENvbHVtbkNvbnRlbnRz KFBhaW50SW5mbyYgLypwYWludEluZm8qLywgY29uc3QgTGF5b3V0UG9pbnQmIC8qcGFpbnRPZmZz ZXQqLykKK3ZvaWQgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OnBhaW50Q29sdW1uQ29udGVudHMoUGFp bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKIHsKICAg ICAvLyBGb3IgZWFjaCByZWN0YW5nbGUsIHNldCBpdCBhcyB0aGUgcmVnaW9uIHJlY3RhbmdsZSBh bmQgdGhlbiBsZXQgZmxvdyB0aHJlYWQgcGFpbnRpbmcgZG8gdGhlIHJlc3QuCiAgICAgLy8gV2Ug bWFrZSBtdWx0aXBsZSBjYWxscyB0byBwYWludEZsb3dUaHJlYWRQb3J0aW9uSW5SZWdpb24sIGNo YW5naW5nIHRoZSByZWN0YW5nbGVzIGVhY2ggdGltZS4KQEAgLTE3Miw3ICsyMzQsMjMgQEAgdm9p ZCBSZW5kZXJNdWx0aUNvbHVtblNldDo6cGFpbnRDb2x1bW5DbwogICAgIGlmICghY29sQ291bnQp CiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgTGF5b3V0 VW5pdCBjb2xHYXAgPSBjb2x1bW5HYXAoKTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg Y29sQ291bnQ7IGkrKykgeworICAgICAgICAvLyBGaXJzdCB3ZSBnZXQgdGhlIGNvbHVtbiByZWN0 LCB3aGljaCBpcyBpbiBvdXIgbG9jYWwgY29vcmRpbmF0ZSBzcGFjZSwgYW5kIHdlIG1ha2UgaXQg cGh5c2ljYWwgYW5kIGFwcGx5CisgICAgICAgIC8vIHRoZSBwYWludCBvZmZzZXQgdG8gaXQuIFRo YXQgZ2l2ZXMgdXMgdGhlIHBoeXNpY2FsIGxvY2F0aW9uIHRoYXQgd2Ugd2FudCB0byBwYWludCB0 aGUgY29sdW1uIGF0LgorICAgICAgICBMYXlvdXRSZWN0IGNvbFJlY3QgPSBjb2x1bW5SZWN0QXQo aSk7CisgICAgICAgIGZsaXBGb3JXcml0aW5nTW9kZShjb2xSZWN0KTsKKyAgICAgICAgY29sUmVj dC5tb3ZlQnkocGFpbnRPZmZzZXQpOworICAgICAgICAKKyAgICAgICAgLy8gTmV4dCB3ZSBnZXQg dGhlIHBvcnRpb24gb2YgdGhlIGZsb3cgdGhyZWFkIHRoYXQgY29ycmVzcG9uZHMgdG8gdGhpcyBj b2x1bW4uCisgICAgICAgIExheW91dFJlY3QgZmxvd1RocmVhZFBvcnRpb24gPSBmbG93VGhyZWFk UG9ydGlvblJlY3RBdChpKTsKKyAgICAgICAgCisgICAgICAgIC8vIE5vdyBnZXQgdGhlIG92ZXJm bG93IHJlY3QgdGhhdCBjb3JyZXNwb25kcyB0byB0aGUgY29sdW1uLgorICAgICAgICBMYXlvdXRS ZWN0IGZsb3dUaHJlYWRPdmVyZmxvd1BvcnRpb24gPSBmbG93VGhyZWFkUG9ydGlvbk92ZXJmbG93 UmVjdChmbG93VGhyZWFkUG9ydGlvbiwgaSwgY29sQ291bnQsIGNvbEdhcCk7CisKKyAgICAgICAg Ly8gRG8gdGhlIHBhaW50IHdpdGggdGhlIGNvbXB1dGVkIHJlY3RzLgorICAgICAgICBmbG93VGhy ZWFkKCktPnBhaW50Rmxvd1RocmVhZFBvcnRpb25JblJlZ2lvbihwYWludEluZm8sIHRoaXMsIGZs b3dUaHJlYWRQb3J0aW9uLCBmbG93VGhyZWFkT3ZlcmZsb3dQb3J0aW9uLCBjb2xSZWN0LmxvY2F0 aW9uKCkpOworICAgIH0KIH0KIAogY29uc3QgY2hhciogUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OnJl bmRlck5hbWUoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11 bHRpQ29sdW1uU2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uU2V0LmgJKHJldmlzaW9uIDEyNjg5MCkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCSh3b3JraW5nIGNvcHkpCkBAIC03OSw2 ICs3OSw5IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0UmVjdCBjb2x1bW5SZWN0QXQodW5zaWduZWQg aW5kZXgpIGNvbnN0OwogICAgIHVuc2lnbmVkIGNvbHVtbkNvdW50KCkgY29uc3Q7CiAKKyAgICBM YXlvdXRSZWN0IGZsb3dUaHJlYWRQb3J0aW9uUmVjdEF0KHVuc2lnbmVkIGluZGV4KSBjb25zdDsK KyAgICBMYXlvdXRSZWN0IGZsb3dUaHJlYWRQb3J0aW9uT3ZlcmZsb3dSZWN0KGNvbnN0IExheW91 dFJlY3QmIGZsb3dUaHJlYWRQb3J0aW9uLCB1bnNpZ25lZCBpbmRleCwgdW5zaWduZWQgY29sQ291 bnQsIGludCBjb2xHYXApIGNvbnN0OworCiAgICAgdW5zaWduZWQgbV9jb21wdXRlZENvbHVtbkNv dW50OwogICAgIExheW91dFVuaXQgbV9jb21wdXRlZENvbHVtbldpZHRoOwogICAgIExheW91dFVu aXQgbV9jb21wdXRlZENvbHVtbkhlaWdodDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSZWdpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSZWdpb24uY3BwCShyZXZpc2lvbiAxMjY4OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsMTMgKzY0LDE4 IEBAIExheW91dFVuaXQgUmVuZGVyUmVnaW9uOjpsb2dpY2FsSGVpZ2h0Rm8KIAogTGF5b3V0UmVj dCBSZW5kZXJSZWdpb246OmZsb3dUaHJlYWRQb3J0aW9uT3ZlcmZsb3dSZWN0KCkgY29uc3QKIHsK KyAgICByZXR1cm4gb3ZlcmZsb3dSZWN0Rm9yRmxvd1RocmVhZFBvcnRpb24oZmxvd1RocmVhZFBv cnRpb25SZWN0KCksIGlzRmlyc3RSZWdpb24oKSwgaXNMYXN0UmVnaW9uKCkpOworfQorCitMYXlv dXRSZWN0IFJlbmRlclJlZ2lvbjo6b3ZlcmZsb3dSZWN0Rm9yRmxvd1RocmVhZFBvcnRpb24oTGF5 b3V0UmVjdCBmbG93VGhyZWFkUG9ydGlvblJlY3QsIGJvb2wgaXNGaXJzdFBvcnRpb24sIGJvb2wg aXNMYXN0UG9ydGlvbikgY29uc3QKK3sKICAgICAvLyBGSVhNRTogV291bGQgbGlrZSB0byBqdXN0 IHVzZSBoYXNPdmVyZmxvd0NsaXAoKSBidXQgd2UgYXJlbid0IGEgYmxvY2sgeWV0LiBXaGVuIFJl bmRlclJlZ2lvbiBpcyBlbGltaW5hdGVkIGFuZAogICAgIC8vIGZvbGRlZCBpbnRvIFJlbmRlckJs b2NrLCBzd2l0Y2ggdG8gaGFzT3ZlcmZsb3dDbGlwKCkuCiAgICAgYm9vbCBjbGlwWCA9IHN0eWxl KCktPm92ZXJmbG93WCgpICE9IE9WSVNJQkxFOwogICAgIGJvb2wgY2xpcFkgPSBzdHlsZSgpLT5v dmVyZmxvd1koKSAhPSBPVklTSUJMRTsKLSAgICBib29sIGlzTGFzdFJlZ2lvbldpdGhSZWdpb25P dmVyZmxvd0JyZWFrID0gKGlzTGFzdFJlZ2lvbigpICYmIChzdHlsZSgpLT5yZWdpb25PdmVyZmxv dygpID09IEJyZWFrUmVnaW9uT3ZlcmZsb3cpKTsKKyAgICBib29sIGlzTGFzdFJlZ2lvbldpdGhS ZWdpb25PdmVyZmxvd0JyZWFrID0gKGlzTGFzdFBvcnRpb24gJiYgKHN0eWxlKCktPnJlZ2lvbk92 ZXJmbG93KCkgPT0gQnJlYWtSZWdpb25PdmVyZmxvdykpOwogICAgIGlmICgoY2xpcFggJiYgY2xp cFkpIHx8ICFpc1ZhbGlkKCkgfHwgIW1fZmxvd1RocmVhZCB8fCBpc0xhc3RSZWdpb25XaXRoUmVn aW9uT3ZlcmZsb3dCcmVhaykKLSAgICAgICAgcmV0dXJuIGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgp OworICAgICAgICByZXR1cm4gZmxvd1RocmVhZFBvcnRpb25SZWN0OwogCiAgICAgTGF5b3V0UmVj dCBmbG93VGhyZWFkT3ZlcmZsb3cgPSBtX2Zsb3dUaHJlYWQtPnZpc3VhbE92ZXJmbG93UmVjdCgp OwogCkBAIC03OCwxNiArODMsMTYgQEAgTGF5b3V0UmVjdCBSZW5kZXJSZWdpb246OmZsb3dUaHJl YWRQb3J0aQogICAgIExheW91dFVuaXQgb3V0bGluZVNpemUgPSBtYXhpbWFsT3V0bGluZVNpemUo UGFpbnRQaGFzZU91dGxpbmUpOwogICAgIExheW91dFJlY3QgY2xpcFJlY3Q7CiAgICAgaWYgKG1f Zmxvd1RocmVhZC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgewotICAgICAgICBMYXlvdXRV bml0IG1pblkgPSBpc0ZpcnN0UmVnaW9uKCkgPyAoZmxvd1RocmVhZE92ZXJmbG93LnkoKSAtIG91 dGxpbmVTaXplKSA6IGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLnkoKTsKLSAgICAgICAgTGF5b3V0 VW5pdCBtYXhZID0gaXNMYXN0UmVnaW9uKCkgPyBtYXgoZmxvd1RocmVhZFBvcnRpb25SZWN0KCku bWF4WSgpLCBmbG93VGhyZWFkT3ZlcmZsb3cubWF4WSgpKSArIG91dGxpbmVTaXplIDogZmxvd1Ro cmVhZFBvcnRpb25SZWN0KCkubWF4WSgpOwotICAgICAgICBMYXlvdXRVbml0IG1pblggPSBjbGlw WCA/IGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLngoKSA6IChmbG93VGhyZWFkT3ZlcmZsb3cueCgp IC0gb3V0bGluZVNpemUpOwotICAgICAgICBMYXlvdXRVbml0IG1heFggPSBjbGlwWCA/IGZsb3dU aHJlYWRQb3J0aW9uUmVjdCgpLm1heFgoKSA6IChmbG93VGhyZWFkT3ZlcmZsb3cubWF4WCgpICsg b3V0bGluZVNpemUpOworICAgICAgICBMYXlvdXRVbml0IG1pblkgPSBpc0ZpcnN0UG9ydGlvbiA/ IChmbG93VGhyZWFkT3ZlcmZsb3cueSgpIC0gb3V0bGluZVNpemUpIDogZmxvd1RocmVhZFBvcnRp b25SZWN0LnkoKTsKKyAgICAgICAgTGF5b3V0VW5pdCBtYXhZID0gaXNMYXN0UG9ydGlvbiA/IG1h eChmbG93VGhyZWFkUG9ydGlvblJlY3QubWF4WSgpLCBmbG93VGhyZWFkT3ZlcmZsb3cubWF4WSgp KSArIG91dGxpbmVTaXplIDogZmxvd1RocmVhZFBvcnRpb25SZWN0Lm1heFkoKTsKKyAgICAgICAg TGF5b3V0VW5pdCBtaW5YID0gY2xpcFggPyBmbG93VGhyZWFkUG9ydGlvblJlY3QueCgpIDogKGZs b3dUaHJlYWRPdmVyZmxvdy54KCkgLSBvdXRsaW5lU2l6ZSk7CisgICAgICAgIExheW91dFVuaXQg bWF4WCA9IGNsaXBYID8gZmxvd1RocmVhZFBvcnRpb25SZWN0Lm1heFgoKSA6IChmbG93VGhyZWFk T3ZlcmZsb3cubWF4WCgpICsgb3V0bGluZVNpemUpOwogICAgICAgICBjbGlwUmVjdCA9IExheW91 dFJlY3QobWluWCwgbWluWSwgbWF4WCAtIG1pblgsIG1heFkgLSBtaW5ZKTsKICAgICB9IGVsc2Ug ewotICAgICAgICBMYXlvdXRVbml0IG1pblggPSBpc0ZpcnN0UmVnaW9uKCkgPyAoZmxvd1RocmVh ZE92ZXJmbG93LngoKSAtIG91dGxpbmVTaXplKSA6IGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLngo KTsKLSAgICAgICAgTGF5b3V0VW5pdCBtYXhYID0gaXNMYXN0UmVnaW9uKCkgPyBtYXgoZmxvd1Ro cmVhZFBvcnRpb25SZWN0KCkubWF4WCgpLCBmbG93VGhyZWFkT3ZlcmZsb3cubWF4WCgpKSArIG91 dGxpbmVTaXplIDogZmxvd1RocmVhZFBvcnRpb25SZWN0KCkubWF4WCgpOwotICAgICAgICBMYXlv dXRVbml0IG1pblkgPSBjbGlwWSA/IGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLnkoKSA6IChmbG93 VGhyZWFkT3ZlcmZsb3cueSgpIC0gb3V0bGluZVNpemUpOwotICAgICAgICBMYXlvdXRVbml0IG1h eFkgPSBjbGlwWSA/IGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLm1heFkoKSA6IChmbG93VGhyZWFk T3ZlcmZsb3cubWF4WSgpICsgb3V0bGluZVNpemUpOworICAgICAgICBMYXlvdXRVbml0IG1pblgg PSBpc0ZpcnN0UG9ydGlvbiA/IChmbG93VGhyZWFkT3ZlcmZsb3cueCgpIC0gb3V0bGluZVNpemUp IDogZmxvd1RocmVhZFBvcnRpb25SZWN0LngoKTsKKyAgICAgICAgTGF5b3V0VW5pdCBtYXhYID0g aXNMYXN0UG9ydGlvbiA/IG1heChmbG93VGhyZWFkUG9ydGlvblJlY3QubWF4WCgpLCBmbG93VGhy ZWFkT3ZlcmZsb3cubWF4WCgpKSArIG91dGxpbmVTaXplIDogZmxvd1RocmVhZFBvcnRpb25SZWN0 Lm1heFgoKTsKKyAgICAgICAgTGF5b3V0VW5pdCBtaW5ZID0gY2xpcFkgPyBmbG93VGhyZWFkUG9y dGlvblJlY3QueSgpIDogKGZsb3dUaHJlYWRPdmVyZmxvdy55KCkgLSBvdXRsaW5lU2l6ZSk7Cisg ICAgICAgIExheW91dFVuaXQgbWF4WSA9IGNsaXBZID8gZmxvd1RocmVhZFBvcnRpb25SZWN0Lm1h eFkoKSA6IChmbG93VGhyZWFkT3ZlcmZsb3cubWF4WSgpICsgb3V0bGluZVNpemUpOwogICAgICAg ICBjbGlwUmVjdCA9IExheW91dFJlY3QobWluWCwgbWluWSwgbWF4WCAtIG1pblgsIG1heFkgLSBt aW5ZKTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZWdp b24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9u LmgJKHJldmlzaW9uIDEyNjg5NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZWdpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTA0LDYgKzEwNCw4IEBAIHByb3RlY3RlZDoKICAg ICB2b2lkIHNldFJlZ2lvbk9iamVjdHNSZWdpb25TdHlsZSgpOwogICAgIHZvaWQgcmVzdG9yZVJl Z2lvbk9iamVjdHNPcmlnaW5hbFN0eWxlKCk7CiAKKyAgICBMYXlvdXRSZWN0IG92ZXJmbG93UmVj dEZvckZsb3dUaHJlYWRQb3J0aW9uKExheW91dFJlY3QgZmxvd1RocmVhZFBvcnRpb25SZWN0LCBi b29sIGlzRmlyc3RQb3J0aW9uLCBib29sIGlzTGFzdFBvcnRpb24pIGNvbnN0OworCiBwcml2YXRl OgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFtZSgpIGNvbnN0IHsgcmV0dXJuICJS ZW5kZXJSZWdpb24iOyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZWdpb25TZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJSZWdpb25TZXQuY3BwCShyZXZpc2lvbiAxMjY4OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUmVnaW9uU2V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYsNyArNTYsNyBA QCB2b2lkIFJlbmRlclJlZ2lvblNldDo6ZXhwYW5kVG9FbmNvbXBhc3NGCiAgICAgYm9vbCBpc0hv cml6b250YWwgPSBmbG93VGhyZWFkKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAg TGF5b3V0VW5pdCBsb2dpY2FsVG9wT2Zmc2V0ID0gaXNIb3Jpem9udGFsID8gcmVjdC55KCkgOiBy ZWN0LngoKTsKICAgICBMYXlvdXRSZWN0IGxheW91dFJlY3QgPSBmbG93VGhyZWFkKCktPmxheW91 dE92ZXJmbG93UmVjdCgpOwotICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodFdpdGhPdmVyZmxv dyA9IChpc0hvcml6b250YWwgPyBsYXlvdXRSZWN0Lm1heFkoKSAtIGZsb3dUaHJlYWQoKS0+eSgp IDogbGF5b3V0UmVjdC5tYXhYKCkgLSBmbG93VGhyZWFkKCktPngoKSkgLSBsb2dpY2FsVG9wT2Zm c2V0OworICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodFdpdGhPdmVyZmxvdyA9IChpc0hvcml6 b250YWwgPyBsYXlvdXRSZWN0Lm1heFkoKSA6IGxheW91dFJlY3QubWF4WCgpKSAtIGxvZ2ljYWxU b3BPZmZzZXQ7CiAgICAgc2V0Rmxvd1RocmVhZFBvcnRpb25SZWN0KExheW91dFJlY3QocmVjdC54 KCksIHJlY3QueSgpLCBpc0hvcml6b250YWwgPyByZWN0LndpZHRoKCkgOiBsb2dpY2FsSGVpZ2h0 V2l0aE92ZXJmbG93LCBpc0hvcml6b250YWwgPyBsb2dpY2FsSGVpZ2h0V2l0aE92ZXJmbG93IDog cmVjdC5oZWlnaHQoKSkpOwogfQogCg==