56034 2011-03-09 11:12:51 -0800 Web Inspector: use DebuggerPresentation instead of DebuggerModel in source frame delegate. 2011-03-30 05:17:37 -0700 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 yurys oldest_to_newest 364627 0 podivilov 2011-03-09 11:12:51 -0800 Web Inspector: use DebuggerPresentation instead of DebuggerModel in source frame delegate. 364631 1 85199 podivilov 2011-03-09 11:13:48 -0800 Created attachment 85199 Patch. 376209 2 podivilov 2011-03-30 05:17:37 -0700 Commited in r80709. 85199 2011-03-09 11:13:48 -0800 2011-03-10 03:51:04 -0800 Patch. patch text/plain 13112 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YTE0ZDk5Li5lMDIyNmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzYg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiB1c2UgRGVidWdnZXJQcmVzZW50YXRpb24gaW5zdGVhZCBvZiBEZWJ1Z2dlck1v ZGVsIGluIHNvdXJjZSBmcmFtZSBkZWxlZ2F0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU2MDM0CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuY29udGludWVUb0xpbmUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLnNl dEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlLnVwZGF0ZUJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmZpbmRCcmVha3BvaW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5f c291cmNlTG9jYXRpb25Ub0FjdHVhbExvY2F0aW9uKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlLl9jcmVhdGVTb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc2V0QnJlYWtw b2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlw dHNQYW5lbC5wcm90b3R5cGUudXBkYXRlQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUucmVtb3ZlQnJl YWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNj cmlwdHNQYW5lbC5wcm90b3R5cGUuZmluZEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLmNvbnRpbnVl VG9MaW5lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY29udGV4dE1lbnUu ZWxzZS5lZGl0QnJlYWtwb2ludENvbmRpdGlvbi5kaWRFZGl0QnJlYWtwb2ludENvbmRpdGlvbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9jb250ZXh0TWVu dS5lbHNlLmVkaXRCcmVha3BvaW50Q29uZGl0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGUuX2NvbnRleHRNZW51LmVsc2Uuc2V0QnJlYWtwb2ludEVuYWJs ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY29udGV4 dE1lbnUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fbW91 c2VEb3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnByb3Rv dHlwZS5yZW1vdmVCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZURlbGVnYXRlLnByb3RvdHlwZS51cGRhdGVCcmVha3BvaW50KToKKworMjAxMS0wMy0wOSAgUGF2 ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZS1pbXBsZW1l bnQgYnJlYWtwb2ludHMgc2lkZWJhciBwYW5lIGJhc2VkIG9uIGRlYnVnZ2VyIHByZXNlbnRhdGlv biBtb2RlbC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU1ODIzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCA3ZTQ2OGFhLi44NmQ2 MDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC03MSw2ICs3MSwxMyBAQCBX ZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIH0KICAgICB9LAogCisgICAgY29udGludWVUb0xpbmU6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJ ZCwgbGluZU51bWJlcikKKyAgICB7CisgICAgICAgIHZhciBsb2NhdGlvbiA9IHRoaXMuX3NvdXJj ZUxvY2F0aW9uVG9BY3R1YWxMb2NhdGlvbihzb3VyY2VGaWxlSWQsIGxpbmVOdW1iZXIpOworICAg ICAgICBpZiAobG9jYXRpb24uc291cmNlSUQpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNb2RlbC5jb250aW51ZVRvTG9jYXRpb24obG9jYXRpb24uc291cmNlSUQsIGxvY2F0aW9u LmxpbmVOdW1iZXIsIGxvY2F0aW9uLmNvbHVtbk51bWJlcik7CisgICAgfSwKKwogICAgIGJyZWFr cG9pbnRzRm9yU291cmNlRmlsZUlkOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQpCiAgICAgewogICAg ICAgICB2YXIgYnJlYWtwb2ludHMgPSBbXTsKQEAgLTgyLDYgKzg5LDE1IEBAIFdlYkluc3BlY3Rv ci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IGJyZWFrcG9pbnRzOwogICAgIH0sCiAKKyAgICBzZXRCcmVha3BvaW50OiBmdW5jdGlvbihzb3Vy Y2VGaWxlSWQsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKKyAgICB7CisgICAgICAg IHZhciBsb2NhdGlvbiA9IHRoaXMuX3NvdXJjZUxvY2F0aW9uVG9BY3R1YWxMb2NhdGlvbihzb3Vy Y2VGaWxlSWQsIGxpbmVOdW1iZXIpOworICAgICAgICBpZiAobG9jYXRpb24udXJsKQorICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2V0QnJlYWtwb2ludChsb2NhdGlvbi51 cmwsIGxvY2F0aW9uLmxpbmVOdW1iZXIsIGxvY2F0aW9uLmNvbHVtbk51bWJlciwgY29uZGl0aW9u LCBlbmFibGVkKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTW9kZWwuc2V0QnJlYWtwb2ludEJ5U291cmNlSWQobG9jYXRpb24uc291cmNlSUQsIGxvY2F0 aW9uLmxpbmVOdW1iZXIsIGxvY2F0aW9uLmNvbHVtbk51bWJlciwgY29uZGl0aW9uLCBlbmFibGVk KTsKKyAgICB9LAorCiAgICAgc2V0QnJlYWtwb2ludEVuYWJsZWQ6IGZ1bmN0aW9uKHNvdXJjZUZp bGVJZCwgbGluZU51bWJlciwgZW5hYmxlZCkKICAgICB7CiAgICAgICAgIHZhciBlbmNvZGVkU291 cmNlTG9jYXRpb24gPSB0aGlzLl9lbmNvZGVTb3VyY2VMb2NhdGlvbihzb3VyY2VGaWxlSWQsIGxp bmVOdW1iZXIpOwpAQCAtOTIsNiArMTA4LDE0IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TW9kZWwudXBkYXRlQnJlYWtwb2ludChicmVha3BvaW50SWQsIGJyZWFrcG9pbnQuY29uZGl0aW9u LCBlbmFibGVkKTsKICAgICB9LAogCisgICAgdXBkYXRlQnJlYWtwb2ludDogZnVuY3Rpb24oc291 cmNlRmlsZUlkLCBsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCisgICAgeworICAgICAg ICB2YXIgZW5jb2RlZFNvdXJjZUxvY2F0aW9uID0gdGhpcy5fZW5jb2RlU291cmNlTG9jYXRpb24o c291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKTsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRJZCA9IHRo aXMuX3NvdXJjZUxvY2F0aW9uVG9CcmVha3BvaW50SWRbZW5jb2RlZFNvdXJjZUxvY2F0aW9uXTsK KyAgICAgICAgaWYgKGJyZWFrcG9pbnRJZCkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1 Z2dlck1vZGVsLnVwZGF0ZUJyZWFrcG9pbnQoYnJlYWtwb2ludElkLCBjb25kaXRpb24sIGVuYWJs ZWQpOworICAgIH0sCisKICAgICByZW1vdmVCcmVha3BvaW50OiBmdW5jdGlvbihzb3VyY2VGaWxl SWQsIGxpbmVOdW1iZXIpCiAgICAgewogICAgICAgICB2YXIgZW5jb2RlZFNvdXJjZUxvY2F0aW9u ID0gdGhpcy5fZW5jb2RlU291cmNlTG9jYXRpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKTsK QEAgLTEwMCw2ICsxMjQsMTQgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwu cmVtb3ZlQnJlYWtwb2ludChicmVha3BvaW50SWQpOwogICAgIH0sCiAKKyAgICBmaW5kQnJlYWtw b2ludDogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQorICAgIHsKKyAgICAgICAg dmFyIGVuY29kZWRTb3VyY2VMb2NhdGlvbiA9IHRoaXMuX2VuY29kZVNvdXJjZUxvY2F0aW9uKHNv dXJjZUZpbGVJZCwgbGluZU51bWJlcik7CisgICAgICAgIHZhciBicmVha3BvaW50SWQgPSB0aGlz Ll9zb3VyY2VMb2NhdGlvblRvQnJlYWtwb2ludElkW2VuY29kZWRTb3VyY2VMb2NhdGlvbl07Cisg ICAgICAgIGlmIChicmVha3BvaW50SWQpCisgICAgICAgICAgICByZXR1cm4gdGhpcy5fYnJlYWtw b2ludHNbYnJlYWtwb2ludElkXTsKKyAgICB9LAorCiAgICAgX2JyZWFrcG9pbnRBZGRlZDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgYnJlYWtwb2ludCA9IGV2ZW50LmRhdGE7 CkBAIC0xNzgsNiArMjEwLDE3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHsgc291cmNlRmlsZUlkOiBzb3VyY2VJ RCwgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBjb2x1bW5OdW1iZXIgfTsK ICAgICB9LAogCisgICAgX3NvdXJjZUxvY2F0aW9uVG9BY3R1YWxMb2NhdGlvbjogZnVuY3Rpb24o c291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQorICAgIHsKKyAgICAgICAgLy8gVE9ETzogdXNlIHNv dXJjZSBtYXBwaW5nIHRvIG9idGFpbiBhY3R1YWwgbG9jYXRpb24uCisgICAgICAgIGZ1bmN0aW9u IGZpbHRlcihzY3JpcHQpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiAoc2NyaXB0LnNv dXJjZVVSTCB8fCBzY3JpcHQuc291cmNlSUQpID09PSBzb3VyY2VGaWxlSWQ7CisgICAgICAgIH0K KyAgICAgICAgdmFyIHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnF1ZXJ5U2Ny aXB0cyhmaWx0ZXIpWzBdOworICAgICAgICByZXR1cm4geyB1cmw6IHNjcmlwdC5zb3VyY2VVUkws IHNvdXJjZUlEOiBzY3JpcHQuc291cmNlSUQsIGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVt bk51bWJlcjogMCB9OworICAgIH0sCisKICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgZm9yICh2YXIgaWQgaW4gdGhpcy5fYnJlYWtwb2ludHMpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggOWI2ZDk4 NS4uOTcxMzY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKQEAgLTU5MCw3ICs1OTAsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfY3JlYXRlU291cmNlRnJhbWU6IGZ1bmN0aW9uKHNv dXJjZUZpbGVJZCkKICAgICB7CiAgICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRGb3JT b3VyY2VGaWxlSWQoc291cmNlRmlsZUlkKTsKLSAgICAgICAgdmFyIGRlbGVnYXRlID0gbmV3IFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsKHNjcmlwdCk7Cisg ICAgICAgIHZhciBkZWxlZ2F0ZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0 ZUZvclNjcmlwdHNQYW5lbCh0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCwgc291cmNlRmlsZUlkLCBz Y3JpcHQpOwogICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lKGRlbGVnYXRlLCBzY3JpcHQuc291cmNlVVJMKTsKICAgICAgICAgc291cmNlRnJhbWUu X3NvdXJjZUZpbGVJZCA9IHNvdXJjZUZpbGVJZDsKICAgICAgICAgc291cmNlRnJhbWUuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUuRXZlbnRzLkxvYWRlZCwgdGhpcy5f c291cmNlRnJhbWVMb2FkZWQsIHRoaXMpOwpAQCAtMTA1MCw5ICsxMDUwLDExIEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKIAog Ci1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbCA9IGZ1bmN0 aW9uKHNjcmlwdCkKK1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1Bh bmVsID0gZnVuY3Rpb24obW9kZWwsIHNvdXJjZUZpbGVJZCwgc2NyaXB0KQogewogICAgIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLmNhbGwodGhpcyk7CisgICAgdGhpcy5fbW9kZWwg PSBtb2RlbDsKKyAgICB0aGlzLl9zb3VyY2VGaWxlSWQgPSBzb3VyY2VGaWxlSWQ7CiAgICAgdGhp cy5fc2NyaXB0ID0gc2NyaXB0OwogICAgIHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCA9ICJwb3Bv dmVyIjsKIH0KQEAgLTExNzIsNTIgKzExNzQsMzAgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l RGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgc2V0QnJlYWtwb2lu dDogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKQogICAgIHsKLSAgICAg ICAgdmFyIGxvY2F0aW9uID0gdGhpcy5fY29udGVudC5zb3VyY2VGcmFtZUxpbmVOdW1iZXJUb0Fj dHVhbExvY2F0aW9uKGxpbmVOdW1iZXIpOwotICAgICAgICBpZiAodGhpcy5fc2NyaXB0LnNvdXJj ZVVSTCkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNldEJyZWFrcG9p bnQodGhpcy5fc2NyaXB0LnNvdXJjZVVSTCwgbG9jYXRpb24ubGluZU51bWJlciwgbG9jYXRpb24u Y29sdW1uTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwotICAgICAgICBlbHNlIGlmIChsb2Nh dGlvbi5zb3VyY2VJRCkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNl dEJyZWFrcG9pbnRCeVNvdXJjZUlkKGxvY2F0aW9uLnNvdXJjZUlELCBsb2NhdGlvbi5saW5lTnVt YmVyLCBsb2NhdGlvbi5jb2x1bW5OdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fbW9kZWwuc2V0QnJlYWtw b2ludCh0aGlzLl9zb3VyY2VGaWxlSWQsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7 CiAKICAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuYnJlYWtwb2ludHNB Y3RpdmF0ZWQpCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudG9nZ2xl QnJlYWtwb2ludHNDbGlja2VkKCk7CiAgICAgfSwKIAotICAgIHJlbW92ZUJyZWFrcG9pbnQ6IGZ1 bmN0aW9uKGJyZWFrcG9pbnRJZCkKKyAgICB1cGRhdGVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5l TnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3Iu ZGVidWdnZXJNb2RlbC5yZW1vdmVCcmVha3BvaW50KGJyZWFrcG9pbnRJZCk7CisgICAgICAgIHRo aXMuX21vZGVsLnVwZGF0ZUJyZWFrcG9pbnQodGhpcy5fc291cmNlRmlsZUlkLCBsaW5lTnVtYmVy LCBjb25kaXRpb24sIGVuYWJsZWQpOwogICAgIH0sCiAKLSAgICB1cGRhdGVCcmVha3BvaW50OiBm dW5jdGlvbihicmVha3BvaW50SWQsIGNvbmRpdGlvbiwgZW5hYmxlZCkKKyAgICByZW1vdmVCcmVh a3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9y LmRlYnVnZ2VyTW9kZWwudXBkYXRlQnJlYWtwb2ludChicmVha3BvaW50SWQsIGNvbmRpdGlvbiwg ZW5hYmxlZCk7CisgICAgICAgIHRoaXMuX21vZGVsLnJlbW92ZUJyZWFrcG9pbnQodGhpcy5fc291 cmNlRmlsZUlkLCBsaW5lTnVtYmVyKTsKICAgICB9LAogCiAgICAgZmluZEJyZWFrcG9pbnQ6IGZ1 bmN0aW9uKGxpbmVOdW1iZXIpCiAgICAgewotICAgICAgICB2YXIgdXJsID0gdGhpcy5fc2NyaXB0 LnNvdXJjZVVSTDsKLSAgICAgICAgdmFyIGxvY2F0aW9uID0gdGhpcy5fY29udGVudC5zb3VyY2VG cmFtZUxpbmVOdW1iZXJUb0FjdHVhbExvY2F0aW9uKGxpbmVOdW1iZXIpOwotICAgICAgICBmdW5j dGlvbiBmaWx0ZXIoYnJlYWtwb2ludCkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKGJyZWFr cG9pbnQudXJsKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnQudXJsICE9PSB1cmwp Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnQuc291cmNlSUQgIT09IGxvY2F0aW9uLnNv dXJjZUlEKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB9 Ci0gICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IGJyZWFrcG9pbnQubG9jYXRpb25zLmxlbmd0 aCA/IGJyZWFrcG9pbnQubG9jYXRpb25zWzBdLmxpbmVOdW1iZXIgOiBicmVha3BvaW50LmxpbmVO dW1iZXI7Ci0gICAgICAgICAgICByZXR1cm4gbGluZU51bWJlciA9PT0gbG9jYXRpb24ubGluZU51 bWJlcjsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9k ZWwucXVlcnlCcmVha3BvaW50cyhmaWx0ZXIpWzBdOworICAgICAgICByZXR1cm4gdGhpcy5fbW9k ZWwuZmluZEJyZWFrcG9pbnQodGhpcy5fc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKTsKICAgICB9 LAogCiAgICAgY29udGludWVUb0xpbmU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCiAgICAgewotICAg ICAgICB2YXIgbG9jYXRpb24gPSB0aGlzLl9jb250ZW50LnNvdXJjZUZyYW1lTGluZU51bWJlclRv QWN0dWFsTG9jYXRpb24obGluZU51bWJlcik7Ci0gICAgICAgIGlmIChsb2NhdGlvbi5zb3VyY2VJ RCkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNvbnRpbnVlVG9Mb2Nh dGlvbihsb2NhdGlvbi5zb3VyY2VJRCwgbG9jYXRpb24ubGluZU51bWJlciwgbG9jYXRpb24uY29s dW1uTnVtYmVyKTsKKyAgICAgICAgdGhpcy5fbW9kZWwuY29udGludWVUb0xpbmUodGhpcy5fc291 cmNlRmlsZUlkLCBsaW5lTnVtYmVyKTsKICAgICB9LAogCiAgICAgY2FuRWRpdFNjcmlwdFNvdXJj ZTogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRnJhbWUuanMKaW5kZXggMzEyMDE1OS4uMzVmZGZmZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC01MDUsMjAgKzUw NSwyMCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBDb25k aXRpb25hbCBCcmVha3BvaW504oCmIiksIGFkZENvbmRpdGlvbmFsQnJlYWtwb2ludC5iaW5kKHRo aXMpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIC8vIFRoaXMgcm93IGhhcyBhIGJy ZWFrcG9pbnQsIHdlIHdhbnQgdG8gc2hvdyBlZGl0IGFuZCByZW1vdmUgYnJlYWtwb2ludCwgYW5k IGVpdGhlciBkaXNhYmxlIG9yIGVuYWJsZS4KLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW1vdmUgQnJlYWtwb2ludCIpLCB0aGlzLl9k ZWxlZ2F0ZS5yZW1vdmVCcmVha3BvaW50LmJpbmQodGhpcy5fZGVsZWdhdGUsIGJyZWFrcG9pbnQu aWQpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJSZW1vdmUgQnJlYWtwb2ludCIpLCB0aGlzLl9kZWxlZ2F0ZS5yZW1vdmVCcmVha3Bv aW50LmJpbmQodGhpcy5fZGVsZWdhdGUsIGxpbmVOdW1iZXIpKTsKICAgICAgICAgICAgIGZ1bmN0 aW9uIGVkaXRCcmVha3BvaW50Q29uZGl0aW9uKCkKICAgICAgICAgICAgIHsKICAgICAgICAgICAg ICAgICBmdW5jdGlvbiBkaWRFZGl0QnJlYWtwb2ludENvbmRpdGlvbihjb21taXR0ZWQsIGNvbmRp dGlvbikKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChjb21taXR0 ZWQpCi0gICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS51cGRhdGVCcmVha3Bv aW50KGJyZWFrcG9pbnQuaWQsIGNvbmRpdGlvbiwgYnJlYWtwb2ludC5lbmFibGVkKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnVwZGF0ZUJyZWFrcG9pbnQobGluZU51 bWJlciwgY29uZGl0aW9uLCBicmVha3BvaW50LmVuYWJsZWQpOwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICB0aGlzLl9lZGl0QnJlYWtwb2ludENvbmRpdGlvbihsaW5lTnVtYmVy LCBicmVha3BvaW50LmNvbmRpdGlvbiwgZGlkRWRpdEJyZWFrcG9pbnRDb25kaXRpb24uYmluZCh0 aGlzKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KFdlYkluc3BlY3Rvci5VSVN0cmluZygiRWRpdCBCcmVha3BvaW504oCmIiksIGVkaXRCcmVha3Bv aW50Q29uZGl0aW9uLmJpbmQodGhpcykpOwogICAgICAgICAgICAgZnVuY3Rpb24gc2V0QnJlYWtw b2ludEVuYWJsZWQoZW5hYmxlZCkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB0aGlz Ll9kZWxlZ2F0ZS51cGRhdGVCcmVha3BvaW50KGJyZWFrcG9pbnQuaWQsIGJyZWFrcG9pbnQuY29u ZGl0aW9uLCBlbmFibGVkKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS51cGRhdGVC cmVha3BvaW50KGxpbmVOdW1iZXIsIGJyZWFrcG9pbnQuY29uZGl0aW9uLCBlbmFibGVkKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChicmVha3BvaW50LmVuYWJsZWQpCiAgICAgICAg ICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRp c2FibGUgQnJlYWtwb2ludCIpLCBzZXRCcmVha3BvaW50RW5hYmxlZC5iaW5kKHRoaXMsIGZhbHNl KSk7CkBAIC01NDcsOSArNTQ3LDkgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSB0aGlzLl9kZWxlZ2F0ZS5maW5kQnJlYWtw b2ludChsaW5lTnVtYmVyKTsKICAgICAgICAgaWYgKGJyZWFrcG9pbnQpIHsKICAgICAgICAgICAg IGlmIChldmVudC5zaGlmdEtleSkKLSAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS51cGRh dGVCcmVha3BvaW50KGJyZWFrcG9pbnQuaWQsIGJyZWFrcG9pbnQuY29uZGl0aW9uLCAhYnJlYWtw b2ludC5lbmFibGVkKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS51cGRhdGVCcmVh a3BvaW50KGxpbmVOdW1iZXIsIGJyZWFrcG9pbnQuY29uZGl0aW9uLCAhYnJlYWtwb2ludC5lbmFi bGVkKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5y ZW1vdmVCcmVha3BvaW50KGJyZWFrcG9pbnQuaWQpOworICAgICAgICAgICAgICAgIHRoaXMuX2Rl bGVnYXRlLnJlbW92ZUJyZWFrcG9pbnQobGluZU51bWJlcik7CiAgICAgICAgIH0gZWxzZQogICAg ICAgICAgICAgdGhpcy5fZGVsZWdhdGUuc2V0QnJlYWtwb2ludChsaW5lTnVtYmVyLCAiIiwgdHJ1 ZSk7CiAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CkBAIC04MTIsMTIgKzgxMiwxMiBA QCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IC8vIFNob3VsZCBiZSBpbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgogICAgIH0sCiAKLSAgICBy ZW1vdmVCcmVha3BvaW50OiBmdW5jdGlvbihicmVha3BvaW50SWQpCisgICAgcmVtb3ZlQnJlYWtw b2ludDogZnVuY3Rpb24obGluZU51bWJlcikKICAgICB7CiAgICAgICAgIC8vIFNob3VsZCBiZSBp bXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgogICAgIH0sCiAKLSAgICB1cGRhdGVCcmVha3BvaW50 OiBmdW5jdGlvbihicmVha3BvaW50SWQsIGNvbmRpdGlvbiwgZW5hYmxlZCkKKyAgICB1cGRhdGVC cmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCiAgICAg ewogICAgICAgICAvLyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KICAgICB9 LAo=