129299 2014-02-25 04:42:19 -0800 [New Multicolumn] -webkit-column-break-inside:avoid doesn't work 2014-02-25 08:04:46 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mstensho mstensho commit-queue esprehn+autocc glenn hyatt kondapallykalyan WebkitBugTracker oldest_to_newest 984262 0 mstensho 2014-02-25 04:42:19 -0800 It works in the old/current multicol implementation. 984263 1 225134 mstensho 2014-02-25 04:42:36 -0800 Created attachment 225134 Test case 984265 2 mstensho 2014-02-25 04:44:27 -0800 Bug in Blink: https://code.google.com/p/chromium/issues/detail?id=346661 984276 3 225139 mstensho 2014-02-25 05:23:53 -0800 Created attachment 225139 Patch 984285 4 225139 abucur 2014-02-25 06:01:10 -0800 Comment on attachment 225139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225139&action=review r=me with some nits. > Source/WebCore/ChangeLog:7 > + Please add a short textual description of what the patch does. > Source/WebCore/rendering/RenderBlockFlow.cpp:1696 > + bool isInsideMulticolFlowThread = flowThread && !flowThread->isRenderNamedFlowThread(); In RenderLayer::updatePagination() the check for a multi-column flow thread is RenderObject::isInFlowRenderFlowThread(). I think it makes sense to use it here as well. 984290 5 225139 mstensho 2014-02-25 06:07:56 -0800 Comment on attachment 225139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225139&action=review >> Source/WebCore/ChangeLog:7 >> + > > Please add a short textual description of what the patch does. Will do, once I know your opinion about the other issue raised. >> Source/WebCore/rendering/RenderBlockFlow.cpp:1696 >> + bool isInsideMulticolFlowThread = flowThread && !flowThread->isRenderNamedFlowThread(); > > In RenderLayer::updatePagination() the check for a multi-column flow thread is RenderObject::isInFlowRenderFlowThread(). I think it makes sense to use it here as well. That should work as well. However, please take a look at RenderBlockFlow::applyAfterBreak() and RenderBlockFlow::applyBeforeBreak(), which checks for multi-column flow thread in the same way as I did here. I suggest that we keep it as it is. Or should I rather change applyAfterBreak() and applyBeforeBreak() as well. 984296 6 225139 abucur 2014-02-25 06:26:00 -0800 Comment on attachment 225139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225139&action=review >>> Source/WebCore/rendering/RenderBlockFlow.cpp:1696 >>> + bool isInsideMulticolFlowThread = flowThread && !flowThread->isRenderNamedFlowThread(); >> >> In RenderLayer::updatePagination() the check for a multi-column flow thread is RenderObject::isInFlowRenderFlowThread(). I think it makes sense to use it here as well. > > That should work as well. However, please take a look at RenderBlockFlow::applyAfterBreak() and RenderBlockFlow::applyBeforeBreak(), which checks for multi-column flow thread in the same way as I did here. I suggest that we keep it as it is. Or should I rather change applyAfterBreak() and applyBeforeBreak() as well. For this patch, I guess not. Keep it as it is then. I'll file a new bug to switch to isInFlow/isOutOfFlowRenderFlowThread getters where it makes sense. 984301 7 225146 mstensho 2014-02-25 06:28:47 -0800 Created attachment 225146 Patch 984311 8 225146 commit-queue 2014-02-25 07:29:32 -0800 Comment on attachment 225146 Patch Rejecting attachment 225146 from commit-queue. mstensho@opera.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 984317 9 225146 commit-queue 2014-02-25 08:04:42 -0800 Comment on attachment 225146 Patch Clearing flags on attachment: 225146 Committed r164649: <http://trac.webkit.org/changeset/164649> 984318 10 commit-queue 2014-02-25 08:04:46 -0800 All reviewed patches have been landed. Closing bug. 225134 2014-02-25 04:42:36 -0800 2014-02-25 04:42:36 -0800 Test case avoid-column-break-inside.html text/html 522 mstensho PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPHRpdGxlPkF2b2lkIGNv bHVtbiBicmVhayBpbnNpZGUgYmxvY2s8L3RpdGxlPgogICAgICAgIDxzY3JpcHQ+CiAgICAgICAg ICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQogICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRp bmdzLnNldFJlZ2lvbkJhc2VkQ29sdW1uc0VuYWJsZWQodHJ1ZSk7CiAgICAgICAgPC9zY3JpcHQ+ CiAgICA8L2hlYWQ+CiAgICA8Ym9keT4KICAgICAgICA8cD5UaGVyZSBzaG91bGQgYmUgYSBibHVl IHNxdWFyZSBiZWxvdy48L3A+CiAgICAgICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1jb2x1bW5zOjQ7 IGNvbHVtbnM6NDsiPgogICAgICAgICAgICA8ZGl2IHN0eWxlPSJ3aWR0aDoxMDBweDsgaGVpZ2h0 OjEwMHB4OyAtd2Via2l0LWNvbHVtbi1icmVhay1pbnNpZGU6YXZvaWQ7IGJyZWFrLWluc2lkZTph dm9pZDsgYmFja2dyb3VuZDpibHVlOyI+PC9kaXY+CiAgICAgICAgPC9kaXY+CiAgICA8L2JvZHk+ CjwvaHRtbD4K 225139 2014-02-25 05:23:53 -0800 2014-02-25 06:28:42 -0800 Patch bug-129299-20140225142410.patch text/plain 4430 mstensho U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVmYWY5OTE2MTJkNGFj NTQyZTkyN2MxNDAwMDc4MjY1ZTc4MTBlNS4uMDU2YWZiM2MzZjgxMzVkYWUwMTU0NGMyYTFjZjMz ZmFiM2RhOTVhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAyLTI1ICBNb3J0 ZW4gU3RlbnNob3JuZSAgPG1zdGVuc2hvQG9wZXJhLmNvbT4KKworICAgICAgICBbTmV3IE11bHRp Y29sdW1uXSAtd2Via2l0LWNvbHVtbi1icmVhay1pbnNpZGU6YXZvaWQgZG9lc24ndCB3b3JrCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjkyOTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0 L211bHRpY29sL25ld211bHRpY29sL2F2b2lkLWNvbHVtbi1icmVhay1pbnNpZGUuaHRtbAorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9ja0Zsb3c6OmFkanVzdEZvclVuc3BsaXR0YWJsZUNoaWxkKToKKwogMjAxNC0w Mi0yNSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgTW92 ZSB0byB1c2luZyBzdGQ6OnVuaXF1ZV9wdHIgZm9yIEVsZW1lbnQsIE5vZGUgYW5kIHJlbGF0ZWQg Y2xhc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApp bmRleCBhOGE1NjVhZTMxYWI2MjllMTY1NTdkMjgyYjJhZjViNmJiODA4ZmU5Li4wZmU0MDQ4NmFi ZmM4OTljYjlhOWIwMzc0OGUyZmUwMjhkMmJjNTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMTY5Miw5ICsxNjkyLDEwIEBAIGJvb2wgUmVu ZGVyQmxvY2tGbG93OjpoYXNOZXh0UGFnZShMYXlvdXRVbml0IGxvZ2ljYWxPZmZzZXQsIFBhZ2VC b3VuZGFyeVJ1bGUgcGFnCiAKIExheW91dFVuaXQgUmVuZGVyQmxvY2tGbG93OjphZGp1c3RGb3JV bnNwbGl0dGFibGVDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxPZmZz ZXQsIGJvb2wgaW5jbHVkZU1hcmdpbnMpCiB7Ci0gICAgYm9vbCBjaGVja0NvbHVtbkJyZWFrcyA9 IHZpZXcoKS5sYXlvdXRTdGF0ZSgpLT5pc1BhZ2luYXRpbmdDb2x1bW5zKCk7Ci0gICAgYm9vbCBj aGVja1BhZ2VCcmVha3MgPSAhY2hlY2tDb2x1bW5CcmVha3MgJiYgdmlldygpLmxheW91dFN0YXRl KCktPm1fcGFnZUxvZ2ljYWxIZWlnaHQ7CiAgICAgUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVh ZCA9IGZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKTsKKyAgICBib29sIGlzSW5zaWRlTXVsdGlj b2xGbG93VGhyZWFkID0gZmxvd1RocmVhZCAmJiAhZmxvd1RocmVhZC0+aXNSZW5kZXJOYW1lZEZs b3dUaHJlYWQoKTsKKyAgICBib29sIGNoZWNrQ29sdW1uQnJlYWtzID0gaXNJbnNpZGVNdWx0aWNv bEZsb3dUaHJlYWQgfHwgdmlldygpLmxheW91dFN0YXRlKCktPmlzUGFnaW5hdGluZ0NvbHVtbnMo KTsKKyAgICBib29sIGNoZWNrUGFnZUJyZWFrcyA9ICFjaGVja0NvbHVtbkJyZWFrcyAmJiB2aWV3 KCkubGF5b3V0U3RhdGUoKS0+bV9wYWdlTG9naWNhbEhlaWdodDsKICAgICBib29sIGNoZWNrUmVn aW9uQnJlYWtzID0gZmxvd1RocmVhZCAmJiBmbG93VGhyZWFkLT5pc1JlbmRlck5hbWVkRmxvd1Ro cmVhZCgpOwogICAgIGJvb2wgaXNVbnNwbGl0dGFibGUgPSBjaGlsZC5pc1Vuc3BsaXR0YWJsZUZv clBhZ2luYXRpb24oKSB8fCAoY2hlY2tDb2x1bW5CcmVha3MgJiYgY2hpbGQuc3R5bGUoKS5jb2x1 bW5CcmVha0luc2lkZSgpID09IFBCQVZPSUQpCiAgICAgICAgIHx8IChjaGVja1BhZ2VCcmVha3Mg JiYgY2hpbGQuc3R5bGUoKS5wYWdlQnJlYWtJbnNpZGUoKSA9PSBQQkFWT0lEKQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDU3 OTNkMjRiY2YxYzllOWU1NGQyOWQwNmY5YjY0YWE3NDljYWQ0NzYuLjU2NTUxZTViMDQ5YjY1NmY0 YWZiZDk4ZjQ4Yzg5ZWQ0ZDQ0Njg3YTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNC0wMi0y NSAgTW9ydGVuIFN0ZW5zaG9ybmUgIDxtc3RlbnNob0BvcGVyYS5jb20+CisKKyAgICAgICAgW05l dyBNdWx0aWNvbHVtbl0gLXdlYmtpdC1jb2x1bW4tYnJlYWstaW5zaWRlOmF2b2lkIGRvZXNuJ3Qg d29yaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5 Mjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBm YXN0L211bHRpY29sL25ld211bHRpY29sL2F2b2lkLWNvbHVtbi1icmVhay1pbnNpZGUtZXhwZWN0 ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNvbC9hdm9p ZC1jb2x1bW4tYnJlYWstaW5zaWRlLmh0bWw6IEFkZGVkLgorCiAyMDE0LTAyLTI0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFN1cHBvcnQgYWJi ciwgYWNyb255bQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9uZXdtdWx0 aWNvbC9hdm9pZC1jb2x1bW4tYnJlYWstaW5zaWRlLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L211bHRpY29sL25ld211bHRpY29sL2F2b2lkLWNvbHVtbi1icmVhay1pbnNpZGUtZXhw ZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mMjNiNDMzMDk2ZGQ1NGJkMzg5ODgwMmZlYjBjZWNiZGI5 MTRhMjhjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9uZXdt dWx0aWNvbC9hdm9pZC1jb2x1bW4tYnJlYWstaW5zaWRlLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCAr MSwxMCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHRp dGxlPkF2b2lkIGNvbHVtbiBicmVhayBpbnNpZGUgYmxvY2s8L3RpdGxlPgorICAgIDwvaGVhZD4K KyAgICA8Ym9keT4KKyAgICAgICAgPHA+VGhlcmUgc2hvdWxkIGJlIGEgYmx1ZSBzcXVhcmUgYmVs b3cuPC9wPgorICAgICAgICA8ZGl2IHN0eWxlPSJ3aWR0aDoxMDBweDsgaGVpZ2h0OjEwMHB4OyBi YWNrZ3JvdW5kOmJsdWU7Ij48L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL25ld211bHRpY29sL2F2b2lkLWNvbHVtbi1icmVh ay1pbnNpZGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvYXZv aWQtY29sdW1uLWJyZWFrLWluc2lkZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkxZWY5ZDIwNTRiOWQ2ZWE3 ZjA0NjA0MjhjZjUyMWFjMTg5YzdiYmIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L211bHRpY29sL25ld211bHRpY29sL2F2b2lkLWNvbHVtbi1icmVhay1pbnNpZGUuaHRtbApA QCAtMCwwICsxLDE2IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAg ICAgICA8dGl0bGU+QXZvaWQgY29sdW1uIGJyZWFrIGluc2lkZSBibG9jazwvdGl0bGU+CisgICAg ICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAg ICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0UmVnaW9uQmFzZWRDb2x1bW5zRW5hYmxlZCh0 cnVlKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAg ICA8cD5UaGVyZSBzaG91bGQgYmUgYSBibHVlIHNxdWFyZSBiZWxvdy48L3A+CisgICAgICAgIDxk aXYgc3R5bGU9Ii13ZWJraXQtY29sdW1uczo0OyBjb2x1bW5zOjQ7Ij4KKyAgICAgICAgICAgIDxk aXYgc3R5bGU9IndpZHRoOjEwMHB4OyBoZWlnaHQ6MTAwcHg7IC13ZWJraXQtY29sdW1uLWJyZWFr LWluc2lkZTphdm9pZDsgYnJlYWstaW5zaWRlOmF2b2lkOyBiYWNrZ3JvdW5kOmJsdWU7Ij48L2Rp dj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1sPgo= 225146 2014-02-25 06:28:47 -0800 2014-02-25 08:04:42 -0800 Patch bug-129299-20140225152904.patch text/plain 4549 mstensho U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVmYWY5OTE2MTJkNGFj NTQyZTkyN2MxNDAwMDc4MjY1ZTc4MTBlNS4uZjI1MTE3MGQwZDM2MjY5OGE3YzE3M2ZkNWVkYTMx NDExNTVjNTdlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAyLTI1ICBNb3J0 ZW4gU3RlbnNob3JuZSAgPG1zdGVuc2hvQG9wZXJhLmNvbT4KKworICAgICAgICBbTmV3IE11bHRp Y29sdW1uXSAtd2Via2l0LWNvbHVtbi1icmVhay1pbnNpZGU6YXZvaWQgZG9lc24ndCB3b3JrCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjkyOTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWkgQnVjdXIuCisKKyAgICAgICAgYWRqdXN0Rm9yVW5z cGxpdHRhYmxlQ2hpbGQoKSBzaW1wbHkgZm9yZ290IHRvIGNoZWNrIHdoZXRoZXIgd2UKKyAgICAg ICAgd2VyZSBpbnNpZGUgZmxvdyB0aHJlYWQgYmFzZWQgbXVsdGljb2wuCisKKyAgICAgICAgVGVz dDogZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNvbC9hdm9pZC1jb2x1bW4tYnJlYWstaW5zaWRlLmh0 bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjphZGp1c3RGb3JVbnNwbGl0dGFibGVDaGlsZCk6CisK IDIwMTQtMDItMjUgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIE1vdmUgdG8gdXNpbmcgc3RkOjp1bmlxdWVfcHRyIGZvciBFbGVtZW50LCBOb2RlIGFuZCBy ZWxhdGVkIGNsYXNzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAKaW5kZXggYThhNTY1YWUzMWFiNjI5ZTE2NTU3ZDI4MmIyYWY1YjZiYjgwOGZlOS4uMGZl NDA0ODZhYmZjODk5Y2I5YTliMDM3NDhlMmZlMDI4ZDJiYzU2YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTE2OTIsOSArMTY5MiwxMCBAQCBi b29sIFJlbmRlckJsb2NrRmxvdzo6aGFzTmV4dFBhZ2UoTGF5b3V0VW5pdCBsb2dpY2FsT2Zmc2V0 LCBQYWdlQm91bmRhcnlSdWxlIHBhZwogCiBMYXlvdXRVbml0IFJlbmRlckJsb2NrRmxvdzo6YWRq dXN0Rm9yVW5zcGxpdHRhYmxlQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0VW5pdCBsb2dp Y2FsT2Zmc2V0LCBib29sIGluY2x1ZGVNYXJnaW5zKQogewotICAgIGJvb2wgY2hlY2tDb2x1bW5C cmVha3MgPSB2aWV3KCkubGF5b3V0U3RhdGUoKS0+aXNQYWdpbmF0aW5nQ29sdW1ucygpOwotICAg IGJvb2wgY2hlY2tQYWdlQnJlYWtzID0gIWNoZWNrQ29sdW1uQnJlYWtzICYmIHZpZXcoKS5sYXlv dXRTdGF0ZSgpLT5tX3BhZ2VMb2dpY2FsSGVpZ2h0OwogICAgIFJlbmRlckZsb3dUaHJlYWQqIGZs b3dUaHJlYWQgPSBmbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCk7CisgICAgYm9vbCBpc0luc2lk ZU11bHRpY29sRmxvd1RocmVhZCA9IGZsb3dUaHJlYWQgJiYgIWZsb3dUaHJlYWQtPmlzUmVuZGVy TmFtZWRGbG93VGhyZWFkKCk7CisgICAgYm9vbCBjaGVja0NvbHVtbkJyZWFrcyA9IGlzSW5zaWRl TXVsdGljb2xGbG93VGhyZWFkIHx8IHZpZXcoKS5sYXlvdXRTdGF0ZSgpLT5pc1BhZ2luYXRpbmdD b2x1bW5zKCk7CisgICAgYm9vbCBjaGVja1BhZ2VCcmVha3MgPSAhY2hlY2tDb2x1bW5CcmVha3Mg JiYgdmlldygpLmxheW91dFN0YXRlKCktPm1fcGFnZUxvZ2ljYWxIZWlnaHQ7CiAgICAgYm9vbCBj aGVja1JlZ2lvbkJyZWFrcyA9IGZsb3dUaHJlYWQgJiYgZmxvd1RocmVhZC0+aXNSZW5kZXJOYW1l ZEZsb3dUaHJlYWQoKTsKICAgICBib29sIGlzVW5zcGxpdHRhYmxlID0gY2hpbGQuaXNVbnNwbGl0 dGFibGVGb3JQYWdpbmF0aW9uKCkgfHwgKGNoZWNrQ29sdW1uQnJlYWtzICYmIGNoaWxkLnN0eWxl KCkuY29sdW1uQnJlYWtJbnNpZGUoKSA9PSBQQkFWT0lEKQogICAgICAgICB8fCAoY2hlY2tQYWdl QnJlYWtzICYmIGNoaWxkLnN0eWxlKCkucGFnZUJyZWFrSW5zaWRlKCkgPT0gUEJBVk9JRCkKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA1NzkzZDI0YmNmMWM5ZTllNTRkMjlkMDZmOWI2NGFhNzQ5Y2FkNDc2Li5jZjhiMzhiMjMx ODgzNGUwNmU4M2Q3NDBlY2RiNzIwM2U2OTEzM2U5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTQtMDItMjUgIE1vcnRlbiBTdGVuc2hvcm5lICA8bXN0ZW5zaG9Ab3BlcmEuY29tPgorCisgICAg ICAgIFtOZXcgTXVsdGljb2x1bW5dIC13ZWJraXQtY29sdW1uLWJyZWFrLWluc2lkZTphdm9pZCBk b2Vzbid0IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyOTI5OQorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlaSBCdWN1ci4KKworICAgICAg ICAqIGZhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvYXZvaWQtY29sdW1uLWJyZWFrLWluc2lkZS1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29sL25ld211bHRpY29s L2F2b2lkLWNvbHVtbi1icmVhay1pbnNpZGUuaHRtbDogQWRkZWQuCisKIDIwMTQtMDItMjQgIENo cmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogU3VwcG9y dCBhYmJyLCBhY3JvbnltCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL25l d211bHRpY29sL2F2b2lkLWNvbHVtbi1icmVhay1pbnNpZGUtZXhwZWN0ZWQuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvYXZvaWQtY29sdW1uLWJyZWFrLWluc2lk ZS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYyM2I0MzMwOTZkZDU0YmQzODk4ODAyZmViMGNl Y2JkYjkxNGEyOGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29s L25ld211bHRpY29sL2F2b2lkLWNvbHVtbi1icmVhay1pbnNpZGUtZXhwZWN0ZWQuaHRtbApAQCAt MCwwICsxLDEwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAg ICA8dGl0bGU+QXZvaWQgY29sdW1uIGJyZWFrIGluc2lkZSBibG9jazwvdGl0bGU+CisgICAgPC9o ZWFkPgorICAgIDxib2R5PgorICAgICAgICA8cD5UaGVyZSBzaG91bGQgYmUgYSBibHVlIHNxdWFy ZSBiZWxvdy48L3A+CisgICAgICAgIDxkaXYgc3R5bGU9IndpZHRoOjEwMHB4OyBoZWlnaHQ6MTAw cHg7IGJhY2tncm91bmQ6Ymx1ZTsiPjwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvYXZvaWQtY29sdW1u LWJyZWFrLWluc2lkZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9uZXdtdWx0aWNv bC9hdm9pZC1jb2x1bW4tYnJlYWstaW5zaWRlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTFlZjlkMjA1NGI5 ZDZlYTdmMDQ2MDQyOGNmNTIxYWMxODljN2JiYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvbXVsdGljb2wvbmV3bXVsdGljb2wvYXZvaWQtY29sdW1uLWJyZWFrLWluc2lkZS5o dG1sCkBAIC0wLDAgKzEsMTYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+ CisgICAgICAgIDx0aXRsZT5Bdm9pZCBjb2x1bW4gYnJlYWsgaW5zaWRlIGJsb2NrPC90aXRsZT4K KyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAg ICAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRSZWdpb25CYXNlZENvbHVtbnNFbmFi bGVkKHRydWUpOworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+Cisg ICAgICAgIDxwPlRoZXJlIHNob3VsZCBiZSBhIGJsdWUgc3F1YXJlIGJlbG93LjwvcD4KKyAgICAg ICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1jb2x1bW5zOjQ7IGNvbHVtbnM6NDsiPgorICAgICAgICAg ICAgPGRpdiBzdHlsZT0id2lkdGg6MTAwcHg7IGhlaWdodDoxMDBweDsgLXdlYmtpdC1jb2x1bW4t YnJlYWstaW5zaWRlOmF2b2lkOyBicmVhay1pbnNpZGU6YXZvaWQ7IGJhY2tncm91bmQ6Ymx1ZTsi PjwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==