31052 2009-11-03 04:55:25 -0800 Web Inspector: Prepare for heap profiles upstreaming 2009-11-03 09:47:52 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 mnaganov webkit-unassigned apavlov commit-queue pfeldman timothy oldest_to_newest 160029 0 mnaganov 2009-11-03 04:55:25 -0800 Add new functionality by deleting some code ;) - pass profile type id from InspectorController; - this makes WebInspector.CPUProfile redundant---removed; - support multiple profile types when populating profiles. 160030 1 42367 mnaganov 2009-11-03 04:57:13 -0800 Created attachment 42367 proposed change 160045 2 42367 pfeldman 2009-11-03 06:34:22 -0800 Comment on attachment 42367 proposed change > - this.panels.profiles.addProfileHeader(WebInspector.CPUProfileType.TypeId, new WebInspector.CPUProfile(profile)); > + this.panels.profiles.addProfileHeader(profile.typeId, profile); If every profile has typeId from now on, should we pass single argument here? 160056 3 42378 mnaganov 2009-11-03 06:55:56 -0800 Created attachment 42378 proposed change, comments addressed 160096 4 42378 commit-queue 2009-11-03 09:47:48 -0800 Comment on attachment 42378 proposed change, comments addressed Clearing flags on attachment: 42378 Committed r50460: <http://trac.webkit.org/changeset/50460> 160097 5 commit-queue 2009-11-03 09:47:52 -0800 All reviewed patches have been landed. Closing bug. 42367 2009-11-03 04:57:13 -0800 2009-11-03 06:55:56 -0800 proposed change populate-multiple-profile-types-patch text/plain 4644 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzVjOTdlNi4uZjFjMDc5ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAwOS0xMS0wMyAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByZXBhcmUgZm9yIGhlYXAgcHJvZmlsZXMgdXBzdHJlYW1p bmc6CisgICAgICAgIC0gcGFzcyBwcm9maWxlIHR5cGUgaWQgZnJvbSBJbnNwZWN0b3JDb250cm9s bGVyOworICAgICAgICAtIHRoaXMgbWFrZXMgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGUgcmVkdW5k YW50LS0tcmVtb3ZlZDsKKyAgICAgICAgLSBzdXBwb3J0IG11bHRpcGxlIHByb2ZpbGUgdHlwZXMg d2hlbiBwb3B1bGF0aW5nIHByb2ZpbGVzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMTA1MgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 Y3JlYXRlUHJvZmlsZUhlYWRlcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVmlldy5wcm9maWxl Q2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVmlldy5wcm90b3R5cGUuX3NvcnREYXRhKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu YWRkUHJvZmlsZUhlYWRlcik6CisKIDIwMDktMTEtMDIgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6 YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwIGIvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggZWZmODAxNC4uMDMyNzAx NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTE0MDUs NiArMTQwNSw3IEBAIFNjcmlwdE9iamVjdCBJbnNwZWN0b3JDb250cm9sbGVyOjpjcmVhdGVQcm9m aWxlSGVhZGVyKGNvbnN0IEpTQzo6UHJvZmlsZSYgcHJvZmlsCiAgICAgU2NyaXB0T2JqZWN0IGhl YWRlciA9IG1fZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwogICAgIGhlYWRlci5zZXQoInRp dGxlIiwgcHJvZmlsZS50aXRsZSgpKTsKICAgICBoZWFkZXIuc2V0KCJ1aWQiLCBwcm9maWxlLnVp ZCgpKTsKKyAgICBoZWFkZXIuc2V0KCJ0eXBlSWQiLCBVU3RyaW5nKENQVVByb2ZpbGVUeXBlKSk7 CiAgICAgcmV0dXJuIGhlYWRlcjsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1By b2ZpbGVWaWV3LmpzCmluZGV4IGFmY2VkNDEuLjJiMWQyMzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKQEAgLTgzLDcgKzgzLDcgQEAgV2ViSW5zcGVjdG9y LkNQVVByb2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICB2YXIgc2VsZiA9IHRoaXM7 CiAgICAgZnVuY3Rpb24gcHJvZmlsZUNhbGxiYWNrKHByb2ZpbGUpCiAgICAgewotICAgICAgICBz ZWxmLnByb2ZpbGUucmVwcmVzZW50ZWRPYmplY3QgPSBwcm9maWxlOworICAgICAgICBzZWxmLnBy b2ZpbGUgPSBwcm9maWxlOwogICAgICAgICBzZWxmLl9hc3NpZ25QYXJlbnRzSW5Qcm9maWxlKCk7 CiAgICAgICAKICAgICAgICAgc2VsZi5wcm9maWxlRGF0YUdyaWRUcmVlID0gc2VsZi5ib3R0b21V cFByb2ZpbGVEYXRhR3JpZFRyZWU7CkBAIC01MDUsNyArNTA1LDcgQEAgV2ViSW5zcGVjdG9yLkNQ VVByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9zb3J0RGF0YTogZnVuY3Rpb24oZXZl bnQpCiAgICAgewotICAgICAgICB0aGlzLl9zb3J0UHJvZmlsZSh0aGlzLnByb2ZpbGUucmVwcmVz ZW50ZWRPYmplY3QpOworICAgICAgICB0aGlzLl9zb3J0UHJvZmlsZSh0aGlzLnByb2ZpbGUpOwog ICAgIH0sCiAKICAgICBfc29ydFByb2ZpbGU6IGZ1bmN0aW9uKCkKQEAgLTYxNiwyNiArNjE2LDMg QEAgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKIH0KIAogV2ViSW5z cGVjdG9yLkNQVVByb2ZpbGVUeXBlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3Iu UHJvZmlsZVR5cGUucHJvdG90eXBlOwotCi1XZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZSA9IGZ1bmN0 aW9uKHByb2ZpbGUpCi17Ci0gICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdCA9IHByb2ZpbGU7Ci0g ICAgdGhpcy50eXBlSWQgPSBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUuVHlwZUlkOwotfQot Ci1XZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZS5wcm90b3R5cGUgPSB7Ci0gICAgZ2V0IHRpdGxlKCkK LSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LnRpdGxlOwotICAg IH0sCi0KLSAgICBnZXQgdWlkKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLnJlcHJlc2Vu dGVkT2JqZWN0LnVpZDsKLSAgICB9LAotCi0gICAgZ2V0IGhlYWQoKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaGVhZDsKLSAgICB9Ci19CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4IGJhYzQ3MDIuLjdlMjVm MjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVs LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCkBA IC00MzMsMTEgKzQzMywxMiBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAKICAgICBfcG9wdWxhdGVQcm9maWxlczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg Ly8gRklYTUU6IFRoaXMgY29kZSBuZWVkcyB0byBiZSBhZGp1c3RlZCB3aGVuIG1vcmUgcHJvZmls aW5nIHR5cGVzIGFyZSBhZGRlZC4KLSAgICAgICAgLy8gQ3VycmVudGx5IGRlZmF1bHRzIHRvIENQ VSBwcm9maWxlcy4KLSAgICAgICAgdmFyIGNwdVByb2ZpbGVzID0gdGhpcy5nZXRQcm9maWxlVHlw ZShXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUuVHlwZUlkKS50cmVlRWxlbWVudDsKLSAgICAg ICAgaWYgKGNwdVByb2ZpbGVzLmNoaWxkcmVuLmxlbmd0aCkKLSAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgdmFyIHNpZGViYXJUcmVlQ2hpbGRyZW5Db3VudCA9IHRoaXMuc2lkZWJhclRyZWUu Y2hpbGRyZW4ubGVuZ3RoOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNpZGViYXJUcmVl Q2hpbGRyZW5Db3VudDsgKytpKSB7CisgICAgICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlz LnNpZGViYXJUcmVlLmNoaWxkcmVuW2ldOworICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50LmNo aWxkcmVuLmxlbmd0aCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KIAogICAg ICAgICBmdW5jdGlvbiBwb3B1bGF0ZUNhbGxiYWNrKHByb2ZpbGVIZWFkZXJzKSB7CiAgICAgICAg ICAgICBwcm9maWxlSGVhZGVycy5zb3J0KGZ1bmN0aW9uKGEsIGIpIHsgcmV0dXJuIGEudWlkIC0g Yi51aWQ7IH0pOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg ZTI1OWJjYy4uM2Y5YWQ4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCkBAIC0xMjkwLDcgKzEyOTAsNyBAQCBXZWJJbnNwZWN0b3IubG9nID0gZnVuY3Rpb24obWVz c2FnZSkKIAogV2ViSW5zcGVjdG9yLmFkZFByb2ZpbGVIZWFkZXIgPSBmdW5jdGlvbihwcm9maWxl KQogewotICAgIHRoaXMucGFuZWxzLnByb2ZpbGVzLmFkZFByb2ZpbGVIZWFkZXIoV2ViSW5zcGVj dG9yLkNQVVByb2ZpbGVUeXBlLlR5cGVJZCwgbmV3IFdlYkluc3BlY3Rvci5DUFVQcm9maWxlKHBy b2ZpbGUpKTsKKyAgICB0aGlzLnBhbmVscy5wcm9maWxlcy5hZGRQcm9maWxlSGVhZGVyKHByb2Zp bGUudHlwZUlkLCBwcm9maWxlKTsKIH0KIAogV2ViSW5zcGVjdG9yLnNldFJlY29yZGluZ1Byb2Zp bGUgPSBmdW5jdGlvbihpc1Byb2ZpbGluZykK 42378 2009-11-03 06:55:56 -0800 2009-11-03 09:47:48 -0800 proposed change, comments addressed populate-multiple-profile-types-patch-2 text/plain 5098 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzVjOTdlNi4uZGNhYzUyZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAwOS0xMS0wMyAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByZXBhcmUgZm9yIGhlYXAgcHJvZmlsZXMgdXBzdHJlYW1p bmc6CisgICAgICAgIC0gcGFzcyBwcm9maWxlIHR5cGUgaWQgZnJvbSBJbnNwZWN0b3JDb250cm9s bGVyOworICAgICAgICAtIHRoaXMgbWFrZXMgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGUgcmVkdW5k YW50LS0tcmVtb3ZlZDsKKyAgICAgICAgLSBzdXBwb3J0IG11bHRpcGxlIHByb2ZpbGUgdHlwZXMg d2hlbiBwb3B1bGF0aW5nIHByb2ZpbGVzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMTA1MgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 Y3JlYXRlUHJvZmlsZUhlYWRlcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVmlldy5wcm9maWxl Q2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVmlldy5wcm90b3R5cGUuX3NvcnREYXRhKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuYWRkUHJvZmlsZUhlYWRlcik6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuYWRkUHJvZmlsZUhlYWRlcik6CisKIDIwMDktMTEtMDIgIENocmlzIEZsZWl6YWNo ICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZp bi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw IGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggZWZmODAx NC4uMDMyNzAxNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAK QEAgLTE0MDUsNiArMTQwNSw3IEBAIFNjcmlwdE9iamVjdCBJbnNwZWN0b3JDb250cm9sbGVyOjpj cmVhdGVQcm9maWxlSGVhZGVyKGNvbnN0IEpTQzo6UHJvZmlsZSYgcHJvZmlsCiAgICAgU2NyaXB0 T2JqZWN0IGhlYWRlciA9IG1fZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwogICAgIGhlYWRl ci5zZXQoInRpdGxlIiwgcHJvZmlsZS50aXRsZSgpKTsKICAgICBoZWFkZXIuc2V0KCJ1aWQiLCBw cm9maWxlLnVpZCgpKTsKKyAgICBoZWFkZXIuc2V0KCJ0eXBlSWQiLCBVU3RyaW5nKENQVVByb2Zp bGVUeXBlKSk7CiAgICAgcmV0dXJuIGhlYWRlcjsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Byb2ZpbGVWaWV3LmpzCmluZGV4IGFmY2VkNDEuLjJiMWQyMzYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKQEAgLTgzLDcgKzgzLDcgQEAgV2Vi SW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICB2YXIgc2Vs ZiA9IHRoaXM7CiAgICAgZnVuY3Rpb24gcHJvZmlsZUNhbGxiYWNrKHByb2ZpbGUpCiAgICAgewot ICAgICAgICBzZWxmLnByb2ZpbGUucmVwcmVzZW50ZWRPYmplY3QgPSBwcm9maWxlOworICAgICAg ICBzZWxmLnByb2ZpbGUgPSBwcm9maWxlOwogICAgICAgICBzZWxmLl9hc3NpZ25QYXJlbnRzSW5Q cm9maWxlKCk7CiAgICAgICAKICAgICAgICAgc2VsZi5wcm9maWxlRGF0YUdyaWRUcmVlID0gc2Vs Zi5ib3R0b21VcFByb2ZpbGVEYXRhR3JpZFRyZWU7CkBAIC01MDUsNyArNTA1LDcgQEAgV2ViSW5z cGVjdG9yLkNQVVByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9zb3J0RGF0YTogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9zb3J0UHJvZmlsZSh0aGlzLnByb2Zp bGUucmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICB0aGlzLl9zb3J0UHJvZmlsZSh0aGlzLnBy b2ZpbGUpOwogICAgIH0sCiAKICAgICBfc29ydFByb2ZpbGU6IGZ1bmN0aW9uKCkKQEAgLTYxNiwy NiArNjE2LDMgQEAgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKIH0K IAogV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJ bnNwZWN0b3IuUHJvZmlsZVR5cGUucHJvdG90eXBlOwotCi1XZWJJbnNwZWN0b3IuQ1BVUHJvZmls ZSA9IGZ1bmN0aW9uKHByb2ZpbGUpCi17Ci0gICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdCA9IHBy b2ZpbGU7Ci0gICAgdGhpcy50eXBlSWQgPSBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUuVHlw ZUlkOwotfQotCi1XZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZS5wcm90b3R5cGUgPSB7Ci0gICAgZ2V0 IHRpdGxlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LnRp dGxlOwotICAgIH0sCi0KLSAgICBnZXQgdWlkKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlz LnJlcHJlc2VudGVkT2JqZWN0LnVpZDsKLSAgICB9LAotCi0gICAgZ2V0IGhlYWQoKQotICAgIHsK LSAgICAgICAgcmV0dXJuIHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaGVhZDsKLSAgICB9Ci19CmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4IGJhYzQ3 MDIuLmFkZjBhMjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1Bh bmVsLmpzCkBAIC0yMTAsOCArMjEwLDkgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICByZXR1cm4gZXNjYXBlKHRleHQpICsgJy8nICsgZXNjYXBlKHBy b2ZpbGVUeXBlSWQpOwogICAgIH0sCiAKLSAgICBhZGRQcm9maWxlSGVhZGVyOiBmdW5jdGlvbih0 eXBlSWQsIHByb2ZpbGUpCisgICAgYWRkUHJvZmlsZUhlYWRlcjogZnVuY3Rpb24ocHJvZmlsZSkK ICAgICB7CisgICAgICAgIHZhciB0eXBlSWQgPSBwcm9maWxlLnR5cGVJZDsKICAgICAgICAgdmFy IHByb2ZpbGVUeXBlID0gdGhpcy5nZXRQcm9maWxlVHlwZSh0eXBlSWQpOwogICAgICAgICB2YXIg c2lkZWJhclBhcmVudCA9IHByb2ZpbGVUeXBlLnRyZWVFbGVtZW50OwogICAgICAgICB2YXIgc21h bGwgPSBmYWxzZTsKQEAgLTQzMywxMSArNDM0LDEyIEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1Bh bmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9wb3B1bGF0ZVByb2ZpbGVzOiBmdW5jdGlvbigpCiAg ICAgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBjb2RlIG5lZWRzIHRvIGJlIGFkanVzdGVkIHdo ZW4gbW9yZSBwcm9maWxpbmcgdHlwZXMgYXJlIGFkZGVkLgotICAgICAgICAvLyBDdXJyZW50bHkg ZGVmYXVsdHMgdG8gQ1BVIHByb2ZpbGVzLgotICAgICAgICB2YXIgY3B1UHJvZmlsZXMgPSB0aGlz LmdldFByb2ZpbGVUeXBlKFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVHlwZS5UeXBlSWQpLnRyZWVF bGVtZW50OwotICAgICAgICBpZiAoY3B1UHJvZmlsZXMuY2hpbGRyZW4ubGVuZ3RoKQotICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB2YXIgc2lkZWJhclRyZWVDaGlsZHJlbkNvdW50ID0gdGhp cy5zaWRlYmFyVHJlZS5jaGlsZHJlbi5sZW5ndGg7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgc2lkZWJhclRyZWVDaGlsZHJlbkNvdW50OyArK2kpIHsKKyAgICAgICAgICAgIHZhciB0cmVl RWxlbWVudCA9IHRoaXMuc2lkZWJhclRyZWUuY2hpbGRyZW5baV07CisgICAgICAgICAgICBpZiAo dHJlZUVsZW1lbnQuY2hpbGRyZW4ubGVuZ3RoKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIHBvcHVsYXRlQ2FsbGJhY2socHJvZmlsZUhlYWRl cnMpIHsKICAgICAgICAgICAgIHByb2ZpbGVIZWFkZXJzLnNvcnQoZnVuY3Rpb24oYSwgYikgeyBy ZXR1cm4gYS51aWQgLSBiLnVpZDsgfSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcwppbmRleCBlMjU5YmNjLi5iOTg1MmZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKQEAgLTEyOTAsNyArMTI5MCw3IEBAIFdlYkluc3BlY3Rvci5sb2cg PSBmdW5jdGlvbihtZXNzYWdlKQogCiBXZWJJbnNwZWN0b3IuYWRkUHJvZmlsZUhlYWRlciA9IGZ1 bmN0aW9uKHByb2ZpbGUpCiB7Ci0gICAgdGhpcy5wYW5lbHMucHJvZmlsZXMuYWRkUHJvZmlsZUhl YWRlcihXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUuVHlwZUlkLCBuZXcgV2ViSW5zcGVjdG9y LkNQVVByb2ZpbGUocHJvZmlsZSkpOworICAgIHRoaXMucGFuZWxzLnByb2ZpbGVzLmFkZFByb2Zp bGVIZWFkZXIocHJvZmlsZSk7CiB9CiAKIFdlYkluc3BlY3Rvci5zZXRSZWNvcmRpbmdQcm9maWxl ID0gZnVuY3Rpb24oaXNQcm9maWxpbmcpCg==