57003 2011-03-24 03:55:08 -0700 Web Inspector: provide live edit callback to source frame delegate. 2011-03-24 07:57:46 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 372731 0 podivilov 2011-03-24 03:55:08 -0700 Web Inspector: provide live edit callback to source frame delegate. Currently, SourceFrame has no information about live edit status. We need to fix this (see https://bugs.webkit.org/show_bug.cgi?id=57002). 372732 1 86756 podivilov 2011-03-24 03:55:39 -0700 Created attachment 86756 Patch. 372811 2 podivilov 2011-03-24 07:57:46 -0700 Committed r81867: <http://trac.webkit.org/changeset/81867> 86756 2011-03-24 03:55:39 -0700 2011-03-24 05:47:10 -0700 Patch. patch text/plain 11547 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5MWQxZTc5Li5hNjlmYjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDMtMjQgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogcHJvdmlkZSBsaXZlIGVkaXQgY2FsbGJhY2sgdG8gc291cmNlIGZyYW1lIGRlbGVn YXRlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcw MDMKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5lZGl0U2NyaXB0U291 cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90 b3R5cGUuY2FuRWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJjZS5kaWRFZGl0U2Ny aXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLnByb3RvdHlwZS5lZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fdXBkYXRlQnJlYWtwb2ludHNBZnRl ckxpdmVFZGl0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLnByb3RvdHlwZS5fc2NyaXB0Rm9yU291cmNlRmlsZUlkKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlLl9jcmVhdGVTb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuY2Fu RWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJjZSk6CisKIDIwMTEt MDMtMjMgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCBjY2QxZjI0Li5hYzYyMzk3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVs LmpzCkBAIC00NCw3ICs0NCw2IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cyA9 IHsKICAgICBEZWJ1Z2dlclJlc3VtZWQ6ICJkZWJ1Z2dlci1yZXN1bWVkIiwKICAgICBQYXJzZWRT Y3JpcHRTb3VyY2U6ICJwYXJzZWQtc2NyaXB0LXNvdXJjZSIsCiAgICAgRmFpbGVkVG9QYXJzZVNj cmlwdFNvdXJjZTogImZhaWxlZC10by1wYXJzZS1zY3JpcHQtc291cmNlIiwKLSAgICBTY3JpcHRT b3VyY2VDaGFuZ2VkOiAic2NyaXB0LXNvdXJjZS1jaGFuZ2VkIiwKICAgICBCcmVha3BvaW50UmVz b2x2ZWQ6ICJicmVha3BvaW50LXJlc29sdmVkIiwKICAgICBSZXNldDogInJlc2V0IgogfQpAQCAt MTc1LDI5ICsxNzQsMjAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0g ewogICAgICAgICByZXR1cm4gc2NyaXB0czsKICAgICB9LAogCi0gICAgZWRpdFNjcmlwdFNvdXJj ZTogZnVuY3Rpb24oc291cmNlSUQsIHNjcmlwdFNvdXJjZSkKKyAgICBlZGl0U2NyaXB0U291cmNl OiBmdW5jdGlvbihzb3VyY2VJRCwgbmV3U291cmNlLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAg IHZhciBvbGRTb3VyY2UgPSB0aGlzLl9zY3JpcHRzW3NvdXJjZUlEXS5zb3VyY2U7Ci0gICAgICAg IERlYnVnZ2VyQWdlbnQuZWRpdFNjcmlwdFNvdXJjZShzb3VyY2VJRCwgc2NyaXB0U291cmNlLCB0 aGlzLl91cGRhdGVTY3JpcHRTb3VyY2UuYmluZCh0aGlzLCBzb3VyY2VJRCwgb2xkU291cmNlKSk7 Ci0gICAgfSwKLQotICAgIF91cGRhdGVTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlELCBv bGRTb3VyY2UsIGVycm9yLCBzdWNjZXNzLCBuZXdCb2R5T3JFcnJvck1lc3NhZ2UsIGNhbGxGcmFt ZXMpCi0gICAgewotICAgICAgICBpZiAoZXJyb3IpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAg ICAgICAgaWYgKCFzdWNjZXNzKSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IubG9nKG5ld0Jv ZHlPckVycm9yTWVzc2FnZSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZl bC5XYXJuaW5nKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIHRo aXMuX3NjcmlwdHNbc291cmNlSURdLnNvdXJjZSA9IG5ld0JvZHlPckVycm9yTWVzc2FnZTsKLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwuRXZlbnRzLlNjcmlwdFNvdXJjZUNoYW5nZWQsIHsgc291cmNlSUQ6IHNvdXJjZUlELCBv bGRTb3VyY2U6IG9sZFNvdXJjZSB9KTsKLQotICAgICAgICBpZiAoY2FsbEZyYW1lcyAmJiBjYWxs RnJhbWVzLmxlbmd0aCkgewotICAgICAgICAgICAgdGhpcy5fZGVidWdnZXJQYXVzZWREZXRhaWxz LmNhbGxGcmFtZXMgPSBjYWxsRnJhbWVzOwotICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUGF1 c2VkLCB0aGlzLl9kZWJ1Z2dlclBhdXNlZERldGFpbHMpOworICAgICAgICBmdW5jdGlvbiBkaWRF ZGl0U2NyaXB0U291cmNlKGVycm9yLCBzdWNjZXNzLCBuZXdCb2R5T3JFcnJvck1lc3NhZ2UsIGNh bGxGcmFtZXMpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKHN1Y2Nlc3MsIG5ld0Jv ZHlPckVycm9yTWVzc2FnZSk7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3MpCisgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF0uc291cmNl ID0gbmV3Qm9keU9yRXJyb3JNZXNzYWdlOworICAgICAgICAgICAgaWYgKGNhbGxGcmFtZXMgJiYg Y2FsbEZyYW1lcy5sZW5ndGgpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9kZWJ1Z2dlclBhdXNl ZERldGFpbHMuY2FsbEZyYW1lcyA9IGNhbGxGcmFtZXM7CisgICAgICAgICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRz LkRlYnVnZ2VyUGF1c2VkLCB0aGlzLl9kZWJ1Z2dlclBhdXNlZERldGFpbHMpOworICAgICAgICAg ICAgfQogICAgICAgICB9CisgICAgICAgIERlYnVnZ2VyQWdlbnQuZWRpdFNjcmlwdFNvdXJjZShz b3VyY2VJRCwgbmV3U291cmNlLCBkaWRFZGl0U2NyaXB0U291cmNlLmJpbmQodGhpcykpOwogICAg IH0sCiAKICAgICBnZXQgY2FsbEZyYW1lcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMK aW5kZXggZTZkNTZmYS4uYzY2NGNlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpA QCAtMzYsNyArMzYsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCA9 IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlcldhc0VuYWJsZWQs IHRoaXMuX2RlYnVnZ2VyV2FzRW5hYmxlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5FdmVu dHMuUGFyc2VkU2NyaXB0U291cmNlLCB0aGlzLl9wYXJzZWRTY3JpcHRTb3VyY2UsIHRoaXMpOwog ICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2UsIHRoaXMu X2ZhaWxlZFRvUGFyc2VTY3JpcHRTb3VyY2UsIHRoaXMpOwotICAgIFdlYkluc3BlY3Rvci5kZWJ1 Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZl bnRzLlNjcmlwdFNvdXJjZUNoYW5nZWQsIHRoaXMuX3NjcmlwdFNvdXJjZUNoYW5nZWQsIHRoaXMp OwogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyTW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRSZXNvbHZlZCwgdGhpcy5fYnJl YWtwb2ludFJlc29sdmVkLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5SZXNldCwg dGhpcy5fcmVzZXQsIHRoaXMpOwogfQpAQCAtMTA2LDIyICsxMDUsNDQgQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg fSwKIAotICAgIF9zY3JpcHRTb3VyY2VDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKKyAgICBjYW5F ZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAgICAgewotICAgICAgICB2 YXIgc291cmNlSUQgPSBldmVudC5kYXRhLnNvdXJjZUlEOwotICAgICAgICB2YXIgb2xkU291cmNl ID0gZXZlbnQuZGF0YS5vbGRTb3VyY2U7Ci0gICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNwZWN0 b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRGb3JTb3VyY2VJRChzb3VyY2VJRCk7Ci0KLSAgICAgICAg dmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHNjcmlwdC5zb3VyY2VV UkwpOwotICAgICAgICBpZiAocmVzb3VyY2UpIHsKLSAgICAgICAgICAgIHZhciByZXZlcnRIYW5k bGUgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5lZGl0U2NyaXB0U291cmNlLmJpbmQoV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwsIHNjcmlwdC5zb3VyY2VJRCwgb2xkU291cmNlKTsKLSAg ICAgICAgICAgIHJlc291cmNlLnNldENvbnRlbnQoc2NyaXB0LnNvdXJjZSwgcmV2ZXJ0SGFuZGxl KTsKLSAgICAgICAgfQorICAgICAgICBpZiAoIVByZWZlcmVuY2VzLmNhbkVkaXRTY3JpcHRTb3Vy Y2UpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHZhciBzY3JpcHQgPSB0aGlz Ll9zY3JpcHRGb3JTb3VyY2VGaWxlSWQoc291cmNlRmlsZUlkKTsKKyAgICAgICAgcmV0dXJuICAh c2NyaXB0LmxpbmVPZmZzZXQgJiYgIXNjcmlwdC5jb2x1bW5PZmZzZXQ7CisgICAgfSwKIAotICAg ICAgICB2YXIgc291cmNlRmlsZUlkID0gc2NyaXB0LnNvdXJjZVVSTCB8fCBzY3JpcHQuc291cmNl SUQ7CisgICAgZWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24oc291cmNlRmlsZUlkLCB0ZXh0LCBj YWxsYmFjaykKKyAgICB7CisgICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRGb3JTb3Vy Y2VGaWxlSWQoc291cmNlRmlsZUlkKTsKKyAgICAgICAgdmFyIG9sZFNvdXJjZSA9IHNjcmlwdC5z b3VyY2U7CisgICAgICAgIGZ1bmN0aW9uIGRpZEVkaXRTY3JpcHRTb3VyY2Uoc3VjY2VzcywgbmV3 Qm9keU9yRXJyb3JNZXNzYWdlKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3Mp IHsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhmYWxzZSwgbmV3Qm9keU9yRXJyb3JNZXNzYWdl KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IHZhciBuZXdTb3VyY2UgPSBuZXdCb2R5T3JFcnJvck1lc3NhZ2U7CisgICAgICAgICAgICB0aGlz Ll91cGRhdGVCcmVha3BvaW50c0FmdGVyTGl2ZUVkaXQoc291cmNlRmlsZUlkLCBvbGRTb3VyY2Us IG5ld1NvdXJjZSk7CiAKKyAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5y ZXNvdXJjZUZvclVSTChzY3JpcHQuc291cmNlVVJMKTsKKyAgICAgICAgICAgIGlmIChyZXNvdXJj ZSkgeworICAgICAgICAgICAgICAgIHZhciBzb3VyY2VGaWxlID0gdGhpcy5fc291cmNlRmlsZXNb c291cmNlRmlsZUlkXTsKKyAgICAgICAgICAgICAgICB2YXIgcmV2ZXJ0SGFuZGxlID0gdGhpcy5l ZGl0U2NyaXB0U291cmNlLmJpbmQodGhpcywgc291cmNlRmlsZUlkLCBvbGRTb3VyY2UsIHNvdXJj ZUZpbGUucmVsb2FkLmJpbmQoc291cmNlRmlsZSkpOworICAgICAgICAgICAgICAgIHJlc291cmNl LnNldENvbnRlbnQobmV3U291cmNlLCByZXZlcnRIYW5kbGUpOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICBjYWxsYmFjayh0cnVlLCBuZXdTb3VyY2UpOworICAgICAgICB9CisgICAgICAg IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmVkaXRTY3JpcHRTb3VyY2Uoc2NyaXB0LnNvdXJj ZUlELCB0ZXh0LCBkaWRFZGl0U2NyaXB0U291cmNlLmJpbmQodGhpcykpOworICAgIH0sCisKKyAg ICBfdXBkYXRlQnJlYWtwb2ludHNBZnRlckxpdmVFZGl0OiBmdW5jdGlvbihzb3VyY2VGaWxlSWQs IG9sZFNvdXJjZSwgbmV3U291cmNlKQorICAgIHsKICAgICAgICAgLy8gQ2xlYXIgYW5kIHJlLWNy ZWF0ZSBicmVha3BvaW50cyBhY2NvcmRpbmcgdG8gdGV4dCBkaWZmLgotICAgICAgICB2YXIgZGlm ZiA9IEFycmF5LmRpZmYob2xkU291cmNlLnNwbGl0KCJcbiIpLCBzY3JpcHQuc291cmNlLnNwbGl0 KCJcbiIpKTsKKyAgICAgICAgdmFyIGRpZmYgPSBBcnJheS5kaWZmKG9sZFNvdXJjZS5zcGxpdCgi XG4iKSwgbmV3U291cmNlLnNwbGl0KCJcbiIpKTsKICAgICAgICAgZm9yICh2YXIgaWQgaW4gdGhp cy5fcHJlc2VudGF0aW9uQnJlYWtwb2ludHMpIHsKICAgICAgICAgICAgIHZhciBicmVha3BvaW50 ID0gdGhpcy5fcHJlc2VudGF0aW9uQnJlYWtwb2ludHNbaWRdOwogICAgICAgICAgICAgaWYgKGJy ZWFrcG9pbnQuc291cmNlRmlsZUlkICE9PSBzb3VyY2VGaWxlSWQpCkBAIC0xNDYsOCArMTY3LDYg QEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgaWYgKG5ld0xpbmVOdW1iZXIgIT09IHVuZGVmaW5lZCkKICAgICAgICAgICAg ICAgICB0aGlzLnNldEJyZWFrcG9pbnQoc291cmNlRmlsZUlkLCBuZXdMaW5lTnVtYmVyLCBicmVh a3BvaW50LmNvbmRpdGlvbiwgYnJlYWtwb2ludC5lbmFibGVkKTsKICAgICAgICAgfQotCi0gICAg ICAgIHRoaXMuX3NvdXJjZUZpbGVzW3NvdXJjZUZpbGVJZF0ucmVsb2FkKCk7CiAgICAgfSwKIAog ICAgIHRvZ2dsZUZvcm1hdFNvdXJjZUZpbGVzOiBmdW5jdGlvbigpCkBAIC0zNDUsNiArMzY0LDE1 IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZUZpbGVzW3NjcmlwdC5zb3VyY2VVUkwgfHwgc2Ny aXB0LnNvdXJjZUlEXTsKICAgICB9LAogCisgICAgX3NjcmlwdEZvclNvdXJjZUZpbGVJZDogZnVu Y3Rpb24oc291cmNlRmlsZUlkKQorICAgIHsKKyAgICAgICAgZnVuY3Rpb24gZmlsdGVyKHNjcmlw dCkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJuIChzY3JpcHQuc291cmNlVVJMIHx8IHNj cmlwdC5zb3VyY2VJRCkgPT09IHNvdXJjZUZpbGVJZDsKKyAgICAgICAgfQorICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwucXVlcnlTY3JpcHRzKGZpbHRlcilbMF07Cisg ICAgfSwKKwogICAgIF9yZXNldDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fc291 cmNlRmlsZXMgPSB7fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggZmI0YTFmZDguLjIzYjAzMWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC01NDcs OSArNTQ3LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAg ICBfY3JlYXRlU291cmNlRnJhbWU6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCkKICAgICB7Ci0gICAg ICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRGb3JTb3VyY2VGaWxlSWQoc291cmNlRmlsZUlk KTsKLSAgICAgICAgdmFyIGRlbGVnYXRlID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yU2NyaXB0c1BhbmVsKHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLCBzb3VyY2VGaWxl SWQsIHNjcmlwdCk7Ci0gICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUoZGVsZWdhdGUsIHNjcmlwdC5zb3VyY2VVUkwpOworICAgICAgICB2YXIgc291 cmNlRmlsZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNvdXJjZUZpbGUoc291cmNlRmlsZUlk KTsKKyAgICAgICAgdmFyIGRlbGVnYXRlID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yU2NyaXB0c1BhbmVsKHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLCBzb3VyY2VGaWxl SWQpOworICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lKGRlbGVnYXRlLCBzb3VyY2VGaWxlLnVybCk7CiAgICAgICAgIHNvdXJjZUZyYW1lLl9zb3Vy Y2VGaWxlSWQgPSBzb3VyY2VGaWxlSWQ7CiAgICAgICAgIHNvdXJjZUZyYW1lLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLkV2ZW50cy5Mb2FkZWQsIHRoaXMuX3NvdXJj ZUZyYW1lTG9hZGVkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fc291cmNlRmlsZUlkVG9Tb3VyY2VG cmFtZVtzb3VyY2VGaWxlSWRdID0gc291cmNlRnJhbWU7CkBAIC01OTcsMTUgKzU5Nyw2IEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwK IAotICAgIF9zY3JpcHRGb3JTb3VyY2VGaWxlSWQ6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCkKLSAg ICB7Ci0gICAgICAgIGZ1bmN0aW9uIGZpbHRlcihzY3JpcHQpCi0gICAgICAgIHsKLSAgICAgICAg ICAgIHJldHVybiAoc2NyaXB0LnNvdXJjZVVSTCB8fCBzY3JpcHQuc291cmNlSUQpID09PSBzb3Vy Y2VGaWxlSWQ7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLnF1ZXJ5U2NyaXB0cyhmaWx0ZXIpWzBdOwotICAgIH0sCi0KICAgICBfY2xlYXJDdXJy ZW50RXhlY3V0aW9uTGluZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2V4 ZWN1dGlvblNvdXJjZUZyYW1lKQpAQCAtMTAwOSwxMiArMTAwMCwxMSBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGU7CiAKIAotV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwgPSBmdW5jdGlvbiht b2RlbCwgc291cmNlRmlsZUlkLCBzY3JpcHQpCitXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZUZvclNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKG1vZGVsLCBzb3VyY2VGaWxlSWQpCiB7CiAg ICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUuY2FsbCh0aGlzKTsKICAgICB0aGlz Ll9tb2RlbCA9IG1vZGVsOwogICAgIHRoaXMuX3NvdXJjZUZpbGVJZCA9IHNvdXJjZUZpbGVJZDsK LSAgICB0aGlzLl9zY3JpcHQgPSBzY3JpcHQ7CiAgICAgdGhpcy5fcG9wb3Zlck9iamVjdEdyb3Vw ID0gInBvcG92ZXIiOwogfQogCkBAIC0xMDYzLDEyICsxMDUzLDE5IEBAIFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGNh bkVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBQcmVm ZXJlbmNlcy5jYW5FZGl0U2NyaXB0U291cmNlICYmICF0aGlzLl9zY3JpcHQubGluZU9mZnNldCAm JiAhdGhpcy5fc2NyaXB0LmNvbHVtbk9mZnNldDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX21vZGVs LmNhbkVkaXRTY3JpcHRTb3VyY2UodGhpcy5fc291cmNlRmlsZUlkKTsKICAgICB9LAogCi0gICAg ZWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24odGV4dCkKKyAgICBlZGl0U2NyaXB0U291cmNlOiBm dW5jdGlvbih0ZXh0LCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1 Z2dlck1vZGVsLmVkaXRTY3JpcHRTb3VyY2UodGhpcy5fc2NyaXB0LnNvdXJjZUlELCB0ZXh0KTsK KyAgICAgICAgZnVuY3Rpb24gZGlkRWRpdFNjcmlwdFNvdXJjZShzdWNjZXNzLCBuZXdCb2R5T3JF cnJvck1lc3NhZ2UpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghc3VjY2VzcykgeworICAg ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2cobmV3Qm9keU9yRXJyb3JNZXNzYWdlLCBXZWJJ bnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLldhcm5pbmcpOworICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICB0aGlzLl9t b2RlbC5lZGl0U2NyaXB0U291cmNlKHRoaXMuX3NvdXJjZUZpbGVJZCwgdGV4dCwgZGlkRWRpdFNj cmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgc2V0U2NyaXB0U291cmNlSXNC ZWluZ0VkaXRlZDogZnVuY3Rpb24oaW5FZGl0TW9kZSkK