83572 2012-04-10 05:59:48 -0700 Height overflow when nesting multiple new Flexbox'es. 2012-05-03 16:21:10 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED http://jsfiddle.net/simurai/BQW3Y/ P2 Critical --- 0 simulus tony cmarcelo ojan paulirish tony vcarbune webkit.review.bot oldest_to_newest 599203 0 simulus 2012-04-10 05:59:48 -0700 It appears that when nesting multiple "new" Flexbox'es, the total height of its flexible children are overflowing. See: http://jsfiddle.net/simurai/BQW3Y/ Note: In the old Flexbox ( display: -webkit-box; ) it works fine. 615520 1 tony 2012-05-03 13:02:02 -0700 *** Bug 85490 has been marked as a duplicate of this bug. *** 615638 2 140094 tony 2012-05-03 14:35:53 -0700 Created attachment 140094 Patch 615650 3 140094 ojan 2012-05-03 14:44:45 -0700 Comment on attachment 140094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140094&action=review > Source/WebCore/rendering/RenderFlexibleBox.cpp:606 > + return overrideContentLogicalHeight - preferredMainAxisExtent; Now that all return cases subtract preferredMainAxisExtent, I wonder if we should rename this method computeMainAxisExtent and subtract preferredMainAxisExtent in the one calling location. Up to you. 615662 4 140101 tony 2012-05-03 14:56:16 -0700 Created attachment 140101 Patch for landing 615665 5 tony 2012-05-03 14:57:24 -0700 (In reply to comment #3) > (From update of attachment 140094 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140094&action=review > > > Source/WebCore/rendering/RenderFlexibleBox.cpp:606 > > + return overrideContentLogicalHeight - preferredMainAxisExtent; > > Now that all return cases subtract preferredMainAxisExtent, I wonder if we should rename this method computeMainAxisExtent and subtract preferredMainAxisExtent in the one calling location. I did a variation that subtracts preferredMainAxisExtent at the end of the method. It's convenient that the concept of available free space is a function. 615764 6 140101 webkit.review.bot 2012-05-03 16:21:01 -0700 Comment on attachment 140101 Patch for landing Clearing flags on attachment: 140101 Committed r116038: <http://trac.webkit.org/changeset/116038> 615765 7 webkit.review.bot 2012-05-03 16:21:10 -0700 All reviewed patches have been landed. Closing bug. 140094 2012-05-03 14:35:53 -0700 2012-05-03 14:56:12 -0700 Patch bug-83572-20120503143556.patch text/plain 5127 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBiMzEyZTk2NWIwY2Q4 MjliZmMyZmNkODQ5YmU2NmMwZGQ1MmU2Ni4uYTliNGM0MDVhMzUyM2NlNWEzM2Q0ZGY0NGNmMzdi MmRkNjRlYmUxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA1LTAzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGVpZ2h0IG92ZXJmbG93IHdo ZW4gbmVzdGluZyBtdWx0aXBsZSBuZXcgRmxleGJveCdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogY3NzMy9mbGV4Ym94L25lc3RlZC1zdHJl dGNoLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUF2YWlsYWJsZUZyZWVT cGFjZSk6CisKIDIwMTItMDUtMDMgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNv bT4KIAogICAgICAgICBhY2Nlc3NpYmlsaXR5L21pc3NwZWxsZWQtYXR0cmlidXRlZC1zdHJpbmcu aHRtbCB0ZXN0IHNvbWV0aW1lcyB0aHJvd3MgZXhjZXB0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggNzFlNjI1NmRkMzIyYzM0MGZj YTc4MThhNzhlMDBjYzJkMDEzY2JjNC4uY2E2NjllMjg2YWIwYzZhMGY5NGRjMTg2YmViMjU5ZDAx Y2QxYTQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guY3BwCkBAIC02MDEsOCArNjAxLDEwIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6 OmNvbXB1dGVBdmFpbGFibGVGcmVlU3BhY2UoTGF5b3V0VW5pdCBwcmVmZXJyZWRNYWluCiAgICAg aWYgKCFpc0NvbHVtbkZsb3coKSkKICAgICAgICAgcmV0dXJuIG1haW5BeGlzQ29udGVudEV4dGVu dCgpIC0gcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQ7CiAKLSAgICBpZiAoaGFzT3ZlcnJpZGVIZWln aHQoKSkKLSAgICAgICAgcmV0dXJuIG92ZXJyaWRlSGVpZ2h0KCk7CisgICAgaWYgKGhhc092ZXJy aWRlSGVpZ2h0KCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBvdmVycmlkZUNvbnRlbnRMb2dpY2Fs SGVpZ2h0ID0gb3ZlcnJpZGVIZWlnaHQoKSAtIChsb2dpY2FsSGVpZ2h0KCkgLSBjb250ZW50TG9n aWNhbEhlaWdodCgpKTsKKyAgICAgICAgcmV0dXJuIG92ZXJyaWRlQ29udGVudExvZ2ljYWxIZWln aHQgLSBwcmVmZXJyZWRNYWluQXhpc0V4dGVudDsKKyAgICB9CiAKICAgICBMYXlvdXRVbml0IGhl aWdodFJlc3VsdCA9IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodFVzaW5nKHN0eWxlKCktPmxv Z2ljYWxIZWlnaHQoKSk7CiAgICAgaWYgKGhlaWdodFJlc3VsdCA9PSAtMSkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5MmUw NTRhODljYTk1NDA5MWFlODlmNmFiOTA1YmRkODRkZmU5MDE5Li4wNDdhYzE3M2ZhMzcwNjUwZmNj MDgwNjQyNGY4ODYzZjY1M2ZkNGJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDUtMDMg IFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBIZWlnaHQgb3ZlcmZs b3cgd2hlbiBuZXN0aW5nIG11bHRpcGxlIG5ldyBGbGV4Ym94J2VzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM1NzIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzczMvZmxleGJveC9uZXN0ZWQtc3Ry ZXRjaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNzczMvZmxleGJveC9uZXN0ZWQt c3RyZXRjaC5odG1sOiBBZGRlZC4KKwogMjAxMi0wNS0wMyAgVGhpYWdvIE1hcmNvcyBQLiBTYW50 b3MgIDx0aGlhZ28uc2FudG9zQGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBDU1MgdGVzdHMg bmVlZHMgZ2FyZGVuaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvbmVz dGVkLXN0cmV0Y2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L25lc3Rl ZC1zdHJldGNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zNmZmZDA5N2M0ZGJmZjIxMTAzZmMy YjIwNDVjZmJmZTFhM2IxMjhiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9m bGV4Ym94L25lc3RlZC1zdHJldGNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQgQEAKK1RoZXJl IHNob3VsZCBiZSB0d28gYm94ZXMgb2YgZXF1YWwgaGVpZ2h0IG9uIHRoZSBsZWZ0IGFuZCAzIGJv eGVzIG9mIGVxdWFsIGhlaWdodCBvbiB0aGUgcmlnaHQuCitQQVNTCitOb25lIG9mIHRoZSBib3hl cyBzaG91bGQgb3ZlcmZsb3cgYW5kIHRoZSBpbm5lciBtb3N0IGJveGVzIHNob3VsZCBiZSBlbmQg YWxpZ25lZC4KK1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9uZXN0 ZWQtc3RyZXRjaC5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L25lc3RlZC1zdHJldGNo Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYTM4NmY1MjlkMDY4ODAwZDk2NmUzZjUwY2EzZTU4NzdhYTFmYjhl MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9uZXN0ZWQtc3Ry ZXRjaC5odG1sCkBAIC0wLDAgKzEsNjEgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh ZD4KKzxzdHlsZT4KK2RpdiB7CisgIG91dGxpbmU6IDFweCBzb2xpZCBibGFjazsKKyAgYmFja2dy b3VuZDogaHNsYSgyMTAsMTAwJSw5MCUsIC44KTsKKyAgcGFkZGluZzogNXB4OworICBtYXJnaW46 IDVweDsgCit9CisKKy5mbGV4Ym94IHsKKyAgZGlzcGxheTogLXdlYmtpdC1mbGV4Ym94OyAKK30K KworLnJvdyB7CisgIC13ZWJraXQtZmxleC1kaXJlY3Rpb246IHJvdzsKK30KKworLmNvbHVtbiB7 CisgIGRpc3BsYXk6IC13ZWJraXQtZmxleGJveDsgCisgIC13ZWJraXQtZmxleC1kaXJlY3Rpb246 IGNvbHVtbjsKK30KKworLmZsZXggeworICAtd2Via2l0LWZsZXg6IDEgMCBhdXRvOworfQorPC9z dHlsZT4KKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9 InJlc291cmNlcy9mbGV4Ym94LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0i Y2hlY2tGbGV4Qm94ZW4oKSI+CitUaGVyZSBzaG91bGQgYmUgdHdvIGJveGVzIG9mIGVxdWFsIGhl aWdodCBvbiB0aGUgbGVmdCBhbmQgMyBib3hlcyBvZiBlcXVhbAoraGVpZ2h0IG9uIHRoZSByaWdo dC4KKzxkaXYgY2xhc3M9ImZsZXhib3ggcm93IiBzdHlsZT0id2lkdGg6IDYwMHB4Ij4KKyAgPGRp diBkYXRhLWV4cGVjdGVkLXdpZHRoPTI5MCBkYXRhLWV4cGVjdGVkLWhlaWdodD0yMjAgY2xhc3M9 ImNvbHVtbiBmbGV4Ij4KKyAgICA8ZGl2IGRhdGEtZXhwZWN0ZWQtd2lkdGg9MjcwIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PTk1IGNsYXNzPSJmbGV4Ij48L2Rpdj4KKyAgICA8ZGl2IGRhdGEtZXhwZWN0 ZWQtd2lkdGg9MjcwIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PTk1IGNsYXNzPSJmbGV4Ij48L2Rpdj4K KyAgPC9kaXY+CisgIDxkaXYgZGF0YS1leHBlY3RlZC13aWR0aD0yOTAgZGF0YS1leHBlY3RlZC1o ZWlnaHQ9MjIwIGNsYXNzPSJjb2x1bW4gZmxleCI+CisgICAgPGRpdiBkYXRhLWV4cGVjdGVkLXdp ZHRoPTI3MCBkYXRhLWV4cGVjdGVkLWhlaWdodD02MCBjbGFzcz0iZmxleCIgc3R5bGU9ImhlaWdo dDogNTBweDsiPjwvZGl2PgorICAgIDxkaXYgZGF0YS1leHBlY3RlZC13aWR0aD0yNzAgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9NjAgY2xhc3M9ImZsZXgiIHN0eWxlPSJoZWlnaHQ6IDUwcHg7Ij48L2Rp dj4KKyAgICA8ZGl2IGRhdGEtZXhwZWN0ZWQtd2lkdGg9MjcwIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0 PTYwIGNsYXNzPSJmbGV4IiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyI+PC9kaXY+CisgIDwvZGl2Pgor PC9kaXY+CisKK05vbmUgb2YgdGhlIGJveGVzIHNob3VsZCBvdmVyZmxvdyBhbmQgdGhlIGlubmVy IG1vc3QgYm94ZXMgc2hvdWxkIGJlIGVuZCBhbGlnbmVkLgorPGRpdiBjbGFzcz0iZmxleGJveCBj b2x1bW4iIHN0eWxlPSJ3aWR0aDogNjAwcHg7IGhlaWdodDogMzAwcHg7IHBvc2l0aW9uOiByZWxh dGl2ZTsiPgorICA8ZGl2IGRhdGEtZXhwZWN0ZWQtd2lkdGg9NTkwIGRhdGEtZXhwZWN0ZWQtaGVp Z2h0PTI1MCBjbGFzcz0iY29sdW1uIGZsZXgiIHN0eWxlPSItd2Via2l0LWZsZXgtcGFjazogZW5k Ij4KKyAgICA8ZGl2IGRhdGEtb2Zmc2V0LXk9IjE4MCIgZGF0YS1leHBlY3RlZC13aWR0aD01NzAg ZGF0YS1leHBlY3RlZC1oZWlnaHQ9MzAgc3R5bGU9ImhlaWdodDogMjBweCI+PC9kaXY+CisgICAg PGRpdiBkYXRhLW9mZnNldC15PSIyMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9NTcwIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PTMwIHN0eWxlPSJoZWlnaHQ6IDIwcHgiPjwvZGl2PgorICA8L2Rpdj4KKyAg PGRpdiBkYXRhLWV4cGVjdGVkLXdpZHRoPTU5MCBkYXRhLWV4cGVjdGVkLWhlaWdodD0zMCBzdHls ZT0iaGVpZ2h0OiAyMHB4Ij48L2Rpdj4KKzwvZGl2PgorCisKKzwvYm9keT4KKzwvaHRtbD4K 140101 2012-05-03 14:56:16 -0700 2012-05-03 16:21:01 -0700 Patch for landing bug-83572-20120503145620.patch text/plain 6610 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBiMzEyZTk2NWIwY2Q4 MjliZmMyZmNkODQ5YmU2NmMwZGQ1MmU2Ni4uNGJmMmRiNjkzYThjYjU2NmZmYjc5MTAwN2Q3MGY0 ZmJmZWM2YWMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA1LTAzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGVpZ2h0IG92ZXJmbG93IHdo ZW4gbmVzdGluZyBtdWx0aXBsZSBuZXcgRmxleGJveCdlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg T2phbiBWYWZhaS4KKworICAgICAgICBUZXN0OiBjc3MzL2ZsZXhib3gvbmVzdGVkLXN0cmV0Y2gu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlQXZhaWxhYmxlRnJlZVNwYWNl KToKKwogMjAxMi0wNS0wMyAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgog CiAgICAgICAgIGFjY2Vzc2liaWxpdHkvbWlzc3BlbGxlZC1hdHRyaWJ1dGVkLXN0cmluZy5odG1s IHRlc3Qgc29tZXRpbWVzIHRocm93cyBleGNlcHRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA3MWU2MjU2ZGQzMjJjMzQwZmNhNzgx OGE3OGUwMGNjMmQwMTNjYmM0Li5lZmEyZWI3MWQ5ZGU2ZTRjYzFjZWY4NTZlYjU2ZDc2OGU0NWUw NGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAKQEAgLTU5OCwyMyArNTk4LDI1IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OnBy ZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckNoaWxkKFJlbmRlckJveCoKIAogTGF5b3V0 VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUF2YWlsYWJsZUZyZWVTcGFjZShMYXlvdXRV bml0IHByZWZlcnJlZE1haW5BeGlzRXh0ZW50KQogeworICAgIExheW91dFVuaXQgY29udGVudEV4 dGVudCA9IDA7CiAgICAgaWYgKCFpc0NvbHVtbkZsb3coKSkKLSAgICAgICAgcmV0dXJuIG1haW5B eGlzQ29udGVudEV4dGVudCgpIC0gcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQ7Ci0KLSAgICBpZiAo aGFzT3ZlcnJpZGVIZWlnaHQoKSkKLSAgICAgICAgcmV0dXJuIG92ZXJyaWRlSGVpZ2h0KCk7Ci0K LSAgICBMYXlvdXRVbml0IGhlaWdodFJlc3VsdCA9IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdo dFVzaW5nKHN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKSk7Ci0gICAgaWYgKGhlaWdodFJlc3VsdCA9 PSAtMSkKLSAgICAgICAgaGVpZ2h0UmVzdWx0ID0gcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQ7Ci0g ICAgTGF5b3V0VW5pdCBtaW5IZWlnaHQgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHRVc2lu ZyhzdHlsZSgpLT5sb2dpY2FsTWluSGVpZ2h0KCkpOyAvLyBMZWF2ZSBhcyAtMSBpZiB1bnNldC4K LSAgICBMYXlvdXRVbml0IG1heEhlaWdodCA9IHN0eWxlKCktPmxvZ2ljYWxNYXhIZWlnaHQoKS5p c1VuZGVmaW5lZCgpID8gaGVpZ2h0UmVzdWx0IDogY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0 VXNpbmcoc3R5bGUoKS0+bG9naWNhbE1heEhlaWdodCgpKTsKLSAgICBpZiAobWF4SGVpZ2h0ID09 IC0xKQotICAgICAgICBtYXhIZWlnaHQgPSBoZWlnaHRSZXN1bHQ7Ci0gICAgaGVpZ2h0UmVzdWx0 ID0gc3RkOjptaW4obWF4SGVpZ2h0LCBoZWlnaHRSZXN1bHQpOwotICAgIGhlaWdodFJlc3VsdCA9 IHN0ZDo6bWF4KG1pbkhlaWdodCwgaGVpZ2h0UmVzdWx0KTsKLQotICAgIHJldHVybiBoZWlnaHRS ZXN1bHQgLSBwcmVmZXJyZWRNYWluQXhpc0V4dGVudDsKKyAgICAgICAgY29udGVudEV4dGVudCA9 IG1haW5BeGlzQ29udGVudEV4dGVudCgpOworICAgIGVsc2UgaWYgKGhhc092ZXJyaWRlSGVpZ2h0 KCkpCisgICAgICAgIGNvbnRlbnRFeHRlbnQgPSBvdmVycmlkZUhlaWdodCgpIC0gKGxvZ2ljYWxI ZWlnaHQoKSAtIGNvbnRlbnRMb2dpY2FsSGVpZ2h0KCkpOworICAgIGVsc2UgeworICAgICAgICBM YXlvdXRVbml0IGhlaWdodFJlc3VsdCA9IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodFVzaW5n KHN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKSk7CisgICAgICAgIGlmIChoZWlnaHRSZXN1bHQgPT0g LTEpCisgICAgICAgICAgICBoZWlnaHRSZXN1bHQgPSBwcmVmZXJyZWRNYWluQXhpc0V4dGVudDsK KyAgICAgICAgTGF5b3V0VW5pdCBtaW5IZWlnaHQgPSBjb21wdXRlQ29udGVudExvZ2ljYWxIZWln aHRVc2luZyhzdHlsZSgpLT5sb2dpY2FsTWluSGVpZ2h0KCkpOyAvLyBMZWF2ZSBhcyAtMSBpZiB1 bnNldC4KKyAgICAgICAgTGF5b3V0VW5pdCBtYXhIZWlnaHQgPSBzdHlsZSgpLT5sb2dpY2FsTWF4 SGVpZ2h0KCkuaXNVbmRlZmluZWQoKSA/IGhlaWdodFJlc3VsdCA6IGNvbXB1dGVDb250ZW50TG9n aWNhbEhlaWdodFVzaW5nKHN0eWxlKCktPmxvZ2ljYWxNYXhIZWlnaHQoKSk7CisgICAgICAgIGlm IChtYXhIZWlnaHQgPT0gLTEpCisgICAgICAgICAgICBtYXhIZWlnaHQgPSBoZWlnaHRSZXN1bHQ7 CisgICAgICAgIGhlaWdodFJlc3VsdCA9IHN0ZDo6bWluKG1heEhlaWdodCwgaGVpZ2h0UmVzdWx0 KTsKKyAgICAgICAgaGVpZ2h0UmVzdWx0ID0gc3RkOjptYXgobWluSGVpZ2h0LCBoZWlnaHRSZXN1 bHQpOworICAgICAgICBjb250ZW50RXh0ZW50ID0gaGVpZ2h0UmVzdWx0OworICAgIH0KKworICAg IHJldHVybiBjb250ZW50RXh0ZW50IC0gcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQ7CiB9CiAKIHZv aWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyhGbGV4T3JkZXJJdGVyYXRvciYg aXRlcmF0b3IsIFdURjo6VmVjdG9yPExpbmVDb250ZXh0PiYgbGluZUNvbnRleHRzKQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDkyZTA1NGE4OWNhOTU0MDkxYWU4OWY2YWI5MDViZGQ4NGRmZTkwMTkuLmVjNzM4MWFhNzJlMjYw M2MyZmZkZmI4YmJkMzMwNmUzZGQ5NjhjNGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0w NS0wMyAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEhlaWdodCBv dmVyZmxvdyB3aGVuIG5lc3RpbmcgbXVsdGlwbGUgbmV3IEZsZXhib3gnZXMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzU3MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE9qYW4gVmFmYWkuCisKKyAgICAgICAgKiBjc3MzL2ZsZXhib3gvbmVzdGVkLXN0 cmV0Y2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBjc3MzL2ZsZXhib3gvbmVzdGVk LXN0cmV0Y2guaHRtbDogQWRkZWQuCisKIDIwMTItMDUtMDMgIFRoaWFnbyBNYXJjb3MgUC4gU2Fu dG9zICA8dGhpYWdvLnNhbnRvc0BpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gQ1NTIHRlc3Rz IG5lZWRzIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L25l c3RlZC1zdHJldGNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9uZXN0 ZWQtc3RyZXRjaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzZmZmQwOTdjNGRiZmYyMTEwM2Zj MmIyMDQ1Y2ZiZmUxYTNiMTI4YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMv ZmxleGJveC9uZXN0ZWQtc3RyZXRjaC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACitUaGVy ZSBzaG91bGQgYmUgdHdvIGJveGVzIG9mIGVxdWFsIGhlaWdodCBvbiB0aGUgbGVmdCBhbmQgMyBi b3hlcyBvZiBlcXVhbCBoZWlnaHQgb24gdGhlIHJpZ2h0LgorUEFTUworTm9uZSBvZiB0aGUgYm94 ZXMgc2hvdWxkIG92ZXJmbG93IGFuZCB0aGUgaW5uZXIgbW9zdCBib3hlcyBzaG91bGQgYmUgZW5k IGFsaWduZWQuCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvbmVz dGVkLXN0cmV0Y2guaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9uZXN0ZWQtc3RyZXRj aC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmEzODZmNTI5ZDA2ODgwMGQ5NjZlM2Y1MGNhM2U1ODc3YWExZmI4 ZTIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gvbmVzdGVkLXN0 cmV0Y2guaHRtbApAQCAtMCwwICsxLDYxIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhl YWQ+Cis8c3R5bGU+CitkaXYgeworICBvdXRsaW5lOiAxcHggc29saWQgYmxhY2s7CisgIGJhY2tn cm91bmQ6IGhzbGEoMjEwLDEwMCUsOTAlLCAuOCk7CisgIHBhZGRpbmc6IDVweDsKKyAgbWFyZ2lu OiA1cHg7IAorfQorCisuZmxleGJveCB7CisgIGRpc3BsYXk6IC13ZWJraXQtZmxleGJveDsgCit9 CisKKy5yb3cgeworICAtd2Via2l0LWZsZXgtZGlyZWN0aW9uOiByb3c7Cit9CisKKy5jb2x1bW4g eworICBkaXNwbGF5OiAtd2Via2l0LWZsZXhib3g7IAorICAtd2Via2l0LWZsZXgtZGlyZWN0aW9u OiBjb2x1bW47Cit9CisKKy5mbGV4IHsKKyAgLXdlYmtpdC1mbGV4OiAxIDAgYXV0bzsKK30KKzwv c3R5bGU+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSJyZXNvdXJjZXMvZmxleGJveC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9 ImNoZWNrRmxleEJveGVuKCkiPgorVGhlcmUgc2hvdWxkIGJlIHR3byBib3hlcyBvZiBlcXVhbCBo ZWlnaHQgb24gdGhlIGxlZnQgYW5kIDMgYm94ZXMgb2YgZXF1YWwKK2hlaWdodCBvbiB0aGUgcmln aHQuCis8ZGl2IGNsYXNzPSJmbGV4Ym94IHJvdyIgc3R5bGU9IndpZHRoOiA2MDBweCI+CisgIDxk aXYgZGF0YS1leHBlY3RlZC13aWR0aD0yOTAgZGF0YS1leHBlY3RlZC1oZWlnaHQ9MjIwIGNsYXNz PSJjb2x1bW4gZmxleCI+CisgICAgPGRpdiBkYXRhLWV4cGVjdGVkLXdpZHRoPTI3MCBkYXRhLWV4 cGVjdGVkLWhlaWdodD05NSBjbGFzcz0iZmxleCI+PC9kaXY+CisgICAgPGRpdiBkYXRhLWV4cGVj dGVkLXdpZHRoPTI3MCBkYXRhLWV4cGVjdGVkLWhlaWdodD05NSBjbGFzcz0iZmxleCI+PC9kaXY+ CisgIDwvZGl2PgorICA8ZGl2IGRhdGEtZXhwZWN0ZWQtd2lkdGg9MjkwIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PTIyMCBjbGFzcz0iY29sdW1uIGZsZXgiPgorICAgIDxkaXYgZGF0YS1leHBlY3RlZC13 aWR0aD0yNzAgZGF0YS1leHBlY3RlZC1oZWlnaHQ9NjAgY2xhc3M9ImZsZXgiIHN0eWxlPSJoZWln aHQ6IDUwcHg7Ij48L2Rpdj4KKyAgICA8ZGl2IGRhdGEtZXhwZWN0ZWQtd2lkdGg9MjcwIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PTYwIGNsYXNzPSJmbGV4IiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyI+PC9k aXY+CisgICAgPGRpdiBkYXRhLWV4cGVjdGVkLXdpZHRoPTI3MCBkYXRhLWV4cGVjdGVkLWhlaWdo dD02MCBjbGFzcz0iZmxleCIgc3R5bGU9ImhlaWdodDogNTBweDsiPjwvZGl2PgorICA8L2Rpdj4K KzwvZGl2PgorCitOb25lIG9mIHRoZSBib3hlcyBzaG91bGQgb3ZlcmZsb3cgYW5kIHRoZSBpbm5l ciBtb3N0IGJveGVzIHNob3VsZCBiZSBlbmQgYWxpZ25lZC4KKzxkaXYgY2xhc3M9ImZsZXhib3gg Y29sdW1uIiBzdHlsZT0id2lkdGg6IDYwMHB4OyBoZWlnaHQ6IDMwMHB4OyBwb3NpdGlvbjogcmVs YXRpdmU7Ij4KKyAgPGRpdiBkYXRhLWV4cGVjdGVkLXdpZHRoPTU5MCBkYXRhLWV4cGVjdGVkLWhl aWdodD0yNTAgY2xhc3M9ImNvbHVtbiBmbGV4IiBzdHlsZT0iLXdlYmtpdC1mbGV4LXBhY2s6IGVu ZCI+CisgICAgPGRpdiBkYXRhLW9mZnNldC15PSIxODAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9NTcw IGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PTMwIHN0eWxlPSJoZWlnaHQ6IDIwcHgiPjwvZGl2PgorICAg IDxkaXYgZGF0YS1vZmZzZXQteT0iMjIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPTU3MCBkYXRhLWV4 cGVjdGVkLWhlaWdodD0zMCBzdHlsZT0iaGVpZ2h0OiAyMHB4Ij48L2Rpdj4KKyAgPC9kaXY+Cisg IDxkaXYgZGF0YS1leHBlY3RlZC13aWR0aD01OTAgZGF0YS1leHBlY3RlZC1oZWlnaHQ9MzAgc3R5 bGU9ImhlaWdodDogMjBweCI+PC9kaXY+Cis8L2Rpdj4KKworCis8L2JvZHk+Cis8L2h0bWw+Cg==