74356 2011-12-12 15:12:39 -0800 REGRESSION(r102357): respondToUnappliedEditing exits early for CreateLinkCommand 2011-12-12 17:07:34 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa adele darin enrica jiapu.mail oldest_to_newest 519553 0 rniwa 2011-12-12 15:12:39 -0800 It appears that r102357 regressed Lion autocorrection panel. After r102357, respondToUnappliedEditing always exits early even when unapplying CreateLinkCommand since EditCommandComposition's isCreateLinkCommand return false. 519649 1 rniwa 2011-12-12 16:16:43 -0800 Is there some manual test / DRT test you can run on Lion for this? Unfortunately, I don't have access to Lion machines and I'm fixing this in blind. 519656 2 118901 rniwa 2011-12-12 16:27:09 -0800 Created attachment 118901 fixes the bug 519658 3 118901 rniwa 2011-12-12 16:28:29 -0800 Comment on attachment 118901 fixes the bug Oops, this patch has some random Editor.cpp change :( 519677 4 118907 rniwa 2011-12-12 16:46:52 -0800 Created attachment 118907 Reveted orthogonal Editor.cpp change 519686 5 118907 enrica 2011-12-12 16:53:28 -0800 Comment on attachment 118907 Reveted orthogonal Editor.cpp change Looks fine to me. 519695 6 rniwa 2011-12-12 16:59:41 -0800 Committed r102643: <http://trac.webkit.org/changeset/102643> 519708 7 rniwa 2011-12-12 17:07:34 -0800 Thanks for the review. I just wish we could add a test for this (or that we already had one). 118901 2011-12-12 16:27:09 -0800 2011-12-12 16:28:29 -0800 fixes the bug bug-74356-20111212162707.patch text/plain 10474 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjYzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDExLTEyLTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjEwMjM1Nyk6 IHJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcgZXhpdHMgZWFybHkgZm9yIENyZWF0ZUxpbmtDb21t YW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDM1 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBw cm9ibGVtIHdhcyB0aGF0IGlzQ3JlYXRlTGlua0NvbW1hbmQgd2FzIGNhbGxlZCBvbiBFZGl0Q29t bWFuZENvbXBvc2l0aW9uIGJ5IHJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcuCisgICAgICAgIEZp eGVkIHRoZSBidWcgYnkgcHJvcGFnYXRpbmcgdGhlIHZhbHVlIG9mIGlzQ3JldGVMaW5rQ29tbWFu ZCBmcm9tIENvbXBvc2l0ZUVkaXRDb21tYW5kIHRvCisgICAgICAgIEVkaXRDb21tYW5kQ29tcG9z aXRpb24gdmlhIHdhc0NyZWF0ZUxpbmtDb21tYW5kLgorCisgICAgICAgIEFsc28gbW92ZSBpc0Ny ZWF0ZUxpbmtDb21tYW5kIGZyb20gRWRpdENvbW1hbmQgdG8gQ29tcG9zaXRlRWRpdENvbW1hbmQg dG8gcHJldmVudCB0aGlzIG1pc3Rha2UgaW4gdGhlIGZ1dHVyZS4KKworICAgICAgICAqIGVkaXRp bmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdENvbW1h bmRDb21wb3NpdGlvbjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRDb21tYW5kQ29t cG9zaXRpb246OkVkaXRDb21tYW5kQ29tcG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29t cG9zaXRlRWRpdENvbW1hbmQ6OmVuc3VyZUNvbXBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvbXBvc2l0ZUVkaXRDb21tYW5kOjppc0NyZWF0ZUxpbmtDb21tYW5kKToKKyAgICAgICAgKiBl ZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmg6CisgICAgICAgIChXZWJDb3JlOjpFZGl0Q29t bWFuZENvbXBvc2l0aW9uOjp3YXNDcmVhdGVMaW5rQ29tbWFuZCk6CisgICAgICAgICogZWRpdGlu Zy9FZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGlzcGF0Y2hFZGl0YWJsZUNvbnRlbnRD aGFuZ2VkRXZlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6YXBwbGllZEVkaXRpbmcp OgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjp1bmFwcGxpZWRFZGl0aW5nKToKKyAgICAgICAg KFdlYkNvcmU6OkVkaXRvcjo6cmVhcHBsaWVkRWRpdGluZyk6CisgICAgICAgICogZWRpdGluZy9T cGVsbGluZ0NvcnJlY3Rpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNwZWxs aW5nQ29ycmVjdGlvbkNvbnRyb2xsZXI6OnJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcpOgorICAg ICAgICAqIGVkaXRpbmcvU3BlbGxpbmdDb3JyZWN0aW9uQ29udHJvbGxlci5oOgorCiAyMDExLTEy LTEyICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6 IGFyaWEtaGlkZGVuIGluaGVyaXRhbmNlIGJyb2tlbiB3aGVuIGFwcGx5aW5nIHRvIHNvbWUgZGVz Y2VuZGFudHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1h bmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRp dENvbW1hbmQuY3BwCShyZXZpc2lvbiAxMDI2MjYpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzEsOSArNzEsMTUg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAogUGFz c1JlZlB0cjxFZGl0Q29tbWFuZENvbXBvc2l0aW9uPiBFZGl0Q29tbWFuZENvbXBvc2l0aW9uOjpj cmVhdGUoRG9jdW1lbnQqIGRvY3VtZW50LAotICAgIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHN0 YXJ0aW5nU2VsZWN0aW9uLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uIGVuZGluZ1NlbGVjdGlvbikK KyAgICBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzdGFydGluZ1NlbGVjdGlvbiwgY29uc3QgVmlz aWJsZVNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9uLCBib29sIHdhc0NyZWF0ZUxpbmtDb21tYW5k KQoreworICAgIHJldHVybiBhZG9wdFJlZihuZXcgRWRpdENvbW1hbmRDb21wb3NpdGlvbihkb2N1 bWVudCwgc3RhcnRpbmdTZWxlY3Rpb24sIGVuZGluZ1NlbGVjdGlvbiwgd2FzQ3JlYXRlTGlua0Nv bW1hbmQpKTsKK30KKworRWRpdENvbW1hbmRDb21wb3NpdGlvbjo6RWRpdENvbW1hbmRDb21wb3Np dGlvbihEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHN0YXJ0aW5n U2VsZWN0aW9uLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBlbmRpbmdTZWxlY3Rpb24sIGJvb2wg d2FzQ3JlYXRlTGlua0NvbW1hbmQpCisgICAgOiBFZGl0Q29tbWFuZChkb2N1bWVudCwgc3RhcnRp bmdTZWxlY3Rpb24sIGVuZGluZ1NlbGVjdGlvbikKKyAgICAsIG1fd2FzQ3JlYXRlTGlua0NvbW1h bmQod2FzQ3JlYXRlTGlua0NvbW1hbmQpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFZGl0 Q29tbWFuZENvbXBvc2l0aW9uKGRvY3VtZW50LCBzdGFydGluZ1NlbGVjdGlvbiwgZW5kaW5nU2Vs ZWN0aW9uKSk7CiB9CiAKIHZvaWQgRWRpdENvbW1hbmRDb21wb3NpdGlvbjo6ZG9BcHBseSgpCkBA IC0xMzUsMTAgKzE0MSwxNSBAQCBFZGl0Q29tbWFuZENvbXBvc2l0aW9uKiBDb21wb3NpdGVFZGl0 Q29tCiAgICAgd2hpbGUgKGNvbW1hbmQgJiYgY29tbWFuZC0+cGFyZW50KCkpCiAgICAgICAgIGNv bW1hbmQgPSBjb21tYW5kLT5wYXJlbnQoKTsKICAgICBpZiAoIWNvbW1hbmQtPm1fY29tcG9zaXRp b24pCi0gICAgICAgIGNvbW1hbmQtPm1fY29tcG9zaXRpb24gPSBFZGl0Q29tbWFuZENvbXBvc2l0 aW9uOjpjcmVhdGUoZG9jdW1lbnQoKSwgc3RhcnRpbmdTZWxlY3Rpb24oKSwgZW5kaW5nU2VsZWN0 aW9uKCkpOworICAgICAgICBjb21tYW5kLT5tX2NvbXBvc2l0aW9uID0gRWRpdENvbW1hbmRDb21w b3NpdGlvbjo6Y3JlYXRlKGRvY3VtZW50KCksIHN0YXJ0aW5nU2VsZWN0aW9uKCksIGVuZGluZ1Nl bGVjdGlvbigpLCBpc0NyZWF0ZUxpbmtDb21tYW5kKCkpOwogICAgIHJldHVybiBjb21tYW5kLT5t X2NvbXBvc2l0aW9uLmdldCgpOwogfQogCitib29sIENvbXBvc2l0ZUVkaXRDb21tYW5kOjppc0Ny ZWF0ZUxpbmtDb21tYW5kKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIC8vCiAv LyBzdWdhcnktc3dlZXQgY29udmVuaWVuY2UgZnVuY3Rpb25zIHRvIGhlbHAgY3JlYXRlIGFuZCBh cHBseSBlZGl0IGNvbW1hbmRzIGluIGNvbXBvc2l0ZSBjb21tYW5kcwogLy8KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmgJKHJldmlzaW9uIDEw MjYyNikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuaAko d29ya2luZyBjb3B5KQpAQCAtMzksMjQgKzM5LDI0IEBAIGNsYXNzIFRleHQ7CiAKIGNsYXNzIEVk aXRDb21tYW5kQ29tcG9zaXRpb24gOiBwdWJsaWMgRWRpdENvbW1hbmQgewogcHVibGljOgotICAg IHN0YXRpYyBQYXNzUmVmUHRyPEVkaXRDb21tYW5kQ29tcG9zaXRpb24+IGNyZWF0ZShEb2N1bWVu dCosIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uKTsKKyAg ICBzdGF0aWMgUGFzc1JlZlB0cjxFZGl0Q29tbWFuZENvbXBvc2l0aW9uPiBjcmVhdGUoRG9jdW1l bnQqLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiwgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYsIGJv b2wgd2FzQ3JlYXRlTGlua0NvbW1hbmQpOwogCiAgICAgdmlydHVhbCB2b2lkIGRvQXBwbHkoKSBP VkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZG9VbmFwcGx5KCkgT1ZFUlJJREU7CiAgICAgdmly dHVhbCB2b2lkIGRvUmVhcHBseSgpIE9WRVJSSURFOwogICAgIHZvaWQgYXBwZW5kKFNpbXBsZUVk aXRDb21tYW5kKik7CisgICAgYm9vbCB3YXNDcmVhdGVMaW5rQ29tbWFuZCgpIGNvbnN0IHsgcmV0 dXJuIG1fd2FzQ3JlYXRlTGlua0NvbW1hbmQ7IH0KIAogI2lmbmRlZiBOREVCVUcKICAgICB2aXJ0 dWFsIHZvaWQgZ2V0Tm9kZXNJbkNvbW1hbmQoSGFzaFNldDxOb2RlKj4mKTsKICNlbmRpZgogCiBw cml2YXRlOgotICAgIEVkaXRDb21tYW5kQ29tcG9zaXRpb24oRG9jdW1lbnQqIGRvY3VtZW50LCBj b25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzdGFydGluZ1NlbGVjdGlvbiwgY29uc3QgVmlzaWJsZVNl bGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9uKQotICAgICAgICA6IEVkaXRDb21tYW5kKGRvY3VtZW50 LCBzdGFydGluZ1NlbGVjdGlvbiwgZW5kaW5nU2VsZWN0aW9uKQotICAgIHsgfQorICAgIEVkaXRD b21tYW5kQ29tcG9zaXRpb24oRG9jdW1lbnQqLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzdGFy dGluZ1NlbGVjdGlvbiwgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9uLCBi b29sIHdhc0NyZWF0ZUxpbmtDb21tYW5kKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNFZGl0Q29tbWFu ZENvbXBvc2l0aW9uKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgVmVj dG9yPFJlZlB0cjxTaW1wbGVFZGl0Q29tbWFuZD4gPiBtX2NvbW1hbmRzOworICAgIGJvb2wgbV93 YXNDcmVhdGVMaW5rQ29tbWFuZDsKIH07CiAKIGNsYXNzIENvbXBvc2l0ZUVkaXRDb21tYW5kIDog cHVibGljIEVkaXRDb21tYW5kIHsKQEAgLTY3LDYgKzY3LDggQEAgcHVibGljOgogICAgIEVkaXRD b21tYW5kQ29tcG9zaXRpb24qIGNvbXBvc2l0aW9uKCkgeyByZXR1cm4gbV9jb21wb3NpdGlvbi5n ZXQoKTsgfQogICAgIEVkaXRDb21tYW5kQ29tcG9zaXRpb24qIGVuc3VyZUNvbXBvc2l0aW9uKCk7 CiAKKyAgICB2aXJ0dWFsIGJvb2wgaXNDcmVhdGVMaW5rQ29tbWFuZCgpIGNvbnN0OworCiBwcm90 ZWN0ZWQ6CiAgICAgZXhwbGljaXQgQ29tcG9zaXRlRWRpdENvbW1hbmQoRG9jdW1lbnQqKTsKIApJ bmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0Q29tbWFuZC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0Q29tbWFuZC5jcHAJKHJldmlzaW9uIDEwMjYy NykKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdENvbW1hbmQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMTksMTEgKzIxOSw2IEBAIGJvb2wgRWRpdENvbW1hbmQ6OmlzVHlwaW5nQ29tbWFu ZCgpIGNvbnMKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgRWRpdENvbW1hbmQ6OmlzQ3Jl YXRlTGlua0NvbW1hbmQoKSBjb25zdAotewotICAgIHJldHVybiBmYWxzZTsKLX0KLQogYm9vbCBF ZGl0Q29tbWFuZDo6c2hvdWxkUmV0YWluQXV0b2NvcnJlY3Rpb25JbmRpY2F0b3IoKSBjb25zdAog ewogICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdENv bW1hbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRDb21tYW5k LmgJKHJldmlzaW9uIDEwMjYyNykKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdENvbW1h bmQuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBib29sIGlzQ29tcG9zaXRlRWRpdENvbW1hbmQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQog ICAgIHZpcnR1YWwgYm9vbCBpc0VkaXRDb21tYW5kQ29tcG9zaXRpb24oKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1R5cGluZ0NvbW1hbmQoKSBjb25zdDsKLSAg ICB2aXJ0dWFsIGJvb2wgaXNDcmVhdGVMaW5rQ29tbWFuZCgpIGNvbnN0OwogCiAgICAgdmlydHVh bCBib29sIHByZXNlcnZlc1R5cGluZ1N0eWxlKCkgY29uc3Q7CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDEwMjYyNikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODU0LDEwICs4NTQsOCBAQCB2b2lkIEVk aXRvcjo6b3V0ZGVudCgpCiAgICAgYXBwbHlDb21tYW5kKEluZGVudE91dGRlbnRDb21tYW5kOjpj cmVhdGUobV9mcmFtZS0+ZG9jdW1lbnQoKSwgSW5kZW50T3V0ZGVudENvbW1hbmQ6Ok91dGRlbnQp KTsKIH0KIAotc3RhdGljIHZvaWQgZGlzcGF0Y2hFZGl0YWJsZUNvbnRlbnRDaGFuZ2VkRXZlbnRz KGNvbnN0IEVkaXRDb21tYW5kJiBjb21tYW5kKQorc3RhdGljIHZvaWQgZGlzcGF0Y2hFZGl0YWJs ZUNvbnRlbnRDaGFuZ2VkRXZlbnRzKEVsZW1lbnQqIHN0YXJ0Um9vdCwgRWxlbWVudCogZW5kUm9v dCkKIHsKLSAgICBFbGVtZW50KiBzdGFydFJvb3QgPSBjb21tYW5kLnN0YXJ0aW5nUm9vdEVkaXRh YmxlRWxlbWVudCgpOwotICAgIEVsZW1lbnQqIGVuZFJvb3QgPSBjb21tYW5kLmVuZGluZ1Jvb3RF ZGl0YWJsZUVsZW1lbnQoKTsKICAgICBFeGNlcHRpb25Db2RlIGVjOwogICAgIGlmIChzdGFydFJv b3QpCiAgICAgICAgIHN0YXJ0Um9vdC0+ZGlzcGF0Y2hFdmVudChFdmVudDo6Y3JlYXRlKGV2ZW50 TmFtZXMoKS53ZWJraXRFZGl0YWJsZUNvbnRlbnRDaGFuZ2VkRXZlbnQsIGZhbHNlLCBmYWxzZSks IGVjKTsKQEAgLTg2OSw3ICs4NjcsNyBAQCB2b2lkIEVkaXRvcjo6YXBwbGllZEVkaXRpbmcoUGFz c1JlZlB0cjxDCiB7CiAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlTGF5b3V0KCk7CiAK LSAgICBkaXNwYXRjaEVkaXRhYmxlQ29udGVudENoYW5nZWRFdmVudHMoKmNtZCk7CisgICAgZGlz cGF0Y2hFZGl0YWJsZUNvbnRlbnRDaGFuZ2VkRXZlbnRzKGNtZC0+c3RhcnRpbmdSb290RWRpdGFi bGVFbGVtZW50KCksIGNtZC0+ZW5kaW5nUm9vdEVkaXRhYmxlRWxlbWVudCgpKTsKICAgICBWaXNp YmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbihjbWQtPmVuZGluZ1NlbGVjdGlvbigpKTsKIAogICAg IG1fc3BlbGxpbmdDb3JyZWN0b3ItPnJlc3BvbmRUb0FwcGxpZWRFZGl0aW5nKGNtZC5nZXQoKSk7 CkBAIC04OTgsNyArODk2LDcgQEAgdm9pZCBFZGl0b3I6OnVuYXBwbGllZEVkaXRpbmcoUGFzc1Jl ZlB0cgogewogICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPnVwZGF0ZUxheW91dCgpOwogICAgIAot ICAgIGRpc3BhdGNoRWRpdGFibGVDb250ZW50Q2hhbmdlZEV2ZW50cygqY21kKTsKKyAgICBkaXNw YXRjaEVkaXRhYmxlQ29udGVudENoYW5nZWRFdmVudHMoY21kLT5zdGFydGluZ1Jvb3RFZGl0YWJs ZUVsZW1lbnQoKSwgY21kLT5lbmRpbmdSb290RWRpdGFibGVFbGVtZW50KCkpOwogICAgIAogICAg IFZpc2libGVTZWxlY3Rpb24gbmV3U2VsZWN0aW9uKGNtZC0+c3RhcnRpbmdTZWxlY3Rpb24oKSk7 CiAgICAgY2hhbmdlU2VsZWN0aW9uQWZ0ZXJDb21tYW5kKG5ld1NlbGVjdGlvbiwgdHJ1ZSwgdHJ1 ZSk7CkBAIC05MTMsOCArOTExLDggQEAgdm9pZCBFZGl0b3I6OnVuYXBwbGllZEVkaXRpbmcoUGFz c1JlZlB0cgogdm9pZCBFZGl0b3I6OnJlYXBwbGllZEVkaXRpbmcoUGFzc1JlZlB0cjxFZGl0Q29t bWFuZENvbXBvc2l0aW9uPiBjbWQpCiB7CiAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRl TGF5b3V0KCk7Ci0gICAgCi0gICAgZGlzcGF0Y2hFZGl0YWJsZUNvbnRlbnRDaGFuZ2VkRXZlbnRz KCpjbWQpOworCisgICAgZGlzcGF0Y2hFZGl0YWJsZUNvbnRlbnRDaGFuZ2VkRXZlbnRzKGNtZC0+ c3RhcnRpbmdSb290RWRpdGFibGVFbGVtZW50KCksIGNtZC0+ZW5kaW5nUm9vdEVkaXRhYmxlRWxl bWVudCgpKTsKICAgICAKICAgICBWaXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbihjbWQtPmVu ZGluZ1NlbGVjdGlvbigpKTsKICAgICBjaGFuZ2VTZWxlY3Rpb25BZnRlckNvbW1hbmQobmV3U2Vs ZWN0aW9uLCB0cnVlLCB0cnVlKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvU3BlbGxp bmdDb3JyZWN0aW9uQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZWRpdGluZy9TcGVsbGluZ0NvcnJlY3Rpb25Db250cm9sbGVyLmNwcAkocmV2aXNpb24gMTAyNjI2 KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9TcGVsbGluZ0NvcnJlY3Rpb25Db250cm9sbGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM2LDkgKzQzNiw5IEBAIHZvaWQgU3BlbGxpbmdDb3Jy ZWN0aW9uQ29udHJvbGxlcjo6cmVzcG8KICAgICBtX29yaWdpbmFsU3RyaW5nRm9yTGFzdERlbGV0 ZWRBdXRvY29ycmVjdGlvbiA9IFN0cmluZygpOwogfQogCi12b2lkIFNwZWxsaW5nQ29ycmVjdGlv bkNvbnRyb2xsZXI6OnJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcoRWRpdENvbW1hbmQqIGNvbW1h bmQpCit2b2lkIFNwZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xsZXI6OnJlc3BvbmRUb1VuYXBwbGll ZEVkaXRpbmcoRWRpdENvbW1hbmRDb21wb3NpdGlvbiogY29tbWFuZCkKIHsKLSAgICBpZiAoIWNv bW1hbmQtPmlzQ3JlYXRlTGlua0NvbW1hbmQoKSkKKyAgICBpZiAoIWNvbW1hbmQtPndhc0NyZWF0 ZUxpbmtDb21tYW5kKCkpCiAgICAgICAgIHJldHVybjsKICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdl ID0gUmFuZ2U6OmNyZWF0ZShtX2ZyYW1lLT5kb2N1bWVudCgpLCBjb21tYW5kLT5zdGFydGluZ1Nl bGVjdGlvbigpLnN0YXJ0KCksIGNvbW1hbmQtPnN0YXJ0aW5nU2VsZWN0aW9uKCkuZW5kKCkpOwog ICAgIGlmICghcmFuZ2UpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NwZWxsaW5nQ29y cmVjdGlvbkNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L1NwZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xsZXIuaAkocmV2aXNpb24gMTAyNjI2KQorKysgU291 cmNlL1dlYkNvcmUvZWRpdGluZy9TcGVsbGluZ0NvcnJlY3Rpb25Db250cm9sbGVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTM4LDYgKzM4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBF ZGl0b3JDbGllbnQ7CiBjbGFzcyBFZGl0Q29tbWFuZDsKK2NsYXNzIEVkaXRDb21tYW5kQ29tcG9z aXRpb247CiBjbGFzcyBGcmFtZTsKIGNsYXNzIFRleHRDaGVja2VyQ2xpZW50OwogCkBAIC04OCw3 ICs4OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVzcG9uZFRvVW5hcHBsaWVkU3BlbGxDb3Jy ZWN0aW9uKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mLCBjb25zdCBTdHJpbmcmIGNvcnJlY3RlZCwg Y29uc3QgU3RyaW5nJiBjb3JyZWN0aW9uKSBVTkxFU1NfRU5BQkxFRCh7IFVOVVNFRF9QQVJBTShj b3JyZWN0ZWQpOyBVTlVTRURfUEFSQU0oY29ycmVjdGlvbik7IH0pCiAgICAgdm9pZCByZXNwb25k VG9BcHBsaWVkRWRpdGluZyhFZGl0Q29tbWFuZCopIFVOTEVTU19FTkFCTEVEKHt9KQotICAgIHZv aWQgcmVzcG9uZFRvVW5hcHBsaWVkRWRpdGluZyhFZGl0Q29tbWFuZCopIFVOTEVTU19FTkFCTEVE KHt9KQorICAgIHZvaWQgcmVzcG9uZFRvVW5hcHBsaWVkRWRpdGluZyhFZGl0Q29tbWFuZENvbXBv c2l0aW9uKikgVU5MRVNTX0VOQUJMRUQoeyB9KQogICAgIHZvaWQgcmVzcG9uZFRvQ2hhbmdlZFNl bGVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBvbGRTZWxlY3Rpb24pIFVOTEVTU19FTkFC TEVEKHsgVU5VU0VEX1BBUkFNKG9sZFNlbGVjdGlvbik7IH0pCiAKICAgICB2b2lkIHN0b3BQZW5k aW5nQ29ycmVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBvbGRTZWxlY3Rpb24pIFVOTEVT U19FTkFCTEVEKHsgVU5VU0VEX1BBUkFNKG9sZFNlbGVjdGlvbik7IH0pCg== 118907 2011-12-12 16:46:52 -0800 2011-12-12 16:53:28 -0800 Reveted orthogonal Editor.cpp change bug-74356-20111212164651.patch text/plain 8158 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjYzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDExLTEyLTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjEwMjM1Nyk6 IHJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcgZXhpdHMgZWFybHkgZm9yIENyZWF0ZUxpbmtDb21t YW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDM1 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBw cm9ibGVtIHdhcyB0aGF0IGlzQ3JlYXRlTGlua0NvbW1hbmQgd2FzIGNhbGxlZCBvbiBFZGl0Q29t bWFuZENvbXBvc2l0aW9uIGJ5IHJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcuCisgICAgICAgIEZp eGVkIHRoZSBidWcgYnkgcHJvcGFnYXRpbmcgdGhlIHZhbHVlIG9mIGlzQ3JldGVMaW5rQ29tbWFu ZCBmcm9tIENvbXBvc2l0ZUVkaXRDb21tYW5kIHRvCisgICAgICAgIEVkaXRDb21tYW5kQ29tcG9z aXRpb24gdmlhIHdhc0NyZWF0ZUxpbmtDb21tYW5kLgorCisgICAgICAgIEFsc28gbW92ZSBpc0Ny ZWF0ZUxpbmtDb21tYW5kIGZyb20gRWRpdENvbW1hbmQgdG8gQ29tcG9zaXRlRWRpdENvbW1hbmQg dG8gcHJldmVudCB0aGlzIG1pc3Rha2UgaW4gdGhlIGZ1dHVyZS4KKworICAgICAgICAqIGVkaXRp bmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdENvbW1h bmRDb21wb3NpdGlvbjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRDb21tYW5kQ29t cG9zaXRpb246OkVkaXRDb21tYW5kQ29tcG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29t cG9zaXRlRWRpdENvbW1hbmQ6OmVuc3VyZUNvbXBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvbXBvc2l0ZUVkaXRDb21tYW5kOjppc0NyZWF0ZUxpbmtDb21tYW5kKToKKyAgICAgICAgKiBl ZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmg6CisgICAgICAgIChXZWJDb3JlOjpFZGl0Q29t bWFuZENvbXBvc2l0aW9uOjp3YXNDcmVhdGVMaW5rQ29tbWFuZCk6CisgICAgICAgICogZWRpdGlu Zy9TcGVsbGluZ0NvcnJlY3Rpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNw ZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xsZXI6OnJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcpOgor ICAgICAgICAqIGVkaXRpbmcvU3BlbGxpbmdDb3JyZWN0aW9uQ29udHJvbGxlci5oOgorCiAyMDEx LTEyLTEyICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAg QVg6IGFyaWEtaGlkZGVuIGluaGVyaXRhbmNlIGJyb2tlbiB3aGVuIGFwcGx5aW5nIHRvIHNvbWUg ZGVzY2VuZGFudHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENv bW1hbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRl RWRpdENvbW1hbmQuY3BwCShyZXZpc2lvbiAxMDI2MjYpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzEsOSArNzEs MTUgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAog UGFzc1JlZlB0cjxFZGl0Q29tbWFuZENvbXBvc2l0aW9uPiBFZGl0Q29tbWFuZENvbXBvc2l0aW9u OjpjcmVhdGUoRG9jdW1lbnQqIGRvY3VtZW50LAotICAgIGNvbnN0IFZpc2libGVTZWxlY3Rpb24m IHN0YXJ0aW5nU2VsZWN0aW9uLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uIGVuZGluZ1NlbGVjdGlv bikKKyAgICBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzdGFydGluZ1NlbGVjdGlvbiwgY29uc3Qg VmlzaWJsZVNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9uLCBib29sIHdhc0NyZWF0ZUxpbmtDb21t YW5kKQoreworICAgIHJldHVybiBhZG9wdFJlZihuZXcgRWRpdENvbW1hbmRDb21wb3NpdGlvbihk b2N1bWVudCwgc3RhcnRpbmdTZWxlY3Rpb24sIGVuZGluZ1NlbGVjdGlvbiwgd2FzQ3JlYXRlTGlu a0NvbW1hbmQpKTsKK30KKworRWRpdENvbW1hbmRDb21wb3NpdGlvbjo6RWRpdENvbW1hbmRDb21w b3NpdGlvbihEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHN0YXJ0 aW5nU2VsZWN0aW9uLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBlbmRpbmdTZWxlY3Rpb24sIGJv b2wgd2FzQ3JlYXRlTGlua0NvbW1hbmQpCisgICAgOiBFZGl0Q29tbWFuZChkb2N1bWVudCwgc3Rh cnRpbmdTZWxlY3Rpb24sIGVuZGluZ1NlbGVjdGlvbikKKyAgICAsIG1fd2FzQ3JlYXRlTGlua0Nv bW1hbmQod2FzQ3JlYXRlTGlua0NvbW1hbmQpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBF ZGl0Q29tbWFuZENvbXBvc2l0aW9uKGRvY3VtZW50LCBzdGFydGluZ1NlbGVjdGlvbiwgZW5kaW5n U2VsZWN0aW9uKSk7CiB9CiAKIHZvaWQgRWRpdENvbW1hbmRDb21wb3NpdGlvbjo6ZG9BcHBseSgp CkBAIC0xMzUsMTAgKzE0MSwxNSBAQCBFZGl0Q29tbWFuZENvbXBvc2l0aW9uKiBDb21wb3NpdGVF ZGl0Q29tCiAgICAgd2hpbGUgKGNvbW1hbmQgJiYgY29tbWFuZC0+cGFyZW50KCkpCiAgICAgICAg IGNvbW1hbmQgPSBjb21tYW5kLT5wYXJlbnQoKTsKICAgICBpZiAoIWNvbW1hbmQtPm1fY29tcG9z aXRpb24pCi0gICAgICAgIGNvbW1hbmQtPm1fY29tcG9zaXRpb24gPSBFZGl0Q29tbWFuZENvbXBv c2l0aW9uOjpjcmVhdGUoZG9jdW1lbnQoKSwgc3RhcnRpbmdTZWxlY3Rpb24oKSwgZW5kaW5nU2Vs ZWN0aW9uKCkpOworICAgICAgICBjb21tYW5kLT5tX2NvbXBvc2l0aW9uID0gRWRpdENvbW1hbmRD b21wb3NpdGlvbjo6Y3JlYXRlKGRvY3VtZW50KCksIHN0YXJ0aW5nU2VsZWN0aW9uKCksIGVuZGlu Z1NlbGVjdGlvbigpLCBpc0NyZWF0ZUxpbmtDb21tYW5kKCkpOwogICAgIHJldHVybiBjb21tYW5k LT5tX2NvbXBvc2l0aW9uLmdldCgpOwogfQogCitib29sIENvbXBvc2l0ZUVkaXRDb21tYW5kOjpp c0NyZWF0ZUxpbmtDb21tYW5kKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIC8v CiAvLyBzdWdhcnktc3dlZXQgY29udmVuaWVuY2UgZnVuY3Rpb25zIHRvIGhlbHAgY3JlYXRlIGFu ZCBhcHBseSBlZGl0IGNvbW1hbmRzIGluIGNvbXBvc2l0ZSBjb21tYW5kcwogLy8KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0NvbXBvc2l0ZUVkaXRDb21tYW5kLmgJKHJldmlzaW9u IDEwMjYyNikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQu aAkod29ya2luZyBjb3B5KQpAQCAtMzksMjQgKzM5LDI0IEBAIGNsYXNzIFRleHQ7CiAKIGNsYXNz IEVkaXRDb21tYW5kQ29tcG9zaXRpb24gOiBwdWJsaWMgRWRpdENvbW1hbmQgewogcHVibGljOgot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPEVkaXRDb21tYW5kQ29tcG9zaXRpb24+IGNyZWF0ZShEb2N1 bWVudCosIGNvbnN0IFZpc2libGVTZWxlY3Rpb24mLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uKTsK KyAgICBzdGF0aWMgUGFzc1JlZlB0cjxFZGl0Q29tbWFuZENvbXBvc2l0aW9uPiBjcmVhdGUoRG9j dW1lbnQqLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiwgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYs IGJvb2wgd2FzQ3JlYXRlTGlua0NvbW1hbmQpOwogCiAgICAgdmlydHVhbCB2b2lkIGRvQXBwbHko KSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZG9VbmFwcGx5KCkgT1ZFUlJJREU7CiAgICAg dmlydHVhbCB2b2lkIGRvUmVhcHBseSgpIE9WRVJSSURFOwogICAgIHZvaWQgYXBwZW5kKFNpbXBs ZUVkaXRDb21tYW5kKik7CisgICAgYm9vbCB3YXNDcmVhdGVMaW5rQ29tbWFuZCgpIGNvbnN0IHsg cmV0dXJuIG1fd2FzQ3JlYXRlTGlua0NvbW1hbmQ7IH0KIAogI2lmbmRlZiBOREVCVUcKICAgICB2 aXJ0dWFsIHZvaWQgZ2V0Tm9kZXNJbkNvbW1hbmQoSGFzaFNldDxOb2RlKj4mKTsKICNlbmRpZgog CiBwcml2YXRlOgotICAgIEVkaXRDb21tYW5kQ29tcG9zaXRpb24oRG9jdW1lbnQqIGRvY3VtZW50 LCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzdGFydGluZ1NlbGVjdGlvbiwgY29uc3QgVmlzaWJs ZVNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9uKQotICAgICAgICA6IEVkaXRDb21tYW5kKGRvY3Vt ZW50LCBzdGFydGluZ1NlbGVjdGlvbiwgZW5kaW5nU2VsZWN0aW9uKQotICAgIHsgfQorICAgIEVk aXRDb21tYW5kQ29tcG9zaXRpb24oRG9jdW1lbnQqLCBjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBz dGFydGluZ1NlbGVjdGlvbiwgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgZW5kaW5nU2VsZWN0aW9u LCBib29sIHdhc0NyZWF0ZUxpbmtDb21tYW5kKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNFZGl0Q29t bWFuZENvbXBvc2l0aW9uKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAg VmVjdG9yPFJlZlB0cjxTaW1wbGVFZGl0Q29tbWFuZD4gPiBtX2NvbW1hbmRzOworICAgIGJvb2wg bV93YXNDcmVhdGVMaW5rQ29tbWFuZDsKIH07CiAKIGNsYXNzIENvbXBvc2l0ZUVkaXRDb21tYW5k IDogcHVibGljIEVkaXRDb21tYW5kIHsKQEAgLTY3LDYgKzY3LDggQEAgcHVibGljOgogICAgIEVk aXRDb21tYW5kQ29tcG9zaXRpb24qIGNvbXBvc2l0aW9uKCkgeyByZXR1cm4gbV9jb21wb3NpdGlv bi5nZXQoKTsgfQogICAgIEVkaXRDb21tYW5kQ29tcG9zaXRpb24qIGVuc3VyZUNvbXBvc2l0aW9u KCk7CiAKKyAgICB2aXJ0dWFsIGJvb2wgaXNDcmVhdGVMaW5rQ29tbWFuZCgpIGNvbnN0OworCiBw cm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgQ29tcG9zaXRlRWRpdENvbW1hbmQoRG9jdW1lbnQqKTsK IApJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0Q29tbWFuZC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0Q29tbWFuZC5jcHAJKHJldmlzaW9uIDEw MjYyNykKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdENvbW1hbmQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMTksMTEgKzIxOSw2IEBAIGJvb2wgRWRpdENvbW1hbmQ6OmlzVHlwaW5nQ29t bWFuZCgpIGNvbnMKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgRWRpdENvbW1hbmQ6Omlz Q3JlYXRlTGlua0NvbW1hbmQoKSBjb25zdAotewotICAgIHJldHVybiBmYWxzZTsKLX0KLQogYm9v bCBFZGl0Q29tbWFuZDo6c2hvdWxkUmV0YWluQXV0b2NvcnJlY3Rpb25JbmRpY2F0b3IoKSBjb25z dAogewogICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dENvbW1hbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRDb21t YW5kLmgJKHJldmlzaW9uIDEwMjYyNykKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdENv bW1hbmQuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNiBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCBib29sIGlzQ29tcG9zaXRlRWRpdENvbW1hbmQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsg fQogICAgIHZpcnR1YWwgYm9vbCBpc0VkaXRDb21tYW5kQ29tcG9zaXRpb24oKSBjb25zdCB7IHJl dHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1R5cGluZ0NvbW1hbmQoKSBjb25zdDsK LSAgICB2aXJ0dWFsIGJvb2wgaXNDcmVhdGVMaW5rQ29tbWFuZCgpIGNvbnN0OwogCiAgICAgdmly dHVhbCBib29sIHByZXNlcnZlc1R5cGluZ1N0eWxlKCkgY29uc3Q7CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvU3BlbGxpbmdDb3JyZWN0aW9uQ29udHJvbGxlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9TcGVsbGluZ0NvcnJlY3Rpb25Db250cm9sbGVy LmNwcAkocmV2aXNpb24gMTAyNjI2KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9TcGVsbGlu Z0NvcnJlY3Rpb25Db250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM2LDkgKzQzNiw5 IEBAIHZvaWQgU3BlbGxpbmdDb3JyZWN0aW9uQ29udHJvbGxlcjo6cmVzcG8KICAgICBtX29yaWdp bmFsU3RyaW5nRm9yTGFzdERlbGV0ZWRBdXRvY29ycmVjdGlvbiA9IFN0cmluZygpOwogfQogCi12 b2lkIFNwZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xsZXI6OnJlc3BvbmRUb1VuYXBwbGllZEVkaXRp bmcoRWRpdENvbW1hbmQqIGNvbW1hbmQpCit2b2lkIFNwZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xs ZXI6OnJlc3BvbmRUb1VuYXBwbGllZEVkaXRpbmcoRWRpdENvbW1hbmRDb21wb3NpdGlvbiogY29t bWFuZCkKIHsKLSAgICBpZiAoIWNvbW1hbmQtPmlzQ3JlYXRlTGlua0NvbW1hbmQoKSkKKyAgICBp ZiAoIWNvbW1hbmQtPndhc0NyZWF0ZUxpbmtDb21tYW5kKCkpCiAgICAgICAgIHJldHVybjsKICAg ICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gUmFuZ2U6OmNyZWF0ZShtX2ZyYW1lLT5kb2N1bWVudCgp LCBjb21tYW5kLT5zdGFydGluZ1NlbGVjdGlvbigpLnN0YXJ0KCksIGNvbW1hbmQtPnN0YXJ0aW5n U2VsZWN0aW9uKCkuZW5kKCkpOwogICAgIGlmICghcmFuZ2UpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL1NwZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NwZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xsZXIuaAkocmV2 aXNpb24gMTAyNjI2KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9TcGVsbGluZ0NvcnJlY3Rp b25Db250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiBjbGFzcyBFZGl0b3JDbGllbnQ7CiBjbGFzcyBFZGl0Q29tbWFuZDsKK2Ns YXNzIEVkaXRDb21tYW5kQ29tcG9zaXRpb247CiBjbGFzcyBGcmFtZTsKIGNsYXNzIFRleHRDaGVj a2VyQ2xpZW50OwogCkBAIC04OCw3ICs4OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVzcG9u ZFRvVW5hcHBsaWVkU3BlbGxDb3JyZWN0aW9uKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mLCBjb25z dCBTdHJpbmcmIGNvcnJlY3RlZCwgY29uc3QgU3RyaW5nJiBjb3JyZWN0aW9uKSBVTkxFU1NfRU5B QkxFRCh7IFVOVVNFRF9QQVJBTShjb3JyZWN0ZWQpOyBVTlVTRURfUEFSQU0oY29ycmVjdGlvbik7 IH0pCiAgICAgdm9pZCByZXNwb25kVG9BcHBsaWVkRWRpdGluZyhFZGl0Q29tbWFuZCopIFVOTEVT U19FTkFCTEVEKHt9KQotICAgIHZvaWQgcmVzcG9uZFRvVW5hcHBsaWVkRWRpdGluZyhFZGl0Q29t bWFuZCopIFVOTEVTU19FTkFCTEVEKHt9KQorICAgIHZvaWQgcmVzcG9uZFRvVW5hcHBsaWVkRWRp dGluZyhFZGl0Q29tbWFuZENvbXBvc2l0aW9uKikgVU5MRVNTX0VOQUJMRUQoeyB9KQogICAgIHZv aWQgcmVzcG9uZFRvQ2hhbmdlZFNlbGVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBvbGRT ZWxlY3Rpb24pIFVOTEVTU19FTkFCTEVEKHsgVU5VU0VEX1BBUkFNKG9sZFNlbGVjdGlvbik7IH0p CiAKICAgICB2b2lkIHN0b3BQZW5kaW5nQ29ycmVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9u JiBvbGRTZWxlY3Rpb24pIFVOTEVTU19FTkFCTEVEKHsgVU5VU0VEX1BBUkFNKG9sZFNlbGVjdGlv bik7IH0pCg==