112398 2013-03-14 19:15:13 -0700 Auto height column flexboxes with border and padding are too short 2013-03-15 14:16:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan cbiesinger eric esprehn+autocc ojan.autocc tony webkit.review.bot oldest_to_newest 855640 0 ojan 2013-03-14 19:15:13 -0700 Auto height column flexboxes with border and padding are too short 855641 1 193220 ojan 2013-03-14 19:15:49 -0700 Created attachment 193220 Patch 856058 2 193220 tony 2013-03-15 10:01:39 -0700 Comment on attachment 193220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193220&action=review > Source/WebCore/rendering/RenderFlexibleBox.cpp:750 > + LayoutUnit availableFreeSpace = mainAxisContentExtent(preferredMainAxisExtent + borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()) - preferredMainAxisExtent; This can't be correct for horizontal flexbox. > LayoutTests/css3/flexbox/auto-height-column-with-border-and-padding.html:5 > + <div class="flex-one-one-auto" style="min-height: 0" data-expected-height=50> It looks like the min-height is needed, but it's not clear to me why it's needed. Why does adding a min-heigth change the available free space? 856095 3 193220 ojan 2013-03-15 10:44:16 -0700 Comment on attachment 193220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193220&action=review >> Source/WebCore/rendering/RenderFlexibleBox.cpp:750 >> + LayoutUnit availableFreeSpace = mainAxisContentExtent(preferredMainAxisExtent + borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()) - preferredMainAxisExtent; > > This can't be correct for horizontal flexbox. The passed in argument is only used for column flexboxes. I was going to put this extra logic directly in mainAxisContentExtent, but the other caller of that function takes LayoutUnit::max as it's argument and thus we'd overflow. When we enable saturated layout arithmetic, we can move this. >> LayoutTests/css3/flexbox/auto-height-column-with-border-and-padding.html:5 >> + <div class="flex-one-one-auto" style="min-height: 0" data-expected-height=50> > > It looks like the min-height is needed, but it's not clear to me why it's needed. Why does adding a min-heigth change the available free space? It doesn't change the available free space. In the old code, the available free space would still be -20, and we'd flex-shrink the flex item to 0, but then adjustChildSizeForMinAndMax would expand the item out to its auto-size again. 856120 4 193220 tony 2013-03-15 11:10:09 -0700 Comment on attachment 193220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193220&action=review > Source/WebCore/ChangeLog:12 > + Test: css3/flexbox/auto-height-column-with-border-and-padding.html > + > + * rendering/RenderFlexibleBox.cpp: > + (WebCore::RenderFlexibleBox::mainAxisContentExtent): > + (WebCore::RenderFlexibleBox::layoutFlexItems): Please explain the cause of the bug and the fix in the ChangeLog. >>> Source/WebCore/rendering/RenderFlexibleBox.cpp:750 >>> + LayoutUnit availableFreeSpace = mainAxisContentExtent(preferredMainAxisExtent + borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()) - preferredMainAxisExtent; >> >> This can't be correct for horizontal flexbox. > > The passed in argument is only used for column flexboxes. I was going to put this extra logic directly in mainAxisContentExtent, but the other caller of that function takes LayoutUnit::max as it's argument and thus we'd overflow. When we enable saturated layout arithmetic, we can move this. I see, the bug is that we're passing the content height to computeLogicalHeight rather than the 'height'. Let's put this in mainAxisContentExtent() and do something like: LayoutUnit logicalHeight = std::max(contentLogicalHeight, contentLogicalHeight + borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()); to catch overflow. We could add a FIXME about removing this when saturated layout is enabled. Can you add a test with a overflow-x:scroll? 856274 5 193373 ojan 2013-03-15 14:09:17 -0700 Created attachment 193373 Patch 856280 6 ojan 2013-03-15 14:16:00 -0700 Committed r145937: <http://trac.webkit.org/changeset/145937> 193220 2013-03-14 19:15:49 -0700 2013-03-15 14:09:15 -0700 Patch bug-112398-20130314191145.patch text/plain 5398 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcxYjFmY2M0MjQ5ODRh MDBmZmYzZmI4MGVlMzg2MjQ4YzIwYThlNy4uM2I0N2NiOTE1YWM0NzQzMTI3NmJhODVmN2U2YWU4 MGU4ZWI0OGY2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAzLTE0ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQXV0byBoZWlnaHQgY29sdW1u IGZsZXhib3hlcyB3aXRoIGJvcmRlciBhbmQgcGFkZGluZyBhcmUgdG9vIHNob3J0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIzOTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBjc3MzL2ZsZXhi b3gvYXV0by1oZWlnaHQtY29sdW1uLXdpdGgtYm9yZGVyLWFuZC1wYWRkaW5nLmh0bWwKKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMpOgorCiAyMDEzLTAzLTE0 ICBSb2JlcnQgRmxhY2sgIDxmbGFja3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1 bV0gU2hvcnQgc2Nyb2xsYmFyIGhhcyBlbXB0eSB0cmFjayByZWN0IGV2ZW4gd2hlbiBidXR0b25z IGhhdmUgbm8gc2l6ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guY3BwCmluZGV4IDgyNGRjYzlkNTdjODExYTgxNDQ5ZDQyYzJhMzEwNDY0YzIwZWZmOWIu LjRmOGVlMmNjMjI2ODE5NWE3ODk3NjliMzcxYmNkMWFmMjljNTI0NGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTE3LDExICs1MTcs MTEgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y3Jvc3NBeGlzQ29udGVudEV4dGVu dCgpIGNvbnN0CiAgICAgcmV0dXJuIGlzSG9yaXpvbnRhbEZsb3coKSA/IGNvbnRlbnRIZWlnaHQo KSA6IGNvbnRlbnRXaWR0aCgpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpt YWluQXhpc0NvbnRlbnRFeHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaWdodCkKK0xh eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4dGVudChMYXlvdXRV bml0IGJvcmRlckJveExvZ2ljYWxIZWlnaHQpCiB7CiAgICAgaWYgKGlzQ29sdW1uRmxvdygpKSB7 CiAgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBjb21wdXRlZFZhbHVlczsKLSAg ICAgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoY29udGVudExvZ2ljYWxIZWlnaHQsIGxvZ2ljYWxU b3AoKSwgY29tcHV0ZWRWYWx1ZXMpOworICAgICAgICBjb21wdXRlTG9naWNhbEhlaWdodChib3Jk ZXJCb3hMb2dpY2FsSGVpZ2h0LCBsb2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKICAgICAg ICAgcmV0dXJuIHN0ZDo6bWF4KExheW91dFVuaXQoMCksIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 IC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSAtIHNjcm9sbGJhckxvZ2ljYWxIZWln aHQoKSk7CiAgICAgfQogICAgIHJldHVybiBjb250ZW50TG9naWNhbFdpZHRoKCk7CkBAIC03NDcs NyArNzQ3LDcgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1zKGJvb2wg cmVsYXlvdXRDaGlsZHJlbiwgVmVjdG9yPExpbmVDb250ZXgKICAgICBtX29yZGVySXRlcmF0b3Iu Zmlyc3QoKTsKICAgICBMYXlvdXRVbml0IGNyb3NzQXhpc09mZnNldCA9IGZsb3dBd2FyZUJvcmRl ckJlZm9yZSgpICsgZmxvd0F3YXJlUGFkZGluZ0JlZm9yZSgpOwogICAgIHdoaWxlIChjb21wdXRl TmV4dEZsZXhMaW5lKG9yZGVyZWRDaGlsZHJlbiwgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQsIHRv dGFsRmxleEdyb3csIHRvdGFsV2VpZ2h0ZWRGbGV4U2hyaW5rLCBtaW5NYXhBcHBsaWVkTWFpbkF4 aXNFeHRlbnQpKSB7Ci0gICAgICAgIExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlID0gbWFp bkF4aXNDb250ZW50RXh0ZW50KHByZWZlcnJlZE1haW5BeGlzRXh0ZW50KSAtIHByZWZlcnJlZE1h aW5BeGlzRXh0ZW50OworICAgICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSA9IG1h aW5BeGlzQ29udGVudEV4dGVudChwcmVmZXJyZWRNYWluQXhpc0V4dGVudCArIGJvcmRlckFuZFBh ZGRpbmdMb2dpY2FsSGVpZ2h0KCkgKyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCkpIC0gcHJlZmVy cmVkTWFpbkF4aXNFeHRlbnQ7CiAgICAgICAgIEZsZXhTaWduIGZsZXhTaWduID0gKG1pbk1heEFw cGxpZWRNYWluQXhpc0V4dGVudCA8IHByZWZlcnJlZE1haW5BeGlzRXh0ZW50ICsgYXZhaWxhYmxl RnJlZVNwYWNlKSA/IFBvc2l0aXZlRmxleGliaWxpdHkgOiBOZWdhdGl2ZUZsZXhpYmlsaXR5Owog ICAgICAgICBJbmZsZXhpYmxlRmxleEl0ZW1TaXplIGluZmxleGlibGVJdGVtczsKICAgICAgICAg VmVjdG9yPExheW91dFVuaXQ+IGNoaWxkU2l6ZXM7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzQxZDZiNGZlNDg3YzVhNjA1 MjkxZWI3MmM3MzBjYTRhZDcxN2RkOC4uMjg2N2NmNzBlZTdiYmFhMjgxYTE3NWUwNTEwODk3MjA3 Njc3NGM3YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAzLTE0ICBPamFuIFZhZmFpICA8 b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQXV0byBoZWlnaHQgY29sdW1uIGZsZXhib3hl cyB3aXRoIGJvcmRlciBhbmQgcGFkZGluZyBhcmUgdG9vIHNob3J0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIzOTgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzczMvZmxleGJveC9hdXRvLWhlaWdo dC1jb2x1bW4td2l0aC1ib3JkZXItYW5kLXBhZGRpbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBjc3MzL2ZsZXhib3gvYXV0by1oZWlnaHQtY29sdW1uLXdpdGgtYm9yZGVyLWFuZC1w YWRkaW5nLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGNzczMvZmxleGJveC9yZXNvdXJjZXMvZmxl eGJveC5jc3M6CisgICAgICAgICguZmxleC1vbmUtb25lLWF1dG8pOgorCiAyMDEzLTAzLTE0ICBC ZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1MgRXhjbHVz aW9uc10gc2hhcGUtb3V0c2lkZSBvbiBmbG9hdHMgZm9yIHJvdW5kZWQgcmVjdGFuZ2xlIHNoYXBl cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2F1dG8taGVpZ2h0LWNvbHVt bi13aXRoLWJvcmRlci1hbmQtcGFkZGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvYXV0by1oZWlnaHQtY29sdW1uLXdpdGgtYm9yZGVyLWFuZC1wYWRkaW5nLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi43ZWYyMmU5YTQzMWFkMDI3MjcxM2I3MWZkYzg3OTQwMTZjOGVm MTJmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2F1dG8taGVp Z2h0LWNvbHVtbi13aXRoLWJvcmRlci1hbmQtcGFkZGluZy1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSBAQAorUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2F1dG8taGVp Z2h0LWNvbHVtbi13aXRoLWJvcmRlci1hbmQtcGFkZGluZy5odG1sIGIvTGF5b3V0VGVzdHMvY3Nz My9mbGV4Ym94L2F1dG8taGVpZ2h0LWNvbHVtbi13aXRoLWJvcmRlci1hbmQtcGFkZGluZy5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmZiMjdmM2E4ZjU2MjNhNWI3OGQwZWEyMWMxNmE5MjhmZWIwMjMxMTAKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvYXV0by1oZWlnaHQtY29s dW1uLXdpdGgtYm9yZGVyLWFuZC1wYWRkaW5nLmh0bWwKQEAgLTAsMCArMSwxMyBAQAorPCFET0NU WVBFIGh0bWw+Cis8bGluayBocmVmPSJyZXNvdXJjZXMvZmxleGJveC5jc3MiIHJlbD0ic3R5bGVz aGVldCI+CisKKzxkaXYgY2xhc3M9ImZsZXhib3ggY29sdW1uIiBzdHlsZT0iYm9yZGVyOiA1cHgg c29saWQgc2FsbW9uOyBwYWRkaW5nOiA1cHg7IiBkYXRhLWV4cGVjdGVkLWhlaWdodD03MD4KKyAg ICA8ZGl2IGNsYXNzPSJmbGV4LW9uZS1vbmUtYXV0byIgc3R5bGU9Im1pbi1oZWlnaHQ6IDAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PTUwPgorICAgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwcHg7 IGJhY2tncm91bmQtY29sb3I6IHBpbmsiPgorICAgIDxkaXY+Cis8L2Rpdj4KKworPHNjcmlwdCBz cmM9Ii4uLy4uL3Jlc291cmNlcy9jaGVjay1sYXlvdXQuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4K K2NoZWNrTGF5b3V0KCIuZmxleGJveCIpOworPC9zY3JpcHQ+ClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L3Jlc291cmNlcy9m bGV4Ym94LmNzcyBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9yZXNvdXJjZXMvZmxleGJveC5j c3MKaW5kZXggNjFmN2UwZGE0OWM2MGM4NmUzNDVjNjlmMjU3ZTExM2FiYzJhNTMyMC4uODM1MDJj ZDE0NGE1NmMzOWNmODU0MzMzNDIxNzA4OTk4ODE4NTViZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvY3NzMy9mbGV4Ym94L3Jlc291cmNlcy9mbGV4Ym94LmNzcworKysgYi9MYXlvdXRUZXN0cy9j c3MzL2ZsZXhib3gvcmVzb3VyY2VzL2ZsZXhib3guY3NzCkBAIC0xOSw2ICsxOSwxMCBAQAogICAg IC13ZWJraXQtZmxleDogMTsKICAgICBmbGV4OiAxOwogfQorLmZsZXgtb25lLW9uZS1hdXRvIHsK KyAgICAtd2Via2l0LWZsZXg6IDEgMSBhdXRvOworICAgIGZsZXg6IDEgMSBhdXRvOworfQogCiAu cm93IHsKICAgICAtd2Via2l0LWZsZXgtZGlyZWN0aW9uOiByb3c7Cg== 193373 2013-03-15 14:09:17 -0700 2013-03-15 14:10:51 -0700 Patch bug-112398-20130315140512.patch text/plain 5285 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcxYjFmY2M0MjQ5ODRh MDBmZmYzZmI4MGVlMzg2MjQ4YzIwYThlNy4uOTdhMGE5ODlmY2E1NWU2YTUxODgxNjk1YzI5Mjg0 NjY4Y2Q4YjFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAzLTE0ICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQXV0byBoZWlnaHQgY29sdW1u IGZsZXhib3hlcyB3aXRoIGJvcmRlciBhbmQgcGFkZGluZyBhcmUgdG9vIHNob3J0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIzOTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBjc3MzL2ZsZXhi b3gvYXV0by1oZWlnaHQtY29sdW1uLXdpdGgtYm9yZGVyLWFuZC1wYWRkaW5nLmh0bWwKKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KToKKyAgICAgICAgY29t cHV0ZUxvZ2ljYWxIZWlnaHQgZXhwZWN0cyB0aGF0IHlvdSBwYXNzIGluIHRoZSBib3JkZXItYm94 IGxvZ2ljYWxIZWlnaHQsIG5vdAorICAgICAgICB0aGUgY29udGVudExvZ2ljYWxIZWlnaHQuIFNp bmNlIHdlIHN1YnRyYWN0IHRoZSBib3JkZXIsIHBhZGRpbmcgYW5kIHNjcm9sbGJhciBoZWlnaHQg ZnJvbSAKKyAgICAgICAgdGhlIHJldHVybmVkIG1fZXh0ZW50LCBpZiB3ZSBwYXNzIGluIHRoZSBj b250ZW50TG9naWNhbEhlaWdodCBhbmQgdGhlIGZsZXhib3ggaXMgYXV0by1zaXplZAorICAgICAg ICB0aGVuIHdlIGVuZCB1cCBpbmNvcnJlY3RseSBzdWJ0cmFjdGluZyBib3JkZXIsIHBhZGRpbmcg YW5kIHNjcm9sbGJhciBoZWlnaHQgZnJvbSB0aGUKKyAgICAgICAgY29udGVudExvZ2ljYWxIZWln aHQuCisKIDIwMTMtMDMtMTQgIFJvYmVydCBGbGFjayAgPGZsYWNrckBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgW2Nocm9taXVtXSBTaG9ydCBzY3JvbGxiYXIgaGFzIGVtcHR5IHRyYWNrIHJlY3Qg ZXZlbiB3aGVuIGJ1dHRvbnMgaGF2ZSBubyBzaXplLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggODI0ZGNjOWQ1N2M4MTFhODE0NDlkNDJj MmEzMTA0NjRjMjBlZmY5Yi4uNWQzMzY3ZjYyOTU2YTA4ODBjM2E3MWZiODk5NmExZDVjNjFkNDUy YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw CkBAIC01MjEsOCArNTIxLDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5B eGlzQ29udGVudEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpCiB7CiAgICAgaWYg KGlzQ29sdW1uRmxvdygpKSB7CiAgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBj b21wdXRlZFZhbHVlczsKLSAgICAgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoY29udGVudExvZ2lj YWxIZWlnaHQsIGxvZ2ljYWxUb3AoKSwgY29tcHV0ZWRWYWx1ZXMpOwotICAgICAgICByZXR1cm4g c3RkOjptYXgoTGF5b3V0VW5pdCgwKSwgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3JkZXJB bmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0gc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpKTsKKyAg ICAgICAgTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyID0gYm9yZGVyQW5kUGFk ZGluZ0xvZ2ljYWxIZWlnaHQoKSArIHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAg Ly8gRklYTUU6IFJlbW92ZSB0aGlzIHN0ZDptYXggb25jZSB3ZSBlbmFibGUgc2F0dXJhdGVkIGxh eW91dCBhcml0aG1ldGljLiBJdCdzIGp1c3QgaGVyZSB0byBoYW5kbGUgb3ZlcmZsb3cuCisgICAg ICAgIExheW91dFVuaXQgYm9yZGVyQm94TG9naWNhbEhlaWdodCA9IHN0ZDo6bWF4KGNvbnRlbnRM b2dpY2FsSGVpZ2h0LCBjb250ZW50TG9naWNhbEhlaWdodCArIGJvcmRlclBhZGRpbmdBbmRTY3Jv bGxiYXIpOworICAgICAgICBjb21wdXRlTG9naWNhbEhlaWdodChib3JkZXJCb3hMb2dpY2FsSGVp Z2h0LCBsb2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6 bWF4KExheW91dFVuaXQoMCksIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGlu Z0FuZFNjcm9sbGJhcik7CiAgICAgfQogICAgIHJldHVybiBjb250ZW50TG9naWNhbFdpZHRoKCk7 CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggYzQxZDZiNGZlNDg3YzVhNjA1MjkxZWI3MmM3MzBjYTRhZDcxN2RkOC4uMWFh ZTM0MGY2YmVmZTJkOTdjMmViNTBhNGE4ODEzNTdmNWM4Mzg3MiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEzLTAzLTE0ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgQXV0byBoZWlnaHQgY29sdW1uIGZsZXhib3hlcyB3aXRoIGJvcmRlciBhbmQgcGFkZGluZyBh cmUgdG9vIHNob3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTIzOTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGNzczMvZmxleGJveC9hdXRvLWhlaWdodC1jb2x1bW4td2l0aC1ib3JkZXItYW5kLXBh ZGRpbmctZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogY3NzMy9mbGV4Ym94L2F1dG8t aGVpZ2h0LWNvbHVtbi13aXRoLWJvcmRlci1hbmQtcGFkZGluZy5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiBjc3MzL2ZsZXhib3gvcmVzb3VyY2VzL2ZsZXhib3guY3NzOgorICAgICAgICAoLmZsZXgt b25lLW9uZS1hdXRvKToKKwogMjAxMy0wMy0xNCAgQmVtIEpvbmVzLUJleSAgPGJqb25lc2JlQGFk b2JlLmNvbT4KIAogICAgICAgICBbQ1NTIEV4Y2x1c2lvbnNdIHNoYXBlLW91dHNpZGUgb24gZmxv YXRzIGZvciByb3VuZGVkIHJlY3RhbmdsZSBzaGFwZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2NzczMvZmxleGJveC9hdXRvLWhlaWdodC1jb2x1bW4td2l0aC1ib3JkZXItYW5kLXBhZGRpbmct ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9hdXRvLWhlaWdodC1jb2x1 bW4td2l0aC1ib3JkZXItYW5kLXBhZGRpbmctZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kM2Fk NjhjNWIzYzVmMDAyY2M4MGJmNjBhM2I3YWIwMDQ4YjlkNzI5Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2F1dG8taGVpZ2h0LWNvbHVtbi13aXRoLWJvcmRlci1h bmQtcGFkZGluZy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNyBAQAorPCFET0NUWVBFIGh0bWw+ CitUZXN0cyB0aGF0IGF1dG8taGVpZ2h0IGNvbHVtbiBmbGV4Ym94ZXMgd2l0aCBib3JkZXIgYW5k IHBhZGRpbmcgY29ycmVjdGx5IHNpemUgdGhlaXIgaGVpZ2h0IHRvIHRoZWlyIGNvbnRlbnQuCis8 ZGl2IHN0eWxlPSJib3JkZXI6IDVweCBzb2xpZCBzYWxtb247IHBhZGRpbmc6IDVweDsiPgorICAg IDxkaXY+CisgICAgICAgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgYmFja2dyb3VuZC1jb2xv cjogcGluayI+CisgICAgPGRpdj4KKzwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3Nz My9mbGV4Ym94L2F1dG8taGVpZ2h0LWNvbHVtbi13aXRoLWJvcmRlci1hbmQtcGFkZGluZy5odG1s IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2F1dG8taGVpZ2h0LWNvbHVtbi13aXRoLWJvcmRl ci1hbmQtcGFkZGluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYwM2VkYmU3MmU3MjU0MzZhOTllZjM0M2Ni MWQ3MDgwYmU2MTU5OWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhi b3gvYXV0by1oZWlnaHQtY29sdW1uLXdpdGgtYm9yZGVyLWFuZC1wYWRkaW5nLmh0bWwKQEAgLTAs MCArMSw4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxsaW5rIGhyZWY9InJlc291cmNlcy9mbGV4Ym94 LmNzcyIgcmVsPSJzdHlsZXNoZWV0Ij4KK1Rlc3RzIHRoYXQgYXV0by1oZWlnaHQgY29sdW1uIGZs ZXhib3hlcyB3aXRoIGJvcmRlciBhbmQgcGFkZGluZyBjb3JyZWN0bHkgc2l6ZSB0aGVpciBoZWln aHQgdG8gdGhlaXIgY29udGVudC4KKzxkaXYgY2xhc3M9ImZsZXhib3ggY29sdW1uIiBzdHlsZT0i Ym9yZGVyOiA1cHggc29saWQgc2FsbW9uOyBwYWRkaW5nOiA1cHg7Ij4KKyAgICA8ZGl2IGNsYXNz PSJmbGV4LW9uZS1vbmUtYXV0byIgc3R5bGU9Im1pbi1oZWlnaHQ6IDAiPgorICAgICAgICA8ZGl2 IHN0eWxlPSJoZWlnaHQ6IDUwcHg7IGJhY2tncm91bmQtY29sb3I6IHBpbmsiPgorICAgIDxkaXY+ Cis8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9yZXNvdXJjZXMv ZmxleGJveC5jc3MgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvcmVzb3VyY2VzL2ZsZXhib3gu Y3NzCmluZGV4IDYxZjdlMGRhNDljNjBjODZlMzQ1YzY5ZjI1N2UxMTNhYmMyYTUzMjAuLjgzNTAy Y2QxNDRhNTZjMzljZjg1NDMzMzQyMTcwODk5ODgxODU1YmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2NzczMvZmxleGJveC9yZXNvdXJjZXMvZmxleGJveC5jc3MKKysrIGIvTGF5b3V0VGVzdHMv Y3NzMy9mbGV4Ym94L3Jlc291cmNlcy9mbGV4Ym94LmNzcwpAQCAtMTksNiArMTksMTAgQEAKICAg ICAtd2Via2l0LWZsZXg6IDE7CiAgICAgZmxleDogMTsKIH0KKy5mbGV4LW9uZS1vbmUtYXV0byB7 CisgICAgLXdlYmtpdC1mbGV4OiAxIDEgYXV0bzsKKyAgICBmbGV4OiAxIDEgYXV0bzsKK30KIAog LnJvdyB7CiAgICAgLXdlYmtpdC1mbGV4LWRpcmVjdGlvbjogcm93Owo=