39866 2010-05-28 01:16:59 -0700 break out of nesting when inserting new paragraph 2017-07-18 08:30:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 NEW P2 Normal --- 1 tony tony rniwa oldest_to_newest 231597 0 tony 2010-05-28 01:16:59 -0700 break out of nesting when inserting new paragraph 231598 1 57302 tony 2010-05-28 01:19:36 -0700 Created attachment 57302 Patch 231599 2 tony 2010-05-28 01:21:58 -0700 This is the same as bug 25002, but expanding the coverage from just div tags to all block level tags except <blockquote>. Additional testing of bug 25002 was suggested by Darin in https://bugs.webkit.org/show_bug.cgi?id=38992#c4 . I also ran some tests on Firefox and it doesn't have any of these problems because it just uses <br> for new paragraphs. WebKit copies the block level node instead. 247886 3 57302 ojan 2010-07-07 17:38:59 -0700 Comment on attachment 57302 Patch I think this is a good incremental improvement on http://trac.webkit.org/changeset/54395, but I don't think the original patch was correct. Consider the following case: <style> #bar > div { color:blue; } #bar > div > div { color:green; } </style> <div contentEditable id='bar'><div><div>abc</div></div> The text is green. If you click at the end, hit enter and then type, the new text should be green. On trunk, it's blue. I think we need to find a way to fix copy-paste to not nest, but have enter use the old behavior. 57302 2010-05-28 01:19:36 -0700 2010-07-07 17:39:12 -0700 Patch bug-39866-20100528171934.patch text/plain 12814 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhMDI0OTM0OGNkNWUzNjRlNjJhNmJkNGEyMjE4YjEwNDgzZmM3ZDY4Li5jM2VhMDQ3 Yzc0NGFmMmY3NzQ5N2M1MjI5MzYwZTU3ZTdhZWIyMWRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDUtMjggIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBicmVhayBvdXQgb2YgbmVzdGlu ZyB3aGVuIGluc2VydGluZyBuZXcgcGFyYWdyYXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTg2NgorCisgICAgICAgICogZWRpdGluZy9pbnNlcnRp bmcvbmVzdGluZy1vbi1wYXJhZ3JhcGgtc2VwYXJhdG9yLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZWRpdGluZy9pbnNlcnRpbmcvbmVzdGluZy1vbi1wYXJhZ3JhcGgtc2VwYXJhdG9y Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9lZGl0aW5nL3Bhc3RlYm9hcmQv cGFzdGUtdGV4dC0wMTUtZXhwZWN0ZWQudHh0OiBOZXcKKyAgICAgICAgICAgIHJlc3VsdHMgaGF2 ZSBvbmUgbGVzcyBuZXN0ZWQgcGFyYWdyYXBoLiAgVGhlcmUgc2hvdWxkIGJlIG5vIG5lc3RlZAor ICAgICAgICAgICAgcGFyYWdyYXBocywgYnV0IHRoYXQncyBidWcgMjQwMDkuCisKIDIwMTAtMDUt MjYgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBOb3QgcmV2aWV3 ZWQsIHNraXBwaW5nIG5ldyB0ZXN0IG9uIGd0ay4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Vk aXRpbmcvaW5zZXJ0aW5nL25lc3Rpbmctb24tcGFyYWdyYXBoLXNlcGFyYXRvci1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2luc2VydGluZy9uZXN0aW5nLW9uLXBhcmFncmFwaC1z ZXBhcmF0b3ItZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQwZTNmNjcwM2Q2MWU2YWFhMjU3NGY0 OTYwZjIyMmJkYzMzYWM5NjIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5n L2luc2VydGluZy9uZXN0aW5nLW9uLXBhcmFncmFwaC1zZXBhcmF0b3ItZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTkgQEAKK1RoaXMgdGVzdCB0ZXN0cyB0aGF0IGlmIGJsb2NrIG5vZGVzIGFyZSBu ZXN0ZWQgYW5kIHRoZSB1c2VyIHByZXNzZXMgZW50ZXIgdG8gc3RhcnQgYSBuZXcgcGFyYWdyYXBo LCB0aGUgbmV3IHBhcmFncmFwaCBzaG91bGQgYmUgb3V0c2lkZSB0aGUgbmVzdGVkIGVsZW1lbmV0 cyB1bmxlc3MgaXQgaXMgYSBibG9ja3F1b3RlLgorCitIZWxsbyBXb3JsZCEKK21vcmUgdGV4dAor CitkaXYgUEFTU0VECitwcmUgUEFTU0VECitibG9ja3F1b3RlIFBBU1NFRAorbGF5ZXIgUEFTU0VE CithcnRpY2xlIFBBU1NFRAorYXNpZGUgUEFTU0VECitmb290ZXIgUEFTU0VECitoZWFkZXIgUEFT U0VECitoZ3JvdXAgUEFTU0VECituYXYgUEFTU0VECitzZWN0aW9uIFBBU1NFRAorYWRkcmVzcyBQ QVNTRUQKK2NlbnRlciBQQVNTRUQKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9p bnNlcnRpbmcvbmVzdGluZy1vbi1wYXJhZ3JhcGgtc2VwYXJhdG9yLmh0bWwgYi9MYXlvdXRUZXN0 cy9lZGl0aW5nL2luc2VydGluZy9uZXN0aW5nLW9uLXBhcmFncmFwaC1zZXBhcmF0b3IuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5iMmZjZmRjOWIzMjNjNTM4YmUzNDE2NTJiMDZjMTk0NDk3YTAxNzcyCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9pbnNlcnRpbmcvbmVzdGluZy1vbi1w YXJhZ3JhcGgtc2VwYXJhdG9yLmh0bWwKQEAgLTAsMCArMSw2OCBAQAorPGJvZHk+Cis8cD5UaGlz IHRlc3QgdGVzdHMgdGhhdCBpZiBibG9jayBub2RlcyBhcmUgbmVzdGVkIGFuZCB0aGUgdXNlciBw cmVzc2VzIGVudGVyIHRvCitzdGFydCBhIG5ldyBwYXJhZ3JhcGgsIHRoZSBuZXcgcGFyYWdyYXBo IHNob3VsZCBiZSBvdXRzaWRlIHRoZSBuZXN0ZWQgZWxlbWVuZXRzCit1bmxlc3MgaXQgaXMgYSBi bG9ja3F1b3RlLjwvcD4KKzxkaXYgY29udGVudGVkaXRhYmxlIGlkPSJyb290Ij4KKzwvZGl2Pgor PGRpdiBpZD0ibG9nIj48L2Rpdj4KKzxzY3JpcHQ+CitmdW5jdGlvbiBsb2cobXNnKQoreworICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJsb2ciKS5pbm5lckhUTUwgKz0gbXNnICsgIjxicj4i OworfQorCitmdW5jdGlvbiB0ZXN0KHRhZ05hbWUpCit7CisgICAgLy8gRmlyc3QsIGNoZWNrIHRv IHNlZSBpZiBuZXN0aW5nIHRoZSB0YWcgaXMgdmlzdWFsbHkgdGhlIHNhbWUgYXMgbm90CisgICAg Ly8gbmVzdGluZyB0aGUgdGFnLgorICAgIHZhciByb290ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInJvb3QiKTsKKyAgICByb290LmlubmVySFRNTCA9ICIiOworCisgICAgdmFyIGZpcnN0ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCh0YWdOYW1lKTsKKyAgICBmaXJzdC5hcHBlbmRDaGlsZChk b2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiSGVsbG8gV29ybGQhIikpOworICAgIHJvb3QuYXBwZW5k Q2hpbGQoZmlyc3QpOworCisgICAgdmFyIHNlY29uZCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo dGFnTmFtZSk7CisgICAgc2Vjb25kLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCJtb3JlIHRleHQiKSk7CisgICAgZmlyc3QuYXBwZW5kQ2hpbGQoc2Vjb25kKTsKKyAgICB2YXIg eCA9IHNlY29uZC5vZmZzZXRUb3A7CisgICAgdmFyIHkgPSBzZWNvbmQub2Zmc2V0TGVmdDsKKwor ICAgIHJvb3QuYXBwZW5kQ2hpbGQoc2Vjb25kKTsKKyAgICB2YXIgbmV3WCA9IHNlY29uZC5vZmZz ZXRUb3A7CisgICAgdmFyIG5ld1kgPSBzZWNvbmQub2Zmc2V0TGVmdDsKKworICAgIHZhciBuZXN0 ZWRUYWdzVmlzdWFsbHlTYW1lID0gKHggPT0gbmV3WCAmJiB5ID09IG5ld1kpOworCisgICAgLy8g SWYgbmVzdGVkIHRhZ3MgYXJlIHZpc3VhbGx5IHRoZSBzYW1lLCB3aGVuIHRoZSB1c2VyIHByZXNz ZXMgZW50ZXIgd2hpbGUKKyAgICAvLyBhdCB0aGUgZW5kIG9mIHRoZSBsaW5lLCB3ZSB3YW50IHRv IGJyZWFrIG91dCBvZiB0aGUgbmVzdGluZy4KKyAgICBmaXJzdC5hcHBlbmRDaGlsZChzZWNvbmQp OworICAgIHZhciBzZWxlY3Rpb24gPSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CisgICAgc2VsZWN0 aW9uLnNldFBvc2l0aW9uKHNlY29uZCwgMCk7CisgICAgc2VsZWN0aW9uLm1vZGlmeSgibW92ZSIs ICJmb3J3YXJkIiwgInNlbnRlbmNlIik7CisgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoIkluc2Vy dFRleHQiLCBmYWxzZSwgIlxuIik7CisKKyAgICB2YXIgcm9vdEV4cGVjdGVkQ2hpbGRyZW4gPSBu ZXN0ZWRUYWdzVmlzdWFsbHlTYW1lID8gMiA6IDE7CisgICAgdmFyIGZpcnN0RXhwZWN0ZWRDaGls ZHJlbiA9IG5lc3RlZFRhZ3NWaXN1YWxseVNhbWUgPyAyIDogMzsKKyAgICB2YXIgcGFzcyA9IChy b290LmNoaWxkTm9kZXMubGVuZ3RoID09IHJvb3RFeHBlY3RlZENoaWxkcmVuKSAmJgorICAgICAg ICAoZmlyc3QuY2hpbGROb2Rlcy5sZW5ndGggPT0gZmlyc3RFeHBlY3RlZENoaWxkcmVuKTsKKyAg ICBsb2codGFnTmFtZSArICIgIiArIChwYXNzID8gIlBBU1NFRCIgOiAiRkFJTEVEIikpOworfQor CitmdW5jdGlvbiBydW5UZXN0cygpCit7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJv bGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAg Ly8gUGFyYWdyYXBocyAocCkgYW5kIGhlYWRpbmdzIChoMSwgaDIsIGV0YykgYXJlIGFsc28gYmxv Y2sgc3R5bGUsIGJ1dCB3ZQorICAgIC8vIGRvbid0IHRlc3QgdGhlbSBoZXJlIGJlY2F1c2UgdGhl eSBjYW4ndCBiZSBuZXN0ZWQuCisgICAgdmFyIHRhZ3MgPSBbImRpdiIsICJwcmUiLCAiYmxvY2tx dW90ZSIsICJsYXllciIsICJhcnRpY2xlIiwgImFzaWRlIiwKKyAgICAgICAgICAgICAgICAiZm9v dGVyIiwgImhlYWRlciIsICJoZ3JvdXAiLCAibmF2IiwgInNlY3Rpb24iLCAiYWRkcmVzcyIsCisg ICAgICAgICAgICAgICAgImNlbnRlciJdOworICAgIGZvciAodmFyIHQgaW4gdGFncykgeworICAg ICAgICB0ZXN0KHRhZ3NbdF0pOworICAgIH0KK30KKworcnVuVGVzdHMoKTsKKzwvc2NyaXB0Pgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2VkaXRpbmcvcGFzdGVib2FyZC9w YXN0ZS10ZXh0LTAxNS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRp dGluZy9wYXN0ZWJvYXJkL3Bhc3RlLXRleHQtMDE1LWV4cGVjdGVkLnR4dAppbmRleCBiNWVkOTE1 NmJjMWM1YzdmZTc4ODRjOWJjMjhmMzc5Nzg5ODAwNmYyLi4yMTg0MzhjM2YxYWY2ZGIzYWJhMGEy MjhlZTA5NWNkODY5MmQ5MzM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv ZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLXRleHQtMDE1LWV4cGVjdGVkLnR4dAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9wYXN0ZWJvYXJkL3Bhc3RlLXRleHQtMDE1LWV4 cGVjdGVkLnR4dApAQCAtMTksMTIgKzE5LDEyIEBAIEVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdE aWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvCiBF RElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOihudWxsKSB0b0RP TVJhbmdlOnJhbmdlIGZyb20gMyBvZiAjdGV4dCA+IFAgPiBQID4gRElWID4gRElWID4gQk9EWSA+ IEhUTUwgPiAjZG9jdW1lbnQgdG8gMyBvZiAjdGV4dCA+IFAgPiBQID4gRElWID4gRElWID4gQk9E WSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJl YW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKIEVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFu Z2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgogRURJVElO RyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9u Ci1FRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZy b20gMyBvZiAjdGV4dCA+IFAgPiBQID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1l bnQgdG8gMyBvZiAjdGV4dCA+IFAgPiBQID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9j dW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgUCA+IFAgPiBESVYgPiBESVYgPiBCT0RZ ID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIFAgPiBQID4gRElWID4gRElWID4gQk9EWSA+IEhU TUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3Rp bGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVk RE9NUmFuZ2U6cmFuZ2UgZnJvbSAzIG9mICN0ZXh0ID4gUCA+IFAgPiBESVYgPiBESVYgPiBCT0RZ ID4gSFRNTCA+ICNkb2N1bWVudCB0byAzIG9mICN0ZXh0ID4gUCA+IFAgPiBESVYgPiBESVYgPiBC T0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBQID4gRElW ID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBQID4gRElWID4gRElWID4g Qk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25z dHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKIEVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRD aGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgogRURJ VElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0 aW9uCi1FRElUSU5HIERFTEVHQVRFOiBzaG91bGRJbnNlcnROb2RlOiNkb2N1bWVudC1mcmFnbWVu dCByZXBsYWNpbmdET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgUCA+IFAgPiBESVYgPiBESVYgPiBC T0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIFAgPiBQID4gRElWID4gRElWID4gQk9EWSA+ IEhUTUwgPiAjZG9jdW1lbnQgZ2l2ZW5BY3Rpb246V2ViVmlld0luc2VydEFjdGlvblBhc3RlZAor RURJVElORyBERUxFR0FURTogc2hvdWxkSW5zZXJ0Tm9kZTojZG9jdW1lbnQtZnJhZ21lbnQgcmVw bGFjaW5nRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIFAgPiBESVYgPiBESVYgPiBCT0RZID4gSFRN TCA+ICNkb2N1bWVudCB0byAwIG9mIFAgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1 bWVudCBnaXZlbkFjdGlvbjpXZWJWaWV3SW5zZXJ0QWN0aW9uUGFzdGVkCiBFRElUSU5HIERFTEVH QVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25O b3RpZmljYXRpb24KLUVESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFu Z2U6KG51bGwpIHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAzIG9mICN0ZXh0ID4gUCA+IFAgPiBQID4g RElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMyBvZiAjdGV4dCA+IFAgPiBQ ID4gUCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2Vs ZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERF TEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOihudWxsKSB0b0RPTVJhbmdlOnJh bmdlIGZyb20gMyBvZiAjdGV4dCA+IFAgPiBQID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAj ZG9jdW1lbnQgdG8gMyBvZiAjdGV4dCA+IFAgPiBQID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwg PiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxT ZWxlY3Rpbmc6RkFMU0UKIEVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rp b246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgogRURJVElORyBERUxFR0FU RTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCiBsYXllciBh dCAoMCwwKSBzaXplIDgwMHg2MDAKQEAgLTM0LDcgKzM0LDE1IEBAIGxheWVyIGF0ICgwLDApIHNp emUgODAweDYwMAogICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4NAog ICAgICAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6ZSA3ODR4MTQwCiAgICAgICAgIFJl bmRlckJsb2NrIHtESVZ9IGF0ICgwLDApIHNpemUgNzg0eDE0MCBbYm9yZGVyOiAoMnB4IHNvbGlk ICNGRjAwMDApXQotICAgICAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMTQsMTQpIHNpemUgNzU2 eDExMgorICAgICAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMTQsMTQpIHNpemUgNzU2eDU2Cisg ICAgICAgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsMCkgc2l6ZSA3NTZ4MjgKKyAgICAgICAg ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzJ4MjgKKyAgICAgICAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzMjogImZvbyIKKyAgICAgICAgICAgIFJlbmRl ckJsb2NrIHtQfSBhdCAoMCwyOCkgc2l6ZSA3NTZ4MjgKKyAgICAgICAgICAgICAgUmVuZGVyVGV4 dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMzF4MjgKKyAgICAgICAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwwKSB3aWR0aCAzMTogImJhciIKKyAgICAgICAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1v dXMpIGF0ICgwLDU2KSBzaXplIDc1NngwCisgICAgICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgx NCw3MCkgc2l6ZSA3NTZ4NTYKICAgICAgICAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwwKSBz aXplIDc1NngyOAogICAgICAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6 ZSAzMngyOAogICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDMyOiAiZm9v IgpAQCAtNDIsMTIgKzUwLDQgQEAgbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCiAgICAgICAg ICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDMxeDI4CiAgICAgICAgICAg ICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMzE6ICJiYXIiCiAgICAgICAgICAgICBSZW5k ZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMCw1Nikgc2l6ZSA3NTZ4MAotICAgICAgICAgICAgUmVu ZGVyQmxvY2sge1B9IGF0ICgwLDU2KSBzaXplIDc1Nng1NgotICAgICAgICAgICAgICBSZW5kZXJC bG9jayB7UH0gYXQgKDAsMCkgc2l6ZSA3NTZ4MjgKLSAgICAgICAgICAgICAgICBSZW5kZXJUZXh0 IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAzMngyOAotICAgICAgICAgICAgICAgICAgdGV4dCBydW4g YXQgKDAsMCkgd2lkdGggMzI6ICJmb28iCi0gICAgICAgICAgICAgIFJlbmRlckJsb2NrIHtQfSBh dCAoMCwyOCkgc2l6ZSA3NTZ4MjgKLSAgICAgICAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0g YXQgKDAsMCkgc2l6ZSAzMXgyOAotICAgICAgICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkg d2lkdGggMzE6ICJiYXIiCi0gICAgICAgICAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1vdXMpIGF0 ICgwLDU2KSBzaXplIDc1NngwCi1jYXJldDogcG9zaXRpb24gMyBvZiBjaGlsZCAwIHsjdGV4dH0g b2YgY2hpbGQgMSB7UH0gb2YgY2hpbGQgMiB7UH0gb2YgY2hpbGQgMCB7UH0gb2YgY2hpbGQgMSB7 RElWfSBvZiBjaGlsZCAxIHtESVZ9IG9mIGNoaWxkIDEge0JPRFl9IG9mIGNoaWxkIDAge0hUTUx9 IG9mIGRvY3VtZW50CitjYXJldDogcG9zaXRpb24gMyBvZiBjaGlsZCAwIHsjdGV4dH0gb2YgY2hp bGQgMSB7UH0gb2YgY2hpbGQgMSB7UH0gb2YgY2hpbGQgMSB7RElWfSBvZiBjaGlsZCAxIHtESVZ9 IG9mIGNoaWxkIDEge0JPRFl9IG9mIGNoaWxkIDAge0hUTUx9IG9mIGRvY3VtZW50CmRpZmYgLS1n aXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDMxMTgzOTAx ZWMyZjM0MjE4ZWY1YjA1MjE0NjM5NTQ3YTFlM2M1MGMuLjM4ZGM1NWZhN2EzMjc4M2I0ZGZkMzcw MWY3MTNkN2VlOGVlODhlMGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUtMjggIFRvbnkgQ2hhbmcg IDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBicmVhayBvdXQgb2YgbmVzdGluZyB3aGVuIGluc2VydGluZyBuZXcgcGFy YWdyYXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z OTg2NgorCisgICAgICAgIFRlc3Q6IGVkaXRpbmcvaW5zZXJ0aW5nL25lc3Rpbmctb24tcGFyYWdy YXBoLXNlcGFyYXRvci5odG1sCisKKyAgICAgICAgKiBlZGl0aW5nL0luc2VydFBhcmFncmFwaFNl cGFyYXRvckNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGlnaGVzdFZpc3VhbGx5RXF1 aXZhbGVudEJsb2NrQmVsb3dSb290KToKKyAgICAgICAgKFdlYkNvcmU6Okluc2VydFBhcmFncmFw aFNlcGFyYXRvckNvbW1hbmQ6OmRvQXBwbHkpOgorCiAyMDEwLTA1LTI2ICBaZWxpZHJhZyBIb3Ju dW5nICA8emVsaWRyYWdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4g VmFmYWkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJh dG9yQ29tbWFuZC5jcHAgYi9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9y Q29tbWFuZC5jcHAKaW5kZXggNDdjNmVmZGNiMGYxNjg3NDdhMDQ4NTQ3ZDY0NjQwNWM2ODdkMTE4 ZC4uM2RjNWVmN2YwZDkyNzk5MzI1ZWRkMTVmOWVlMTllZjllYThiZjY0OCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9lZGl0aW5nL0luc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQuY3BwCisrKyBi L1dlYkNvcmUvZWRpdGluZy9JbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kLmNwcApAQCAt NDQsMTYgKzQ0LDE3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFtZXNwYWNlIEhU TUxOYW1lczsKIAotLy8gV2hlbiBpbnNlcnRpbmcgYSBuZXcgbGluZSwgd2Ugd2FudCB0byBhdm9p ZCBuZXN0aW5nIGVtcHR5IGRpdnMgaWYgd2UgY2FuLiAgT3RoZXJ3aXNlLCB3aGVuCi0vLyBwYXN0 aW5nLCBpdCdzIGVhc3kgdG8gaGF2ZSBlYWNoIG5ldyBsaW5lIGJlIGEgZGl2IGRlZXBlciB0aGFu IHRoZSBwcmV2aW91cy4gIEUuZy4sIGluIHRoZSBjYXNlCi0vLyBiZWxvdywgd2Ugd2FudCB0byBp bnNlcnQgYXQgXiBpbnN0ZWFkIG9mIHwuCi0vLyA8ZGl2PmZvbzxkaXY+YmFyPC9kaXY+fDwvZGl2 Pl4KLXN0YXRpYyBFbGVtZW50KiBoaWdoZXN0VmlzdWFsbHlFcXVpdmFsZW50RGl2QmVsb3dSb290 KEVsZW1lbnQqIHN0YXJ0QmxvY2spCisvLyBXaGVuIGluc2VydGluZyBhIG5ldyBsaW5lLCB3ZSB3 YW50IHRvIGF2b2lkIG5lc3RpbmcgZW1wdHkgYmxvY2tzIGlmIHdlIGNhbi4gIE90aGVyd2lzZSwK Ky8vIGl0J3MgZWFzeSB0byBoYXZlIGVhY2ggbmV3IGxpbmUgYmUgYSBibG9jayBkZWVwZXIgdGhh biB0aGUgcHJldmlvdXMuICBFLmcuLCBpbiB0aGUgY2FzZQorLy8gYmVsb3csIGlmIHRoZSBjdXJz b3IgaXMgYXQgKiBhbmQgdGhlIHVzZXIgcHJlc3NlcyBlbnRlciwgd2Ugd2FudCB0aGUgbmV3IGN1 cnNvcgorLy8gcG9zaXRpb24gdG8gYmUgXiBub3QgfC4KKy8vIDxkaXY+Zm9vPGRpdj5iYXIqPC9k aXY+fDwvZGl2Pl4KK3N0YXRpYyBFbGVtZW50KiBoaWdoZXN0VmlzdWFsbHlFcXVpdmFsZW50Qmxv Y2tCZWxvd1Jvb3QoRWxlbWVudCogc3RhcnRCbG9jaywgY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFn TmFtZSkKIHsKICAgICBFbGVtZW50KiBjdXJCbG9jayA9IHN0YXJ0QmxvY2s7CiAgICAgLy8gV2Ug ZG9uJ3Qgd2FudCB0byByZXR1cm4gYSByb290IG5vZGUgKGlmIGl0IGhhcHBlbnMgdG8gYmUgYSBk aXYsIGUuZy4sIGluIGEgZG9jdW1lbnQgZnJhZ21lbnQpIGJlY2F1c2UgdGhlcmUgYXJlIG5vCiAg ICAgLy8gc2libGluZ3MgZm9yIHVzIHRvIGFwcGVuZCB0by4KLSAgICB3aGlsZSAoIWN1ckJsb2Nr LT5uZXh0U2libGluZygpICYmIGN1ckJsb2NrLT5wYXJlbnRFbGVtZW50KCktPmhhc1RhZ05hbWUo ZGl2VGFnKSAmJiBjdXJCbG9jay0+cGFyZW50RWxlbWVudCgpLT5wYXJlbnRFbGVtZW50KCkpIHsK KyAgICB3aGlsZSAoIWN1ckJsb2NrLT5uZXh0U2libGluZygpICYmIGN1ckJsb2NrLT5wYXJlbnRF bGVtZW50KCktPmhhc1RhZ05hbWUodGFnTmFtZSkgJiYgY3VyQmxvY2stPnBhcmVudEVsZW1lbnQo KS0+cGFyZW50RWxlbWVudCgpKSB7CiAgICAgICAgIE5hbWVkTm9kZU1hcCogYXR0cmlidXRlcyA9 IGN1ckJsb2NrLT5wYXJlbnRFbGVtZW50KCktPmF0dHJpYnV0ZXModHJ1ZSk7CiAgICAgICAgIGlm IChhdHRyaWJ1dGVzICYmICFhdHRyaWJ1dGVzLT5pc0VtcHR5KCkpCiAgICAgICAgICAgICBicmVh azsKQEAgLTIzMywxMSArMjM0LDEyIEBAIHZvaWQgSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29t bWFuZDo6ZG9BcHBseSgpCiAgICAgICAgICAgICAgICAgc2hvdWxkQXBwbHlTdHlsZUFmdGVySW5z ZXJ0aW9uID0gZmFsc2U7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIC8vIE1vc3Qgb2Yg dGhlIHRpbWUgd2Ugd2FudCB0byBzdGF5IGF0IHRoZSBuZXN0aW5nIGxldmVsIG9mIHRoZSBzdGFy dEJsb2NrIChlLmcuLCB3aGVuIG5lc3Rpbmcgd2l0aGluIGxpc3RzKS4gIEhvd2V2ZXIsCi0gICAg ICAgICAgICAvLyBmb3IgZGl2IG5vZGVzLCB0aGlzIGNhbiByZXN1bHQgaW4gbmVzdGVkIGRpdiB0 YWdzIHRoYXQgYXJlIGhhcmQgdG8gYnJlYWsgb3V0IG9mLgorICAgICAgICAgICAgLy8gV2l0aCB0 aGUgZXhjZXB0aW9uIG9mIGJsb2NrcXVvdGVzLCBzZXR0aW5nIHRoZSBjdXJzb3IgYXQgdGhlIGVu ZCBvZiBuZXN0ZWQgYmxvY2sgbm9kZXMgaXMKKyAgICAgICAgICAgIC8vIHZpc3VhbGx5IHRoZSBz YW1lIGFzIHNldHRpbmcgdGhlIGN1cnNvciBvdXRzaWRlIGEgYmxvY2suICBUbyBhdm9pZCBuZXN0 aW5nIG9mIG5vZGVzLCB3ZQorICAgICAgICAgICAgLy8gY3JlYXRlIG5ldyBwYXJhZ3JhcGhzIG91 dHNpZGUgdGhlIHRoZSBibG9jay4KICAgICAgICAgICAgIEVsZW1lbnQqIHNpYmxpbmdOb2RlID0g c3RhcnRCbG9jazsKLSAgICAgICAgICAgIGlmIChibG9ja1RvSW5zZXJ0LT5oYXNUYWdOYW1lKGRp dlRhZykpCi0gICAgICAgICAgICAgICAgc2libGluZ05vZGUgPSBoaWdoZXN0VmlzdWFsbHlFcXVp dmFsZW50RGl2QmVsb3dSb290KHN0YXJ0QmxvY2spOworICAgICAgICAgICAgaWYgKCFibG9ja1Rv SW5zZXJ0LT5oYXNUYWdOYW1lKGJsb2NrcXVvdGVUYWcpKQorICAgICAgICAgICAgICAgIHNpYmxp bmdOb2RlID0gaGlnaGVzdFZpc3VhbGx5RXF1aXZhbGVudEJsb2NrQmVsb3dSb290KHN0YXJ0Qmxv Y2ssIGJsb2NrVG9JbnNlcnQtPnRhZ1FOYW1lKCkpOwogICAgICAgICAgICAgaW5zZXJ0Tm9kZUFm dGVyKGJsb2NrVG9JbnNlcnQsIHNpYmxpbmdOb2RlKTsKICAgICAgICAgfQogCg==