35713 2010-03-03 18:36:43 -0800 undo after smartdelete should select the deleted space 2010-03-09 15:41:46 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan webkit-unassigned adele ap darin enrica eric oldest_to_newest 195850 0 ojan 2010-03-03 18:36:43 -0800 undo after smartdelete should select the deleted space 195851 1 49976 ojan 2010-03-03 18:40:13 -0800 Created attachment 49976 Patch 197674 2 49976 abarth 2010-03-09 11:06:01 -0800 Comment on attachment 49976 Patch Ojan is slowly teaching me the editing code. I'd prefer to have someone more expert review these patches, but no one seems to be forthcoming. + void setStartingSelectionOnSmartDelete(Position&, Position&); Why pass these by reference instead of by constant reference? 197816 3 ojan 2010-03-09 15:41:46 -0800 Committed r55752: <http://trac.webkit.org/changeset/55752> 49976 2010-03-03 18:40:13 -0800 2010-03-09 11:06:01 -0800 Patch bug-35713-20100303184012.patch text/plain 10107 ojan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMGIwNWYxLi5lNDFjN2I5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMt MDMgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB1bmRvIGFmdGVyIHNtYXJ0ZGVsZXRlIHNob3Vs ZCBzZWxlY3QgdGhlIGRlbGV0ZWQgc3BhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM1NzEzCisKKyAgICAgICAgKiBlZGl0aW5nL3VuZG8vdW5kby1z bWFydC1kZWxldGUtcmV2ZXJzZWQtc2VsZWN0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogZWRpdGluZy91bmRvL3VuZG8tc21hcnQtZGVsZXRlLXJldmVyc2VkLXNlbGVjdGlvbi5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL3VuZG8vdW5kby1zbWFydC1kZWxldGUtd29y ZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvdW5kby91bmRvLXNtYXJ0 LWRlbGV0ZS13b3JkLmh0bWw6IEFkZGVkLgorCiAyMDEwLTAzLTAzICBDc2FiYSBPc3p0cm9nb27D oWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBTa2lwIG5ldyB0ZXN0IGludHJv ZHVjZWQgaW4gcjU1NDc0LCBiZWNhdXNlIG9mCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0 aW5nL3VuZG8vdW5kby1zbWFydC1kZWxldGUtcmV2ZXJzZWQtc2VsZWN0aW9uLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvdW5kby91bmRvLXNtYXJ0LWRlbGV0ZS1yZXZlcnNlZC1z ZWxlY3Rpb24tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LjBkYzc3ZGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3VuZG8vdW5k by1zbWFydC1kZWxldGUtcmV2ZXJzZWQtc2VsZWN0aW9uLWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDUgQEAKK1Rlc3RzOiAKK0RvdWJsZS1jbGljayB0aGUgZ3JlZW4gImEiIGFuZCBkcmFnIGJhY2t3 YXJkcyB0byBzZWxlY3QgImJhciBiYXoiIHdpdGggd29yZCBncmFudWxhcml0eS4gRGVsZXRlLCB0 aGVuIHVuZG8gdGhlIGRlbGV0ZS4gVGhlIHNwYWNlIHRoYXQgZ290IHNtYXJ0IGRlbGV0ZWQgc2hv dWxkIG5vdyBiZSBzZWxlY3RlZCBhbmQgdGhlIGFuY2hvciBvZiB0aGUgc2VsZWN0aW9uIHNob3Vs ZCBiZSBhdCB0aGUgZW5kIG9mIHRoZSBzZWxlY3Rpb24uCisKK2ZvbyBiYXIgYmF6IGJpegorUEFT U0VECmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3VuZG8vdW5kby1zbWFydC1kZWxl dGUtcmV2ZXJzZWQtc2VsZWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3VuZG8vdW5k by1zbWFydC1kZWxldGUtcmV2ZXJzZWQtc2VsZWN0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMjE3YmJmYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2VkaXRpbmcvdW5kby91bmRvLXNtYXJ0LWRlbGV0ZS1yZXZlcnNlZC1zZWxlY3Rpb24uaHRtbApA QCAtMCwwICsxLDcwIEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Li4vZWRpdGluZy5q cyBsYW5ndWFnZT0iSmF2YVNjcmlwdCIgdHlwZT0idGV4dC9KYXZhU2NyaXB0IiA+PC9zY3JpcHQ+ CisKKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxheW91 dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworZnVuY3Rpb24gZ2V0U3RyaW5nRm9yTm9k ZShub2RlKSB7CisgICAgcmV0dXJuIG5vZGUgKyAiKCIgKyBub2RlLmRhdGEgKyAiKSI7Cit9CisK K2Z1bmN0aW9uIGVkaXRpbmdUZXN0KCkgeworICAgIHZhciBzdGFydCA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJzdGFydCIpOworICAgIHZhciB4ID0gc3RhcnQub2Zmc2V0TGVmdCArIDU7Cisg ICAgdmFyIG1pZGRsZVkgPSBzdGFydC5vZmZzZXRUb3AgKyBzdGFydC5vZmZzZXRIZWlnaHQgLyAy OworICAgIHZhciBlbmRYID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVuZCIpLm9mZnNldExl ZnQ7CisKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4LCBtaWRkbGVZKTsKKyAgICBldmVu dFNlbmRlci5tb3VzZURvd24oKTsKKyAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisgICAgZXZl bnRTZW5kZXIubW91c2VEb3duKCk7CisKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhlbmRY LCBtaWRkbGVZKTsKKyAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CisKKyAgICBkb2N1bWVudC5l eGVjQ29tbWFuZCgiRGVsZXRlIik7CisgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoIlVuZG8iKTsK KyAgICAKKyAgICB2YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgIGlm IChzZWxlY3Rpb24uYW5jaG9yTm9kZSAhPSBzdGFydC5uZXh0U2libGluZyB8fAorICAgICAgICBz ZWxlY3Rpb24uYW5jaG9yT2Zmc2V0ICE9IDEgfHwKKyAgICAgICAgc2VsZWN0aW9uLmZvY3VzTm9k ZSAhPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicm9vdCIpLmZpcnN0Q2hpbGQgfHwKKyAgICAg ICAgc2VsZWN0aW9uLmZvY3VzT2Zmc2V0ICE9IDQpIHsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInJlc3VsdCIpLmlubmVySFRNTCA9ICJGQUlMRUQuIFNlbGVjdGlvbiB3YXMgIiAr CisgICAgICAgICAgImFuY2hvck5vZGU6IiArIGdldFN0cmluZ0Zvck5vZGUoc2VsZWN0aW9uLmFu Y2hvck5vZGUpICsKKyAgICAgICAgICAiIGFuY2hvck9mZnNldDoiICsgc2VsZWN0aW9uLmFuY2hv ck9mZnNldCArCisgICAgICAgICAgIiBmb2N1c05vZGU6IiArIGdldFN0cmluZ0Zvck5vZGUoc2Vs ZWN0aW9uLmZvY3VzTm9kZSkgKworICAgICAgICAgICIgZm9jdXNPZmZzZXQ6IiArIHNlbGVjdGlv bi5mb2N1c09mZnNldDsKKyAgICB9IGVsc2UKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInJlc3VsdCIpLmlubmVySFRNTCA9ICJQQVNTRUQiOworfQorCis8L3NjcmlwdD4KKzwvaGVh ZD4gCis8Ym9keT4KKworPGRpdiBjbGFzcz0iZXhwbGFuYXRpb24iPgorPGRpdiBjbGFzcz0ic2Nl bmFyaW8iPgorVGVzdHM6IAorPGJyPgorRG91YmxlLWNsaWNrIHRoZSBncmVlbiAiYSIgYW5kIGRy YWcgYmFja3dhcmRzIHRvIHNlbGVjdCAiYmFyIGJheiIgd2l0aCB3b3JkIGdyYW51bGFyaXR5LiBE ZWxldGUsIHRoZW4gdW5kbyB0aGUgZGVsZXRlLiBUaGUgc3BhY2UgdGhhdCBnb3Qgc21hcnQgZGVs ZXRlZCBzaG91bGQgbm93IGJlIHNlbGVjdGVkIGFuZCB0aGUgYW5jaG9yIG9mIHRoZSBzZWxlY3Rp b24gc2hvdWxkIGJlIGF0IHRoZSBlbmQgb2YgdGhlIHNlbGVjdGlvbi4KKzwvZGl2PgorPC9kaXY+ Cis8YnI+Cis8ZGl2IGNvbnRlbnRlZGl0YWJsZSBpZD0icm9vdCI+Citmb28gYjxzcGFuIGlkPSJl bmQiPmE8L3NwYW4+ciBiPHNwYW4gaWQ9InN0YXJ0IiBzdHlsZT0iY29sb3I6Z3JlZW4iPmE8L3Nw YW4+eiBiaXoKKzwvZGl2PgorCis8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2PgorPHNjcmlwdD4KK2xh eW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKK3NldFRpbWVvdXQoZnVuY3Rpb24o KSB7CisgICAgZWRpdGluZ1Rlc3QoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlE b25lKCk7Cit9LCAxMDAwKTsKKzwvc2NyaXB0PgorCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3VuZG8vdW5kby1zbWFydC1kZWxldGUtd29yZC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3VuZG8vdW5kby1zbWFydC1kZWxldGUtd29y ZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGI2YTcz MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvdW5kby91bmRvLXNtYXJ0 LWRlbGV0ZS13b3JkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQgQEAKK1Rlc3RzOiAKK1NlbGVj dCBhIHdvcmQgdmlhIGRvdWJsZS1jbGljay4gRGVsZXRlLiBUaGVuIHVuZG8gdGhlIGRlbGV0ZS4g VGhlIHNwYWNlIHRoYXQgZ290IHNtYXJ0IGRlbGV0ZWQgc2hvdWxkIG5vdyBiZSBzZWxlY3RlZC4K K2ZvbyBiYXIgYmF6CitQQVNTRUQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvdW5k by91bmRvLXNtYXJ0LWRlbGV0ZS13b3JkLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3VuZG8v dW5kby1zbWFydC1kZWxldGUtd29yZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjFlMmZlYjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3Vu ZG8vdW5kby1zbWFydC1kZWxldGUtd29yZC5odG1sCkBAIC0wLDAgKzEsNTggQEAKKzxodG1sPgor PGhlYWQ+Cis8c2NyaXB0IHNyYz0uLi9lZGl0aW5nLmpzIGxhbmd1YWdlPSJKYXZhU2NyaXB0IiB0 eXBlPSJ0ZXh0L0phdmFTY3JpcHQiID48L3NjcmlwdD4KKworPHNjcmlwdD4KK2lmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4 dCgpOworCitmdW5jdGlvbiBlZGl0aW5nVGVzdCgpIHsKKyAgICB2YXIgd29yZCA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJ3b3JkIik7CisgICAgdmFyIHggPSB3b3JkLm9mZnNldExlZnQ7Cisg ICAgdmFyIHkgPSB3b3JkLm9mZnNldFRvcDsKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4 LCB5KTsKKyAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICBldmVudFNlbmRlci5tb3Vz ZVVwKCk7CisgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgZXZlbnRTZW5kZXIubW91 c2VVcCgpOworCisgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoIkRlbGV0ZSIpOworICAgIGRvY3Vt ZW50LmV4ZWNDb21tYW5kKCJVbmRvIik7CisgICAgCisgICAgdmFyIHNlbGVjdGlvbiA9IHdpbmRv dy5nZXRTZWxlY3Rpb24oKTsKKyAgICBpZiAoc2VsZWN0aW9uLmFuY2hvck5vZGUgIT0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInJvb3QiKS5maXJzdENoaWxkIHx8CisgICAgICAgIHNlbGVjdGlv bi5hbmNob3JPZmZzZXQgIT0gNCB8fAorICAgICAgICBzZWxlY3Rpb24uZm9jdXNOb2RlICE9IHdv cmQuZmlyc3RDaGlsZCB8fAorICAgICAgICBzZWxlY3Rpb24uZm9jdXNPZmZzZXQgIT0gMykgewor ICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0IikuaW5uZXJIVE1MID0gIkZB SUxFRCI7CisgICAgICAgIGNvbnNvbGUubG9nKHNlbGVjdGlvbi5hbmNob3JOb2RlKTsKKyAgICAg ICAgY29uc29sZS5sb2coc2VsZWN0aW9uLmFuY2hvck9mZnNldCk7CisgICAgICAgIGNvbnNvbGUu bG9nKHNlbGVjdGlvbi5mb2N1c05vZGUpOworICAgICAgICBjb25zb2xlLmxvZyhzZWxlY3Rpb24u Zm9jdXNPZmZzZXQpOyAgICAgICAgCisgICAgfSBlbHNlCisgICAgICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJyZXN1bHQiKS5pbm5lckhUTUwgPSAiUEFTU0VEIjsKK30KKworPC9zY3JpcHQ+ Cis8L2hlYWQ+IAorPGJvZHk+CisKKzxkaXYgY2xhc3M9ImV4cGxhbmF0aW9uIj4KKzxkaXYgY2xh c3M9InNjZW5hcmlvIj4KK1Rlc3RzOiAKKzxicj4KK1NlbGVjdCBhIHdvcmQgdmlhIGRvdWJsZS1j bGljay4gRGVsZXRlLiBUaGVuIHVuZG8gdGhlIGRlbGV0ZS4gVGhlIHNwYWNlIHRoYXQgZ290IHNt YXJ0IGRlbGV0ZWQgc2hvdWxkIG5vdyBiZSBzZWxlY3RlZC4KKzwvZGl2PgorPC9kaXY+CisKKzxk aXYgY29udGVudGVkaXRhYmxlIGlkPSJyb290Ij4KK2ZvbyA8c3BhbiBpZD0id29yZCI+YmFyPC9z cGFuPiBiYXoKKzwvZGl2PgorCis8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2PgorPHNjcmlwdD4KK2Vk aXRpbmdUZXN0KCk7Cis8L3NjcmlwdD4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5ZTBjZmMxLi43MzQ3 ZWJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDEwLTAzLTAzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg dW5kbyBhZnRlciBzbWFydGRlbGV0ZSBzaG91bGQgc2VsZWN0IHRoZSBkZWxldGVkIHNwYWNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTcxMworCisg ICAgICAgIFRleHRFZGl0IGJlaGF2aW9yIGlzIHRvIHNlbGVjdCB0aGUgZGVsZXRlZCBzcGFjZSBh ZnRlciBhIHNtYXJ0ZGVsZXRlLgorCisgICAgICAgIFRlc3RzOiBlZGl0aW5nL3VuZG8vdW5kby1z bWFydC1kZWxldGUtcmV2ZXJzZWQtc2VsZWN0aW9uLmh0bWwKKyAgICAgICAgICAgICAgIGVkaXRp bmcvdW5kby91bmRvLXNtYXJ0LWRlbGV0ZS13b3JkLmh0bWwKKworICAgICAgICAqIGVkaXRpbmcv RGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZWxldGVTZWxl Y3Rpb25Db21tYW5kOjpzZXRTdGFydGluZ1NlbGVjdGlvbk9uU21hcnREZWxldGUpOgorICAgICAg ICAoV2ViQ29yZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6aW5pdGlhbGl6ZVBvc2l0aW9uRGF0 YSk6CisgICAgICAgICogZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5kLmg6CisgICAgICAg ICogZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpc2li bGVTZWxlY3Rpb246OnNldFdpdGhvdXRWYWxpZGF0aW9uKToKKyAgICAgICAgVGhpcyBhc3NlcnQg bG9va3MgYm9ndXMgdG8gbWUuIHVuZG8tc21hcnQtZGVsZXRlLXJldmVyc2VkLXNlbGVjdGlvbi5o dG1sIGhpdHMgaXQKKyAgICAgICAgYnV0IG5vdCBhcyBhIHJlc3VsdCBvZiB0aGUgb3RoZXIgY2hh bmdlcyBpbiB0aGlzIHBhdGNoLiBUaGUgZ3JhbnVsYXJpdHkgd2hlbgorICAgICAgICBkZWxldGlu ZyBhZnRlciBtYWtpbmcgYSB3b3JkZ3JhbnVsYXJpdHkgc2VsZWN0aW9uIGlzIHdvcmRncmFudWxh cml0eSwgbm90IGNoYXJhY3RlcmdyYW51bGFyaXR5LgorCiAyMDEwLTAzLTAzICBEdW1pdHJ1IERh bmlsaXVjICA8ZHVtaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgbm9ib2R5 LCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9u Q29tbWFuZC5jcHAgYi9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAK aW5kZXggZDNkOWNjOS4uODAyN2IxNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9lZGl0aW5nL0RlbGV0 ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rp b25Db21tYW5kLmNwcApAQCAtMTYxLDYgKzE2MSwyMCBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNv bW1hbmQ6OmluaXRpYWxpemVTdGFydEVuZChQb3NpdGlvbiYgc3RhcnQsIFBvc2l0aW9uJiBlbmQp CiAgICAgfQogfQogCit2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNldFN0YXJ0aW5nU2Vs ZWN0aW9uT25TbWFydERlbGV0ZShQb3NpdGlvbiYgc3RhcnQsIFBvc2l0aW9uJiBlbmQpCit7Cisg ICAgVmlzaWJsZVBvc2l0aW9uIG5ld0Jhc2U7CisgICAgVmlzaWJsZVBvc2l0aW9uIG5ld0V4dGVu dDsKKyAgICBpZiAoc3RhcnRpbmdTZWxlY3Rpb24oKS5pc0Jhc2VGaXJzdCgpKSB7CisgICAgICAg IG5ld0Jhc2UgPSBzdGFydDsKKyAgICAgICAgbmV3RXh0ZW50ID0gZW5kOworICAgIH0gZWxzZSB7 CisgICAgICAgIG5ld0Jhc2UgPSBlbmQ7CisgICAgICAgIG5ld0V4dGVudCA9IHN0YXJ0OyAgICAg ICAgCisgICAgfQorICAgIHNldFN0YXJ0aW5nU2VsZWN0aW9uKFZpc2libGVTZWxlY3Rpb24obmV3 QmFzZSwgbmV3RXh0ZW50KSk7ICAgICAgICAgICAgCit9CisgICAgCiB2b2lkIERlbGV0ZVNlbGVj dGlvbkNvbW1hbmQ6OmluaXRpYWxpemVQb3NpdGlvbkRhdGEoKQogewogICAgIFBvc2l0aW9uIHN0 YXJ0LCBlbmQ7CkBAIC0yMzAsNiArMjQ0LDggQEAgdm9pZCBEZWxldGVTZWxlY3Rpb25Db21tYW5k Ojppbml0aWFsaXplUG9zaXRpb25EYXRhKCkKICAgICAgICAgICAgIG1fdXBzdHJlYW1TdGFydCA9 IHBvcy51cHN0cmVhbSgpOwogICAgICAgICAgICAgbV9kb3duc3RyZWFtU3RhcnQgPSBwb3MuZG93 bnN0cmVhbSgpOwogICAgICAgICAgICAgbV9sZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1T dGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0aW9uKHZpc2libGVQb3MuYWZmaW5pdHkoKSk7CisK KyAgICAgICAgICAgIHNldFN0YXJ0aW5nU2VsZWN0aW9uT25TbWFydERlbGV0ZShtX3Vwc3RyZWFt U3RhcnQsIG1fdXBzdHJlYW1FbmQpOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICAvLyB0 cmFpbGluZyB3aGl0ZXNwYWNlIGlzIG9ubHkgY29uc2lkZXJlZCBmb3Igc21hcnQgZGVsZXRlIGlm IHRoZXJlIGlzIG5vIGxlYWRpbmcKQEAgLTI0MSw2ICsyNTcsOCBAQCB2b2lkIERlbGV0ZVNlbGVj dGlvbkNvbW1hbmQ6OmluaXRpYWxpemVQb3NpdGlvbkRhdGEoKQogICAgICAgICAgICAgbV91cHN0 cmVhbUVuZCA9IHBvcy51cHN0cmVhbSgpOwogICAgICAgICAgICAgbV9kb3duc3RyZWFtRW5kID0g cG9zLmRvd25zdHJlYW0oKTsKICAgICAgICAgICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlID0gbV9k b3duc3RyZWFtRW5kLnRyYWlsaW5nV2hpdGVzcGFjZVBvc2l0aW9uKFZQX0RFRkFVTFRfQUZGSU5J VFkpOworCisgICAgICAgICAgICBzZXRTdGFydGluZ1NlbGVjdGlvbk9uU21hcnREZWxldGUobV9k b3duc3RyZWFtU3RhcnQsIG1fZG93bnN0cmVhbUVuZCk7CiAgICAgICAgIH0KICAgICB9CiAgICAg CmRpZmYgLS1naXQgYS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5oIGIv V2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuaAppbmRleCBjODg3MmVmLi40 NGEwMDVjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFu ZC5oCisrKyBiL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5kLmgKQEAgLTUx LDYgKzUxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgcHJlc2VydmVzVHlwaW5nU3R5 bGUoKSBjb25zdDsKIAogICAgIHZvaWQgaW5pdGlhbGl6ZVN0YXJ0RW5kKFBvc2l0aW9uJiwgUG9z aXRpb24mKTsKKyAgICB2b2lkIHNldFN0YXJ0aW5nU2VsZWN0aW9uT25TbWFydERlbGV0ZShQb3Np dGlvbiYsIFBvc2l0aW9uJik7CiAgICAgdm9pZCBpbml0aWFsaXplUG9zaXRpb25EYXRhKCk7CiAg ICAgdm9pZCBzYXZlVHlwaW5nU3R5bGVTdGF0ZSgpOwogICAgIHZvaWQgaW5zZXJ0UGxhY2Vob2xk ZXJGb3JBbmNlc3RvckJsb2NrQ29udGVudCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9lZGl0aW5n L1Zpc2libGVTZWxlY3Rpb24uY3BwIGIvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24u Y3BwCmluZGV4IGJhZWYyYjUuLjU3MWZlMmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZWRpdGluZy9W aXNpYmxlU2VsZWN0aW9uLmNwcAorKysgYi9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlv bi5jcHAKQEAgLTQ0MSw3ICs0NDEsNiBAQCB2b2lkIFZpc2libGVTZWxlY3Rpb246OnNldFdpdGhv dXRWYWxpZGF0aW9uKGNvbnN0IFBvc2l0aW9uJiBiYXNlLCBjb25zdCBQb3NpdGlvbgogICAgIEFT U0VSVCghZXh0ZW50LmlzTnVsbCgpKTsKICAgICBBU1NFUlQoYmFzZSAhPSBleHRlbnQpOwogICAg IEFTU0VSVChtX2FmZmluaXR5ID09IERPV05TVFJFQU0pOwotICAgIEFTU0VSVChtX2dyYW51bGFy aXR5ID09IENoYXJhY3RlckdyYW51bGFyaXR5KTsKICAgICBtX2Jhc2UgPSBiYXNlOwogICAgIG1f ZXh0ZW50ID0gZXh0ZW50OwogICAgIG1fYmFzZUlzRmlyc3QgPSBjb21wYXJlUG9zaXRpb25zKGJh c2UsIGV4dGVudCkgPD0gMDsK