55377 2011-02-28 07:43:56 -0800 Web Inspector: [REGRESSION] source frame is recreated for each inlined script in document 2011-02-28 09:30:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 359045 0 podivilov 2011-02-28 07:43:56 -0800 Web Inspector: [REGRESSION] source frame is recreated for each inlined script in document. 359046 1 84058 podivilov 2011-02-28 07:44:44 -0800 Created attachment 84058 Patch. 359048 2 84059 podivilov 2011-02-28 07:47:16 -0800 Created attachment 84059 Patch. 359087 3 84068 podivilov 2011-02-28 08:49:24 -0800 Created attachment 84068 Patch. 359112 4 podivilov 2011-02-28 09:30:19 -0800 Committed r79873: <http://trac.webkit.org/changeset/79873> 84058 2011-02-28 07:44:44 -0800 2011-02-28 07:47:16 -0800 Patch. patch text/plain 5763 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjM2RiMTUzLi44ZjA5ZWJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDIt MjggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1JF R1JFU1NJT05dIHNvdXJjZSBmcmFtZSBpcyByZWNyZWF0ZWQgZm9yIGVhY2ggaW5saW5lZCBzY3Jp cHQgaW4gZG9jdW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NTM3NworCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFu ZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBh bmVsLmh0bWw6CisKIDIwMTEtMDItMjcgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBXaW5kb3dzIGV4cGVjdGVkIGZhaWx1cmUgcmVzdWx0cyBmb3IgZmFzdC9l dmVudHMvcGFnZXNob3ctcGFnZWhpZGUtb24tYmFjay1jYWNoZWQuaHRtbApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQu dHh0CmluZGV4IGU2MjUyMjMuLmVmZGQzOTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKQEAgLTUsNSAr NSw4IEBAIERlYnVnZ2VyIHdhcyBlbmFibGVkLgogUnVubmluZzogdGVzdEluaXRpYWxMb2FkCiAK IFJ1bm5pbmc6IHRlc3RIaXN0b3J5CisKK1J1bm5pbmc6IHRlc3RTb3VyY2VGcmFtZXNDb3VudAor UGFnZSByZWxvYWRlZC4KIERlYnVnZ2VyIHdhcyBkaXNhYmxlZC4KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKaW5kZXggYzI1ODBiNS4u ZDcwZjQzZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Njcmlw dHMtcGFuZWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 cy1wYW5lbC5odG1sCkBAIC05NywxMiArOTcsNDQgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg ICAgICBjaGVja0N1cnJlbnRseVNlbGVjdGVkRmlsZU5hbWUoImRlYnVnZ2VyLXRlc3QuanMiKTsK IAogICAgICAgICAgICAgbmV4dCgpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRl c3RTb3VyY2VGcmFtZXNDb3VudChuZXh0KQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgc291 cmNlRnJhbWVDb3VudCA9IDA7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1Njcmlw dFNvdXJjZSgic2NyaXB0cy1wYW5lbC5odG1sIiwgZGlkU2hvd1NjcmlwdFNvdXJjZSk7CisKKyAg ICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3VyY2UoKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZENyZWF0ZVNvdXJjZUZyYW1lKCkKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZUZyYW1lQ291bnQgKz0gMTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVy KHBhbmVsLCAiX2NyZWF0ZVNvdXJjZUZyYW1lIiwgZGlkQ3JlYXRlU291cmNlRnJhbWUsIHRydWUp OworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucmVsb2FkUGFnZShkaWRSZWxvYWQpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZWxvYWQoKQorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCJzY3Jp cHRzLXBhbmVsLmh0bWwiLCBzZWxlY3Rbc2VsZWN0LnNlbGVjdGVkSW5kZXhdLnRleHQpOworICAg ICAgICAgICAgICAgIC8vIFRoZXJlIHNob3VsZCBiZSBtYXhpbXVtIDIgc291cmNlIGZyYW1lczog Zmlyc3Qgb25lIGlzIHRoZSBmaXJzdCBzaG93biwgc2Vjb25kIG9uZSBpcyB0aGUgbGFzdCB2aWV3 ZWQgKCJzY3JpcHRzLXBhbmVsLmh0bWwiKS4KKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydEVxdWFscyh0cnVlLCBzb3VyY2VGcmFtZUNvdW50IDw9IDIsICJ0b28gbWFueSBzb3Vy Y2UgZnJhbWVzIGNyZWF0ZWQgYWZ0ZXIgcGFnZSByZWxvYWQiKTsKKyAgICAgICAgICAgICAgICBu ZXh0KCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICBdKTsKIH07CiAKIDwvc2NyaXB0 PgogCis8c2NyaXB0PgorZnVuY3Rpb24gc2Vjb25kSW5saW5lZFNjcmlwdEluUGFnZSgpCit7Cisg ICAgcmV0dXJuIDA7Cit9Cis8L3NjcmlwdD4KKwogPC9oZWFkPgogCiA8Ym9keSBvbmxvYWQ9InJ1 blRlc3QoKSI+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGM4ODRjYi4uNGU1YjAzMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDExLTAyLTI4ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OXSBzb3VyY2UgZnJhbWUgaXMgcmVjcmVhdGVk IGZvciBlYWNoIGlubGluZWQgc2NyaXB0IGluIGRvY3VtZW50LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTUzNzcKKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUuX3Jlc291cmNlTG9hZGluZ0ZpbmlzaGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9zb3VyY2VGcmFtZUZvclNvdXJjZU5h bWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2NyZWF0 ZVNvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLl9yZWNyZWF0ZVNvdXJjZUZyYW1lKToKKwogMjAxMS0wMi0yNyAgQmVuamFtaW4gUG91bGFp biAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNh bSBXZWluaWcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCmluZGV4IDk3ZWVlMDYuLjcwNmIyODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0zMjAsNyArMzIw LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGRl bGV0ZSByZXNvdXJjZS5fc2NyaXB0c1BlbmRpbmdSZXNvdXJjZUxvYWQ7CiAKICAgICAgICAgLy8g UmVjcmVhdGUgc291cmNlIGZyYW1lIHRvIHNob3cgcmVzb3VyY2UgY29udGVudC4KLSAgICAgICAg dGhpcy5fcmVjcmVhdGVTb3VyY2VGcmFtZShyZXNvdXJjZS51cmwpOworICAgICAgICB2YXIgZXhp c3RpbmdTb3VyY2VGcmFtZSA9IHRoaXMuX3NvdXJjZU5hbWVUb1NvdXJjZUZyYW1lW3Jlc291cmNl LnVybF07CisgICAgICAgIGlmIChleGlzdGluZ1NvdXJjZUZyYW1lICYmICFleGlzdGluZ1NvdXJj ZUZyYW1lLl9oYXNSZXNvdXJjZSkKKyAgICAgICAgICAgIHRoaXMuX3JlY3JlYXRlU291cmNlRnJh bWUocmVzb3VyY2UudXJsKTsKIAogICAgICAgICAvLyBBZGQgcmVzb3VyY2UgdXJsIHRvIGZpbGVz IHNlbGVjdCBpZiBub3QgYWxyZWFkeSBhZGRlZCB3aGlsZSBkZWJ1Z2dpbmcgaW5saW5lZCBzY3Jp cHRzLgogICAgICAgICBpZiAoIShyZXNvdXJjZS51cmwgaW4gdGhpcy5fc291cmNlTmFtZVRvRmls ZXNTZWxlY3RPcHRpb24pKQpAQCAtNTgzLDkgKzU4NSwxMSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfc291cmNlRnJhbWVGb3JTb3VyY2VOYW1lOiBmdW5j dGlvbihzb3VyY2VOYW1lKQogICAgIHsKICAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5f c291cmNlTmFtZVRvU291cmNlRnJhbWVbc291cmNlTmFtZV07Ci0gICAgICAgIGlmIChzb3VyY2VG cmFtZSkKLSAgICAgICAgICAgIHJldHVybiBzb3VyY2VGcmFtZTsKKyAgICAgICAgcmV0dXJuIHNv dXJjZUZyYW1lIHx8IHRoaXMuX2NyZWF0ZVNvdXJjZUZyYW1lKHNvdXJjZU5hbWUpOworICAgIH0s CiAKKyAgICBfY3JlYXRlU291cmNlRnJhbWU6IGZ1bmN0aW9uKHNvdXJjZU5hbWUpCisgICAgewog ICAgICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0Rm9yU291cmNlTmFtZShzb3VyY2VOYW1l KTsKICAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlcjsKICAgICAgICAgdmFyIGlzU2NyaXB0OwpA QCAtNTk4LDYgKzYwMiw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICB9CiAgICAgICAgIHNvdXJjZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZShjb250ZW50UHJvdmlkZXIsIHNjcmlwdC5zb3VyY2VVUkwsIGlzU2NyaXB0KTsKICAg ICAgICAgc291cmNlRnJhbWUuX3NvdXJjZU5hbWUgPSBzb3VyY2VOYW1lOworICAgICAgICBzb3Vy Y2VGcmFtZS5faGFzUmVzb3VyY2UgPSAhIXNjcmlwdC5yZXNvdXJjZTsKICAgICAgICAgc291cmNl RnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUuRXZlbnRzLkxv YWRlZCwgdGhpcy5fc291cmNlRnJhbWVMb2FkZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9zb3Vy Y2VOYW1lVG9Tb3VyY2VGcmFtZVtzb3VyY2VOYW1lXSA9IHNvdXJjZUZyYW1lOwogICAgICAgICBy ZXR1cm4gc291cmNlRnJhbWU7CkBAIC02MTQsNyArNjE5LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLnZpc2libGVWaWV3ICE9PSBv bGRTb3VyY2VGcmFtZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIgbmV3U291 cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VGcmFtZUZvclNvdXJjZU5hbWUoc291cmNlTmFtZSkKKyAg ICAgICAgdmFyIG5ld1NvdXJjZUZyYW1lID0gdGhpcy5fY3JlYXRlU291cmNlRnJhbWUoc291cmNl TmFtZSkKICAgICAgICAgbmV3U291cmNlRnJhbWUuc2Nyb2xsVG9wID0gb2xkU291cmNlRnJhbWUu c2Nyb2xsVG9wOwogICAgICAgICB0aGlzLnZpc2libGVWaWV3ID0gbmV3U291cmNlRnJhbWU7CiAg ICAgfSwK 84059 2011-02-28 07:47:16 -0800 2011-02-28 08:49:24 -0800 Patch. patch text/plain 5926 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjM2RiMTUzLi44ZjA5ZWJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDIt MjggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1JF R1JFU1NJT05dIHNvdXJjZSBmcmFtZSBpcyByZWNyZWF0ZWQgZm9yIGVhY2ggaW5saW5lZCBzY3Jp cHQgaW4gZG9jdW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NTM3NworCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFu ZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBh bmVsLmh0bWw6CisKIDIwMTEtMDItMjcgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBXaW5kb3dzIGV4cGVjdGVkIGZhaWx1cmUgcmVzdWx0cyBmb3IgZmFzdC9l dmVudHMvcGFnZXNob3ctcGFnZWhpZGUtb24tYmFjay1jYWNoZWQuaHRtbApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQu dHh0CmluZGV4IGU2MjUyMjMuLmVmZGQzOTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKQEAgLTUsNSAr NSw4IEBAIERlYnVnZ2VyIHdhcyBlbmFibGVkLgogUnVubmluZzogdGVzdEluaXRpYWxMb2FkCiAK IFJ1bm5pbmc6IHRlc3RIaXN0b3J5CisKK1J1bm5pbmc6IHRlc3RTb3VyY2VGcmFtZXNDb3VudAor UGFnZSByZWxvYWRlZC4KIERlYnVnZ2VyIHdhcyBkaXNhYmxlZC4KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKaW5kZXggYzI1ODBiNS4u ZWZjMTE1YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Njcmlw dHMtcGFuZWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 cy1wYW5lbC5odG1sCkBAIC05NywxMiArOTcsNTggQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg ICAgICBjaGVja0N1cnJlbnRseVNlbGVjdGVkRmlsZU5hbWUoImRlYnVnZ2VyLXRlc3QuanMiKTsK IAogICAgICAgICAgICAgbmV4dCgpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRl c3RTb3VyY2VGcmFtZXNDb3VudChuZXh0KQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgc291 cmNlRnJhbWVDb3VudCA9IDA7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1Njcmlw dFNvdXJjZSgic2NyaXB0cy1wYW5lbC5odG1sIiwgZGlkU2hvd1NjcmlwdFNvdXJjZSk7CisKKyAg ICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3VyY2UoKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZENyZWF0ZVNvdXJjZUZyYW1lKCkKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZUZyYW1lQ291bnQgKz0gMTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVy KHBhbmVsLCAiX2NyZWF0ZVNvdXJjZUZyYW1lIiwgZGlkQ3JlYXRlU291cmNlRnJhbWUsIHRydWUp OworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucmVsb2FkUGFnZShkaWRSZWxvYWQpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZWxvYWQoKQorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCJzY3Jp cHRzLXBhbmVsLmh0bWwiLCBzZWxlY3Rbc2VsZWN0LnNlbGVjdGVkSW5kZXhdLnRleHQpOworICAg ICAgICAgICAgICAgIC8vIFRoZXJlIHNob3VsZCBiZSBtYXhpbXVtIDIgc291cmNlIGZyYW1lczog Zmlyc3Qgb25lIGlzIHRoZSBmaXJzdCBzaG93biwgc2Vjb25kIG9uZSBpcyB0aGUgbGFzdCB2aWV3 ZWQgKCJzY3JpcHRzLXBhbmVsLmh0bWwiKS4KKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydEVxdWFscyh0cnVlLCBzb3VyY2VGcmFtZUNvdW50IDw9IDIsICJ0b28gbWFueSBzb3Vy Y2UgZnJhbWVzIGNyZWF0ZWQgYWZ0ZXIgcGFnZSByZWxvYWQiKTsKKyAgICAgICAgICAgICAgICBu ZXh0KCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICBdKTsKIH07CiAKIDwvc2NyaXB0 PgogCis8c2NyaXB0PgorZnVuY3Rpb24gc2Vjb25kSW5saW5lZFNjcmlwdEluUGFnZSgpCit7Cisg ICAgcmV0dXJuIDA7Cit9Cis8L3NjcmlwdD4KKworPHNjcmlwdD4KK2Z1bmN0aW9uIHRoaXJkSW5s aW5lZFNjcmlwdEluUGFnZSgpCit7CisgICAgcmV0dXJuIDA7Cit9Cis8L3NjcmlwdD4KKworPHNj cmlwdD4KK2Z1bmN0aW9uIGZvdXJ0aElubGluZWRTY3JpcHRJblBhZ2UoKQoreworICAgIHJldHVy biAwOworfQorPC9zY3JpcHQ+CisKIDwvaGVhZD4KIAogPGJvZHkgb25sb2FkPSJydW5UZXN0KCki PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDBjODg0Y2IuLjRlNWIwMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxMS0wMi0yOCAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gc291cmNlIGZyYW1lIGlzIHJlY3JlYXRlZCBmb3IgZWFj aCBpbmxpbmVkIHNjcmlwdCBpbiBkb2N1bWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU1Mzc3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlLl9yZXNvdXJjZUxvYWRpbmdGaW5pc2hlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc291cmNlRnJhbWVGb3JTb3VyY2VOYW1lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9jcmVhdGVTb3VyY2VG cmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fcmVj cmVhdGVTb3VyY2VGcmFtZSk6CisKIDIwMTEtMDItMjcgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5q YW1pbi5wb3VsYWluQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2Vpbmln LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qcwppbmRleCA5N2VlZTA2Li43MDZiMjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMzIwLDcgKzMyMCw5IEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBkZWxldGUgcmVz b3VyY2UuX3NjcmlwdHNQZW5kaW5nUmVzb3VyY2VMb2FkOwogCiAgICAgICAgIC8vIFJlY3JlYXRl IHNvdXJjZSBmcmFtZSB0byBzaG93IHJlc291cmNlIGNvbnRlbnQuCi0gICAgICAgIHRoaXMuX3Jl Y3JlYXRlU291cmNlRnJhbWUocmVzb3VyY2UudXJsKTsKKyAgICAgICAgdmFyIGV4aXN0aW5nU291 cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VOYW1lVG9Tb3VyY2VGcmFtZVtyZXNvdXJjZS51cmxdOwor ICAgICAgICBpZiAoZXhpc3RpbmdTb3VyY2VGcmFtZSAmJiAhZXhpc3RpbmdTb3VyY2VGcmFtZS5f aGFzUmVzb3VyY2UpCisgICAgICAgICAgICB0aGlzLl9yZWNyZWF0ZVNvdXJjZUZyYW1lKHJlc291 cmNlLnVybCk7CiAKICAgICAgICAgLy8gQWRkIHJlc291cmNlIHVybCB0byBmaWxlcyBzZWxlY3Qg aWYgbm90IGFscmVhZHkgYWRkZWQgd2hpbGUgZGVidWdnaW5nIGlubGluZWQgc2NyaXB0cy4KICAg ICAgICAgaWYgKCEocmVzb3VyY2UudXJsIGluIHRoaXMuX3NvdXJjZU5hbWVUb0ZpbGVzU2VsZWN0 T3B0aW9uKSkKQEAgLTU4Myw5ICs1ODUsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgX3NvdXJjZUZyYW1lRm9yU291cmNlTmFtZTogZnVuY3Rpb24oc291 cmNlTmFtZSkKICAgICB7CiAgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IHRoaXMuX3NvdXJjZU5h bWVUb1NvdXJjZUZyYW1lW3NvdXJjZU5hbWVdOwotICAgICAgICBpZiAoc291cmNlRnJhbWUpCi0g ICAgICAgICAgICByZXR1cm4gc291cmNlRnJhbWU7CisgICAgICAgIHJldHVybiBzb3VyY2VGcmFt ZSB8fCB0aGlzLl9jcmVhdGVTb3VyY2VGcmFtZShzb3VyY2VOYW1lKTsKKyAgICB9LAogCisgICAg X2NyZWF0ZVNvdXJjZUZyYW1lOiBmdW5jdGlvbihzb3VyY2VOYW1lKQorICAgIHsKICAgICAgICAg dmFyIHNjcmlwdCA9IHRoaXMuX3NjcmlwdEZvclNvdXJjZU5hbWUoc291cmNlTmFtZSk7CiAgICAg ICAgIHZhciBjb250ZW50UHJvdmlkZXI7CiAgICAgICAgIHZhciBpc1NjcmlwdDsKQEAgLTU5OCw2 ICs2MDIsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgfQogICAgICAgICBzb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUo Y29udGVudFByb3ZpZGVyLCBzY3JpcHQuc291cmNlVVJMLCBpc1NjcmlwdCk7CiAgICAgICAgIHNv dXJjZUZyYW1lLl9zb3VyY2VOYW1lID0gc291cmNlTmFtZTsKKyAgICAgICAgc291cmNlRnJhbWUu X2hhc1Jlc291cmNlID0gISFzY3JpcHQucmVzb3VyY2U7CiAgICAgICAgIHNvdXJjZUZyYW1lLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLkV2ZW50cy5Mb2FkZWQsIHRo aXMuX3NvdXJjZUZyYW1lTG9hZGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fc291cmNlTmFtZVRv U291cmNlRnJhbWVbc291cmNlTmFtZV0gPSBzb3VyY2VGcmFtZTsKICAgICAgICAgcmV0dXJuIHNv dXJjZUZyYW1lOwpAQCAtNjE0LDcgKzYxOSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy52aXNpYmxlVmlldyAhPT0gb2xkU291cmNl RnJhbWUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIG5ld1NvdXJjZUZyYW1l ID0gdGhpcy5fc291cmNlRnJhbWVGb3JTb3VyY2VOYW1lKHNvdXJjZU5hbWUpCisgICAgICAgIHZh ciBuZXdTb3VyY2VGcmFtZSA9IHRoaXMuX2NyZWF0ZVNvdXJjZUZyYW1lKHNvdXJjZU5hbWUpCiAg ICAgICAgIG5ld1NvdXJjZUZyYW1lLnNjcm9sbFRvcCA9IG9sZFNvdXJjZUZyYW1lLnNjcm9sbFRv cDsKICAgICAgICAgdGhpcy52aXNpYmxlVmlldyA9IG5ld1NvdXJjZUZyYW1lOwogICAgIH0sCg== 84068 2011-02-28 08:49:24 -0800 2011-02-28 08:56:24 -0800 Patch. patch text/plain 5654 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjM2RiMTUzLi44ZjA5ZWJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDIt MjggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1JF R1JFU1NJT05dIHNvdXJjZSBmcmFtZSBpcyByZWNyZWF0ZWQgZm9yIGVhY2ggaW5saW5lZCBzY3Jp cHQgaW4gZG9jdW1lbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NTM3NworCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFu ZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBh bmVsLmh0bWw6CisKIDIwMTEtMDItMjcgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBXaW5kb3dzIGV4cGVjdGVkIGZhaWx1cmUgcmVzdWx0cyBmb3IgZmFzdC9l dmVudHMvcGFnZXNob3ctcGFnZWhpZGUtb24tYmFjay1jYWNoZWQuaHRtbApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwtZXhwZWN0ZWQu dHh0CmluZGV4IGU2MjUyMjMuLmVmZGQzOTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC1leHBlY3RlZC50eHQKQEAgLTUsNSAr NSw4IEBAIERlYnVnZ2VyIHdhcyBlbmFibGVkLgogUnVubmluZzogdGVzdEluaXRpYWxMb2FkCiAK IFJ1bm5pbmc6IHRlc3RIaXN0b3J5CisKK1J1bm5pbmc6IHRlc3RTb3VyY2VGcmFtZXNDb3VudAor UGFnZSByZWxvYWRlZC4KIERlYnVnZ2VyIHdhcyBkaXNhYmxlZC4KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKaW5kZXggYzI1ODBiNS4u ZWZjMTE1YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Njcmlw dHMtcGFuZWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 cy1wYW5lbC5odG1sCkBAIC05NywxMiArOTcsNTggQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg ICAgICBjaGVja0N1cnJlbnRseVNlbGVjdGVkRmlsZU5hbWUoImRlYnVnZ2VyLXRlc3QuanMiKTsK IAogICAgICAgICAgICAgbmV4dCgpOworICAgICAgICB9LAorCisgICAgICAgIGZ1bmN0aW9uIHRl c3RTb3VyY2VGcmFtZXNDb3VudChuZXh0KQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgc291 cmNlRnJhbWVDb3VudCA9IDA7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1Njcmlw dFNvdXJjZSgic2NyaXB0cy1wYW5lbC5odG1sIiwgZGlkU2hvd1NjcmlwdFNvdXJjZSk7CisKKyAg ICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3VyY2UoKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZENyZWF0ZVNvdXJjZUZyYW1lKCkKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHNvdXJjZUZyYW1lQ291bnQgKz0gMTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVy KHBhbmVsLCAiX2NyZWF0ZVNvdXJjZUZyYW1lIiwgZGlkQ3JlYXRlU291cmNlRnJhbWUsIHRydWUp OworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QucmVsb2FkUGFnZShkaWRSZWxvYWQpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBkaWRSZWxvYWQoKQorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0RXF1YWxzKCJzY3Jp cHRzLXBhbmVsLmh0bWwiLCBzZWxlY3Rbc2VsZWN0LnNlbGVjdGVkSW5kZXhdLnRleHQpOworICAg ICAgICAgICAgICAgIC8vIFRoZXJlIHNob3VsZCBiZSBtYXhpbXVtIDIgc291cmNlIGZyYW1lczog Zmlyc3Qgb25lIGlzIHRoZSBmaXJzdCBzaG93biwgc2Vjb25kIG9uZSBpcyB0aGUgbGFzdCB2aWV3 ZWQgKCJzY3JpcHRzLXBhbmVsLmh0bWwiKS4KKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmFzc2VydEVxdWFscyh0cnVlLCBzb3VyY2VGcmFtZUNvdW50IDw9IDIsICJ0b28gbWFueSBzb3Vy Y2UgZnJhbWVzIGNyZWF0ZWQgYWZ0ZXIgcGFnZSByZWxvYWQiKTsKKyAgICAgICAgICAgICAgICBu ZXh0KCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICBdKTsKIH07CiAKIDwvc2NyaXB0 PgogCis8c2NyaXB0PgorZnVuY3Rpb24gc2Vjb25kSW5saW5lZFNjcmlwdEluUGFnZSgpCit7Cisg ICAgcmV0dXJuIDA7Cit9Cis8L3NjcmlwdD4KKworPHNjcmlwdD4KK2Z1bmN0aW9uIHRoaXJkSW5s aW5lZFNjcmlwdEluUGFnZSgpCit7CisgICAgcmV0dXJuIDA7Cit9Cis8L3NjcmlwdD4KKworPHNj cmlwdD4KK2Z1bmN0aW9uIGZvdXJ0aElubGluZWRTY3JpcHRJblBhZ2UoKQoreworICAgIHJldHVy biAwOworfQorPC9zY3JpcHQ+CisKIDwvaGVhZD4KIAogPGJvZHkgb25sb2FkPSJydW5UZXN0KCki PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDBjODg0Y2IuLjRlNWIwMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxMS0wMi0yOCAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gc291cmNlIGZyYW1lIGlzIHJlY3JlYXRlZCBmb3IgZWFj aCBpbmxpbmVkIHNjcmlwdCBpbiBkb2N1bWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU1Mzc3CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlLl9yZXNvdXJjZUxvYWRpbmdGaW5pc2hlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc291cmNlRnJhbWVGb3JTb3VyY2VOYW1lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9jcmVhdGVTb3VyY2VG cmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fcmVj cmVhdGVTb3VyY2VGcmFtZSk6CisKIDIwMTEtMDItMjcgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5q YW1pbi5wb3VsYWluQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2Vpbmln LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qcwppbmRleCA5N2VlZTA2Li5lNTRiMzVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMjg0LDggKzI4NCwxMSBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHJlc291 cmNlKSB7CiAgICAgICAgICAgICBpZiAocmVzb3VyY2UuZmluaXNoZWQpIHsKICAgICAgICAgICAg ICAgICAvLyBSZXNvdXJjZSBpcyBmaW5pc2hlZCwgYmluZCB0aGUgc2NyaXB0IHJpZ2h0IGF3YXku Ci0gICAgICAgICAgICAgICAgcmVzb3VyY2UuX3NjcmlwdHNQZW5kaW5nUmVzb3VyY2VMb2FkID0g W3NjcmlwdF07Ci0gICAgICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VMb2FkaW5nRmluaXNoZWQo eyB0YXJnZXQ6IHJlc291cmNlIH0pOworICAgICAgICAgICAgICAgIHNjcmlwdC5yZXNvdXJjZSA9 IHJlc291cmNlOworCisgICAgICAgICAgICAgICAgLy8gQWRkIHJlc291cmNlIHVybCB0byBmaWxl cyBzZWxlY3QgaWYgbm90IGFscmVhZHkgYWRkZWQgd2hpbGUgZGVidWdnaW5nIGlubGluZWQgc2Ny aXB0cy4KKyAgICAgICAgICAgICAgICBpZiAoIShyZXNvdXJjZS51cmwgaW4gdGhpcy5fc291cmNl TmFtZVRvRmlsZXNTZWxlY3RPcHRpb24pKQorICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRP cHRpb25Ub0ZpbGVzU2VsZWN0QW5kU2hvd1NvdXJjZUZyYW1lSWZOZWVkZWQocmVzb3VyY2UudXJs KTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLy8gUmVzb3VyY2UgaXMg bm90IGZpbmlzaGVkLCBiaW5kIHRoZSBzY3JpcHQgbGF0ZXIuCiAgICAgICAgICAgICAgICAgaWYg KCFyZXNvdXJjZS5fc2NyaXB0c1BlbmRpbmdSZXNvdXJjZUxvYWQpIHsKQEAgLTU4Myw5ICs1ODYs MTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX3NvdXJj ZUZyYW1lRm9yU291cmNlTmFtZTogZnVuY3Rpb24oc291cmNlTmFtZSkKICAgICB7CiAgICAgICAg IHZhciBzb3VyY2VGcmFtZSA9IHRoaXMuX3NvdXJjZU5hbWVUb1NvdXJjZUZyYW1lW3NvdXJjZU5h bWVdOwotICAgICAgICBpZiAoc291cmNlRnJhbWUpCi0gICAgICAgICAgICByZXR1cm4gc291cmNl RnJhbWU7CisgICAgICAgIHJldHVybiBzb3VyY2VGcmFtZSB8fCB0aGlzLl9jcmVhdGVTb3VyY2VG cmFtZShzb3VyY2VOYW1lKTsKKyAgICB9LAogCisgICAgX2NyZWF0ZVNvdXJjZUZyYW1lOiBmdW5j dGlvbihzb3VyY2VOYW1lKQorICAgIHsKICAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3Njcmlw dEZvclNvdXJjZU5hbWUoc291cmNlTmFtZSk7CiAgICAgICAgIHZhciBjb250ZW50UHJvdmlkZXI7 CiAgICAgICAgIHZhciBpc1NjcmlwdDsKQEAgLTYxNCw3ICs2MTksNyBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMudmlzaWJsZVZpZXcg IT09IG9sZFNvdXJjZUZyYW1lKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBu ZXdTb3VyY2VGcmFtZSA9IHRoaXMuX3NvdXJjZUZyYW1lRm9yU291cmNlTmFtZShzb3VyY2VOYW1l KQorICAgICAgICB2YXIgbmV3U291cmNlRnJhbWUgPSB0aGlzLl9jcmVhdGVTb3VyY2VGcmFtZShz b3VyY2VOYW1lKQogICAgICAgICBuZXdTb3VyY2VGcmFtZS5zY3JvbGxUb3AgPSBvbGRTb3VyY2VG cmFtZS5zY3JvbGxUb3A7CiAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcgPSBuZXdTb3VyY2VGcmFt ZTsKICAgICB9LAo=