25277 2009-04-17 16:15:51 -0700 If there is no line wrapping, a caret can leave its containing block but it shouldn't leave its root line box 2009-04-17 19:00:29 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 justin.garcia justin.garcia mitz simon.fraser oldest_to_newest 117986 0 justin.garcia 2009-04-17 16:15:51 -0700 If there is no line wrapping, a caret can leave its containing block but it shouldn't leave its root line box. Otherwise I believe it can be clipped by the containing blocks outline. Test case forthcoming. <rdar://problem/6800956> 117990 1 29593 justin.garcia 2009-04-17 16:50:54 -0700 Created attachment 29593 patch 117994 2 29593 mitz 2009-04-17 17:02:58 -0700 Comment on attachment 29593 patch You should add a reference to the test to the WebCore ChangeLog. I don't think this covers all cases. Not all textAlign() values that are not LEFT should behave the same, and I think in most cases (maybe even for LEFT and RIGHT) the behavior also needs to take style()->direction() into account, because that's how we decide on which side of the block the overflow goes. See the logic in RenderBlock::computeHorizontalPositionsForLine(). 117995 3 justin.garcia 2009-04-17 17:04:22 -0700 (In reply to comment #2) > Not all textAlign() values that are not LEFT should behave the same oops! will fix... 118003 4 29597 justin.garcia 2009-04-17 17:38:28 -0700 Created attachment 29597 patch patch with new test case to cover the case that dan mentioned, where the text-align is right but the direction is LTR. In that case we spill over to the right off the block like we do in other direction:LTR cases. 118008 5 29597 mitz 2009-04-17 18:31:14 -0700 Comment on attachment 29597 patch r=me There's a problem with this and earlier caret painting patches in that the difference between correct and incorrect behavior in the pixel test is below our detection threshold. I am not sure what to do about it (maybe use the Mac SPI that's exposed via DRT for getting caret rects?), but addressing that is not part of this bug. 118010 6 simon.fraser 2009-04-17 18:33:19 -0700 Maybe caretWidth should be settable at runtime via a CSS property, or DRT API, and we can make it really fat? 118011 7 mitz 2009-04-17 18:35:48 -0700 I don't think we want a CSS property for it, but maybe a WebView SPI. 118012 8 justin.garcia 2009-04-17 18:38:16 -0700 I'll correct the test description to say that the problem is that the caret paints over the focus halo a bit (rather than getting clipped). 118013 9 justin.garcia 2009-04-17 18:54:25 -0700 http://trac.webkit.org/changeset/42634 118014 10 justin.garcia 2009-04-17 19:00:29 -0700 and http://trac.webkit.org/changeset/42635 29593 2009-04-17 16:50:54 -0700 2009-04-17 17:38:28 -0700 patch 25277.txt text/plain 5292 justin.garcia SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjYzMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDQtMTcgIEp1c3RpbiBHYXJjaWEgIDxqdXN0aW4uZ2FyY2lh QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUyNzcKKyAgICAg ICAgSWYgdGhlcmUgaXMgbm8gbGluZSB3cmFwcGluZywgYSBjYXJldCBjYW4gbGVhdmUgaXRzIGNv bnRhaW5pbmcgYmxvY2sgYnV0IGl0IHNob3VsZG4ndCBsZWF2ZSBpdHMgcm9vdCBsaW5lIGJveAor ICAgICAgICAKKyAgICAgICAgQWxzbyBhZGQgY29kZSB0byBoYW5kbGUgYSBjYXJldCB3aWRlciB0 aGFuIG9uZSBwaXhlbC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmxvY2FsQ2FyZXRSZWN0KTogRGlzdHJpYnV0ZSBh IGNhcmV0J3Mgd2lkdGggdG8gZWl0aGVyIHNpZGUgb2YgdGhlIG9mZnNldCwKKyAgICAgICAgc28g dGhhdCBhIGNhcmV0IGJldHdlZW4gdHdvIGNoYXJhY3RlcnMgZG9lc24ndCBoYW5nIG92ZXIgb25l IGNoYXJhY3RlciBtb3JlIHRoYW4gYW5vdGhlci4KKyAgICAgICAgSWYgdGhlcmUgaXMgbm8gd3Jh cHBpbmcsIHRoZSBjYXJldCBjYW4gbGVhdmUgaXRzIGNvbnRhaW5pbmcgYmxvY2ssIGJ1dCBub3Qg aXRzIHJvb3QgbGluZSBib3guCisKIDIwMDktMDQtMTcgIERhdmlkIEtpbHplciAgPGRka2lsemVy QGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlmeSBGRUFUVVJFX0RFRklORVMgZGVmaW5pdGlv bgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHJldmlzaW9uIDQyNTk5KQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4OSw3ICsz ODksMTMgQEAKIAogICAgIGludCBsZWZ0ID0gYm94LT5wb3NpdGlvbkZvck9mZnNldChjYXJldE9m ZnNldCk7CiAKKyAgICAvLyBEaXN0cmlidXRlIHRoZSBjYXJldCdzIHdpZHRoIHRvIGVpdGhlciBz aWRlIG9mIHRoZSBvZmZzZXQuCisgICAgaW50IGNhcmV0V2lkdGhMZWZ0T2ZPZmZzZXQgPSBjYXJl dFdpZHRoIC8gMjsKKyAgICBsZWZ0IC09IGNhcmV0V2lkdGhMZWZ0T2ZPZmZzZXQ7CisgICAgaW50 IGNhcmV0V2lkdGhSaWdodE9mT2Zmc2V0ID0gY2FyZXRXaWR0aCAtIGNhcmV0V2lkdGhMZWZ0T2ZP ZmZzZXQ7CisKICAgICBpbnQgcm9vdExlZnQgPSBib3gtPnJvb3QoKS0+eCgpOworICAgIGludCBy b290UmlnaHQgPSByb290TGVmdCArIGJveC0+cm9vdCgpLT53aWR0aCgpOwogICAgIC8vIEZJWE1F OiBzaG91bGQgd2UgdXNlIHRoZSB3aWR0aCBvZiB0aGUgcm9vdCBpbmxpbmUgYm94IG9yIHRoZQog ICAgIC8vIHdpZHRoIG9mIHRoZSBjb250YWluaW5nIGJsb2NrIGZvciB0aGlzPwogICAgIGlmIChl eHRyYVdpZHRoVG9FbmRPZkxpbmUpCkBAIC0zOTksMTAgKzQwNSwyMyBAQAogICAgIGlmIChzdHls ZSgpLT5hdXRvV3JhcCgpKSB7CiAgICAgICAgIGludCBhdmFpbGFibGVXaWR0aCA9IGNiLT5saW5l V2lkdGgodG9wLCBmYWxzZSk7CiAgICAgICAgIGlmIChib3gtPmRpcmVjdGlvbigpID09IExUUikK LSAgICAgICAgICAgIGxlZnQgPSBtaW4obGVmdCwgcm9vdExlZnQgKyBhdmFpbGFibGVXaWR0aCAt IDEpOworICAgICAgICAgICAgbGVmdCA9IG1pbihsZWZ0LCByb290TGVmdCArIGF2YWlsYWJsZVdp ZHRoIC0gY2FyZXRXaWR0aFJpZ2h0T2ZPZmZzZXQpOwogICAgICAgICBlbHNlCiAgICAgICAgICAg ICBsZWZ0ID0gbWF4KGxlZnQsIHJvb3RMZWZ0KTsKICAgICB9CisgICAgCisgICAgaWYgKCFzdHls ZSgpLT5hdXRvV3JhcCgpKSB7CisgICAgICAgIC8vIElmIHRoZXJlIGlzIG5vIHdyYXBwaW5nLCB0 aGUgY2FyZXQgY2FuIGxlYXZlIGl0cyBjb250YWluaW5nIGJsb2NrLCBidXQgbm90IGl0cyByb290 IGxpbmUgYm94LgorICAgICAgICBpZiAoY2ItPnN0eWxlKCktPnRleHRBbGlnbigpID09IExFRlQp IHsKKyAgICAgICAgICAgIGludCByaWdodEVkZ2UgPSBtYXgoY2ItPndpZHRoKCksIHJvb3RSaWdo dCk7CisgICAgICAgICAgICBsZWZ0ID0gbWluKGxlZnQsIHJpZ2h0RWRnZSAtIGNhcmV0V2lkdGhS aWdodE9mT2Zmc2V0KTsKKyAgICAgICAgICAgIGxlZnQgPSBtYXgobGVmdCwgcm9vdExlZnQpOwor ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaW50IGxlZnRFZGdlID0gbWluKGNiLT54KCks IHJvb3RMZWZ0KTsKKyAgICAgICAgICAgIGxlZnQgPSBtYXgobGVmdCwgbGVmdEVkZ2UpOworICAg ICAgICAgICAgbGVmdCA9IG1pbihsZWZ0LCByb290UmlnaHQgLSBjYXJldFdpZHRoKTsKKyAgICAg ICAgfQorICAgIH0KIAogICAgIHJldHVybiBJbnRSZWN0KGxlZnQsIHRvcCwgY2FyZXRXaWR0aCwg aGVpZ2h0KTsKIH0KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2lubGluZS8y NTI3Ny1leHBlY3RlZC5jaGVja3N1bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvZmFzdC9pbmxpbmUvMjUyNzctZXhwZWN0ZWQuY2hlY2tzdW0JKHJldmlzaW9uIDApCisr KyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbmxpbmUvMjUyNzctZXhwZWN0ZWQuY2hl Y2tzdW0JKHJldmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKK2Q2MDg0NmY3MTFiZWQwNzZkY2VlZjAy MDAzODNiZDZjClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL2Zhc3QvaW5saW5lLzI1Mjc3LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbmxpbmUvMjUyNzctZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvaW5saW5lLzI1 Mjc3LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMyBAQAorbGF5ZXIgYXQg KDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCits YXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDAp IHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4 NAorICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6ZSA3ODR4MzYKKyAgICAgICAg UmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNzY3eDM2CisgICAgICAgICAgdGV4dCBy dW4gYXQgKDAsMCkgd2lkdGggNzY3OiAiVGhpcyB0ZXN0cyBmb3IgYSBidWcgKGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTI3Nykgd2hlcmUgYSBjYXJldCBhdCB0aGUg ZW5kIG9mIGEgbm9uLXdyYXBwaW5nIGxpbmUgdGhhdCIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAo MCwxOCkgd2lkdGggNDc1OiAiZXh0ZW5kcyBvdXRzaWRlIG9mIHRoZSBjb250YWluaW5nIGJsb2Nr IHdvdWxkIGJlIGNsaXBwZWQgYnkgdGhlIGZvY3VzIGhhbG8uIgorICAgICAgUmVuZGVyQmxvY2sg e0RJVn0gYXQgKDAsMzYpIHNpemUgNTB4MTgKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0 ICgwLDApIHNpemUgMjYzeDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMjYz OiAiVGhlIGNhcmV0IHNob3VsZCBiZSBhdCB0aGUgZW5kIG9mIHRoaXMgbGluZS4iCitjYXJldDog cG9zaXRpb24gNDQgb2YgY2hpbGQgMCB7I3RleHR9IG9mIGNoaWxkIDIge0RJVn0gb2YgY2hpbGQg MCB7Qk9EWX0gb2YgY2hpbGQgMCB7SFRNTH0gb2YgZG9jdW1lbnQKSW5kZXg6IExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9mYXN0L2lubGluZS8yNTI3Ny1leHBlY3RlZC5wbmcKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpD YW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBiaW5hcnkgdHlwZS4Kc3ZuOm1pbWUtdHlw ZSA9IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbQoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvaW5saW5lLzI1Mjc3LWV4cGVjdGVkLnBuZwpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCk5hbWU6IHN2bjptaW1lLXR5cGUKICAgKyBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KCklu ZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS8yNTI3Ny5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvaW5saW5lLzI1Mjc3Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRU ZXN0cy9mYXN0L2lubGluZS8yNTI3Ny5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMgQEAK KzxkaXYgaWQ9ImRlc2NyaXB0aW9uIj5UaGlzIHRlc3RzIGZvciBhIGJ1ZyAoaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1Mjc3KSB3aGVyZSBhIGNhcmV0IGF0IHRoZSBl bmQgb2YgYSBub24td3JhcHBpbmcgbGluZSB0aGF0IGV4dGVuZHMgb3V0c2lkZSBvZiB0aGUgY29u dGFpbmluZyBibG9jayB3b3VsZCBiZSBjbGlwcGVkIGJ5IHRoZSBmb2N1cyBoYWxvLjwvZGl2Pgor PGRpdiBpZD0iZWRpdCIgY29udGVudEVkaXRhYmxlPSJ0cnVlIiBzdHlsZT0id2lkdGg6IDUwcHg7 IHdoaXRlLXNwYWNlOiBub3dyYXA7Ij5UaGUgY2FyZXQgc2hvdWxkIGJlIGF0IHRoZSBlbmQgb2Yg dGhpcyBsaW5lLjwvZGl2PgorPHNjcmlwdD53aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRp b24oZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVkaXQiKSwgMSk8L3NjcmlwdD4K 29597 2009-04-17 17:38:28 -0700 2009-04-17 18:31:14 -0700 patch 25277.txt text/plain 7991 justin.garcia SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjYzMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMDQtMTcgIEp1c3RpbiBHYXJjaWEgIDxqdXN0aW4uZ2FyY2lh QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUyNzcKKyAgICAg ICAgSWYgdGhlcmUgaXMgbm8gbGluZSB3cmFwcGluZywgYSBjYXJldCBjYW4gbGVhdmUgaXRzIGNv bnRhaW5pbmcgYmxvY2sgYnV0IGl0IHNob3VsZG4ndCBsZWF2ZSBpdHMgcm9vdCBsaW5lIGJveAor ICAgICAgICAKKyAgICAgICAgQWxzbyBhZGRlZCBjb2RlIHRvIGhhbmRsZSBhIGNhcmV0IHdpZGVy IHRoYW4gb25lIHBpeGVsLgorICAgICAgICAKKyAgICAgICAgQWRkZWQgZmFzdC9pbmxpbmUvMjUy NzcuaHRtbCBhbmQgZmFzdC9pbmxpbmUvMjUyNzctMi5odG1sCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Ojpsb2NhbENh cmV0UmVjdCk6IERpc3RyaWJ1dGUgYSBjYXJldCdzIHdpZHRoIHRvIGVpdGhlciBzaWRlIG9mIHRo ZSBvZmZzZXQsCisgICAgICAgIHNvIHRoYXQgYSBjYXJldCBiZXR3ZWVuIHR3byBjaGFyYWN0ZXJz IGRvZXNuJ3QgaGFuZyBvdmVyIG9uZSBjaGFyYWN0ZXIgbW9yZSB0aGFuIHRoZSBvdGhlci4KKyAg ICAgICAgSWYgdGhlcmUgaXMgbm8gd3JhcHBpbmcsIHRoZSBjYXJldCBjYW4gbGVhdmUgaXRzIGNv bnRhaW5pbmcgYmxvY2ssIGJ1dCBub3QgaXRzIHJvb3QgbGluZSBib3guCisKIDIwMDktMDQtMTcg IERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlmeSBG RUFUVVJFX0RFRklORVMgZGVmaW5pdGlvbgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJ KHJldmlzaW9uIDQyNTk5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM4OSw3ICszODksMTMgQEAKIAogICAgIGludCBsZWZ0ID0gYm94LT5w b3NpdGlvbkZvck9mZnNldChjYXJldE9mZnNldCk7CiAKKyAgICAvLyBEaXN0cmlidXRlIHRoZSBj YXJldCdzIHdpZHRoIHRvIGVpdGhlciBzaWRlIG9mIHRoZSBvZmZzZXQuCisgICAgaW50IGNhcmV0 V2lkdGhMZWZ0T2ZPZmZzZXQgPSBjYXJldFdpZHRoIC8gMjsKKyAgICBsZWZ0IC09IGNhcmV0V2lk dGhMZWZ0T2ZPZmZzZXQ7CisgICAgaW50IGNhcmV0V2lkdGhSaWdodE9mT2Zmc2V0ID0gY2FyZXRX aWR0aCAtIGNhcmV0V2lkdGhMZWZ0T2ZPZmZzZXQ7CisKICAgICBpbnQgcm9vdExlZnQgPSBib3gt PnJvb3QoKS0+eCgpOworICAgIGludCByb290UmlnaHQgPSByb290TGVmdCArIGJveC0+cm9vdCgp LT53aWR0aCgpOwogICAgIC8vIEZJWE1FOiBzaG91bGQgd2UgdXNlIHRoZSB3aWR0aCBvZiB0aGUg cm9vdCBpbmxpbmUgYm94IG9yIHRoZQogICAgIC8vIHdpZHRoIG9mIHRoZSBjb250YWluaW5nIGJs b2NrIGZvciB0aGlzPwogICAgIGlmIChleHRyYVdpZHRoVG9FbmRPZkxpbmUpCkBAIC0zOTksOSAr NDA1LDIwIEBACiAgICAgaWYgKHN0eWxlKCktPmF1dG9XcmFwKCkpIHsKICAgICAgICAgaW50IGF2 YWlsYWJsZVdpZHRoID0gY2ItPmxpbmVXaWR0aCh0b3AsIGZhbHNlKTsKICAgICAgICAgaWYgKGJv eC0+ZGlyZWN0aW9uKCkgPT0gTFRSKQotICAgICAgICAgICAgbGVmdCA9IG1pbihsZWZ0LCByb290 TGVmdCArIGF2YWlsYWJsZVdpZHRoIC0gMSk7CisgICAgICAgICAgICBsZWZ0ID0gbWluKGxlZnQs IHJvb3RMZWZ0ICsgYXZhaWxhYmxlV2lkdGggLSBjYXJldFdpZHRoUmlnaHRPZk9mZnNldCk7CiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIGxlZnQgPSBtYXgobGVmdCwgcm9vdExlZnQpOworICAg IH0gZWxzZSB7CisgICAgICAgIC8vIElmIHRoZXJlIGlzIG5vIHdyYXBwaW5nLCB0aGUgY2FyZXQg Y2FuIGxlYXZlIGl0cyBjb250YWluaW5nIGJsb2NrLCBidXQgbm90IGl0cyByb290IGxpbmUgYm94 LgorICAgICAgICBpZiAoY2ItPnN0eWxlKCktPmRpcmVjdGlvbigpID09IExUUikgeworICAgICAg ICAgICAgaW50IHJpZ2h0RWRnZSA9IG1heChjYi0+d2lkdGgoKSwgcm9vdFJpZ2h0KTsKKyAgICAg ICAgICAgIGxlZnQgPSBtaW4obGVmdCwgcmlnaHRFZGdlIC0gY2FyZXRXaWR0aFJpZ2h0T2ZPZmZz ZXQpOworICAgICAgICAgICAgbGVmdCA9IG1heChsZWZ0LCByb290TGVmdCk7CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICBpbnQgbGVmdEVkZ2UgPSBtaW4oY2ItPngoKSwgcm9vdExlZnQp OworICAgICAgICAgICAgbGVmdCA9IG1heChsZWZ0LCBsZWZ0RWRnZSk7CisgICAgICAgICAgICBs ZWZ0ID0gbWluKGxlZnQsIHJvb3RSaWdodCAtIGNhcmV0V2lkdGgpOworICAgICAgICB9CiAgICAg fQogCiAgICAgcmV0dXJuIEludFJlY3QobGVmdCwgdG9wLCBjYXJldFdpZHRoLCBoZWlnaHQpOwpJ bmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvaW5saW5lLzI1Mjc3LWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbmxpbmUv MjUyNzctZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL2Zhc3QvaW5saW5lLzI1Mjc3LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSwxMyBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAs MCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxv Y2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0 ICg4LDgpIHNpemUgNzg0eDU4NAorICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6 ZSA3ODR4MzYKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgNzY3eDM2 CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNzY3OiAiVGhpcyB0ZXN0cyBmb3Ig YSBidWcgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTI3Nykgd2hl cmUgYSBjYXJldCBhdCB0aGUgZW5kIG9mIGEgbm9uLXdyYXBwaW5nIGxpbmUgdGhhdCIKKyAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwxOCkgd2lkdGggNDc1OiAiZXh0ZW5kcyBvdXRzaWRlIG9mIHRo ZSBjb250YWluaW5nIGJsb2NrIHdvdWxkIGJlIGNsaXBwZWQgYnkgdGhlIGZvY3VzIGhhbG8uIgor ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMzYpIHNpemUgNTB4MTgKKyAgICAgICAgUmVu ZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMjYzeDE4CisgICAgICAgICAgdGV4dCBydW4g YXQgKDAsMCkgd2lkdGggMjYzOiAiVGhlIGNhcmV0IHNob3VsZCBiZSBhdCB0aGUgZW5kIG9mIHRo aXMgbGluZS4iCitjYXJldDogcG9zaXRpb24gNDQgb2YgY2hpbGQgMCB7I3RleHR9IG9mIGNoaWxk IDIge0RJVn0gb2YgY2hpbGQgMCB7Qk9EWX0gb2YgY2hpbGQgMCB7SFRNTH0gb2YgZG9jdW1lbnQK SW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2lubGluZS8yNTI3Ny0yLWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbmxp bmUvMjUyNzctMi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvZmFzdC9pbmxpbmUvMjUyNzctMi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsMTMgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3 IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJl bmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtC T0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDApIHNpemUgNzg0eDM2CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXpl IDc2N3gzNgorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDc2NzogIlRoaXMgdGVz dHMgZm9yIGEgYnVnIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUy NzcpIHdoZXJlIGEgY2FyZXQgYXQgdGhlIGVuZCBvZiBhIG5vbi13cmFwcGluZyBsaW5lIHRoYXQi CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTgpIHdpZHRoIDQ3NTogImV4dGVuZHMgb3V0c2lk ZSBvZiB0aGUgY29udGFpbmluZyBibG9jayB3b3VsZCBiZSBjbGlwcGVkIGJ5IHRoZSBmb2N1cyBo YWxvLiIKKyAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDM2KSBzaXplIDUweDE4CisgICAg ICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDI2M3gxOAorICAgICAgICAgIHRl eHQgcnVuIGF0ICgwLDApIHdpZHRoIDI2MzogIlRoZSBjYXJldCBzaG91bGQgYmUgYXQgdGhlIGVu ZCBvZiB0aGlzIGxpbmUuIgorY2FyZXQ6IHBvc2l0aW9uIDQ0IG9mIGNoaWxkIDAgeyN0ZXh0fSBv ZiBjaGlsZCAyIHtESVZ9IG9mIGNoaWxkIDAge0JPRFl9IG9mIGNoaWxkIDAge0hUTUx9IG9mIGRv Y3VtZW50CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbmxpbmUvMjUyNzct ZXhwZWN0ZWQucG5nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEg YmluYXJ5IHR5cGUuCnN2bjptaW1lLXR5cGUgPSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KClBy b3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2lubGluZS8y NTI3Ny1leHBlY3RlZC5wbmcKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOYW1lOiBzdm46bWltZS10eXBlCiAgICsgYXBw bGljYXRpb24vb2N0ZXQtc3RyZWFtCgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zh c3QvaW5saW5lLzI1Mjc3LTItZXhwZWN0ZWQuY2hlY2tzdW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvaW5saW5lLzI1Mjc3LTItZXhwZWN0ZWQuY2hlY2tzdW0J KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbmxpbmUvMjUy NzctMi1leHBlY3RlZC5jaGVja3N1bQkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAorZDYwODQ2 ZjcxMWJlZDA3NmRjZWVmMDIwMDM4M2JkNmMKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCklu ZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9pbmxpbmUvMjUyNzctZXhwZWN0ZWQu Y2hlY2tzdW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvaW5s aW5lLzI1Mjc3LWV4cGVjdGVkLmNoZWNrc3VtCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL2Zhc3QvaW5saW5lLzI1Mjc3LWV4cGVjdGVkLmNoZWNrc3VtCShyZXZpc2lv biAwKQpAQCAtMCwwICsxIEBACitkNjA4NDZmNzExYmVkMDc2ZGNlZWYwMjAwMzgzYmQ2YwpcIE5v IG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9m YXN0L2lubGluZS8yNTI3Ny0yLWV4cGVjdGVkLnBuZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CkNhbm5vdCBkaXNwbGF5 OiBmaWxlIG1hcmtlZCBhcyBhIGJpbmFyeSB0eXBlLgpzdm46bWltZS10eXBlID0gYXBwbGljYXRp b24vb2N0ZXQtc3RyZWFtCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvZmFzdC9pbmxpbmUvMjUyNzctMi1leHBlY3RlZC5wbmcKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOYW1lOiBz dm46bWltZS10eXBlCiAgICsgYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtCgpJbmRleDogTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvMjUyNzctMi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3QvaW5saW5lLzI1Mjc3LTIuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zh c3QvaW5saW5lLzI1Mjc3LTIuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzIEBACis8ZGl2 IGlkPSJkZXNjcmlwdGlvbiI+VGhpcyB0ZXN0cyBmb3IgYSBidWcgKGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTI3Nykgd2hlcmUgYSBjYXJldCBhdCB0aGUgZW5kIG9m IGEgbm9uLXdyYXBwaW5nIGxpbmUgdGhhdCBleHRlbmRzIG91dHNpZGUgb2YgdGhlIGNvbnRhaW5p bmcgYmxvY2sgd291bGQgYmUgY2xpcHBlZCBieSB0aGUgZm9jdXMgaGFsby48L2Rpdj4KKzxkaXYg aWQ9ImVkaXQiIGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSIgc3R5bGU9IndpZHRoOiA1MHB4OyB3aGl0 ZS1zcGFjZTogbm93cmFwOyB0ZXh0LWFsaWduOnJpZ2h0OyBkaXJlY3Rpb246bHRyIj5UaGUgY2Fy ZXQgc2hvdWxkIGJlIGF0IHRoZSBlbmQgb2YgdGhpcyBsaW5lLjwvZGl2PgorPHNjcmlwdD53aW5k b3cuZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRpb24oZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVk aXQiKSwgMSk8L3NjcmlwdD4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvaW5saW5lLzI1Mjc3Lmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvMjUyNzcuaHRtbAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvaW5saW5lLzI1Mjc3Lmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMyBAQAorPGRpdiBpZD0iZGVzY3JpcHRpb24iPlRoaXMgdGVzdHMgZm9y IGEgYnVnIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjUyNzcpIHdo ZXJlIGEgY2FyZXQgYXQgdGhlIGVuZCBvZiBhIG5vbi13cmFwcGluZyBsaW5lIHRoYXQgZXh0ZW5k cyBvdXRzaWRlIG9mIHRoZSBjb250YWluaW5nIGJsb2NrIHdvdWxkIGJlIGNsaXBwZWQgYnkgdGhl IGZvY3VzIGhhbG8uPC9kaXY+Cis8ZGl2IGlkPSJlZGl0IiBjb250ZW50RWRpdGFibGU9InRydWUi IHN0eWxlPSJ3aWR0aDogNTBweDsgd2hpdGUtc3BhY2U6IG5vd3JhcDsiPlRoZSBjYXJldCBzaG91 bGQgYmUgYXQgdGhlIGVuZCBvZiB0aGlzIGxpbmUuPC9kaXY+Cis8c2NyaXB0PndpbmRvdy5nZXRT ZWxlY3Rpb24oKS5zZXRQb3NpdGlvbihkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZWRpdCIpLCAx KTwvc2NyaXB0Pgo=