82690 2012-03-29 22:44:00 -0700 Pressing enter on blank line after bullet deletes entire bulleted line 2012-04-30 11:53:32 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 adele webkit-unassigned adele enrica max.hong.shen rniwa webkit.review.bot oldest_to_newest 591883 0 134726 adele 2012-03-29 22:44:00 -0700 Created attachment 134726 test Pressing enter on blank line after bullet deletes entire bulleted line See the attached test case. When you hit enter, the text disappears. <rdar://problem/10701992> 595545 1 135594 max.hong.shen 2012-04-04 08:13:11 -0700 Created attachment 135594 First try 595615 2 135594 rniwa 2012-04-04 09:33:39 -0700 Comment on attachment 135594 First try View in context: https://bugs.webkit.org/attachment.cgi?id=135594&action=review > Source/WebCore/editing/CompositeEditCommand.cpp:1278 > - if (emptyListItem->renderer()->previousSibling()) > + if (emptyListItemRenderer->previousSibling()) Why can't we just call isListItem on the previous node? > Source/WebCore/editing/CompositeEditCommand.cpp:1290 > - removeNode(emptyListItem->renderer()->previousSibling() ? emptyListItem : listNode); > + removeNode(emptyListItemRenderer->previousSibling() ? emptyListItem : listNode); Ditto. 595914 3 135675 max.hong.shen 2012-04-04 14:08:47 -0700 Created attachment 135675 use isListItem 595923 4 max.hong.shen 2012-04-04 14:11:48 -0700 Thanks for the review and the suggestion. I agree that we should use isListItem instead, which is more clear :) (In reply to comment #2) > (From update of attachment 135594 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135594&action=review > > > Source/WebCore/editing/CompositeEditCommand.cpp:1278 > > - if (emptyListItem->renderer()->previousSibling()) > > + if (emptyListItemRenderer->previousSibling()) > > Why can't we just call isListItem on the previous node? > > > Source/WebCore/editing/CompositeEditCommand.cpp:1290 > > - removeNode(emptyListItem->renderer()->previousSibling() ? emptyListItem : listNode); > > + removeNode(emptyListItemRenderer->previousSibling() ? emptyListItem : listNode); > > Ditto. 597777 5 135675 enrica 2012-04-06 15:59:56 -0700 Comment on attachment 135675 use isListItem Looks good to me. Thanks for fixing this! 599216 6 135675 max.hong.shen 2012-04-10 06:31:08 -0700 Comment on attachment 135675 use isListItem Thanks for the review! 599330 7 135675 webkit.review.bot 2012-04-10 09:20:00 -0700 Comment on attachment 135675 use isListItem Clearing flags on attachment: 135675 Committed r113723: <http://trac.webkit.org/changeset/113723> 612824 8 rniwa 2012-04-30 11:53:32 -0700 Closing the bug since it's fixed in http://trac.webkit.org/changeset/113723. 134726 2012-03-29 22:44:00 -0700 2012-03-29 22:44:00 -0700 test listproblem.html text/html 261 adele PGh0bWw+PGJvZHkgY29udGVudGVkaXRhYmxlPSJ0cnVlIj48ZGl2Pjx1bCBpZD0idGVzdCI+PGxp PlByZXNzIGVudGVyLiBUaGlzIGJ1bGxldCBzaG91bGQgbm90IGRpc2FwcGVhciE8L2xpPjxicj48 L3VsPjwvZGl2Pgo8c2NyaXB0Pgp2YXIgdGVzdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0 ZXN0Iik7CndpbmRvdy5nZXRTZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KHRlc3QsIDEsIHRl c3QsIDEpOwo8L3NjcmlwdD4KPC9ib2R5PjwvaHRtbD4K 135594 2012-04-04 08:13:11 -0700 2012-04-21 18:47:12 -0700 First try 82690v1.patch text/plain 6177 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzE4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTA0ICBZaSBTaGVu ICA8eWkuNC5zaGVuQG5va2lhLmNvbT4KKworICAgICAgICBQcmVzc2luZyBlbnRlciBvbiBibGFu ayBsaW5lIGFmdGVyIGJ1bGxldCBkZWxldGVzIGVudGlyZSBidWxsZXRlZCBsaW5lLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI2OTAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBDb21wb3NpdGVFZGl0 Q29tbWFuZDo6YnJlYWtPdXRPZkVtcHR5TGlzdEl0ZW0oKSwgaXQgY2hlY2tzIHRoZSBlbXB0eSBs aXN0IGl0ZW0ncyByZW5kZXJlcidzIHNpYmxpbmdzCisgICAgICAgIHRvIGRlY2lkZSB3aGljaCBl bXB0eSBwYXJ0IG9mIHRoZSBsaXN0IHNob3VsZCBiZSByZW1vdmVkLiBIb3dldmVyLCBpZiB0aGUg ZW1wdHkgbGlzdCBpdGVtJ3MgcmVuZGVyZXIgaXMKKyAgICAgICAgd3JhcHBlZCBieSBhbiBhbm9u eW1vdXMgYmxvY2ssIGUuZy4gPHVsPjxsaT5oZWxsbzwvbGk+PGJyPl48L3VsPiwgd2Ugc2hvdWxk IHVzZSB0aGUgYW5vbnltb3VzIHJlbmRlcmVyIAorICAgICAgICBpbnN0ZWFkLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cyA6IGFkZGVkIG5ldyB0ZXN0IGNhc2UgaW4gdGhlIGV4aXN0aW5nIHRlc3Qg KGJyZWFrLW91dC1vZi1lbXB0eS1saXN0LWl0ZW0uaHRtbCkKKworICAgICAgICAqIGVkaXRpbmcv Q29tcG9zaXRlRWRpdENvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlRWRp dENvbW1hbmQ6OmJyZWFrT3V0T2ZFbXB0eUxpc3RJdGVtKToKKwogMjAxMi0wNC0wNCAgQWxleGlz IE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZS1hZGQg dmFyaWFibGUgbmFtZXMgaW4gQ1NTIHJlbGF0ZWQgaGVhZGVycyB0byBoZWxwIHVuZGVyc3RhbmRp bmcgdGhlIG1lYW5pbmcgb2YgdGhlbS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29t cG9zaXRlRWRpdENvbW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwCShyZXZpc2lvbiAxMTMxODEpCisrKyBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTI2Nyw5ICsxMjY3LDE1IEBAIGJvb2wgQ29tcG9zaXRlRWRpdENvbW1hbmQ6OmJyZWFrT3V0 T2ZFbXAKICAgICBpZiAoIW5ld0Jsb2NrKQogICAgICAgICBuZXdCbG9jayA9IGNyZWF0ZURlZmF1 bHRQYXJhZ3JhcGhFbGVtZW50KGRvY3VtZW50KCkpOwogCi0gICAgaWYgKGVtcHR5TGlzdEl0ZW0t PnJlbmRlcmVyKCktPm5leHRTaWJsaW5nKCkpIHsKKyAgICBSZW5kZXJPYmplY3QqIGVtcHR5TGlz dEl0ZW1SZW5kZXJlciA9IGVtcHR5TGlzdEl0ZW0tPnJlbmRlcmVyKCk7CisgICAgLy8gSWYgdGhl IGVtcHR5TGlzdEl0ZW0ncyByZW5kZXJlciBpcyB3cmFwcGVkIGJ5IGFuIGFub255bW91cyBibG9j aywgZS5nLiA8dWw+PGxpPmhlbGxvPC9saT48YnI+XjwvdWw+LCB1c2UgdGhlIGFub255bW91cyBy ZW5kZXJlciBpbnN0ZWFkLgorICAgIHdoaWxlICghZW1wdHlMaXN0SXRlbVJlbmRlcmVyLT5uZXh0 U2libGluZygpICYmICFlbXB0eUxpc3RJdGVtUmVuZGVyZXItPnByZXZpb3VzU2libGluZygpCisg ICAgICAgICYmIGVtcHR5TGlzdEl0ZW1SZW5kZXJlci0+cGFyZW50KCkgJiYgZW1wdHlMaXN0SXRl bVJlbmRlcmVyLT5wYXJlbnQoKS0+aXNBbm9ueW1vdXNCbG9jaygpKQorICAgICAgICBlbXB0eUxp c3RJdGVtUmVuZGVyZXIgPSBlbXB0eUxpc3RJdGVtUmVuZGVyZXItPnBhcmVudCgpOworCisgICAg aWYgKGVtcHR5TGlzdEl0ZW1SZW5kZXJlci0+bmV4dFNpYmxpbmcoKSkgewogICAgICAgICAvLyBJ ZiBlbXB0eUxpc3RJdGVtIGZvbGxvd3MgYW5vdGhlciBsaXN0IGl0ZW0sIHNwbGl0IHRoZSBsaXN0 IG5vZGUuCi0gICAgICAgIGlmIChlbXB0eUxpc3RJdGVtLT5yZW5kZXJlcigpLT5wcmV2aW91c1Np YmxpbmcoKSkKKyAgICAgICAgaWYgKGVtcHR5TGlzdEl0ZW1SZW5kZXJlci0+cHJldmlvdXNTaWJs aW5nKCkpCiAgICAgICAgICAgICBzcGxpdEVsZW1lbnQoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KGxp c3ROb2RlKSwgZW1wdHlMaXN0SXRlbSk7CiAKICAgICAgICAgLy8gSWYgZW1wdHlMaXN0SXRlbSBp cyBmb2xsb3dlZCBieSBvdGhlciBsaXN0IGl0ZW0sIHRoZW4gaW5zZXJ0IG5ld0Jsb2NrIGJlZm9y ZSB0aGUgbGlzdCBub2RlLgpAQCAtMTI4MSw3ICsxMjg3LDcgQEAgYm9vbCBDb21wb3NpdGVFZGl0 Q29tbWFuZDo6YnJlYWtPdXRPZkVtcAogICAgICAgICAvLyBXaGVuIGVtcHR5TGlzdEl0ZW0gZG9l cyBub3QgZm9sbG93IGFueSBsaXN0IGl0ZW0sIGluc2VydCBuZXdCbG9jayBhZnRlciB0aGUgZW5j bG9zaW5nIGxpc3Qgbm9kZS4KICAgICAgICAgLy8gUmVtb3ZlIHRoZSBlbmNsb3Npbmcgbm9kZSBp ZiBlbXB0eUxpc3RJdGVtIGlzIHRoZSBvbmx5IGNoaWxkOyBvdGhlcndpc2UganVzdCByZW1vdmUg ZW1wdHlMaXN0SXRlbS4KICAgICAgICAgaW5zZXJ0Tm9kZUFmdGVyKG5ld0Jsb2NrLCBsaXN0Tm9k ZSk7Ci0gICAgICAgIHJlbW92ZU5vZGUoZW1wdHlMaXN0SXRlbS0+cmVuZGVyZXIoKS0+cHJldmlv dXNTaWJsaW5nKCkgPyBlbXB0eUxpc3RJdGVtIDogbGlzdE5vZGUpOworICAgICAgICByZW1vdmVO b2RlKGVtcHR5TGlzdEl0ZW1SZW5kZXJlci0+cHJldmlvdXNTaWJsaW5nKCkgPyBlbXB0eUxpc3RJ dGVtIDogbGlzdE5vZGUpOwogICAgIH0KIAogICAgIGFwcGVuZEJsb2NrUGxhY2Vob2xkZXIobmV3 QmxvY2spOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTEzMTg3KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDQtMDQgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFByZXNzaW5nIGVudGVyIG9uIGJsYW5r IGxpbmUgYWZ0ZXIgYnVsbGV0IGRlbGV0ZXMgZW50aXJlIGJ1bGxldGVkIGxpbmUuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjY5MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIENvbXBvc2l0ZUVkaXRD b21tYW5kOjpicmVha091dE9mRW1wdHlMaXN0SXRlbSgpLCBpdCBjaGVja3MgdGhlIGVtcHR5IGxp c3QgaXRlbSdzIHJlbmRlcmVyJ3Mgc2libGluZ3MKKyAgICAgICAgdG8gZGVjaWRlIHdoaWNoIGVt cHR5IHBhcnQgb2YgdGhlIGxpc3Qgc2hvdWxkIGJlIHJlbW92ZWQuIEhvd2V2ZXIsIGlmIHRoZSBl bXB0eSBsaXN0IGl0ZW0ncyByZW5kZXJlciBpcworICAgICAgICB3cmFwcGVkIGJ5IGFuIGFub255 bW91cyBibG9jaywgZS5nLiA8dWw+PGxpPmhlbGxvPC9saT48YnI+XjwvdWw+LCB3ZSBzaG91bGQg dXNlIHRoZSBhbm9ueW1vdXMgcmVuZGVyZXIgCisgICAgICAgIGluc3RlYWQuCisKKyAgICAgICAg KiBlZGl0aW5nL2V4ZWNDb21tYW5kL2JyZWFrLW91dC1vZi1lbXB0eS1saXN0LWl0ZW0tZXhwZWN0 ZWQudHh0OgorICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvc2NyaXB0LXRlc3RzL2JyZWFr LW91dC1vZi1lbXB0eS1saXN0LWl0ZW0uanM6CisKIAogICAgICAgICBVbnJldmlld2VkLiBMYXlv dXQgVGVzdCBmYXN0L2NhbnZhcy9jYW52YXMtdG9EYXRhVVJMLXdlYnAuaHRtbCBpcyBjcmFzaGlu ZwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE3MzUK SW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvYnJlYWstb3V0LW9mLWVtcHR5 LWxpc3QtaXRlbS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGlu Zy9leGVjQ29tbWFuZC9icmVhay1vdXQtb2YtZW1wdHktbGlzdC1pdGVtLWV4cGVjdGVkLnR4dAko cmV2aXNpb24gMTEzMTgxKQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9icmVh ay1vdXQtb2YtZW1wdHktbGlzdC1pdGVtLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAt MTAsNiArMTAsOCBAQCBQQVNTIGVudGVyQXRUYXJnZXQoJzx1bD48bGk+aGVsbG88dWw+PGxpCiBQ QVNTIGVudGVyQXRUYXJnZXQoJzx1bD48bGk+aGVsbG88dWw+PGxpIGlkPSJ0YXJnZXQiPjxicj48 L2xpPjwvdWw+PC9saT48L3VsPicpIGlzICc8dWw+PGxpPmhlbGxvPC9saT48bGk+PGJyPjwvbGk+ PC91bD4nCiBQQVNTIGVudGVyQXRUYXJnZXQoJzx1bD48bGk+PHVsPjxsaSBpZD0idGFyZ2V0Ij48 YnI+PC9saT48L3VsPndvcmxkPC9saT48L3VsPicpIGlzICc8dWw+PGxpPjxkaXY+PGJyPjwvZGl2 PndvcmxkPC9saT48L3VsPicKIFBBU1MgZW50ZXJBdFRhcmdldCgnPHVsPjxsaT48dWw+PGxpIGlk PSJ0YXJnZXQiPjxicj48L2xpPjwvdWw+PC9saT48L3VsPicpIGlzICc8dWw+PGxpPjwvbGk+PGxp Pjxicj48L2xpPjwvdWw+JworUEFTUyBlbnRlckF0VGFyZ2V0KCc8dWw+PGxpPmhlbGxvPC9saT48 YnIgaWQ9InRhcmdldCI+PC91bD4nKSBpcyAnPHVsPjxsaT5oZWxsbzwvbGk+PC91bD48ZGl2Pjxi cj48L2Rpdj4nCitQQVNTIGVudGVyQXRUYXJnZXQoJzx1bD48YnIgaWQ9InRhcmdldCI+PC91bD4n KSBpcyAnPGRpdj48YnI+PC9kaXY+JwogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQog CiBURVNUIENPTVBMRVRFCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3Nj cmlwdC10ZXN0cy9icmVhay1vdXQtb2YtZW1wdHktbGlzdC1pdGVtLmpzCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvc2NyaXB0LXRlc3RzL2JyZWFrLW91dC1v Zi1lbXB0eS1saXN0LWl0ZW0uanMJKHJldmlzaW9uIDExMzE4MSkKKysrIExheW91dFRlc3RzL2Vk aXRpbmcvZXhlY0NvbW1hbmQvc2NyaXB0LXRlc3RzL2JyZWFrLW91dC1vZi1lbXB0eS1saXN0LWl0 ZW0uanMJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDYgKzQ5LDggQEAgdGVzdEJyZWFrT3V0T2ZFbXB0 eUxpc3RJdGVtKCc8dWw+PGxpPmhlbAogdGVzdEJyZWFrT3V0T2ZFbXB0eUxpc3RJdGVtKCc8dWw+ PGxpPmhlbGxvPHVsPjxsaSBpZD0idGFyZ2V0Ij48YnI+PC9saT48L3VsPjwvbGk+PC91bD4nLCAn PHVsPjxsaT5oZWxsbzwvbGk+PGxpPjxicj48L2xpPjwvdWw+Jyk7CiB0ZXN0QnJlYWtPdXRPZkVt cHR5TGlzdEl0ZW0oJzx1bD48bGk+PHVsPjxsaSBpZD0idGFyZ2V0Ij48YnI+PC9saT48L3VsPndv cmxkPC9saT48L3VsPicsICc8dWw+PGxpPjxkaXY+PGJyPjwvZGl2PndvcmxkPC9saT48L3VsPicp OwogdGVzdEJyZWFrT3V0T2ZFbXB0eUxpc3RJdGVtKCc8dWw+PGxpPjx1bD48bGkgaWQ9InRhcmdl dCI+PGJyPjwvbGk+PC91bD48L2xpPjwvdWw+JywgJzx1bD48bGk+PC9saT48bGk+PGJyPjwvbGk+ PC91bD4nKTsKK3Rlc3RCcmVha091dE9mRW1wdHlMaXN0SXRlbSgnPHVsPjxsaT5oZWxsbzwvbGk+ PGJyIGlkPSJ0YXJnZXQiPjwvdWw+JywgJzx1bD48bGk+aGVsbG88L2xpPjwvdWw+PGRpdj48YnI+ PC9kaXY+Jyk7Cit0ZXN0QnJlYWtPdXRPZkVtcHR5TGlzdEl0ZW0oJzx1bD48YnIgaWQ9InRhcmdl dCI+PC91bD4nLCAnPGRpdj48YnI+PC9kaXY+Jyk7CiAKIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hp bGQodGVzdENvbnRhaW5lcik7CiAK 135675 2012-04-04 14:08:47 -0700 2012-04-10 09:20:00 -0700 use isListItem 82690v2.patch text/plain 5717 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzIzNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTA0ICBZaSBTaGVu ICA8eWkuNC5zaGVuQG5va2lhLmNvbT4KKworICAgICAgICBQcmVzc2luZyBlbnRlciBvbiBibGFu ayBsaW5lIGFmdGVyIGJ1bGxldCBkZWxldGVzIGVudGlyZSBidWxsZXRlZCBsaW5lLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI2OTAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBDb21wb3NpdGVFZGl0 Q29tbWFuZDo6YnJlYWtPdXRPZkVtcHR5TGlzdEl0ZW0oKSwgaXQgY2hlY2tzIHRoZSBlbXB0eSBs aXN0IGl0ZW0ncyByZW5kZXJlcidzIHNpYmxpbmdzCisgICAgICAgIHRvIGRlY2lkZSB3aGljaCBl bXB0eSBwYXJ0IG9mIHRoZSBsaXN0IHNob3VsZCBiZSByZW1vdmVkLiBIb3dldmVyLCBpZiB0aGUg ZW1wdHkgbGlzdCBpdGVtJ3MgcmVuZGVyZXIgaXMKKyAgICAgICAgd3JhcHBlZCBieSBhbiBhbm9u eW1vdXMgYmxvY2ssIGUuZy4gPHVsPjxsaT5oZWxsbzwvbGk+PGJyPl48L3VsPiwgdGhlIGNoZWNr IG1heSBmYWlsLiBTbywgd2UgdXNlIGlzTGlzdEl0ZW0KKyAgICAgICAgb24gdGhlIGVtcHR5IGxp c3Qgbm9kZSdzIHNpYmxpbmdzIGluc3RlYWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIDogYWRk ZWQgbmV3IHRlc3QgY2FzZSBpbiB0aGUgZXhpc3RpbmcgdGVzdCAoYnJlYWstb3V0LW9mLWVtcHR5 LWxpc3QtaXRlbS5odG1sKQorCisgICAgICAgICogZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVFZGl0Q29tbWFuZDo6YnJlYWtPdXRP ZkVtcHR5TGlzdEl0ZW0pOgorCiAyMDEyLTA0LTA0ICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmViYXNlbGluZSBiaW5kaW5nIHRlc3RzLgpJbmRleDogU291 cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAJKHJldmlz aW9uIDExMzIyNikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1h bmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjY3LDkgKzEyNjcsOSBAQCBib29sIENvbXBvc2l0 ZUVkaXRDb21tYW5kOjpicmVha091dE9mRW1wCiAgICAgaWYgKCFuZXdCbG9jaykKICAgICAgICAg bmV3QmxvY2sgPSBjcmVhdGVEZWZhdWx0UGFyYWdyYXBoRWxlbWVudChkb2N1bWVudCgpKTsKIAot ICAgIGlmIChlbXB0eUxpc3RJdGVtLT5yZW5kZXJlcigpLT5uZXh0U2libGluZygpKSB7CisgICAg aWYgKGlzTGlzdEl0ZW0oZW1wdHlMaXN0SXRlbS0+bmV4dFNpYmxpbmcoKSkpIHsKICAgICAgICAg Ly8gSWYgZW1wdHlMaXN0SXRlbSBmb2xsb3dzIGFub3RoZXIgbGlzdCBpdGVtLCBzcGxpdCB0aGUg bGlzdCBub2RlLgotICAgICAgICBpZiAoZW1wdHlMaXN0SXRlbS0+cmVuZGVyZXIoKS0+cHJldmlv dXNTaWJsaW5nKCkpCisgICAgICAgIGlmIChpc0xpc3RJdGVtKGVtcHR5TGlzdEl0ZW0tPnByZXZp b3VzU2libGluZygpKSkKICAgICAgICAgICAgIHNwbGl0RWxlbWVudChzdGF0aWNfY2FzdDxFbGVt ZW50Kj4obGlzdE5vZGUpLCBlbXB0eUxpc3RJdGVtKTsKIAogICAgICAgICAvLyBJZiBlbXB0eUxp c3RJdGVtIGlzIGZvbGxvd2VkIGJ5IG90aGVyIGxpc3QgaXRlbSwgdGhlbiBpbnNlcnQgbmV3Qmxv Y2sgYmVmb3JlIHRoZSBsaXN0IG5vZGUuCkBAIC0xMjgxLDcgKzEyODEsNyBAQCBib29sIENvbXBv c2l0ZUVkaXRDb21tYW5kOjpicmVha091dE9mRW1wCiAgICAgICAgIC8vIFdoZW4gZW1wdHlMaXN0 SXRlbSBkb2VzIG5vdCBmb2xsb3cgYW55IGxpc3QgaXRlbSwgaW5zZXJ0IG5ld0Jsb2NrIGFmdGVy IHRoZSBlbmNsb3NpbmcgbGlzdCBub2RlLgogICAgICAgICAvLyBSZW1vdmUgdGhlIGVuY2xvc2lu ZyBub2RlIGlmIGVtcHR5TGlzdEl0ZW0gaXMgdGhlIG9ubHkgY2hpbGQ7IG90aGVyd2lzZSBqdXN0 IHJlbW92ZSBlbXB0eUxpc3RJdGVtLgogICAgICAgICBpbnNlcnROb2RlQWZ0ZXIobmV3QmxvY2ss IGxpc3ROb2RlKTsKLSAgICAgICAgcmVtb3ZlTm9kZShlbXB0eUxpc3RJdGVtLT5yZW5kZXJlcigp LT5wcmV2aW91c1NpYmxpbmcoKSA/IGVtcHR5TGlzdEl0ZW0gOiBsaXN0Tm9kZSk7CisgICAgICAg IHJlbW92ZU5vZGUoaXNMaXN0SXRlbShlbXB0eUxpc3RJdGVtLT5wcmV2aW91c1NpYmxpbmcoKSkg PyBlbXB0eUxpc3RJdGVtIDogbGlzdE5vZGUpOwogICAgIH0KIAogICAgIGFwcGVuZEJsb2NrUGxh Y2Vob2xkZXIobmV3QmxvY2spOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTEzMjM1KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDQt MDQgIFlpIFNoZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFByZXNzaW5nIGVu dGVyIG9uIGJsYW5rIGxpbmUgYWZ0ZXIgYnVsbGV0IGRlbGV0ZXMgZW50aXJlIGJ1bGxldGVkIGxp bmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjY5 MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIENv bXBvc2l0ZUVkaXRDb21tYW5kOjpicmVha091dE9mRW1wdHlMaXN0SXRlbSgpLCBpdCBjaGVja3Mg dGhlIGVtcHR5IGxpc3QgaXRlbSdzIHJlbmRlcmVyJ3Mgc2libGluZ3MKKyAgICAgICAgdG8gZGVj aWRlIHdoaWNoIGVtcHR5IHBhcnQgb2YgdGhlIGxpc3Qgc2hvdWxkIGJlIHJlbW92ZWQuIEhvd2V2 ZXIsIGlmIHRoZSBlbXB0eSBsaXN0IGl0ZW0ncyByZW5kZXJlciBpcworICAgICAgICB3cmFwcGVk IGJ5IGFuIGFub255bW91cyBibG9jaywgZS5nLiA8dWw+PGxpPmhlbGxvPC9saT48YnI+XjwvdWw+ LCB0aGUgY2hlY2sgbWF5IGZhaWwuIFNvLCB3ZSB1c2UgaXNMaXN0SXRlbQorICAgICAgICBvbiB0 aGUgZW1wdHkgbGlzdCBub2RlJ3Mgc2libGluZ3MgaW5zdGVhZC4KKworICAgICAgICAqIGVkaXRp bmcvZXhlY0NvbW1hbmQvYnJlYWstb3V0LW9mLWVtcHR5LWxpc3QtaXRlbS1leHBlY3RlZC50eHQ6 CisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9zY3JpcHQtdGVzdHMvYnJlYWstb3V0LW9m LWVtcHR5LWxpc3QtaXRlbS5qczoKKwogMjAxMi0wNC0wNCAgSmVzdXMgU2FuY2hlei1QYWxlbmNp YSAgPGplc3VzLnBhbGVuY2lhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgV0tUUiBuZWVkcyB0 byBpbXBsZW1lbnQgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0UGFnZVZpc2liaWxpdHkoKQpJbmRl eDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9icmVhay1vdXQtb2YtZW1wdHktbGlz dC1pdGVtLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4 ZWNDb21tYW5kL2JyZWFrLW91dC1vZi1lbXB0eS1saXN0LWl0ZW0tZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAxMTMyMjYpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2JyZWFrLW91 dC1vZi1lbXB0eS1saXN0LWl0ZW0tZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xMCw2 ICsxMCw4IEBAIFBBU1MgZW50ZXJBdFRhcmdldCgnPHVsPjxsaT5oZWxsbzx1bD48bGkKIFBBU1Mg ZW50ZXJBdFRhcmdldCgnPHVsPjxsaT5oZWxsbzx1bD48bGkgaWQ9InRhcmdldCI+PGJyPjwvbGk+ PC91bD48L2xpPjwvdWw+JykgaXMgJzx1bD48bGk+aGVsbG88L2xpPjxsaT48YnI+PC9saT48L3Vs PicKIFBBU1MgZW50ZXJBdFRhcmdldCgnPHVsPjxsaT48dWw+PGxpIGlkPSJ0YXJnZXQiPjxicj48 L2xpPjwvdWw+d29ybGQ8L2xpPjwvdWw+JykgaXMgJzx1bD48bGk+PGRpdj48YnI+PC9kaXY+d29y bGQ8L2xpPjwvdWw+JwogUEFTUyBlbnRlckF0VGFyZ2V0KCc8dWw+PGxpPjx1bD48bGkgaWQ9InRh cmdldCI+PGJyPjwvbGk+PC91bD48L2xpPjwvdWw+JykgaXMgJzx1bD48bGk+PC9saT48bGk+PGJy PjwvbGk+PC91bD4nCitQQVNTIGVudGVyQXRUYXJnZXQoJzx1bD48bGk+aGVsbG88L2xpPjxiciBp ZD0idGFyZ2V0Ij48L3VsPicpIGlzICc8dWw+PGxpPmhlbGxvPC9saT48L3VsPjxkaXY+PGJyPjwv ZGl2PicKK1BBU1MgZW50ZXJBdFRhcmdldCgnPHVsPjxiciBpZD0idGFyZ2V0Ij48L3VsPicpIGlz ICc8ZGl2Pjxicj48L2Rpdj4nCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRF U1QgQ09NUExFVEUKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvc2NyaXB0 LXRlc3RzL2JyZWFrLW91dC1vZi1lbXB0eS1saXN0LWl0ZW0uanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9zY3JpcHQtdGVzdHMvYnJlYWstb3V0LW9mLWVt cHR5LWxpc3QtaXRlbS5qcwkocmV2aXNpb24gMTEzMjI2KQorKysgTGF5b3V0VGVzdHMvZWRpdGlu Zy9leGVjQ29tbWFuZC9zY3JpcHQtdGVzdHMvYnJlYWstb3V0LW9mLWVtcHR5LWxpc3QtaXRlbS5q cwkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksOCBAQCB0ZXN0QnJlYWtPdXRPZkVtcHR5TGlz dEl0ZW0oJzx1bD48bGk+aGVsCiB0ZXN0QnJlYWtPdXRPZkVtcHR5TGlzdEl0ZW0oJzx1bD48bGk+ aGVsbG88dWw+PGxpIGlkPSJ0YXJnZXQiPjxicj48L2xpPjwvdWw+PC9saT48L3VsPicsICc8dWw+ PGxpPmhlbGxvPC9saT48bGk+PGJyPjwvbGk+PC91bD4nKTsKIHRlc3RCcmVha091dE9mRW1wdHlM aXN0SXRlbSgnPHVsPjxsaT48dWw+PGxpIGlkPSJ0YXJnZXQiPjxicj48L2xpPjwvdWw+d29ybGQ8 L2xpPjwvdWw+JywgJzx1bD48bGk+PGRpdj48YnI+PC9kaXY+d29ybGQ8L2xpPjwvdWw+Jyk7CiB0 ZXN0QnJlYWtPdXRPZkVtcHR5TGlzdEl0ZW0oJzx1bD48bGk+PHVsPjxsaSBpZD0idGFyZ2V0Ij48 YnI+PC9saT48L3VsPjwvbGk+PC91bD4nLCAnPHVsPjxsaT48L2xpPjxsaT48YnI+PC9saT48L3Vs PicpOwordGVzdEJyZWFrT3V0T2ZFbXB0eUxpc3RJdGVtKCc8dWw+PGxpPmhlbGxvPC9saT48YnIg aWQ9InRhcmdldCI+PC91bD4nLCAnPHVsPjxsaT5oZWxsbzwvbGk+PC91bD48ZGl2Pjxicj48L2Rp dj4nKTsKK3Rlc3RCcmVha091dE9mRW1wdHlMaXN0SXRlbSgnPHVsPjxiciBpZD0idGFyZ2V0Ij48 L3VsPicsICc8ZGl2Pjxicj48L2Rpdj4nKTsKIAogZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZCh0 ZXN0Q29udGFpbmVyKTsKIAo=