23093 2009-01-03 17:04:42 -0800 REGRESSION (3.2-ToT): Clear button in search field fails to redraw correctly 2009-03-11 12:00:49 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P1 Normal --- 1 simon.fraser simon.fraser adele oldest_to_newest 104258 0 simon.fraser 2009-01-03 17:04:42 -0800 In the attached testcase, type a character into the search field. Note how the Clear button shows up, but only half of it draws. 104259 1 26395 simon.fraser 2009-01-03 17:05:06 -0800 Created attachment 26395 Testcase 113076 2 zwarich 2009-03-10 16:03:44 -0700 I'll take this bug. 113077 3 simon.fraser 2009-03-10 16:07:17 -0700 <rdar://problem/6493801&6577037> 113082 4 zwarich 2009-03-10 16:45:12 -0700 Between the r37126 and r37300 nightlies, the clear button disappears entirely, but I am not sure if this is the root cause of the bug. I'll see where it goes to being half-drawn. 113089 5 zwarich 2009-03-10 17:11:50 -0700 The change from an undrawn clear button and a half-drawn clear button occurs between the r38676 and r38683 nightlies. The only relevant change is r38678: http://trac.webkit.org/changeset/38678 Simon, I am not an expert on this code, but it seems to me that the inflation of the rect for repainting is causing the button to be partially drawn, and the real problem occurred earlier when it was no longer drawn at all. What do you think? 113094 6 simon.fraser 2009-03-10 17:25:56 -0700 I think it would be instructive to debug through clippedOverflowRectForRepaint() and figure out why the rect ends up being wrong. 113105 7 zwarich 2009-03-10 18:57:22 -0700 Odd, a local debug build of r37126 demonstrates the same problematic behaviour. I'll just do as you suggest and debug the problem in ToT instead of trying to find the regression. 113110 8 simon.fraser 2009-03-10 20:39:33 -0700 I think the real issue here is that no-one tells the clear button to repaint when it is shown or hidden. 113111 9 zwarich 2009-03-10 20:44:36 -0700 Simon has a good idea of what causes this bug so I will unassign it. 113119 10 simon.fraser 2009-03-10 21:54:04 -0700 As a related issue, I found that the cancel button's div is also too short: bug 24509. 113121 11 28464 simon.fraser 2009-03-10 21:56:52 -0700 Created attachment 28464 Patch, testcase, changelog 113208 12 simon.fraser 2009-03-11 12:00:49 -0700 http://trac.webkit.org/changeset/41590 26395 2009-01-03 17:05:06 -0800 2009-01-03 17:05:06 -0800 Testcase test.html text/html 1871 simon.fraser PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIgoiaHR0cDov L3d3dy53My5vcmcvVFIvaHRtbDQvc3RyaWN0LmR0ZCI+CjxodG1sIGxhbmc9ImVuIj4KICA8aGVh ZD4KICAgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1s O2NoYXJzZXQ9dXRmLTgiPgogICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCiAgICA8L3N0eWxl PgoKCiAgPC9oZWFkPgogIDxib2R5PgoKICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiIHN0eWxlPSIi PgoKICAgICAgPGRpdiBjbGFzcz0iYWxwaGFUb3BBbmRCb3R0b21GYWRlIiBzdHlsZT0icG9zaXRp b246IHJlbGF0aXZlOyI+CgogICAgICAgIDxkaXYgY2xhc3M9InRhYmxlIiBzdHlsZT0id2lkdGg6 IDEwMCU7IGhlaWdodDogMzAwcHg7IHBhZGRpbmc6IDAuMzc1ZW0KM2V4OyI+PGRpdiBjbGFzcz0i cm93Ij4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iY2VsbCIgc3R5bGU9IndpZHRoOiA1MCU7IGhl aWdodDogMTAwJTsiPgogICAgICAgICAgICAgIDxkaXYgc3R5bGU9IndpZHRoOiAxMDAlOyBoZWln aHQ6IDEwMCU7IHBvc2l0aW9uOiByZWxhdGl2ZTsiPgogICAgICAgICAgICAgICAgPGRpdiBzdHls ZT0ibWFyZ2luOiAwZW0gM2V4OyBjb2xvcjogIzMzMzsgZm9udC1mYW1pbHk6ICdMdWNpZGEKR3Jh bmRlJzsgZm9udC13ZWlnaHQ6IG5vcm1hbDsiPgogICAgICAgICAgICAgICAgICA8ZGl2IHN0eWxl PSJmb250LXNpemU6IDE4cHg7IGZvbnQtd2VpZ2h0Ogpub3JtYWw7Ij5UaXRsZTwvZGl2PgogICAg ICAgICAgICAgICAgICA8ZGl2IHN0eWxlPSJjb2xvcjogIzY2NjsgbWFyZ2luLWxlZnQ6IDFleDsg bWFyZ2luLXRvcDoKMC4yNWVtOyI+U3VidGl0bGUhPC9kaXY+CiAgICAgICAgICAgICAgICA8L2Rp dj4KCiAgICAgICAgICAgICAgICA8ZGl2IHN0eWxlPSJmb250OiAxMXB4IG5vcm1hbCAnTHVjaWRh IEdyYW5kZSc7IGNvbG9yOiAjNTU1Ij4KICAgICAgICAgICAgICAgICAgPHA+WWF5IGZvciB1cy4u IGFuZCBzdHVmZjwvcD4KICAgICAgICAgICAgICAgICAgPHA+QW5kIHNvbWUgbW9yZSBiaXRzIGFu ZCBwaWVjZXMuPC9wPgoKICAgICAgICAgICAgICAgICAgPCEtLSBUaGlzIGlucHV0IHNlYXJjaCBi b3ggaXMgdmVyeSwgdmVyeSBzbHVnaXNoIHRvIHJlc3BvbmQKdG8ga2V5IHByZXNzZXMsIGFuZCBj aGV3cyB1cCAxMDAlIENQVSBvbiBhIEc0IFBQQyBQb3dlckJvb2sgLS0+CgogICAgICAgICAgICAg ICAgICA8IS0tCkkgZG9uJ3Qga25vdyB3aGljaCBvZiB0aGUgYWJvdmUgcGllY2VzIGNvbnRyaWJ1 dGUgdG8gdGhlIHByb2JsZW0sIGJ1dCBJIHNsaWNlZAppdCBkb3duIHRvIGp1c3QgdGhlc2UgYml0 cyB0aGF0IHJlcHJvZHVjZSB0aGUgcHJvYmxlbS4KCk5vdGU6IFdoZW4gSSB3YXMgdHJpbW1pbmcg dGhpbmdzIGRvd24gdG8gYSB1c2VhYmxlIGV4YW1wbGUsIHRoZXJlJ3MgZGVmaW5pdGVseQpzb21l IHBvaW50IHdoZXJlIHRoZSBwcm9ibGVtICdtb3N0bHknIGdvZXMgYXdheS4KCkFsc28sIEkgZG9u J3Qga25vdyBpZiB0aGlzIGlzIGEgV2ViS2l0IGJ1ZyBvciBhIE1hYyBPUyBYIGNvbXBvc2l0b3Ig cGVyZm9ybWFuY2UKaXNzdWUuICAKCi0tPgoKICAgICAgICAgICAgICAgICAgPGlucHV0IHR5cGU9 InNlYXJjaCIgbmFtZT0icmVxIiB2YWx1ZT0iIiByZXN1bHRzPSI1IgpwbGFjZWhvbGRlcj0iU2Vh cmNoIFRoaXMiIGF1dG9zYXZlPSIiPgoKICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAg ICAgIDwvZGl2PgogICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgIDwvZGl2PgogICAgICAgIDwv ZGl2PgogICAgICA8L2Rpdj4KICAgIDwvZGl2PgoKICA8L2JvZHk+CjwvaHRtbD4= 28464 2009-03-10 21:56:52 -0700 2009-03-11 11:12:17 -0700 Patch, testcase, changelog 24509_patch.txt text/plain 8526 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1ODA3YWEwLi4zMzE5NGU4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDMt MTAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDkzCisgICAgICAgIAorICAgICAgICBUZXN0IGZvciByZXBh aW50aW5nIG9mIHRoZSBzZWFyY2ggZmllbGQgY2FuY2VsIGJ1dHRvbi4KKworICAgICAgICAqIGZh c3QvcmVwYWludC9zZWFyY2gtZmllbGQtY2FuY2VsLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBs YXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvc2VhcmNoLWZpZWxkLWNhbmNlbC1leHBlY3RlZC5jaGVj a3N1bTogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC9zZWFyY2gt ZmllbGQtY2FuY2VsLWV4cGVjdGVkLnBuZzogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFj L2Zhc3QvcmVwYWludC9zZWFyY2gtZmllbGQtY2FuY2VsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisK IDIwMDktMDMtMTAgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZXBh aW50L3NlYXJjaC1maWVsZC1jYW5jZWwuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVwYWludC9z ZWFyY2gtZmllbGQtY2FuY2VsLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uZTU2YTM5MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVwYWludC9z ZWFyY2gtZmllbGQtY2FuY2VsLmh0bWwKQEAgLTAsMCArMSwyMCBAQAorPGh0bWw+Cis8aGVhZD4K KyAgPHRpdGxlPkNhbmNlbCBidXR0b24gcmVkcmF3PC90aXRsZT4KKyAgPHN0eWxlIHR5cGU9InRl eHQvY3NzIj4KKyAgICAjc2VhcmNoZmllbGQgeworICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlw dCBzcmM9InJlcGFpbnQuanMiIHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRmLTgi Pjwvc2NyaXB0PgorICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgY2hhcnNldD0idXRm LTgiPgorICAgIGZ1bmN0aW9uIHJlcGFpbnRUZXN0KCkKKyAgICB7CisgICAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnc2VhcmNoZmllbGQnKS52YWx1ZSA9ICdzb21lIHRleHQnOworICAgIH0K KyAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blJlcGFpbnRUZXN0KCkiPgor ICA8cD5UZXN0IGZvciA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjMwOTMiPmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5 MzwvYT4uIFRoZSBjYW5jZWwgYnV0dG9uIGluIGEgc2VhcmNoIGZpZWxkIGZhaWxzIHRvIHJlZHJh dy48L3A+CisgIDxpbnB1dCBpZD0ic2VhcmNoZmllbGQiIHR5cGU9InNlYXJjaCI+Cis8L2JvZHk+ Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC9zZWFyY2gtZmllbGQtY2FuY2VsLWV4cGVj dGVkLmNoZWNrc3VtIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC9zZWFy Y2gtZmllbGQtY2FuY2VsLWV4cGVjdGVkLmNoZWNrc3VtCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLjI5OGE4NTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3NlYXJjaC1maWVsZC1jYW5jZWwtZXhwZWN0ZWQuY2hlY2tz dW0KQEAgLTAsMCArMSBAQAorYjk3MzhkNDRmNTQ1MThkZTgwNGQ2YmRkMTQzMzkxZjYKXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvZmFzdC9yZXBhaW50L3NlYXJjaC1maWVsZC1jYW5jZWwtZXhwZWN0ZWQucG5nIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVwYWludC9zZWFyY2gtZmllbGQtY2FuY2VsLWV4cGVj dGVkLnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yYzI4NzhhCkJpbmFy eSBmaWxlcyAvZGV2L251bGwgYW5kIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvcmVw YWludC9zZWFyY2gtZmllbGQtY2FuY2VsLWV4cGVjdGVkLnBuZyBkaWZmZXIKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3JlcGFpbnQvc2VhcmNoLWZpZWxkLWNhbmNl bC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9yZXBhaW50L3Nl YXJjaC1maWVsZC1jYW5jZWwtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmJhODY1NDgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvZmFzdC9yZXBhaW50L3NlYXJjaC1maWVsZC1jYW5jZWwtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsMjQgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3IGF0 ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRl ckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtCT0RZ fSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwwKSBz aXplIDc4NHgxOAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA1M3gx OAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDUzOiAiVGVzdCBmb3IgIgorICAg ICAgICBSZW5kZXJJbmxpbmUge0F9IGF0ICgwLDApIHNpemUgMzA1eDE4IFtjb2xvcj0jMDAwMEVF XQorICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoNTMsMCkgc2l6ZSAzMDV4MTgKKyAg ICAgICAgICAgIHRleHQgcnVuIGF0ICg1MywwKSB3aWR0aCAzMDU6ICJodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwOTMiCisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0 fSBhdCAoMzU4LDApIHNpemUgMzIyeDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDM1OCwwKSB3 aWR0aCAzMjI6ICIuIFRoZSBjYW5jZWwgYnV0dG9uIGluIGEgc2VhcmNoIGZpZWxkIGZhaWxzIHRv IHJlZHJhdy4iCisgICAgICBSZW5kZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMCwzNCkgc2l6ZSA3 ODR4MjMKKyAgICAgICAgUmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfSBhdCAoMiwyKSBzaXplIDE0 OHgxOSBbYmdjb2xvcj0jRkZGRkZGXSBbYm9yZGVyOiAoMnB4IGluc2V0ICMwMDAwMDApXQorICAg ICAgICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgzLDMpIHNpemUgMTQyeDEzCisgICAgICAgICAg ICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCwwKSBzaXplIDh4MTEKKyAgICAgICAgICAgIFJlbmRl ckJsb2NrIHtESVZ9IGF0ICgxMjksMCkgc2l6ZSAxM3gxMQorICAgICAgICBSZW5kZXJUZXh0IHsj dGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMHgwCitsYXllciBhdCAoMjEsNDcpIHNpemUgMTIxeDEzCisgIFJlbmRlckJsb2Nr IHtESVZ9IGF0ICg4LDApIHNpemUgMTIxeDEzCisgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgx LDApIHNpemUgNTR4MTMKKyAgICAgIHRleHQgcnVuIGF0ICgxLDApIHdpZHRoIDU0OiAic29tZSB0 ZXh0IgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBkZmZiODM1Li4zZTE0ZDcxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDA5LTAzLTEwICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMDkzCisgICAgICAgIAorICAgICAgICBXaGVuIHRoZSBjYW5jZWwg YnV0dG9uIGluIHRoZSBzZWFyY2ggZmllbGQgaXMgc2hvd24gb3IgaGlkZGVuLAorICAgICAgICB3 ZSBuZWVkIHRvIGV4cGxpY2l0bHkgc2V0U3R5bGUoKSBvbiB0aGUgY2FuY2VsIGJ1dHRvbidzIHJl bmRlcmVyLAorICAgICAgICB0byBlbnN1cmUgdGhhdCByZXBhaW50IGhhcHBlbnMuIENoYW5naW5n IHRoZSBzdHlsZSB3aXRob3V0IHRlbGxpbmcKKyAgICAgICAgdGhlIHJlbmRlcmVyIHdvbid0IHdv cmsuCisKKyAgICAgICAgVGVzdDogZmFzdC9yZXBhaW50L3NlYXJjaC1maWVsZC1jYW5jZWwuaHRt bAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnN1YnRyZWVI YXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGlu ZTo6dXBkYXRlRnJvbUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lOjpjcmVhdGVDYW5jZWxCdXR0b25TdHlsZSk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnVwZGF0ZUNhbmNlbEJ1dHRvblZpc2liaWxp dHkpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjp2aXNp YmlsaXR5Rm9yQ2FuY2VsQnV0dG9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENv bnRyb2xTaW5nbGVMaW5lLmg6CisKIDIwMDktMDMtMTAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAgYi9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCmluZGV4IGNhODg1 ZjguLjk3YjA0NDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZS5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lLmNwcApAQCAtMTc0LDggKzE3NCw4IEBAIHZvaWQgUmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lOjpzdWJ0cmVlSGFzQ2hhbmdlZCgpCiAgICAgSW5wdXRFbGVtZW50KiBpbnB1 dCA9IGlucHV0RWxlbWVudCgpOwogICAgIGlucHV0LT5zZXRWYWx1ZUZyb21SZW5kZXJlcihpbnB1 dC0+Y29uc3RyYWluVmFsdWUodGV4dCgpKSk7CiAKLSAgICBpZiAoUmVuZGVyT2JqZWN0KiBjYW5j ZWxCdXR0b25SZW5kZXJlciA9IG1fY2FuY2VsQnV0dG9uID8gbV9jYW5jZWxCdXR0b24tPnJlbmRl cmVyKCkgOiAwKQotICAgICAgICB1cGRhdGVDYW5jZWxCdXR0b25WaXNpYmlsaXR5KGNhbmNlbEJ1 dHRvblJlbmRlcmVyLT5zdHlsZSgpKTsKKyAgICBpZiAobV9jYW5jZWxCdXR0b24pCisgICAgICAg IHVwZGF0ZUNhbmNlbEJ1dHRvblZpc2liaWxpdHkoKTsKIAogICAgIC8vIElmIHRoZSBpbmNyZW1l bnRhbCBhdHRyaWJ1dGUgaXMgc2V0LCB0aGVuIGRpc3BhdGNoIHRoZSBzZWFyY2ggZXZlbnQKICAg ICBpZiAoaW5wdXQtPnNlYXJjaEV2ZW50c1Nob3VsZEJlRGlzcGF0Y2hlZCgpKQpAQCAtNDcxLDgg KzQ3MSw4IEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjp1cGRhdGVGcm9tRWxl bWVudCgpCiAgICAgYm9vbCBwbGFjZWhvbGRlclZpc2liaWxpdHlTaG91bGRDaGFuZ2UgPSBtX3Bs YWNlaG9sZGVyVmlzaWJsZSAhPSBwbGFjZWhvbGRlclNob3VsZEJlVmlzaWJsZSgpOwogICAgIG1f cGxhY2Vob2xkZXJWaXNpYmxlID0gcGxhY2Vob2xkZXJTaG91bGRCZVZpc2libGUoKTsKIAotICAg IGlmIChSZW5kZXJPYmplY3QqIGNhbmNlbEJ1dHRvblJlbmRlcmVyID0gbV9jYW5jZWxCdXR0b24g PyBtX2NhbmNlbEJ1dHRvbi0+cmVuZGVyZXIoKSA6IDApCi0gICAgICAgIHVwZGF0ZUNhbmNlbEJ1 dHRvblZpc2liaWxpdHkoY2FuY2VsQnV0dG9uUmVuZGVyZXItPnN0eWxlKCkpOworICAgIGlmICht X2NhbmNlbEJ1dHRvbikKKyAgICAgICAgdXBkYXRlQ2FuY2VsQnV0dG9uVmlzaWJpbGl0eSgpOwog CiAgICAgaWYgKG1fcGxhY2Vob2xkZXJWaXNpYmxlKSB7CiAgICAgICAgIEV4Y2VwdGlvbkNvZGUg ZWMgPSAwOwpAQCAtNTgwLDE1ICs1ODAsMzAgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gUmVu ZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjcmVhdGVDYW5jZWxCdXR0b25TdHlsZShjb24KICAg ICBpZiAoc3RhcnRTdHlsZSkKICAgICAgICAgY2FuY2VsQmxvY2tTdHlsZS0+aW5oZXJpdEZyb20o c3RhcnRTdHlsZSk7CiAKLSAgICB1cGRhdGVDYW5jZWxCdXR0b25WaXNpYmlsaXR5KGNhbmNlbEJs b2NrU3R5bGUuZ2V0KCkpOworICAgIGNhbmNlbEJsb2NrU3R5bGUtPnNldFZpc2liaWxpdHkodmlz aWJpbGl0eUZvckNhbmNlbEJ1dHRvbigpKTsKICAgICByZXR1cm4gY2FuY2VsQmxvY2tTdHlsZS5y ZWxlYXNlKCk7CiB9CiAKLXZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjp1cGRhdGVD YW5jZWxCdXR0b25WaXNpYmlsaXR5KFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKK3ZvaWQgUmVu ZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjp1cGRhdGVDYW5jZWxCdXR0b25WaXNpYmlsaXR5KCkg Y29uc3QKK3sKKyAgICBpZiAoIW1fY2FuY2VsQnV0dG9uLT5yZW5kZXJlcigpKQorICAgICAgICBy ZXR1cm47CisKKyAgICBjb25zdCBSZW5kZXJTdHlsZSogY3VyU3R5bGUgPSBtX2NhbmNlbEJ1dHRv bi0+cmVuZGVyZXIoKS0+c3R5bGUoKTsKKyAgICBFVmlzaWJpbGl0eSBidXR0b25WaXNpYmlsaXR5 ID0gdmlzaWJpbGl0eUZvckNhbmNlbEJ1dHRvbigpOworICAgIGlmIChjdXJTdHlsZS0+dmlzaWJp bGl0eSgpID09IGJ1dHRvblZpc2liaWxpdHkpCisgICAgICAgIHJldHVybjsKKworICAgIFJlZlB0 cjxSZW5kZXJTdHlsZT4gY2FuY2VsQnV0dG9uU3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmUoY3Vy U3R5bGUpOworICAgIGNhbmNlbEJ1dHRvblN0eWxlLT5zZXRWaXNpYmlsaXR5KGJ1dHRvblZpc2li aWxpdHkpOworICAgIG1fY2FuY2VsQnV0dG9uLT5yZW5kZXJlcigpLT5zZXRTdHlsZShjYW5jZWxC dXR0b25TdHlsZSk7Cit9CisKK0VWaXNpYmlsaXR5IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGlu ZTo6dmlzaWJpbGl0eUZvckNhbmNlbEJ1dHRvbigpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG5vZGUo KS0+aXNIVE1MRWxlbWVudCgpKTsKICAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IHN0YXRp Y19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihub2RlKCkpOwotICAgIHN0eWxlLT5zZXRWaXNpYmls aXR5KGlucHV0LT52YWx1ZSgpLmlzRW1wdHkoKSA/IEhJRERFTiA6IFZJU0lCTEUpOworICAgIHJl dHVybiBpbnB1dC0+dmFsdWUoKS5pc0VtcHR5KCkgPyBISURERU4gOiBWSVNJQkxFOwogfQogCiBj b25zdCBBdG9taWNTdHJpbmcmIFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6YXV0b3NhdmVO YW1lKCkgY29uc3QKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZS5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaW5lLmgKaW5kZXggMjA4NzRlMS4uNzIyZjUxZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmgKQEAgLTc2LDcgKzc2LDggQEAgcHJpdmF0 ZToKICAgICBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBjcmVhdGVSZXN1bHRzQnV0dG9uU3R5bGUo Y29uc3QgUmVuZGVyU3R5bGUqIHN0YXJ0U3R5bGUpIGNvbnN0OwogICAgIFBhc3NSZWZQdHI8UmVu ZGVyU3R5bGU+IGNyZWF0ZUNhbmNlbEJ1dHRvblN0eWxlKGNvbnN0IFJlbmRlclN0eWxlKiBzdGFy dFN0eWxlKSBjb25zdDsKIAotICAgIHZvaWQgdXBkYXRlQ2FuY2VsQnV0dG9uVmlzaWJpbGl0eShS ZW5kZXJTdHlsZSopIGNvbnN0OworICAgIHZvaWQgdXBkYXRlQ2FuY2VsQnV0dG9uVmlzaWJpbGl0 eSgpIGNvbnN0OworICAgIEVWaXNpYmlsaXR5IHZpc2liaWxpdHlGb3JDYW5jZWxCdXR0b24oKSBj b25zdDsKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGF1dG9zYXZlTmFtZSgpIGNvbnN0OwogCiAg ICAgdm9pZCBzdGFydFNlYXJjaEV2ZW50VGltZXIoKTsK