122754 2013-10-14 08:10:45 -0700 [New Multicolumn] Child top margin sometimes ignored for column balancing 2014-08-27 12:47:58 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mstensho mstensho andymercer commit-queue esprehn+autocc glenn hyatt kondapallykalyan WebkitBugTracker oldest_to_newest 939447 0 mstensho 2013-10-14 08:10:45 -0700 During the first layout pass, the code incorrectly believes that the element ends up in the next column (or page), and eats the margin. Apart from broken layout, this may even cause an assertion failure: ASSERTION FAILED: currentMinSpaceShortage != LayoutUnit::max() ../../Source/WebCore/rendering/RenderMultiColumnSet.cpp(112) : bool WebCore::RenderMultiColumnSet::calculateBalancedHeight(bool) ... because the column heights don't become tall enough in the initial balancing pass. 939448 1 214152 mstensho 2013-10-14 08:11:58 -0700 Created attachment 214152 Test case 995334 2 mstensho 2014-03-28 08:46:41 -0700 Corresponding bug in Blink: http://code.google.com/p/chromium/issues/detail?id=353587 995342 3 228054 mstensho 2014-03-28 09:16:54 -0700 Created attachment 228054 Patch 995343 4 mstensho 2014-03-28 09:18:22 -0700 @dave - can you review this, please? I couldn't really avoid fixing this one while working on spanners support. 997644 5 228054 hyatt 2014-04-04 11:19:44 -0700 Comment on attachment 228054 Patch r=me 998664 6 228054 commit-queue 2014-04-08 11:20:14 -0700 Comment on attachment 228054 Patch Clearing flags on attachment: 228054 Committed r166938: <http://trac.webkit.org/changeset/166938> 998665 7 commit-queue 2014-04-08 11:20:17 -0700 All reviewed patches have been landed. Closing bug. 1010265 8 andymercer 2014-05-19 12:42:47 -0700 This was landed back in April, but it appears to still be broken. See: http://stackoverflow.com/questions/23745077/block-elements-inside-multicolumn-layout-padding-issue-in-chrome-ie http://jsfiddle.net/6cVqZ/ 1031742 9 mstensho 2014-08-27 12:47:58 -0700 That's unrelated to this bug, but it seems that someone answered your stackoverflow question while I was gone. The clue is to use break-inside:avoid . This property doesn't yet exist in Blink, though (and I assume the same is still the case for WebKit as well). You have to say li { -webkit-column-break-inside:avoid; } instead. 214152 2013-10-14 08:11:58 -0700 2013-10-14 08:11:58 -0700 Test case tc.html text/html 550 mstensho PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPHRpdGxlPm1hcmdpbnMg YWRqb2luaW5nIG11bHRpY29sIGNvbnRhaW5lcjwvdGl0bGU+CiAgICA8L2hlYWQ+CiAgICA8Ym9k eSBzdHlsZT0ib3ZlcmZsb3c6aGlkZGVuOyI+CiAgICAgICAgPHA+VG8gYmUgdGVzdGVkIHdpdGgg cmVnaW9uIGJhc2VkIGNvbHVtbnMgZW5hYmxlZC48L3A+CiAgICAgICAgPHA+WW91IHNob3VsZCBz ZWUgdGhlIGZsYWcgb2YgQXVzdHJpYSBiZWxvdyAoZnJvbSB0b3AgdG8gYm90dG9tOiByZWQgcmVj dGFuZ2xlLCB3aGl0ZSByZWN0YW5nbGUsIHJlZCByZWN0YW5nbGUpLjwvcD4KICAgICAgICA8ZGl2 IHN0eWxlPSItd2Via2l0LWNvbHVtbnM6MTsgY29sdW1uczoxOyB3aWR0aDo0NTBweDsgYm9yZGVy OjFweCBzb2xpZCBibGFjazsgYmFja2dyb3VuZDpyZWQ7Ij4KICAgICAgICAgICAgPGRpdiBzdHls ZT0ibWFyZ2luOjEwMHB4IDA7IGhlaWdodDoxMDBweDsgYmFja2dyb3VuZDp3aGl0ZTsiPjwvZGl2 PgogICAgICAgIDwvZGl2PgogICAgPC9ib2R5Pgo8L2h0bWw+Cg== 228054 2014-03-28 09:16:54 -0700 2014-04-08 11:20:13 -0700 Patch bug-122754-20140328171633.patch text/plain 14571 mstensho U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWE3OTJjYzU5Y2VlMzFm YTU1NTBiMWUxYzIxZjkzNGU2ZGI1NmRjNy4uN2FmZDk5NThiYzExOTY0Y2QyMDQ3OTBlYTQ1ODU0 M2Q2OWVjZTBmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAzLTI4ICBNb3J0 ZW4gU3RlbnNob3JuZSAgPG1zdGVuc2hvQG9wZXJhLmNvbT4KKworICAgICAgICBbTmV3IE11bHRp Y29sdW1uXSBDaGlsZCB0b3AgbWFyZ2luIHNvbWV0aW1lcyBpZ25vcmVkIGZvciBjb2x1bW4gYmFs YW5jaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjI3NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSBuZWVkIHRvIHNldCB6ZXJvIHBhZ2UgbG9naWNhbCBoZWlnaHQgaW4gTGF5b3V0U3RhdGUgd2hl biBjb2x1bW4KKyAgICAgICAgaGVpZ2h0IGlzIHVua25vd24gKHdoZW4gdGhlIGNvbHVtbnMgaGF2 ZW4ndCB5ZXQgYmVlbgorICAgICAgICBiYWxhbmNlZCkuIFRoZXJlJ3MgY29kZSB0aGF0IGFzc3Vt ZXMgdGhhdCBub24temVybyBwYWdlIGhlaWdodCBtZWFucworICAgICAgICB0aGF0IHBhZ2UgaGVp Z2h0IGlzIGtub3duLiBMeWluZyBhYm91dCB0aGlzIG1ha2VzIHRoZSBwYWdpbmF0aW9uIGNvZGUK KyAgICAgICAgYmVsaWV2ZSB0aGF0IGV2ZXJ5IHRvcCBtYXJnaW4gaXMgYWRqYWNlbnQgdG8gYSBj b2x1bW4gYnJlYWssIHdoaWNoCisgICAgICAgIG1ha2VzIGl0IGVhdCBhbmQgaWdub3JlIGFsbCB0 b3AgbWFyZ2lucy4KKworICAgICAgICBUaGlzIHNob3VsZCBiZSBjbGVhbmVkIHVwLCBidXQgaXQn cyBlYXNpZXIgdG8gd2FpdCB1bnRpbCB0aGUgb2xkCisgICAgICAgIG11bHRpY29sIGNvZGUgaGFz IGJlZW4gcmVtb3ZlZC4KKworICAgICAgICBUZXN0czogZmFzdC9tdWx0aWNvbC9icmVhay1pbi1z Y3JvbGxhYmxlLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wv bGVhZGluZy1hbmQtdHJhaWxpbmctbWFyZ2luLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvbXVs dGljb2wvbmV3bXVsdGljb2wvbGVhZGluZy1tYXJnaW4uaHRtbAorCisgICAgICAgICogcmVuZGVy aW5nL0xheW91dFN0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRlOjpMYXlv dXRTdGF0ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmNoZWNrRm9yUGFnaW5hdGlvbkxvZ2ljYWxI ZWlnaHRDaGFuZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmg6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmlzUGFnZUxvZ2ljYWxI ZWlnaHRLbm93bik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1Ro cmVhZC5oOgorCiAyMDE0LTAzLTI4ICBKYW1lcyBDcmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogQ29weS9wYXN0ZSBlcnJvci4gRXZlbnRMaXN0ZW5lciBi bG9jayBpbiBET00uanNvbiB1c2VzIGRlc2NyaXB0aW9uIGZyb20gTm9kZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwCmluZGV4IDAzMmZhMTVhMTA0NTBmZGIyN2E2NTI1 YzdlNmExZTNjNmMwZmFlZjkuLjE5MGYzZTA3NjAzMzEwMzRmNTZjNTg4MjQyMzA5NGViNDhlOWM5 YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcApAQCAtODgsNiAr ODgsNyBAQCBMYXlvdXRTdGF0ZTo6TGF5b3V0U3RhdGUoc3RkOjp1bmlxdWVfcHRyPExheW91dFN0 YXRlPiBuZXh0LCBSZW5kZXJCb3gqIHJlbmRlcmVyLAogICAgICAgICBtX3BhZ2VPZmZzZXQgPSBM YXlvdXRTaXplKG1fbGF5b3V0T2Zmc2V0LndpZHRoKCkgKyAoIWlzRmxpcHBlZCA/IHJlbmRlcmVy LT5ib3JkZXJMZWZ0KCkgKyByZW5kZXJlci0+cGFkZGluZ0xlZnQoKSA6IHJlbmRlcmVyLT5ib3Jk ZXJSaWdodCgpICsgcmVuZGVyZXItPnBhZGRpbmdSaWdodCgpKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBtX2xheW91dE9mZnNldC5oZWlnaHQoKSArICghaXNGbGlwcGVkID8gcmVu ZGVyZXItPmJvcmRlclRvcCgpICsgcmVuZGVyZXItPnBhZGRpbmdUb3AoKSA6IHJlbmRlcmVyLT5i b3JkZXJCb3R0b20oKSArIHJlbmRlcmVyLT5wYWRkaW5nQm90dG9tKCkpKTsKICAgICAgICAgbV9w YWdlTG9naWNhbEhlaWdodENoYW5nZWQgPSBwYWdlTG9naWNhbEhlaWdodENoYW5nZWQ7CisgICAg ICAgIG1faXNQYWdpbmF0ZWQgPSB0cnVlOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIElmIHdl IGRvbid0IGVzdGFibGlzaCBhIG5ldyBwYWdlIGhlaWdodCwgdGhlbiBwcm9wYWdhdGUgdGhlIG9s ZCBwYWdlIGhlaWdodCBhbmQgb2Zmc2V0IGRvd24uCiAgICAgICAgIG1fcGFnZUxvZ2ljYWxIZWln aHQgPSBtX25leHQtPm1fcGFnZUxvZ2ljYWxIZWlnaHQ7CkBAIC05Niw4ICs5NywxMSBAQCBMYXlv dXRTdGF0ZTo6TGF5b3V0U3RhdGUoc3RkOjp1bmlxdWVfcHRyPExheW91dFN0YXRlPiBuZXh0LCBS ZW5kZXJCb3gqIHJlbmRlcmVyLAogICAgICAgICAKICAgICAgICAgLy8gRGlzYWJsZSBwYWdpbmF0 aW9uIGZvciBvYmplY3RzIHdlIGRvbid0IHN1cHBvcnQuIEZvciBub3cgdGhpcyBpbmNsdWRlcyBv dmVyZmxvdzpzY3JvbGwvYXV0bywgaW5saW5lIGJsb2NrcyBhbmQKICAgICAgICAgLy8gd3JpdGlu ZyBtb2RlIHJvb3RzLgotICAgICAgICBpZiAocmVuZGVyZXItPmlzVW5zcGxpdHRhYmxlRm9yUGFn aW5hdGlvbigpKQorICAgICAgICBpZiAocmVuZGVyZXItPmlzVW5zcGxpdHRhYmxlRm9yUGFnaW5h dGlvbigpKSB7CiAgICAgICAgICAgICBtX3BhZ2VMb2dpY2FsSGVpZ2h0ID0gMDsKKyAgICAgICAg ICAgIG1faXNQYWdpbmF0ZWQgPSBmYWxzZTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBt X2lzUGFnaW5hdGVkID0gbV9wYWdlTG9naWNhbEhlaWdodCB8fCBtX25leHQtPm1fY29sdW1uSW5m byB8fCByZW5kZXJlci0+Zmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpOwogICAgIH0KICAgICAK ICAgICAvLyBQcm9wYWdhdGUgbGluZSBncmlkIGluZm9ybWF0aW9uLgpAQCAtMTExLDggKzExNSw2 IEBAIExheW91dFN0YXRlOjpMYXlvdXRTdGF0ZShzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0U3RhdGU+ IG5leHQsIFJlbmRlckJveCogcmVuZGVyZXIsCiAgICAgbV9sYXlvdXREZWx0YVhTYXR1cmF0ZWQg PSBtX25leHQtPm1fbGF5b3V0RGVsdGFYU2F0dXJhdGVkOwogICAgIG1fbGF5b3V0RGVsdGFZU2F0 dXJhdGVkID0gbV9uZXh0LT5tX2xheW91dERlbHRhWVNhdHVyYXRlZDsKICNlbmRpZgotICAgIAot ICAgIG1faXNQYWdpbmF0ZWQgPSBtX3BhZ2VMb2dpY2FsSGVpZ2h0IHx8IG1fY29sdW1uSW5mbyB8 fCByZW5kZXJlci0+aXNSZW5kZXJGbG93VGhyZWFkKCk7CiAKICAgICBpZiAobGluZUdyaWQoKSAm JiAobGluZUdyaWQoKS0+c3R5bGUoKS53cml0aW5nTW9kZSgpID09IHJlbmRlcmVyLT5zdHlsZSgp LndyaXRpbmdNb2RlKCkpICYmIHJlbmRlcmVyLT5pc1JlbmRlckJsb2NrKCkpCiAgICAgICAgIHRv UmVuZGVyQmxvY2socmVuZGVyZXIpLT5jb21wdXRlTGluZUdyaWRQYWdpbmF0aW9uT3JpZ2luKCp0 aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5k ZXggZmM2MmQyZTEzMDM1MWNlZTI3ODQwODkzMTkzZjVlMjE3ODMwNWMyZS4uYmY5Y2FhYTM1Yjk1 ODk3MmRlMDgxMDE3OGUzM2NiNDlkYjQxYTcyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTM1NDgsOCArMzU0OCwyMCBAQCB2b2lkIFJlbmRl ckJsb2NrRmxvdzo6Y2hlY2tGb3JQYWdpbmF0aW9uTG9naWNhbEhlaWdodENoYW5nZShMYXlvdXRV bml0JiBwYWdlTG9naQogCiAgICAgICAgIGNvbEluZm8tPnNldFBhZ2luYXRpb25Vbml0KHBhZ2lu YXRpb25Vbml0KCkpOwogICAgIH0gZWxzZSBpZiAoaXNSZW5kZXJGbG93VGhyZWFkKCkpIHsKLSAg ICAgICAgcGFnZUxvZ2ljYWxIZWlnaHQgPSAxOyAvLyBUaGlzIGlzIGp1c3QgYSBoYWNrIHRvIGFs d2F5cyBtYWtlIHN1cmUgd2UgaGF2ZSBhIHBhZ2UgbG9naWNhbCBoZWlnaHQuCi0gICAgICAgIHBh Z2VMb2dpY2FsSGVpZ2h0Q2hhbmdlZCA9IHRvUmVuZGVyRmxvd1RocmVhZCh0aGlzKS0+cGFnZUxv Z2ljYWxTaXplQ2hhbmdlZCgpOworICAgICAgICBSZW5kZXJGbG93VGhyZWFkKiBmbG93VGhyZWFk ID0gdG9SZW5kZXJGbG93VGhyZWFkKHRoaXMpOworCisgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlz IGEgaGFjayB0byBhbHdheXMgbWFrZSBzdXJlIHdlIGhhdmUgYSBwYWdlIGxvZ2ljYWwgaGVpZ2h0 LCBpZiBzYWlkIGhlaWdodAorICAgICAgICAvLyBpcyBrbm93bi4gVGhlIHBhZ2UgbG9naWNhbCBo ZWlnaHQgdGhpbmcgaW4gTGF5b3V0U3RhdGUgaXMgbWVhbmluZ2xlc3MgZm9yIGZsb3cKKyAgICAg ICAgLy8gdGhyZWFkLWJhc2VkIHBhZ2luYXRpb24gKHBhZ2UgaGVpZ2h0IGlzbid0IG5lY2Vzc2Fy aWx5IHVuaWZvcm0gdGhyb3VnaG91dCB0aGUgZmxvdworICAgICAgICAvLyB0aHJlYWQpLCBidXQg YXMgbG9uZyBhcyBpdCBpcyB1c2VkIHVuaXZlcnNhbGx5IGFzIGEgbWVhbnMgdG8gZGV0ZXJtaW5l IHdoZXRoZXIgcGFnZQorICAgICAgICAvLyBoZWlnaHQgaXMga25vd24gb3Igbm90LCB3ZSBuZWVk IHRoaXMuIFBhZ2UgaGVpZ2h0IGlzIHVua25vd24gd2hlbiBjb2x1bW4gYmFsYW5jaW5nIGlzCisg ICAgICAgIC8vIGVuYWJsZWQgYW5kIGZsb3cgdGhyZWFkIGhlaWdodCBpcyBzdGlsbCB1bmtub3du IChpLmUuIGR1cmluZyB0aGUgZmlyc3QgbGF5b3V0IHBhc3MpLiBXaGVuCisgICAgICAgIC8vIGl0 J3MgdW5rbm93biwgd2UgbmVlZCB0byBwcmV2ZW50IHRoZSBwYWdpbmF0aW9uIGNvZGUgZnJvbSBh c3N1bWluZyBwYWdlIGJyZWFrcyBldmVyeXdoZXJlCisgICAgICAgIC8vIGFuZCB0aGVyZWJ5IGVh dGluZyBldmVyeSB0b3AgbWFyZ2luLiBJdCBzaG91bGQgYmUgdHJpdmlhbCB0byBjbGVhbiB1cCBh bmQgZ2V0IHJpZCBvZiB0aGlzCisgICAgICAgIC8vIGhhY2sgb25jZSB0aGUgb2xkIG11bHRpY29s IGltcGxlbWVudGF0aW9uIGlzIGdvbmUuCisgICAgICAgIHBhZ2VMb2dpY2FsSGVpZ2h0ID0gZmxv d1RocmVhZC0+aXNQYWdlTG9naWNhbEhlaWdodEtub3duKCkgPyBMYXlvdXRVbml0KDEpIDogTGF5 b3V0VW5pdCgwKTsKKworICAgICAgICBwYWdlTG9naWNhbEhlaWdodENoYW5nZWQgPSBmbG93VGhy ZWFkLT5wYWdlTG9naWNhbFNpemVDaGFuZ2VkKCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaAppbmRleCBjZjdlYjhmMWJjZTFmMGZkODM2 MGY5MDM3M2I0MmMyNTc4NGJmNWUyLi4yZjlhYTM3NGU5NWM0MGJkMzU2NWJhOWViOGU2ZDU2ZTg5 ZTc0MDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1Ro cmVhZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmgK QEAgLTEzOCw2ICsxMzgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGFkZEZvcmNlZFJl Z2lvbkJyZWFrKGNvbnN0IFJlbmRlckJsb2NrKiwgTGF5b3V0VW5pdCwgUmVuZGVyQm94KiBicmVh a0NoaWxkLCBib29sIGlzQmVmb3JlLCBMYXlvdXRVbml0KiBvZmZzZXRCcmVha0FkanVzdG1lbnQg PSAwKTsKICAgICB2b2lkIGFwcGx5QnJlYWtBZnRlckNvbnRlbnQoTGF5b3V0VW5pdCk7CiAKKyAg ICB2aXJ0dWFsIGJvb2wgaXNQYWdlTG9naWNhbEhlaWdodEtub3duKCkgY29uc3QgeyByZXR1cm4g dHJ1ZTsgfQogICAgIGJvb2wgcGFnZUxvZ2ljYWxTaXplQ2hhbmdlZCgpIGNvbnN0IHsgcmV0dXJu IG1fcGFnZUxvZ2ljYWxTaXplQ2hhbmdlZDsgfQogCiAgICAgYm9vbCBoYXNBdXRvTG9naWNhbEhl aWdodFJlZ2lvbnMoKSBjb25zdCB7IEFTU0VSVChpc0F1dG9Mb2dpY2FsSGVpZ2h0UmVnaW9uc0Nv dW50Q29uc2lzdGVudCgpKTsgcmV0dXJuIG1fYXV0b0xvZ2ljYWxIZWlnaHRSZWdpb25zQ291bnQ7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVt bkZsb3dUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29s dW1uRmxvd1RocmVhZC5jcHAKaW5kZXggNWM2NzdhZjllODM4Zjc1YTBkMzBlZGNiMjA3ZTRjNGQ0 MTY2ZWIyYS4uZDdlMzg2ZGJiZGE3OWJkZWY1YjAyY2QwMjVjOTFiMTIzNzRlMTVmYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVh ZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxv d1RocmVhZC5jcHAKQEAgLTIxMSw0ICsyMTEsMTQgQEAgUmVuZGVyUmVnaW9uKiBSZW5kZXJNdWx0 aUNvbHVtbkZsb3dUaHJlYWQ6Om1hcEZyb21GbG93VG9SZWdpb24oVHJhbnNmb3JtU3RhdGUmIHQK ICAgICByZXR1cm4gcmVuZGVyUmVnaW9uOwogfQogCitib29sIFJlbmRlck11bHRpQ29sdW1uRmxv d1RocmVhZDo6aXNQYWdlTG9naWNhbEhlaWdodEtub3duKCkgY29uc3QKK3sKKyAgICBmb3IgKFJl bmRlckJveCogcmVuZGVyZXIgPSBwYXJlbnRCb3goKS0+bGFzdENoaWxkQm94KCk7IHJlbmRlcmVy OyByZW5kZXJlciA9IHJlbmRlcmVyLT5wcmV2aW91c1NpYmxpbmdCb3goKSkgeworICAgICAgICBp ZiAocmVuZGVyZXItPmlzUmVuZGVyTXVsdGlDb2x1bW5TZXQoKSkKKyAgICAgICAgICAgIHJldHVy biB0b1JlbmRlck11bHRpQ29sdW1uU2V0KHJlbmRlcmVyKS0+Y29tcHV0ZWRDb2x1bW5IZWlnaHQo KTsKKyAgICB9CisgICAgLy8gQSBjb2x1bW4gc2V0IGhhc24ndCBiZWVuIGNyZWF0ZWQgeWV0LiBI ZWlnaHQgbWF5IGFscmVhZHkgYmUga25vd24gaWYgY29sdW1uLWZpbGwgaXMgJ2F1dG8nLCB0aG91 Z2guCisgICAgcmV0dXJuICFyZXF1aXJlc0JhbGFuY2luZygpOworfQorCiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmgK aW5kZXggZmE3MjY0ODdkMTMyYjViZGU3NDFmYTY5YTZiMGEwMDJlZjM1YTNiZi4uZmJkZGMxNzY1 NmRkYWQyMWJiMWQzN2NhODFiOTYyOWRlMTI2MzA5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaApAQCAtNzMsNiAr NzMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlQnJlYWsoY29uc3QgUmVu ZGVyQmxvY2sqLCBMYXlvdXRVbml0IG9mZnNldCwgTGF5b3V0VW5pdCBzcGFjZVNob3J0YWdlKSBv dmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTWluaW11bVBhZ2VIZWlnaHQoY29uc3Qg UmVuZGVyQmxvY2sqLCBMYXlvdXRVbml0IG9mZnNldCwgTGF5b3V0VW5pdCBtaW5IZWlnaHQpIG92 ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBhZGRGb3JjZWRSZWdpb25CcmVhayhjb25zdCBSZW5k ZXJCbG9jayosIExheW91dFVuaXQsIFJlbmRlckJveCogYnJlYWtDaGlsZCwgYm9vbCBpc0JlZm9y ZSwgTGF5b3V0VW5pdCogb2Zmc2V0QnJlYWtBZGp1c3RtZW50ID0gMCkgb3ZlcnJpZGU7CisgICAg dmlydHVhbCBib29sIGlzUGFnZUxvZ2ljYWxIZWlnaHRLbm93bigpIGNvbnN0IG92ZXJyaWRlOwog CiBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1fY29sdW1uQ291bnQ7ICAgLy8gVGhlIGRlZmF1bHQg Y29sdW1uIGNvdW50L3dpZHRoIHRoYXQgYXJlIGJhc2VkIG9mZiBvdXIgY29udGFpbmluZyBibG9j ayB3aWR0aC4gVGhlc2UgdmFsdWVzIHJlcHJlc2VudCBvbmx5IHRoZSBkZWZhdWx0LApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGQ0ODJlOWM3ZWFiYmFhNjY1NGI5OTRhZGYzYzM4MjEwMWY4MWIyODQuLmY2OWJkMmVkZDk1ZWE2 YTZjODQ2NjM3YzgyMWY5NzM5NzhiMzNiMjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxNC0w My0yOCAgTW9ydGVuIFN0ZW5zaG9ybmUgIDxtc3RlbnNob0BvcGVyYS5jb20+CisKKyAgICAgICAg W05ldyBNdWx0aWNvbHVtbl0gQ2hpbGQgdG9wIG1hcmdpbiBzb21ldGltZXMgaWdub3JlZCBmb3Ig Y29sdW1uIGJhbGFuY2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyNzU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBmYXN0L211bHRpY29sL2JyZWFrLWluLXNjcm9sbGFibGUtZXhwZWN0ZWQuaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9icmVhay1pbi1zY3JvbGxhYmxlLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvbGVhZGluZy1h bmQtdHJhaWxpbmctbWFyZ2luLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv bXVsdGljb2wvbmV3bXVsdGljb2wvbGVhZGluZy1hbmQtdHJhaWxpbmctbWFyZ2luLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvbGVhZGluZy1tYXJnaW4t ZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNv bC9sZWFkaW5nLW1hcmdpbi5odG1sOiBBZGRlZC4KKwogMjAxNC0wMy0yOCAgS3J6eXN6dG9mIEN6 ZWNoICA8ay5jemVjaEBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtHVEtdIFJlbW92ZSBl eHBlY3RhdGlvbnMgYWZ0ZXIgcjE2NjE5NApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9t dWx0aWNvbC9icmVhay1pbi1zY3JvbGxhYmxlLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L211bHRpY29sL2JyZWFrLWluLXNjcm9sbGFibGUtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5iNDYxYWEyZjFiMzZlNDRiMDgxMzhiZjRkZmVmNzY4OGEwMzNiMzI2Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9icmVhay1pbi1zY3JvbGxhYmxlLWV4cGVj dGVkLmh0bWwKQEAgLTAsMCArMSwxOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8 aGVhZD4KKyAgICAgICAgPHRpdGxlPkZvcmNlZCBicmVhayBpbnNpZGUgc2Nyb2xsYWJsZSBjb250 YWluZXI8L3RpdGxlPgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgaWYgKHdpbmRvdy5p bnRlcm5hbHMpCisgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFJlZ2lvbkJh c2VkQ29sdW1uc0VuYWJsZWQodHJ1ZSk7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4K KyAgICA8Ym9keT4KKyAgICAgICAgPHA+VGhlIHdvcmQgJ1BBU1MnIHNob3VsZCBiZSBzZWVuIG9u IHRoZSBsZWZ0IGJlbG93LiBUaGUgc2Nyb2xsYmFycyBzaG91bGRuJ3QgYmUgc2Nyb2xsYWJsZS48 L3A+CisgICAgICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtY29sdW1uczoyOyBjb2x1bW5zOjI7IG9y cGhhbnM6MTsgd2lkb3dzOjE7Ij4KKyAgICAgICAgICAgIDxkaXYgc3R5bGU9Im92ZXJmbG93OnNj cm9sbDsgaGVpZ2h0OjEwZW07Ij4KKyAgICAgICAgICAgICAgICAmbmJzcDsKKyAgICAgICAgICAg ICAgICA8ZGl2PlBBU1M8L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2PgorICAgICAgICA8L2Rpdj4K KyAgICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRp Y29sL2JyZWFrLWluLXNjcm9sbGFibGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wv YnJlYWstaW4tc2Nyb2xsYWJsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc3Y2EzODJhNjcxZDcyMzI0OTM2 NmEwYzYyZTcyOWU0YmZlM2YyNjAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L211bHRpY29sL2JyZWFrLWluLXNjcm9sbGFibGUuaHRtbApAQCAtMCwwICsxLDE5IEBACis8IURP Q1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+Rm9yY2VkIGJy ZWFrIGluc2lkZSBzY3JvbGxhYmxlIGNvbnRhaW5lcjwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQ+ CisgICAgICAgICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAgICAgICBpbnRl cm5hbHMuc2V0dGluZ3Muc2V0UmVnaW9uQmFzZWRDb2x1bW5zRW5hYmxlZCh0cnVlKTsKKyAgICAg ICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8cD5UaGUgd29y ZCAnUEFTUycgc2hvdWxkIGJlIHNlZW4gb24gdGhlIGxlZnQgYmVsb3cuIFRoZSBzY3JvbGxiYXJz IHNob3VsZG4ndCBiZSBzY3JvbGxhYmxlLjwvcD4KKyAgICAgICAgPGRpdiBzdHlsZT0iLXdlYmtp dC1jb2x1bW5zOjI7IGNvbHVtbnM6Mjsgb3JwaGFuczoxOyB3aWRvd3M6MTsiPgorICAgICAgICAg ICAgPGRpdiBzdHlsZT0ib3ZlcmZsb3c6c2Nyb2xsOyBoZWlnaHQ6MTBlbTsiPgorICAgICAgICAg ICAgICAgICZuYnNwOworICAgICAgICAgICAgICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtY29sdW1u LWJyZWFrLWJlZm9yZTphbHdheXM7IGJyZWFrLWJlZm9yZTpjb2x1bW47Ij5QQVNTPC9kaXY+Cisg ICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNvbC9sZWFkaW5n LWFuZC10cmFpbGluZy1tYXJnaW4tZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVs dGljb2wvbmV3bXVsdGljb2wvbGVhZGluZy1hbmQtdHJhaWxpbmctbWFyZ2luLWV4cGVjdGVkLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uM2IwODdhODkxYTBiMmVmNWNjYTY5YzMwYTFiNGY2NGQzMmQzZjNiMgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wv bGVhZGluZy1hbmQtdHJhaWxpbmctbWFyZ2luLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxMyBA QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHRpdGxlPkxl YWRpbmcgYW5kIHRyYWlsaW5nIG1hcmdpbjwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQ+CisgICAg ICAgICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAgICAgICBpbnRlcm5hbHMu c2V0dGluZ3Muc2V0UmVnaW9uQmFzZWRDb2x1bW5zRW5hYmxlZCh0cnVlKTsKKyAgICAgICAgPC9z Y3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8cD5UaGVyZSBzaG91bGQg YmUgbm8gc2Nyb2xsYmFycy48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNvbC9sZWFkaW5nLWFuZC10cmFpbGlu Zy1tYXJnaW4uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvbGVh ZGluZy1hbmQtdHJhaWxpbmctbWFyZ2luLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGMxYThlNGRhNzk2YmQ4 MDc3MzkzYjNkODQ2YzFhYzgwYTZmNjBjYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvbGVhZGluZy1hbmQtdHJhaWxpbmctbWFyZ2luLmh0 bWwKQEAgLTAsMCArMSwxNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4K KyAgICAgICAgPHRpdGxlPkxlYWRpbmcgYW5kIHRyYWlsaW5nIG1hcmdpbjwvdGl0bGU+CisgICAg ICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAg ICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0UmVnaW9uQmFzZWRDb2x1bW5zRW5hYmxlZCh0 cnVlKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAg ICA8cD5UaGVyZSBzaG91bGQgYmUgbm8gc2Nyb2xsYmFycy48L3A+CisgICAgICAgIDxkaXYgc3R5 bGU9Ii13ZWJraXQtY29sdW1uczozOyBjb2x1bW5zOjM7Ij4KKyAgICAgICAgICAgIDxkaXYgc3R5 bGU9Im1hcmdpbi10b3A6MWVtOyBtYXJnaW4tYm90dG9tOjEwZW07Ij4mbmJzcDs8L2Rpdj4KKyAg ICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNvbC9sZWFkaW5nLW1hcmdpbi1leHBlY3RlZC5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNvbC9sZWFkaW5nLW1hcmdpbi1l eHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ5NmFlYWFmNDBhZWJiYTI3YWFmMjA4YTZiZTAwOWU0 ZWQ2ZGNlODQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL25l d211bHRpY29sL2xlYWRpbmctbWFyZ2luLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw5IEBACis8 IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+TGVhZGlu ZyBtYXJnaW5zPC90aXRsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxwPlRo ZXJlIHNob3VsZCBiZSBubyBzY3JvbGxiYXJzLjwvcD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL25ld211bHRpY29sL2xlYWRpbmct bWFyZ2luLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL25ld211bHRpY29sL2xlYWRp bmctbWFyZ2luLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGI4NzY0NGU5NjE4MjU0OTE3ZTVjN2VjZWFhNDZj ZTcxNzFjOGJlYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wv bmV3bXVsdGljb2wvbGVhZGluZy1tYXJnaW4uaHRtbApAQCAtMCwwICsxLDIxIEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+TGVhZGluZyBtYXJn aW5zPC90aXRsZT4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgIGlmICh3aW5kb3cuaW50 ZXJuYWxzKQorICAgICAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRSZWdpb25CYXNl ZENvbHVtbnNFbmFibGVkKHRydWUpOworICAgICAgICA8L3NjcmlwdD4KKyAgICAgICAgPHN0eWxl PgorICAgICAgICAgICAgLnRlc3QgeyBtYXJnaW4tdG9wOjEwMHB4OyBib3JkZXI6MnB4IHNvbGlk IHRyYW5zcGFyZW50OyB9CisgICAgICAgIDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5 PgorICAgICAgICA8cD5UaGVyZSBzaG91bGQgYmUgbm8gc2Nyb2xsYmFycy48L3A+CisgICAgICAg IDxkaXYgc3R5bGU9Ii13ZWJraXQtY29sdW1uLWNvdW50OjI7IGNvbHVtbi1jb3VudDoyOyI+Cisg ICAgICAgICAgICA8ZGl2IGNsYXNzPSJ0ZXN0Ij48L2Rpdj4KKyAgICAgICAgICAgIDxkaXYgY2xh c3M9InRlc3QiPjwvZGl2PgorICAgICAgICAgICAgPGRpdiBjbGFzcz0idGVzdCI+PC9kaXY+Cisg ICAgICAgIDwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4K