17906 2008-03-17 20:50:12 -0700 white-space: pre-wrap or -webkit-line-break: after-white-space text can overlap float at end of line 2008-07-25 13:22:04 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED HasReduction, InRadar P2 Normal --- 1 mitz mitz jacob.refstrup oldest_to_newest 74207 0 mitz 2008-03-17 20:50:12 -0700 A float occurring in the trailing whitespace of a line with white-space: pre-wrap or -webkit-line-break: after-white-space (editable HTML uses the latter by default) is not pushed down to the next line if it does not fit. See attached test case. 74208 1 19857 mitz 2008-03-17 20:50:29 -0700 Created attachment 19857 Test case 74305 2 mitz 2008-03-18 13:32:06 -0700 <rdar://problem/5805741> 85955 3 22285 jacob.refstrup 2008-07-15 13:17:09 -0700 Created attachment 22285 Fix for floats added in trailing whitespace for an already full linebox The root cause seems to be that the call to skipWhitespace(InlineIterator&) when the line box is already full causes floats to be added (correct) but also positioned (incorrect); the positioning should be deferred until newLine() is called. I've regressed this on gtk without issues (but then again gtk doesn't seem to dump render trees) but will need a volunteer to check it on MacOSX. 86421 4 22285 mitz 2008-07-19 11:49:43 -0700 Comment on attachment 22285 Fix for floats added in trailing whitespace for an already full linebox Looks good, but I think it would help, instead of the comments, to distinguish between the two skipWhitespace functions by renaming them to skipTrailingWhitespace and skipLeadingWhitespace. The former would also not need to return the available width. 86505 5 22285 mitz 2008-07-20 14:26:23 -0700 Comment on attachment 22285 Fix for floats added in trailing whitespace for an already full linebox r- for now because I think it's important to distinguish between the functions (see previous comment). 86518 6 jacob.refstrup 2008-07-20 19:28:52 -0700 (In reply to comment #5) > (From update of attachment 22285 [edit]) > r- for now because I think it's important to distinguish between the functions > (see previous comment). > Thx for the feedback -- I'll update the patch tomorrow when time allows. - Jacob 86578 7 22406 jacob.refstrup 2008-07-21 09:44:40 -0700 Created attachment 22406 Final patch with layout test added and feedback from mitz incorporated Added test case (editable-text-overlapping-float.html) and expected output (for Qt) Renamed functions per mitz's suggestions. Removed return value from skipTrailingWhitespace as it's not used. 86593 8 22406 mitz 2008-07-21 11:09:27 -0700 Comment on attachment 22406 Final patch with layout test added and feedback from mitz incorporated Looks good, but cannot be landed as-is: the css2.1 directory contains a standard test suite; the new test should go in fast/block/float. Expected results (render tree and bitmap) will for Mac OS X will need to be generated too. I am going to take care of those things when landing the patch. 86960 9 mitz 2008-07-25 13:22:04 -0700 Landed in <http://trac.webkit.org/changeset/35354>. 19857 2008-03-17 20:50:29 -0700 2008-03-17 20:50:29 -0700 Test case editable-text-overlapping-float.html text/html 791 mitz PHA+CiAgICBUZXh0IHNob3VsZCBub3Qgb3ZlcmxhcCB0aGUgYmx1ZSBzcXVhcmUuCjwvcD4KPGRp diBzdHlsZT0iLXdlYmtpdC1saW5lLWJyZWFrOiBhZnRlci13aGl0ZS1zcGFjZTsgd2lkdGg6IDM5 NnB4OyBib3JkZXI6IHNvbGlkIG1hcm9vbjsgcGFkZGluZzogMnB4OyI+RnVzY2UgYXQgYW50ZS4g SW4gaGFjIGhhYml0YXNzZSBwbGF0ZWEgZGljdHVtc3QuIE1hZWNlbmFzIGlhY3VsaXMgbm9udW1t eSBtYWduYS4gVml2YW11cyBhIHRvcnRvciB2aXRhZSBlbmltIG9ybmFyZSBjb25zZWN0ZXR1ZXIu IExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ZXIgYWRpcGlzY2luZyBlbGl0 LiBFdGlhbSBldCBpcHN1bS4gTmFtIGNvbnNlY3RldHVlciBtaSBlZ2V0IHZlbGl0LiA8ZGl2IHN0 eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiBsaWdodGJsdWU7IHdpZHRoOiA0ZW07IGhlaWdodDogNGVt OyBmbG9hdDogcmlnaHQiPjwvZGl2PiBTZWQgbmVjIHJpc3VzIHZpdGFlIGZlbGlzIGF1Y3RvciB1 bHRyaWNpZXMuIFBlbGxlbnRlc3F1ZSBhbGlxdWV0IHF1YW0gYWMgbG9yZW0uIER1aXMgaW50ZXJk dW0sIGVsaXQgaW4gdWx0cmljaWVzIGF1Y3RvciwgZXJhdCBwZWRlIHNvbGxpY2l0dWRpbiBsaWJl cm8sIG5vbiB1bHRyaWNlcyBvZGlvIGVsaXQgaW4gYXVndWUuIFV0IGVnZXN0YXMgYmliZW5kdW0g bGVjdHVzLiBDbGFzcyBhcHRlbnQgdGFjaXRpIHNvY2lvc3F1IGFkIGxpdG9yYSB0b3JxdWVudCBw ZXIgY29udWJpYSBub3N0cmEsIHBlciBpbmNlcHRvcyBoeW1lbmFlb3MuCjwvZGl2Pgo= 22285 2008-07-15 13:17:09 -0700 2008-07-21 09:44:40 -0700 Fix for floats added in trailing whitespace for an already full linebox fix-float-in-trailing-ws.patch text/plain 2133 jacob.refstrup SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTE4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDctMTUgIEphY29iIFJlZnN0cnVwICA8amFjb2IucmVmc3Ry dXBAaHAuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRCRC4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5MDYKKworICAgICAgICAqIHJlbmRl cmluZy9iaWRpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpza2lwV2hpdGVz cGFjZSk6CisgICAgICAgIC0gcmVtb3ZlZCBjYWxsIHRvIHBvc2l0aW9uIGZsb2F0czsgdGhleSBv bmx5IGdldCBhZGRlZAorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmZpbmROZXh0TGlu ZUJyZWFrKToKKyAgICAgICAgLSBhZGRlZCBhIGNvbW1lbnQgb24gZmxvYXRzIG5vdCBiZWluZyBw b3NpdGlvbmVkIHdoZW4gc2tpcHBpbmcKKyAgICAgICAgICB3aGl0ZXNwYWNlIGF0IHRoZSBlbmQg b2YgYW4gYWxyZWFkeSBmdWxsIGxpbmUKKwogMjAwOC0wNy0xNSAgS2V2aW4gTWNDdWxsb3VnaCAg PGttY2N1bGxvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9mZi4KSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL2JpZGkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVu ZGVyaW5nL2JpZGkuY3BwCShyZXZpc2lvbiAzNTE0MSkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL2Jp ZGkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDU3LDggKzE0NTcsOCBAQCBpbnQgUmVuZGVyQmxv Y2s6OnNraXBXaGl0ZXNwYWNlKElubGluZUl0CiAgICAgICAgIFJlbmRlck9iamVjdCogb2JqZWN0 ID0gaXRlcmF0b3Iub2JqOwogICAgICAgICBpZiAob2JqZWN0LT5pc0Zsb2F0aW5nKCkpIHsKICAg ICAgICAgICAgIGluc2VydEZsb2F0aW5nT2JqZWN0KG9iamVjdCk7Ci0gICAgICAgICAgICBwb3Np dGlvbk5ld0Zsb2F0cygpOwotICAgICAgICAgICAgYXZhaWxhYmxlV2lkdGggPSBsaW5lV2lkdGgo bV9oZWlnaHQpOworICAgICAgICAgICAgLy8gYXMgdGhpcyBmdW5jdGlvbiBpcyBvbmx5IGNhbGxl ZCB3aGVuIHdlIGFyZSBza2lwcGluZyB3aGl0ZXNwYWNlIGF0IHRoZQorICAgICAgICAgICAgLy8g ZW5kIG9mIGEgZnVsbCBsaW5lIHdlIGRvIG5vdCB3YW50IHRvIHBvc2l0aW9uIHRoZSBmbG9hdCBu b3cKICAgICAgICAgfSBlbHNlIGlmIChvYmplY3QtPmlzUG9zaXRpb25lZCgpKSB7CiAgICAgICAg ICAgICAvLyBGSVhNRTogVGhlIG1hdGggaGVyZSBpcyBhY3R1YWxseSBub3QgcmVhbGx5IHJpZ2h0 LiAgSXQncyBhIGJlc3QtZ3Vlc3MgYXBwcm94aW1hdGlvbiB0aGF0CiAgICAgICAgICAgICAvLyB3 aWxsIHdvcmsgZm9yIHRoZSBjb21tb24gY2FzZXMKQEAgLTE4ODgsNiArMTg4OCw5IEBAIElubGlu ZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmUKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbGluZVdhc1Rvb1dpZGUgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBsQnJlYWsub2JqID0gbzsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbEJyZWFrLnBvcyA9IHBvczsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8g c2tpcCB3aGl0ZXNwYWNlIC0tIGRvbid0IHBvc2l0aW9uIGFueSBuZXcgZmxvYXRzCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGVuY291bnRlcmVkIGR1cmluZyB0aGlzICh0aGV5 J2xsIGJlIHBvc2l0aW9uZWQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gd2hl biBuZXdMaW5lKCkgaXMgY2FsbGVkKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz a2lwV2hpdGVzcGFjZShsQnJlYWspOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICAgICAgICAgIH0K 22406 2008-07-21 09:44:40 -0700 2008-07-21 11:09:27 -0700 Final patch with layout test added and feedback from mitz incorporated fix-float-in-trailing-ws-final.patch text/plain 8349 jacob.refstrup SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTI2OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDgtMDctMjEgIEphY29iIFJlZnN0cnVwICA8amFjb2IucmVmc3Ry dXBAaHAuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IG1pdHouCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTA2CisgICAgICAgIAorICAgICAg ICBUZXN0OiBjc3MyLjEvZWRpdGFibGUtdGV4dC1vdmVybGFwcGluZy1mbG9hdC5odG1sCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKyAgICAgICAgKiByZW5kZXJpbmcvYmlk aS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2tpcFRyYWlsaW5nV2hpdGVz cGFjZSk6CisgICAgICAgIC0gcmVuYW1lZCB0byByZWZsZWN0IHVzYWdlIGFuZCByZW1vdmVkIGNh bGwgdG8gcG9zaXRpb24gZmxvYXRzOyAKKyAgICAgICAgICB0aGV5IG9ubHkgZ2V0IGFkZGVkCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2tpcExlYWRpbmdXaGl0ZXNwYWNlKToKKyAg ICAgICAgLSByZW5hbWVkIHRvIHJlZmxlY3QgdXNhZ2UKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayk6CisgICAgICAgIC0gdXNlIHNraXBUcmFpbGluZ1do aXRlc3BhY2UgYXQgZW5kIG9mIGxpbmUgKGFzIGJlZm9yZSBidXQgd2l0aCBuZXcKKyAgICAgICAg ICBuYW1lKQorCiAyMDA4LTA3LTIxICBTaW1vbiBIYXVzbWFubiAgPGhhdXNtYW5uQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSG9sZ2VyLgpJbmRleDogV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5oCShyZXZpc2lvbiAzNTIyMykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0NSw4ICsxNDUsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBt YXRjaGVkRW5kTGluZShjb25zdCBJbmxpbmVCaWRpUmVzb2x2ZXImLCBjb25zdCBJbmxpbmVJdGVy YXRvciYgZW5kTGluZVN0YXJ0LCBjb25zdCBCaWRpU3RhdHVzJiBlbmRMaW5lU3RhdHVzLAogICAg ICAgICAgICAgICAgICAgICAgICAgUm9vdElubGluZUJveComIGVuZExpbmUsIGludCYgZW5kWVBv cywgaW50JiByZXBhaW50Qm90dG9tLCBpbnQmIHJlcGFpbnRUb3ApOwogICAgIGJvb2wgZ2VuZXJh dGVzTGluZUJveGVzRm9ySW5saW5lQ2hpbGQoUmVuZGVyT2JqZWN0Kik7Ci0gICAgaW50IHNraXBX aGl0ZXNwYWNlKElubGluZUl0ZXJhdG9yJik7Ci0gICAgaW50IHNraXBXaGl0ZXNwYWNlKElubGlu ZUJpZGlSZXNvbHZlciYpOworICAgIHZvaWQgc2tpcFRyYWlsaW5nV2hpdGVzcGFjZShJbmxpbmVJ dGVyYXRvciYpOworICAgIGludCBza2lwTGVhZGluZ1doaXRlc3BhY2UoSW5saW5lQmlkaVJlc29s dmVyJik7CiAgICAgdm9pZCBmaXRCZWxvd0Zsb2F0cyhpbnQgd2lkdGhUb0ZpdCwgaW50JiBhdmFp bGFibGVXaWR0aCk7CiAgICAgSW5saW5lSXRlcmF0b3IgZmluZE5leHRMaW5lQnJlYWsoSW5saW5l QmlkaVJlc29sdmVyJiwgRUNsZWFyKiBjbGVhciA9IDApOwogICAgIFJvb3RJbmxpbmVCb3gqIGNv bnN0cnVjdExpbmUodW5zaWduZWQgcnVuQ291bnQsIEJpZGlSdW4qIGZpcnN0UnVuLCBCaWRpUnVu KiBsYXN0UnVuLCBib29sIGxhc3RMaW5lLCBSZW5kZXJPYmplY3QqIGVuZE9iamVjdCk7CkluZGV4 OiBXZWJDb3JlL3JlbmRlcmluZy9iaWRpLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRl cmluZy9iaWRpLmNwcAkocmV2aXNpb24gMzUyMjMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9iaWRp LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQzNiwxOSArMTQzNiwxOCBAQCBib29sIFJlbmRlckJs b2NrOjpnZW5lcmF0ZXNMaW5lQm94ZXNGb3JJCiAgICAgcmV0dXJuICFpdC5hdEVuZCgpOwogfQog Ci0vLyBGSVhNRTogVGhlIGVudGlyZSBjb25jZXB0IG9mIHRoZSBza2lwV2hpdGVzcGFjZSBmdW5j dGlvbiBpcyBmbGF3ZWQsIHNpbmNlIHdlIHJlYWxseSBuZWVkIHRvIGJlIGJ1aWxkaW5nCisvLyBG SVhNRTogVGhlIGVudGlyZSBjb25jZXB0IG9mIHRoZSBza2lwVHJhaWxpbmdXaGl0ZXNwYWNlIGZ1 bmN0aW9uIGlzIGZsYXdlZCwgc2luY2Ugd2UgcmVhbGx5IG5lZWQgdG8gYmUgYnVpbGRpbmcKIC8v IGxpbmUgYm94ZXMgZXZlbiBmb3IgY29udGFpbmVycyB0aGF0IG1heSB1bHRpbWF0ZWx5IGNvbGxh cHNlIGF3YXkuICBPdGhlcndpc2Ugd2UnbGwgbmV2ZXIgZ2V0IHBvc2l0aW9uZWQKIC8vIGVsZW1l bnRzIHF1aXRlIHJpZ2h0LiAgSW4gb3RoZXIgd29yZHMsIHdlIG5lZWQgdG8gYnVpbGQgdGhpcyBm dW5jdGlvbidzIHdvcmsgaW50byB0aGUgbm9ybWFsIGxpbmUKIC8vIG9iamVjdCBpdGVyYXRpb24g cHJvY2Vzcy4KLWludCBSZW5kZXJCbG9jazo6c2tpcFdoaXRlc3BhY2UoSW5saW5lSXRlcmF0b3Im IGl0ZXJhdG9yKQorLy8gTkIuIHRoaXMgZnVuY3Rpb24gd2lsbCBpbnNlcnQgYW55IGZsb2F0aW5n IGVsZW1lbnRzIHRoYXQgd291bGQgb3RoZXJ3aXNlCisvLyBiZSBza2lwcGVkIGJ1dCBpdCB3aWxs IG5vdCBwb3NpdGlvbiB0aGVtLgordm9pZCBSZW5kZXJCbG9jazo6c2tpcFRyYWlsaW5nV2hpdGVz cGFjZShJbmxpbmVJdGVyYXRvciYgaXRlcmF0b3IpCiB7Ci0gICAgaW50IGF2YWlsYWJsZVdpZHRo ID0gbGluZVdpZHRoKG1faGVpZ2h0KTsKICAgICB3aGlsZSAoIWl0ZXJhdG9yLmF0RW5kKCkgJiYg IXJlcXVpcmVzTGluZUJveChpdGVyYXRvcikpIHsKICAgICAgICAgUmVuZGVyT2JqZWN0KiBvYmpl Y3QgPSBpdGVyYXRvci5vYmo7CiAgICAgICAgIGlmIChvYmplY3QtPmlzRmxvYXRpbmcoKSkgewog ICAgICAgICAgICAgaW5zZXJ0RmxvYXRpbmdPYmplY3Qob2JqZWN0KTsKLSAgICAgICAgICAgIHBv c2l0aW9uTmV3RmxvYXRzKCk7Ci0gICAgICAgICAgICBhdmFpbGFibGVXaWR0aCA9IGxpbmVXaWR0 aChtX2hlaWdodCk7CiAgICAgICAgIH0gZWxzZSBpZiAob2JqZWN0LT5pc1Bvc2l0aW9uZWQoKSkg ewogICAgICAgICAgICAgLy8gRklYTUU6IFRoZSBtYXRoIGhlcmUgaXMgYWN0dWFsbHkgbm90IHJl YWxseSByaWdodC4gIEl0J3MgYSBiZXN0LWd1ZXNzIGFwcHJveGltYXRpb24gdGhhdAogICAgICAg ICAgICAgLy8gd2lsbCB3b3JrIGZvciB0aGUgY29tbW9uIGNhc2VzCkBAIC0xNDczLDEwICsxNDcy LDkgQEAgaW50IFJlbmRlckJsb2NrOjpza2lwV2hpdGVzcGFjZShJbmxpbmVJdAogICAgICAgICB9 CiAgICAgICAgIGl0ZXJhdG9yLmluY3JlbWVudCgpOwogICAgIH0KLSAgICByZXR1cm4gYXZhaWxh YmxlV2lkdGg7CiB9CiAKLWludCBSZW5kZXJCbG9jazo6c2tpcFdoaXRlc3BhY2UoSW5saW5lQmlk aVJlc29sdmVyJiByZXNvbHZlcikKK2ludCBSZW5kZXJCbG9jazo6c2tpcExlYWRpbmdXaGl0ZXNw YWNlKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIpCiB7CiAgICAgaW50IGF2YWlsYWJsZVdp ZHRoID0gbGluZVdpZHRoKG1faGVpZ2h0KTsKICAgICB3aGlsZSAoIXJlc29sdmVyLnBvc2l0aW9u KCkuYXRFbmQoKSAmJiAhcmVxdWlyZXNMaW5lQm94KHJlc29sdmVyLnBvc2l0aW9uKCkpKSB7CkBA IC0xNTU5LDcgKzE1NTcsNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRM aW5lCiAKICAgICBib29sIGFwcGxpZWRTdGFydFdpZHRoID0gcmVzb2x2ZXIucG9zaXRpb24oKS5w b3MgPiAwOwogCi0gICAgaW50IHdpZHRoID0gc2tpcFdoaXRlc3BhY2UocmVzb2x2ZXIpOworICAg IGludCB3aWR0aCA9IHNraXBMZWFkaW5nV2hpdGVzcGFjZShyZXNvbHZlcik7CiAKICAgICBpbnQg dyA9IDA7CiAgICAgaW50IHRtcFcgPSAwOwpAQCAtMTg3OCw3ICsxODc2LDcgQEAgSW5saW5lSXRl cmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBsaW5lV2FzVG9vV2lkZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGxCcmVhay5vYmogPSBvOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs QnJlYWsucG9zID0gcG9zOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBza2lwV2hp dGVzcGFjZShsQnJlYWspOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBza2lwVHJh aWxpbmdXaGl0ZXNwYWNlKGxCcmVhayk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGxp bmVXYXNUb29XaWRlIHx8IHcgKyB0bXBXID4gd2lkdGgpIHsKSW5kZXg6IExheW91dFRlc3RzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDM1 MjY4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTMgQEAKKzIwMDgtMDctMjEgIEphY29iIFJlZnN0cnVwICA8amFjb2IucmVmc3RydXBAaHAuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IG1pdHouCisgICAgICAgIAorICAgICAgICAtIGFkZGVk IHRlc3QgY2FzZSBmb3IgZmxvYXQgYmVpbmcgYWRkZWQgaW4gdHJhaWxpbmcgd2hpdGVzcGFjZQor ICAgICAgICAgIG9mIGFuIGFscmVhZHkgZnVsbCBsaW5lICh3aXRoIHByZS13cmFwIG9yIGFmdGVy LXdoaXRlLXNwYWNlIHNldCkuCisKKyAgICAgICAgKiBjc3MyLjEvZWRpdGFibGUtdGV4dC1vdmVy bGFwcGluZy1mbG9hdC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9jc3MyLjEv ZWRpdGFibGUtdGV4dC1vdmVybGFwcGluZy1mbG9hdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAy MDA4LTA3LTIwICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUlM9 RGFuIEJlcm5zdGVpbi4KSW5kZXg6IExheW91dFRlc3RzL2NzczIuMS9lZGl0YWJsZS10ZXh0LW92 ZXJsYXBwaW5nLWZsb2F0Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvY3NzMi4xL2Vk aXRhYmxlLXRleHQtb3ZlcmxhcHBpbmctZmxvYXQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL2NzczIuMS9lZGl0YWJsZS10ZXh0LW92ZXJsYXBwaW5nLWZsb2F0Lmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsNSBAQAorPHA+CisgICAgVGV4dCBzaG91bGQgbm90IG92ZXJsYXAg dGhlIGJsdWUgc3F1YXJlLgorPC9wPgorPGRpdiBzdHlsZT0iLXdlYmtpdC1saW5lLWJyZWFrOiBh ZnRlci13aGl0ZS1zcGFjZTsgd2lkdGg6IDM5NnB4OyBib3JkZXI6IHNvbGlkIG1hcm9vbjsgcGFk ZGluZzogMnB4OyI+RnVzY2UgYXQgYW50ZS4gSW4gaGFjIGhhYml0YXNzZSBwbGF0ZWEgZGljdHVt c3QuIE1hZWNlbmFzIGlhY3VsaXMgbm9udW1teSBtYWduYS4gVml2YW11cyBhIHRvcnRvciB2aXRh ZSBlbmltIG9ybmFyZSBjb25zZWN0ZXR1ZXIuIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBj b25zZWN0ZXR1ZXIgYWRpcGlzY2luZyBlbGl0LiBFdGlhbSBldCBpcHN1bS4gTmFtIGNvbnNlY3Rl dHVlciBtaSBlZ2V0IHZlbGl0LiA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiBsaWdodGJs dWU7IHdpZHRoOiA0ZW07IGhlaWdodDogNGVtOyBmbG9hdDogcmlnaHQiPjwvZGl2PiBTZWQgbmVj IHJpc3VzIHZpdGFlIGZlbGlzIGF1Y3RvciB1bHRyaWNpZXMuIFBlbGxlbnRlc3F1ZSBhbGlxdWV0 IHF1YW0gYWMgbG9yZW0uIER1aXMgaW50ZXJkdW0sIGVsaXQgaW4gdWx0cmljaWVzIGF1Y3Rvciwg ZXJhdCBwZWRlIHNvbGxpY2l0dWRpbiBsaWJlcm8sIG5vbiB1bHRyaWNlcyBvZGlvIGVsaXQgaW4g YXVndWUuIFV0IGVnZXN0YXMgYmliZW5kdW0gbGVjdHVzLiBDbGFzcyBhcHRlbnQgdGFjaXRpIHNv Y2lvc3F1IGFkIGxpdG9yYSB0b3JxdWVudCBwZXIgY29udWJpYSBub3N0cmEsIHBlciBpbmNlcHRv cyBoeW1lbmFlb3MuCis8L2Rpdj4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3F0L2NzczIu MS9lZGl0YWJsZS10ZXh0LW92ZXJsYXBwaW5nLWZsb2F0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9jc3MyLjEvZWRpdGFibGUtdGV4dC1vdmVybGFw cGluZy1mbG9hdC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9jc3MyLjEvZWRpdGFibGUtdGV4dC1vdmVybGFwcGluZy1mbG9hdC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjMgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAw eDYwMAorICBSZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkg c2l6ZSA4MDB4NjAwCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAK KyAgICBSZW5kZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRl ckJsb2NrIHtQfSBhdCAoMCwwKSBzaXplIDc4NHgxOQorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDAsMCkgc2l6ZSAyNTZ4MTkKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0 aCAyNTY6ICJUZXh0IHNob3VsZCBub3Qgb3ZlcmxhcCB0aGUgYmx1ZSBzcXVhcmUuIgorICAgICAg UmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMzMpIHNpemUgNDA2eDIwMCBbYm9yZGVyOiAoM3B4IHNv bGlkICM4MDAwMDApXQorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDUsNSkgc2l6ZSAz OTl4NzYKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNSw1KSB3aWR0aCAzNzc6ICJGdXNjZSBhdCBh bnRlLiBJbiBoYWMgaGFiaXRhc3NlIHBsYXRlYSBkaWN0dW1zdC4gTWFlY2VuYXMgIgorICAgICAg ICAgIHRleHQgcnVuIGF0ICg1LDI0KSB3aWR0aCAzODU6ICJpYWN1bGlzIG5vbnVtbXkgbWFnbmEu IFZpdmFtdXMgYSB0b3J0b3Igdml0YWUgZW5pbSBvcm5hcmUgIgorICAgICAgICAgIHRleHQgcnVu IGF0ICg1LDQzKSB3aWR0aCAzNTc6ICJjb25zZWN0ZXR1ZXIuIExvcmVtIGlwc3VtIGRvbG9yIHNp dCBhbWV0LCBjb25zZWN0ZXR1ZXIgIgorICAgICAgICAgIHRleHQgcnVuIGF0ICg1LDYyKSB3aWR0 aCAzOTk6ICJhZGlwaXNjaW5nIGVsaXQuIEV0aWFtIGV0IGlwc3VtLiBOYW0gY29uc2VjdGV0dWVy IG1pIGVnZXQgdmVsaXQuICIKKyAgICAgICAgUmVuZGVyQmxvY2sgKGZsb2F0aW5nKSB7RElWfSBh dCAoMzQ1LDgxKSBzaXplIDU2eDU2IFtiZ2NvbG9yPSNBREQ4RTZdCisgICAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoNDA0LDYyKSBzaXplIDM5NngxMzMKKyAgICAgICAgICB0ZXh0IHJ1biBh dCAoNDA0LDYyKSB3aWR0aCAtMzogIiAiCisgICAgICAgICAgdGV4dCBydW4gYXQgKDUsODEpIHdp ZHRoIDMzOTogIlNlZCBuZWMgcmlzdXMgdml0YWUgZmVsaXMgYXVjdG9yIHVsdHJpY2llcy4gUGVs bGVudGVzcXVlICIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNSwxMDApIHdpZHRoIDMzNDogImFs aXF1ZXQgcXVhbSBhYyBsb3JlbS4gRHVpcyBpbnRlcmR1bSwgZWxpdCBpbiB1bHRyaWNpZXMgIgor ICAgICAgICAgIHRleHQgcnVuIGF0ICg1LDExOSkgd2lkdGggMzMzOiAiYXVjdG9yLCBlcmF0IHBl ZGUgc29sbGljaXR1ZGluIGxpYmVybywgbm9uIHVsdHJpY2VzIG9kaW8gIgorICAgICAgICAgIHRl eHQgcnVuIGF0ICg1LDEzOCkgd2lkdGggMzg1OiAiZWxpdCBpbiBhdWd1ZS4gVXQgZWdlc3RhcyBi aWJlbmR1bSBsZWN0dXMuIENsYXNzIGFwdGVudCB0YWNpdGkgIgorICAgICAgICAgIHRleHQgcnVu IGF0ICg1LDE1Nykgd2lkdGggMzgxOiAic29jaW9zcXUgYWQgbGl0b3JhIHRvcnF1ZW50IHBlciBj b251YmlhIG5vc3RyYSwgcGVyIGluY2VwdG9zICIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNSwx NzYpIHdpZHRoIDc4OiAiaHltZW5hZW9zLiIK