90689 2012-07-06 08:43:34 -0700 Web Inspector: Snippet renaming behavior is not correct. 2012-07-06 10:08:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 664127 0 vsevik 2012-07-06 08:43:34 -0700 When navigator is open in the overlay and user presses cancel while renaming a snippet overlay is closed and entered name is committed. 664130 1 151089 vsevik 2012-07-06 08:54:02 -0700 Created attachment 151089 Patch 664164 2 vsevik 2012-07-06 10:08:29 -0700 Committed r121983: <http://trac.webkit.org/changeset/121983> 151089 2012-07-06 08:54:02 -0700 2012-07-06 09:33:11 -0700 Patch bug-90689-20120706195400.patch text/plain 12725 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxOTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTBlYTA5MzcxZDQzY2Ex ZTA5NjBjOTNkMjUyODhkZTNhY2U1ODg5NS4uYmVlNjE4NThlNzA5ZDA2M2QyYWIxNTYyOTM2NWNk NmQ2M2QzNTc1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEyLTA3LTA2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNuaXBwZXQgcmVuYW1pbmcgYmVoYXZpb3IgaXMgbm90IGNvcnJlY3QuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDY4OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5hdmlnYXRvciBvdmVybGF5IGlz IG5vdyBub3QgY2xvc2VkIHdoZW4gZWRpdGluZyBpcyBjYW5jZWxlZC4KKyAgICAgICAgRXNjIGhh bmRsZXIgaW4gTmF2aWdhdG9yT3ZlcmxheUNvbnRyb2xsZXIgaXMgbm90IGluc3RhbGxlZCBhcyBh IHNob3J0Y3V0IGFueW1vcmUgc2luY2UKKyAgICAgICAgaXQgc2hvdWxkIG5vdCBiZSBjYWxsZWQg dW50aWwgYWxsIHVuZGVybHlpbmcgRE9NIGVsZW1lbnRzIGhhbmRsZWQgdGhlIGtleSBkb3duIGV2 ZW50LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JPdmVybGF5Q29u dHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JPdmVybGF5Q29udHJv bGxlci5wcm90b3R5cGUuc2V0IHNob3dOYXZpZ2F0b3JPdmVybGF5KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OYXZpZ2F0b3JPdmVybGF5Q29udHJvbGxlci5wcm90b3R5cGUuX2tleURvd24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvck92ZXJsYXlDb250cm9sbGVyLnByb3RvdHlw ZS5faW5uZXJIaWRlTmF2aWdhdG9yT3ZlcmxheSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9OYXZpZ2F0b3JWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclZp ZXcucHJvdG90eXBlLnJlbmFtZS5jb21taXRIYW5kbGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZS5yZW5hbWUuY2FuY2VsSGFuZGxlcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUucmVuYW1lLmFmdGVyRWRpdGlu Zyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlLl9pdGVtUmVuYW1pbmdSZXF1ZXN0ZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRzTmF2aWdhdG9yVmlldy5wcm90b3R5cGUu X2hhbmRsZVJlbmFtZVNuaXBwZXQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUuX2l0ZW1SZW5hbWluZ1JlcXVlc3RlZC5jYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5faXRlbVJlbmFtaW5nUmVxdWVzdGVkKToKKworMjAx Mi0wNy0wNiAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKwogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBTbmlwcGV0cyBzaG91bGQgYmUgY29ycmVjdGx5IChyZSlsb2FkZWQg d2hlbiBpbnNwZWN0b3IgaXMgb3BlbiBhbmQgb24gbmF2aWdhdGlvbi4KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwNjcyCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yT3ZlcmxheUNvbnRyb2xs ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvck92ZXJs YXlDb250cm9sbGVyLmpzCmluZGV4IDUxY2U2N2Q3MmUxNTBhNGFiOWY5ZDliZjQ1NWExMTNhNzlj OWQ5ODYuLmQxYTkxMmFkZTNlNjIwNTk4NTBjMGY0ODQxNWRjNDlmN2E1NmRiZTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yT3ZlcmxheUNv bnRyb2xsZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZp Z2F0b3JPdmVybGF5Q29udHJvbGxlci5qcwpAQCAtMjgsMTQgKzI4LDEyIEBACiAKIC8qKgogICog QGNvbnN0cnVjdG9yCi0gKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5QYW5lbH0gcGFuZWwKICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlNwbGl0Vmlld30gcGFyZW50U3BsaXRWaWV3CiAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5WaWV3fSBuYXZpZ2F0b3JWaWV3CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5WaWV3fSBlZGl0b3JWaWV3CiAgKi8KLVdlYkluc3BlY3Rvci5OYXZpZ2F0b3JPdmVybGF5Q29u dHJvbGxlciA9IGZ1bmN0aW9uKHBhbmVsLCBwYXJlbnRTcGxpdFZpZXcsIG5hdmlnYXRvclZpZXcs IGVkaXRvclZpZXcpCitXZWJJbnNwZWN0b3IuTmF2aWdhdG9yT3ZlcmxheUNvbnRyb2xsZXIgPSBm dW5jdGlvbihwYXJlbnRTcGxpdFZpZXcsIG5hdmlnYXRvclZpZXcsIGVkaXRvclZpZXcpCiB7Ci0g ICAgdGhpcy5fcGFuZWwgPSBwYW5lbDsKICAgICB0aGlzLl9wYXJlbnRTcGxpdFZpZXcgPSBwYXJl bnRTcGxpdFZpZXc7CiAgICAgdGhpcy5fbmF2aWdhdG9yVmlldyA9IG5hdmlnYXRvclZpZXc7CiAg ICAgdGhpcy5fZWRpdG9yVmlldyA9IGVkaXRvclZpZXc7CkBAIC02MSwxMSArNTksNiBAQCBXZWJJ bnNwZWN0b3IuTmF2aWdhdG9yT3ZlcmxheUNvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAg ICB3aW5kb3cuc2V0VGltZW91dCh0aGlzLl9tYXliZVNob3dOYXZpZ2F0b3JPdmVybGF5LmJpbmQo dGhpcyksIDApOwogICAgIH0sCiAKLSAgICBfZXNjRG93bldoaWxlTmF2aWdhdG9yT3ZlcmxheU9w ZW46IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgdGhpcy5oaWRlTmF2aWdhdG9yT3Zl cmxheSgpOwotICAgIH0sCi0KICAgICBfbWF5YmVTaG93TmF2aWdhdG9yT3ZlcmxheTogZnVuY3Rp b24oKQogICAgIHsKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5uYXZpZ2F0b3JI aWRkZW4uZ2V0KCkgJiYgIVdlYkluc3BlY3Rvci5zZXR0aW5ncy5uYXZpZ2F0b3JXYXNPbmNlSGlk ZGVuLmdldCgpKQpAQCAtMTI0LDYgKzExNyw4IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JPdmVy bGF5Q29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX25hdmlnYXRvclNob3dI aWRlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQaW4gbmF2aWdhdG9yIik7 CiAKICAgICAgICAgdGhpcy5fc2lkZWJhck92ZXJsYXkgPSBuZXcgV2ViSW5zcGVjdG9yLlNpZGVi YXJPdmVybGF5KHRoaXMuX25hdmlnYXRvclZpZXcsICJzY3JpcHRzUGFuZWxOYXZpZ2F0b3JPdmVy bGF5V2lkdGgiLCBQcmVmZXJlbmNlcy5taW5TY3JpcHRzU2lkZWJhcldpZHRoKTsKKyAgICAgICAg dGhpcy5fYm91bmRLZXlEb3duID0gdGhpcy5fa2V5RG93bi5iaW5kKHRoaXMpOworICAgICAgICB0 aGlzLl9zaWRlYmFyT3ZlcmxheS5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0 aGlzLl9ib3VuZEtleURvd24sIGZhbHNlKTsKICAgICAgICAgdmFyIG5hdmlnYXRvck92ZXJsYXlS ZXNpemVXaWRnZXRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAg ICAgIG5hdmlnYXRvck92ZXJsYXlSZXNpemVXaWRnZXRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNj cmlwdHMtbmF2aWdhdG9yLXJlc2l6ZXItd2lkZ2V0Iik7CiAgICAgICAgIHRoaXMuX3NpZGViYXJP dmVybGF5LnJlc2l6ZXJXaWRnZXRFbGVtZW50ID0gbmF2aWdhdG9yT3ZlcmxheVJlc2l6ZVdpZGdl dEVsZW1lbnQ7CkBAIC0xMzEsMTIgKzEyNiwyMiBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yT3Zl cmxheUNvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9uYXZpZ2F0b3JWaWV3 LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24uZWxlbWVu dCk7CiAgICAgICAgIHRoaXMuX2JvdW5kQ29udGFpbmluZ0VsZW1lbnRGb2N1c2VkID0gdGhpcy5f Y29udGFpbmluZ0VsZW1lbnRGb2N1c2VkLmJpbmQodGhpcyk7CiAgICAgICAgIHRoaXMuX3BhcmVu dFNwbGl0Vmlldy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2Jv dW5kQ29udGFpbmluZ0VsZW1lbnRGb2N1c2VkLCBmYWxzZSk7Ci0gICAgICAgIHRoaXMuX3BhbmVs LnJlZ2lzdGVyU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5Fc2Mu Y29kZSwgdGhpcy5fZXNjRG93bldoaWxlTmF2aWdhdG9yT3ZlcmxheU9wZW4uYmluZCh0aGlzKSk7 CiAKICAgICAgICAgdGhpcy5fc2lkZWJhck92ZXJsYXkuc2hvdyh0aGlzLl9wYXJlbnRTcGxpdFZp ZXcuZWxlbWVudCk7CiAgICAgICAgIHRoaXMuX25hdmlnYXRvclZpZXcuZm9jdXMoKTsKICAgICB9 LAogCisgICAgX2tleURvd246IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmIChldmVudC5o YW5kbGVkKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmIChldmVudC5rZXlDb2Rl ID09PSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkVzYy5jb2RlKSB7CisgICAg ICAgICAgICB0aGlzLmhpZGVOYXZpZ2F0b3JPdmVybGF5KCk7CisgICAgICAgICAgICBldmVudC5j b25zdW1lKHRydWUpOworICAgICAgICB9CisgICAgfSwKKwogICAgIGhpZGVOYXZpZ2F0b3JPdmVy bGF5OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fbmF2aWdhdG9yU2hvd0hp ZGVCdXR0b24uc3RhdGUgIT09ICJvdmVybGF5IikKQEAgLTE1Myw3ICsxNTgsNyBAQCBXZWJJbnNw ZWN0b3IuTmF2aWdhdG9yT3ZlcmxheUNvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgIF9pbm5l ckhpZGVOYXZpZ2F0b3JPdmVybGF5OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9w YXJlbnRTcGxpdFZpZXcuZWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0 aGlzLl9ib3VuZENvbnRhaW5pbmdFbGVtZW50Rm9jdXNlZCwgZmFsc2UpOwotICAgICAgICB0aGlz Ll9wYW5lbC51bnJlZ2lzdGVyU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu S2V5cy5Fc2MuY29kZSk7CisgICAgICAgIHRoaXMuX3NpZGViYXJPdmVybGF5LmVsZW1lbnQucmVt b3ZlRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX2JvdW5kS2V5RG93biwgZmFsc2UpOwog ICAgICAgICB0aGlzLl9zaWRlYmFyT3ZlcmxheS5oaWRlKCk7CiAgICAgfSwKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCmluZGV4 IDUzMmNhZTU2YzYzMTQzMjkzZjc0NWI1ODBhNTk0MGIyNGRkMzMxYzMuLmEwMjIxNzQ3NDMxYmNi YmViMGVhMjhiM2I0OTkwYzg5Mzg3ZGI2ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMKQEAgLTI1MiwyMSArMjUyLDE5IEBA IFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICAvLyBUcmVlIG91dGxpbmUgc2hvdWxkIGJlIG1hcmtlZCBhcyBlZGl0 ZWQgYXMgd2VsbCBhcyB0aGUgdHJlZSBlbGVtZW50IHRvIHByZXZlbnQgc2VhcmNoIGZyb20gc3Rh cnRpbmcuCi0gICAgICAgIHZhciB0cmVlT3V0bGluZUVsZW1lbnQgPSBzY3JpcHRUcmVlRWxlbWVu dC50cmVlT3V0bGluZS5lbGVtZW50CisgICAgICAgIHZhciB0cmVlT3V0bGluZUVsZW1lbnQgPSBz Y3JpcHRUcmVlRWxlbWVudC50cmVlT3V0bGluZS5lbGVtZW50OwogICAgICAgICBXZWJJbnNwZWN0 b3IubWFya0JlaW5nRWRpdGVkKHRyZWVPdXRsaW5lRWxlbWVudCwgdHJ1ZSk7CiAKICAgICAgICAg ZnVuY3Rpb24gY29tbWl0SGFuZGxlcihlbGVtZW50LCBuZXdUaXRsZSwgb2xkVGl0bGUpCiAgICAg ICAgIHsKICAgICAgICAgICAgIGlmIChuZXdUaXRsZSAmJiBuZXdUaXRsZSAhPT0gb2xkVGl0bGUp CiAgICAgICAgICAgICAgICAgdGhpcy5fZmlsZVJlbmFtZWQodWlTb3VyY2VDb2RlLCBuZXdUaXRs ZSk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2NyaXB0 VGl0bGUodWlTb3VyY2VDb2RlKTsKLSAgICAgICAgICAgIGFmdGVyRWRpdGluZyh0cnVlKTsKKyAg ICAgICAgICAgIGFmdGVyRWRpdGluZy5jYWxsKHRoaXMsIHRydWUpOwogICAgICAgICB9CiAKICAg ICAgICAgZnVuY3Rpb24gY2FuY2VsSGFuZGxlcigpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGFm dGVyRWRpdGluZyhmYWxzZSk7CisgICAgICAgICAgICBhZnRlckVkaXRpbmcuY2FsbCh0aGlzLCBm YWxzZSk7CiAgICAgICAgIH0KIAogICAgICAgICAvKioKQEAgLTI3NSw2ICsyNzMsNyBAQCBXZWJJ bnNwZWN0b3IuTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZ1bmN0aW9uIGFm dGVyRWRpdGluZyhjb21taXR0ZWQpCiAgICAgICAgIHsKICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5tYXJrQmVpbmdFZGl0ZWQodHJlZU91dGxpbmVFbGVtZW50LCBmYWxzZSk7CisgICAgICAgICAg ICB0aGlzLl91cGRhdGVTY3JpcHRUaXRsZSh1aVNvdXJjZUNvZGUpOwogICAgICAgICAgICAgaWYg KGNhbGxiYWNrKQogICAgICAgICAgICAgICAgIGNhbGxiYWNrKGNvbW1pdHRlZCk7CiAgICAgICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c05hdmlnYXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c05hdmlnYXRvci5qcwppbmRleCA2NWI3YzcxZjIzOTk5MDJlNjhjZmRhMzRmODlkYTY1ZTUzYTc0 M2NmLi5kOGNhZjg0MTZiZDU0MTlhODllZTg3YmYyMWU0MGI2ZGE3OTYzMDEyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9y LmpzCkBAIC00OCw2ICs0OCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuX3NuaXBwZXRzVmlldy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5OYXZpZ2F0b3JWaWV3LkV2ZW50cy5JdGVtU2VsZWN0ZWQsIHRoaXMuX3NjcmlwdFNlbGVj dGVkLCB0aGlzKTsKICAgICB0aGlzLl9zbmlwcGV0c1ZpZXcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuTmF2aWdhdG9yVmlldy5FdmVudHMuRmlsZVJlbmFtZWQsIHRoaXMuX2ZpbGVSZW5h bWVkLCB0aGlzKTsKICAgICB0aGlzLl9zbmlwcGV0c1ZpZXcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuU25pcHBldHNOYXZpZ2F0b3JWaWV3LkV2ZW50cy5TbmlwcGV0Q3JlYXRpb25SZXF1 ZXN0ZWQsIHRoaXMuX3NuaXBwZXRDcmVhdGlvblJlcXVlc3RlZCwgdGhpcyk7CisgICAgdGhpcy5f c25pcHBldHNWaWV3LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNuaXBwZXRzTmF2aWdh dG9yVmlldy5FdmVudHMuSXRlbVJlbmFtaW5nUmVxdWVzdGVkLCB0aGlzLl9pdGVtUmVuYW1pbmdS ZXF1ZXN0ZWQsIHRoaXMpOwogCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IuU2NyaXB0c1RhYiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJTb3VyY2VzIiksIHRoaXMuX3NjcmlwdHNWaWV3KTsKICAgICB0aGlzLl90YWJiZWRQYW5lLnNl bGVjdFRhYihXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5TY3JpcHRzVGFiKTsKQEAgLTU5 LDYgKzYwLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IgPSBmdW5jdGlvbigpCiBX ZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5FdmVudHMgPSB7CiAgICAgU2NyaXB0U2VsZWN0 ZWQ6ICJTY3JpcHRTZWxlY3RlZCIsCiAgICAgU25pcHBldENyZWF0aW9uUmVxdWVzdGVkOiAiU25p cHBldENyZWF0aW9uUmVxdWVzdGVkIiwKKyAgICBJdGVtUmVuYW1pbmdSZXF1ZXN0ZWQ6ICJJdGVt UmVuYW1pbmdSZXF1ZXN0ZWQiLAogICAgIEZpbGVSZW5hbWVkOiAiRmlsZVJlbmFtZWQiCiB9CiAK QEAgLTE2Niw2ICsxNjgsMTQgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90 eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVu dAogICAgICAqLworICAgIF9pdGVtUmVuYW1pbmdSZXF1ZXN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQor ICAgIHsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LlNjcmlwdHNOYXZpZ2F0b3IuRXZlbnRzLkl0ZW1SZW5hbWluZ1JlcXVlc3RlZCwgZXZlbnQuZGF0 YSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50 fSBldmVudAorICAgICAqLwogICAgIF9zbmlwcGV0Q3JlYXRpb25SZXF1ZXN0ZWQ6IGZ1bmN0aW9u KGV2ZW50KQogICAgIHsgICAgCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLkV2ZW50cy5TbmlwcGV0Q3JlYXRpb25SZXF1 ZXN0ZWQsIGV2ZW50LmRhdGEpOwpAQCAtMTkyLDcgKzIwMiw4IEBAIFdlYkluc3BlY3Rvci5Tbmlw cGV0c05hdmlnYXRvclZpZXcgPSBmdW5jdGlvbigpCiB9CiAKIFdlYkluc3BlY3Rvci5TbmlwcGV0 c05hdmlnYXRvclZpZXcuRXZlbnRzID0gewotICAgIFNuaXBwZXRDcmVhdGlvblJlcXVlc3RlZDog IlNuaXBwZXRDcmVhdGlvblJlcXVlc3RlZCIKKyAgICBTbmlwcGV0Q3JlYXRpb25SZXF1ZXN0ZWQ6 ICJTbmlwcGV0Q3JlYXRpb25SZXF1ZXN0ZWQiLAorICAgIEl0ZW1SZW5hbWluZ1JlcXVlc3RlZDog Ikl0ZW1SZW5hbWluZ1JlcXVlc3RlZCIKIH0KIAogV2ViSW5zcGVjdG9yLlNuaXBwZXRzTmF2aWdh dG9yVmlldy5wcm90b3R5cGUgPSB7CkBAIC0yNTIsNyArMjYzLDcgQEAgV2ViSW5zcGVjdG9yLlNu aXBwZXRzTmF2aWdhdG9yVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2hhbmRsZVJl bmFtZVNuaXBwZXQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgZXZlbnQpCiAgICAgewotICAgICAg ICB0aGlzLnJlbmFtZSh1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5FdmVudHMuSXRlbVJlbmFt aW5nUmVxdWVzdGVkLCB1aVNvdXJjZUNvZGUpOwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXgg NzY3NjVjYzdmNTQxNjliMTQyNjI2NzY2MTczMmQ2YTYwYmJhOTljNi4uMzMwYTE5Y2I5NjJiMDBj ODk5MGQ2MzU2MjFmMTUzNWRlMTZhNzFkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTgwLDEwICs4MCwxMSBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24od29ya3NwYWNlRm9yVGVzdCkKICAgICB0 aGlzLl9lZGl0b3JDb250YWluZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRh aW5lcih0aGlzLCAicHJldmlvdXNseVZpZXdlZEZpbGVzIik7CiAgICAgdGhpcy5fZWRpdG9yQ29u dGFpbmVyLnNob3codGhpcy5lZGl0b3JWaWV3Lm1haW5FbGVtZW50KTsKIAotICAgIHRoaXMuX25h dmlnYXRvckNvbnRyb2xsZXIgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRvck92ZXJsYXlDb250 cm9sbGVyKHRoaXMsIHRoaXMuZWRpdG9yVmlldywgdGhpcy5fbmF2aWdhdG9yLnZpZXcsIHRoaXMu X2VkaXRvckNvbnRhaW5lci52aWV3KTsKKyAgICB0aGlzLl9uYXZpZ2F0b3JDb250cm9sbGVyID0g bmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JPdmVybGF5Q29udHJvbGxlcih0aGlzLmVkaXRvclZp ZXcsIHRoaXMuX25hdmlnYXRvci52aWV3LCB0aGlzLl9lZGl0b3JDb250YWluZXIudmlldyk7CiAK ICAgICB0aGlzLl9uYXZpZ2F0b3IuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2NyaXB0 c05hdmlnYXRvci5FdmVudHMuU2NyaXB0U2VsZWN0ZWQsIHRoaXMuX3NjcmlwdFNlbGVjdGVkLCB0 aGlzKTsKICAgICB0aGlzLl9uYXZpZ2F0b3IuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu U2NyaXB0c05hdmlnYXRvci5FdmVudHMuU25pcHBldENyZWF0aW9uUmVxdWVzdGVkLCB0aGlzLl9z bmlwcGV0Q3JlYXRpb25SZXF1ZXN0ZWQsIHRoaXMpOworICAgIHRoaXMuX25hdmlnYXRvci5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLkV2ZW50cy5JdGVtUmVu YW1pbmdSZXF1ZXN0ZWQsIHRoaXMuX2l0ZW1SZW5hbWluZ1JlcXVlc3RlZCwgdGhpcyk7CiAgICAg dGhpcy5fbmF2aWdhdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZp Z2F0b3IuRXZlbnRzLkZpbGVSZW5hbWVkLCB0aGlzLl9maWxlUmVuYW1lZCwgdGhpcyk7CiAKICAg ICB0aGlzLl9lZGl0b3JDb250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGFi YmVkRWRpdG9yQ29udGFpbmVyLkV2ZW50cy5FZGl0b3JTZWxlY3RlZCwgdGhpcy5fZWRpdG9yU2Vs ZWN0ZWQsIHRoaXMpOwpAQCAtMTAyNSw3ICsxMDI2LDEwIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3Iuc2NyaXB0U25pcHBldE1v ZGVsLnJlbmFtZVNjcmlwdFNuaXBwZXQoc25pcHBldEphdmFTY3JpcHRTb3VyY2UsIG5hbWUpOwog ICAgIH0sCiAgICAgICAgIAotICAgIF9zbmlwcGV0Q3JlYXRpb25SZXF1ZXN0ZWQ6IGZ1bmN0aW9u KCkKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQKKyAg ICAgKi8KKyAgICBfc25pcHBldENyZWF0aW9uUmVxdWVzdGVkOiBmdW5jdGlvbihldmVudCkKICAg ICB7CiAgICAgICAgIHZhciBzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZSA9IFdlYkluc3BlY3Rvci5z Y3JpcHRTbmlwcGV0TW9kZWwuY3JlYXRlU2NyaXB0U25pcHBldCgpOwogICAgICAgICB0aGlzLl9z aG93U291cmNlTGluZShzbmlwcGV0SmF2YVNjcmlwdFNvdXJjZSk7CkBAIC0xMDUzLDYgKzEwNTcs MzAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAog ICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAorICAgICAq LworICAgIF9pdGVtUmVuYW1pbmdSZXF1ZXN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAg ICAgICAgdmFyIHVpU291cmNlQ29kZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZX0gKi8gZXZlbnQuZGF0YTsKKyAgICAgICAgCisgICAgICAgIHZhciBzaG91bGRIaWRlTmF2 aWdhdG9yID0gIXRoaXMuX25hdmlnYXRvckNvbnRyb2xsZXIuaXNOYXZpZ2F0b3JQaW5uZWQoKTsK KyAgICAgICAgaWYgKHRoaXMuX25hdmlnYXRvckNvbnRyb2xsZXIuaXNOYXZpZ2F0b3JIaWRkZW4o KSkKKyAgICAgICAgICAgIHRoaXMuX25hdmlnYXRvckNvbnRyb2xsZXIuc2hvd05hdmlnYXRvck92 ZXJsYXkoKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yLnJlbmFtZSh1aVNvdXJjZUNvZGUsIGNh bGxiYWNrLmJpbmQodGhpcykpOworICAgIAorICAgICAgICAvKioKKyAgICAgICAgICogQHBhcmFt IHtib29sZWFufSBjb21taXR0ZWQKKyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIGNhbGxi YWNrKGNvbW1pdHRlZCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHNob3VsZEhpZGVOYXZp Z2F0b3IgJiYgY29tbWl0dGVkKSB7CisgICAgICAgICAgICAgICAgdGhpcy5fbmF2aWdhdG9yQ29u dHJvbGxlci5oaWRlTmF2aWdhdG9yT3ZlcmxheSgpOworICAgICAgICAgICAgICAgIHRoaXMuX3No b3dTb3VyY2VMaW5lKHVpU291cmNlQ29kZSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAg ICB9LAorCisgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl fSB1aVNvdXJjZUNvZGUKICAgICAgKi8KICAgICBfc2hvd0xvY2FsSGlzdG9yeTogZnVuY3Rpb24o dWlTb3VyY2VDb2RlKQo=