85623 2012-05-04 07:53:10 -0700 Web Inspector: eliminate temporaryProfile property in ProfilesPanel. 2012-05-04 08:23:56 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 616216 0 loislo 2012-05-04 07:53:10 -0700 current implementation of ProfilesPanel is a bit messy. It uses a single property _temporaryProfile for the all kind of profilers. But it is possible to run different profilers simultaneously. 616220 1 140227 loislo 2012-05-04 07:57:34 -0700 Created attachment 140227 Patch 616248 2 loislo 2012-05-04 08:23:56 -0700 Committed r116104: <http://trac.webkit.org/changeset/116104> 140227 2012-05-04 07:57:34 -0700 2012-05-04 08:01:34 -0700 Patch bug-85623-20120504185732.patch text/plain 14252 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY1NGM0Njg2YjU2MDM5 NDVhZmIxMWU0N2M5NzFhMmMyZTUwYjgxNS4uNjNiZjFmOWExYzg1NGEzNTBjZDdkOTE0ZDFmZjU1 YzQyMmE3ODFkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEyLTA1LTA0ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBlbGltaW5hdGUgdGVtcG9yYXJ5UHJvZmlsZSBwcm9wZXJ0eSBmcm9tIFByb2ZpbGVzUGFu ZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTYy MworCisgICAgICAgIFdlIGNhbiBydW4gZGlmZmVyZW50IHByb2ZpbGVycyBhdCB0aGUgc2FtZSB0 aW1lIHRoZXJlZm9yZSB3ZSBoYXZlIHRvIGtlZXAgdGVtb3JhcnkgcHJvZmlsZSBwZXIgcHJvZmls ZXIgdHlwZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ1NTU2VsZWN0b3JQcm9maWxlVmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DU1NTZWxlY3RvclByb2ZpbGVUeXBlLnByb3RvdHlwZS5jcmVhdGVW aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTZWxlY3RvclByb2ZpbGVUeXBlLnByb3Rv dHlwZS5jcmVhdGVUZW1wb3JhcnlQcm9maWxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NT ZWxlY3RvclByb2ZpbGVUeXBlLnByb3RvdHlwZS5jcmVhdGVQcm9maWxlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSGVhcFNuYXBzaG90UHJvZmlsZVR5cGUucHJvdG90eXBlLmNyZWF0ZVZpZXcpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2ZpbGVUeXBlLnByb3RvdHlwZS5jcmVh dGVUZW1wb3JhcnlQcm9maWxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQ cm9maWxlVHlwZS5wcm90b3R5cGUuY3JlYXRlUHJvZmlsZSk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DUFVQcm9m aWxlVHlwZS5wcm90b3R5cGUuc3RhcnRSZWNvcmRpbmdQcm9maWxlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5DUFVQcm9maWxlVHlwZS5wcm90b3R5cGUuY3JlYXRlVmlldyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUucHJvdG90eXBlLmNyZWF0ZVRlbXBvcmFyeVByb2Zp bGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLnByb3RvdHlwZS5jcmVh dGVQcm9maWxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGUucHJvdG90eXBlLmNyZWF0ZVNp ZGViYXJUcmVlRWxlbWVudEZvclByb2ZpbGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2Zp bGVUeXBlLnByb3RvdHlwZS5jcmVhdGVUZW1wb3JhcnlQcm9maWxlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qcm9maWxlVHlwZS5wcm90b3R5cGUuY3JlYXRlUHJvZmlsZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZUhlYWRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFBy b2ZpbGVIZWFkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90 eXBlLmFkZFByb2ZpbGVIZWFkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFu ZWwucHJvdG90eXBlLmZpbmRUZW1wb3JhcnlQcm9maWxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fcmVtb3ZlVGVtcG9yYXJ5UHJvZmlsZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuX3BvcHVsYXRlUHJvZmls ZXMucG9wdWxhdGVDYWxsYmFjay52YXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVz UGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZVByb2ZpbGVzLnBvcHVsYXRlQ2FsbGJhY2spOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZVByb2Zp bGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5zZXRS ZWNvcmRpbmdQcm9maWxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnBy b3RvdHlwZS50YWtlSGVhcFNuYXBzaG90KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxl c1BhbmVsLnByb3RvdHlwZS5fcmVwb3J0SGVhcFNuYXBzaG90UHJvZ3Jlc3MpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlByb2ZpbGVyRGlzcGF0Y2hlci5wcm90b3R5cGUuYWRkUHJvZmlsZUhlYWRl cik6CisKIDIwMTItMDUtMDQgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3Nz YS5vcmc+CiAKICAgICAgICAgW1F0XSBCdWlsZCBmaXggd2hlbiB1c2luZyBsaWJwbmcgdmVyc2lv biA+IDEuMi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q1NTU2VsZWN0b3JQcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ1NTU2VsZWN0b3JQcm9maWxlVmlldy5qcwppbmRleCA3YmE5M2NiZGI2NTU4MjZmMDQz NmEwMzY4NTU5NjVhYmE5MmY0NmFlLi4wZDNjMzY2ODFlM2VlMTU5MTIyZDlhODEyZmY0MDdlM2Qw YjNmNDM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NT U1NlbGVjdG9yUHJvZmlsZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9DU1NTZWxlY3RvclByb2ZpbGVWaWV3LmpzCkBAIC0zNDksNiArMzQ5LDE2IEBAIFdl Ykluc3BlY3Rvci5DU1NTZWxlY3RvclByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAgICBjcmVh dGVWaWV3OiBmdW5jdGlvbihwcm9maWxlKQogICAgIHsKICAgICAgICAgcmV0dXJuIG5ldyBXZWJJ bnNwZWN0b3IuQ1NTU2VsZWN0b3JQcm9maWxlVmlldyhwcm9maWxlKTsKKyAgICB9LAorCisgICAg Y3JlYXRlVGVtcG9yYXJ5UHJvZmlsZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJu IG5ldyBXZWJJbnNwZWN0b3IuUHJvZmlsZUhlYWRlcihXZWJJbnNwZWN0b3IuQ1NTU2VsZWN0b3JQ cm9maWxlVHlwZS5UeXBlSWQsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVjb3JkaW5nXHUyMDI2 IikpOworICAgIH0sCisKKyAgICBjcmVhdGVQcm9maWxlOiBmdW5jdGlvbihwcm9maWxlKQorICAg IHsKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUHJvZmlsZUhlYWRlcihwcm9maWxl LnR5cGVJZCwgcHJvZmlsZS50aXRsZSwgcHJvZmlsZS51aWQpOwogICAgIH0KIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RWaWV3 LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RWaWV3 LmpzCmluZGV4IDE0MjA1ZjRhNTUzYzAyYWQ1ZmYwMDNlODMyOGIwNDJiYjlkYmQ0NWIuLjhjMDA2 NTY2MWZmNjUzZWE1YmZkZDQ2ZWQ0ZjUwZTEyYWI1ZTJkOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Vmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFZpZXcuanMKQEAgLTc0 Nyw2ICs3NDcsMTYgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2ZpbGVUeXBlLnByb3Rv dHlwZSA9IHsKICAgICBjcmVhdGVWaWV3OiBmdW5jdGlvbihwcm9maWxlKQogICAgIHsKICAgICAg ICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90VmlldyhXZWJJbnNwZWN0b3Iu cGFuZWxzLnByb2ZpbGVzLCBwcm9maWxlKTsKKyAgICB9LAorCisgICAgY3JlYXRlVGVtcG9yYXJ5 UHJvZmlsZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0 b3IuUHJvZmlsZUhlYWRlcihXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJvZmlsZVR5cGUuVHlw ZUlkLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNuYXBzaG90dGluZ1x1MjAyNiIpKTsKKyAgICB9 LAorCisgICAgY3JlYXRlUHJvZmlsZTogZnVuY3Rpb24ocHJvZmlsZSkKKyAgICB7CisgICAgICAg IHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkhlYXBQcm9maWxlSGVhZGVyKHByb2ZpbGUudHlwZUlk LCBwcm9maWxlLnRpdGxlLCBwcm9maWxlLnVpZCwgcHJvZmlsZS5tYXhKU09iamVjdElkKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UHJvZmlsZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2Zp bGVWaWV3LmpzCmluZGV4IDY2OWYyNDYzYWFkNjk4NmJiZWEyMDQzYThjMzBlYTVhMmRhYTUxZTMu LjgwOWNjYWE0MDQzYjU2MTJlNGU3Y2YzYTE3ZWFhMzJlMmY5MGZiYWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwpAQCAtNTkzLDYg KzU5Myw3IEBAIFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVHlwZS5wcm90b3R5cGUgPSB7CiAgICAg c3RhcnRSZWNvcmRpbmdQcm9maWxlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9y ZWNvcmRpbmcgPSB0cnVlOworICAgICAgICBXZWJJbnNwZWN0b3IudXNlck1ldHJpY3MuUHJvZmls ZXNDUFVQcm9maWxlVGFrZW4ucmVjb3JkKCk7CiAgICAgICAgIFByb2ZpbGVyQWdlbnQuc3RhcnQo KTsKICAgICB9LAogCkBAIC02MTUsNiArNjE2LDE2IEBAIFdlYkluc3BlY3Rvci5DUFVQcm9maWxl VHlwZS5wcm90b3R5cGUgPSB7CiAgICAgY3JlYXRlVmlldzogZnVuY3Rpb24ocHJvZmlsZSkKICAg ICB7CiAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3KHByb2Zp bGUpOworICAgIH0sCisKKyAgICBjcmVhdGVUZW1wb3JhcnlQcm9maWxlOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Qcm9maWxlSGVhZGVyKFdlYklu c3BlY3Rvci5DUFVQcm9maWxlVHlwZS5UeXBlSWQsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVj b3JkaW5nXHUyMDI2IikpOworICAgIH0sCisKKyAgICBjcmVhdGVQcm9maWxlOiBmdW5jdGlvbihw cm9maWxlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUHJvZmlsZUhl YWRlcihwcm9maWxlLnR5cGVJZCwgcHJvZmlsZS50aXRsZSwgcHJvZmlsZS51aWQpOwogICAgIH0K IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9m aWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxl c1BhbmVsLmpzCmluZGV4IGY3YWRiNDRlMDIyNzNhNzc3YzU2YmEyNWUwYmFjYTkwMDM5ZDVjNTgu LmY0M2JmOTgwZjRkNDkxYjE0ZjhlZTdlNGE1ZWMxNjY5ZDUxNTg2ODYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTg3 LDYgKzg3LDE4IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVHlwZS5wcm90b3R5cGUgPSB7CiAgICAg Y3JlYXRlU2lkZWJhclRyZWVFbGVtZW50Rm9yUHJvZmlsZTogZnVuY3Rpb24ocHJvZmlsZSkKICAg ICB7CiAgICAgICAgIHRocm93IG5ldyBFcnJvcigiTmVlZHMgaW1wbGVtZW50ZWQuIik7CisgICAg fSwKKworICAgIC8vIE11c3QgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KKyAgICBjcmVh dGVUZW1wb3JhcnlQcm9maWxlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aHJvdyBuZXcg RXJyb3IoIk5lZWRzIGltcGxlbWVudGVkLiIpOworICAgIH0sCisKKyAgICAvLyBNdXN0IGJlIGlt cGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCisgICAgY3JlYXRlUHJvZmlsZTogZnVuY3Rpb24ocHJv ZmlsZSkKKyAgICB7CisgICAgICAgIHRocm93IG5ldyBFcnJvcigiTmVlZHMgaW1wbGVtZW50ZWQu Iik7CiAgICAgfQogfQogCkBAIC0xMDIsMTYgKzExNCwzMiBAQCBXZWJJbnNwZWN0b3IucmVnaXN0 ZXJMaW5raWZpZXJQbHVnaW4oZnVuY3Rpb24odGl0bGUpCiAgKiBAY29uc3RydWN0b3IKICAqIEBw YXJhbSB7c3RyaW5nfSBwcm9maWxlVHlwZQogICogQHBhcmFtIHtzdHJpbmd9IHRpdGxlCi0gKiBA cGFyYW0ge251bWJlcn0gdWlkCi0gKiBAcGFyYW0ge251bWJlcn0gbWF4SlNPYmplY3RJZAotICog QHBhcmFtIHtib29sZWFufSBpc1RlbXBvcmFyeQorICogQHBhcmFtIHtudW1iZXI9fSB1aWQKICAq LwotV2ViSW5zcGVjdG9yLlByb2ZpbGVIZWFkZXIgPSBmdW5jdGlvbihwcm9maWxlVHlwZSwgdGl0 bGUsIHVpZCwgbWF4SlNPYmplY3RJZCwgaXNUZW1wb3JhcnkpCitXZWJJbnNwZWN0b3IuUHJvZmls ZUhlYWRlciA9IGZ1bmN0aW9uKHByb2ZpbGVUeXBlLCB0aXRsZSwgdWlkKQogewogICAgIHRoaXMu dHlwZUlkID0gcHJvZmlsZVR5cGUsCiAgICAgdGhpcy50aXRsZSA9IHRpdGxlOwotICAgIHRoaXMu dWlkID0gdWlkOwotICAgIHRoaXMuaXNUZW1wb3JhcnkgPSBpc1RlbXBvcmFyeTsKKyAgICBpZiAo dWlkID09PSB1bmRlZmluZWQpIHsKKyAgICAgICAgdGhpcy51aWQgPSAtMTsKKyAgICAgICAgdGhp cy5pc1RlbXBvcmFyeSA9IHRydWU7CisgICAgfSBlbHNlIHsKKyAgICAgICAgdGhpcy51aWQgPSB1 aWQ7CisgICAgICAgIHRoaXMuaXNUZW1wb3JhcnkgPSBmYWxzZTsKKyAgICB9Cit9CisKKy8qKgor ICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlByb2ZpbGVIZWFkZXJ9 CisgKiBAcGFyYW0ge3N0cmluZ30gcHJvZmlsZVR5cGUKKyAqIEBwYXJhbSB7c3RyaW5nfSB0aXRs ZQorICogQHBhcmFtIHtudW1iZXJ9IHVpZAorICogQHBhcmFtIHtudW1iZXJ9IG1heEpTT2JqZWN0 SWQKKyAqLworV2ViSW5zcGVjdG9yLkhlYXBQcm9maWxlSGVhZGVyID0gZnVuY3Rpb24ocHJvZmls ZVR5cGUsIHRpdGxlLCB1aWQsIG1heEpTT2JqZWN0SWQpCit7CisgICAgV2ViSW5zcGVjdG9yLlBy b2ZpbGVIZWFkZXIuY2FsbCh0aGlzLCBwcm9maWxlVHlwZSwgdGl0bGUsIHVpZCk7CiAgICAgdGhp cy5tYXhKU09iamVjdElkID0gbWF4SlNPYmplY3RJZDsKIH0KIApAQCAtMzA1LDE0ICszMzMsMTIg QEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gZXNjYXBlKHRleHQpICsgJy8nICsgZXNjYXBlKHByb2ZpbGVUeXBlSWQpOwogICAgIH0sCiAK LQogICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlByb2ZpbGVIZWFkZXJ9IHBy b2ZpbGUKICAgICAgKi8KICAgICBhZGRQcm9maWxlSGVhZGVyOiBmdW5jdGlvbihwcm9maWxlKQog ICAgIHsKLSAgICAgICAgaWYgKHRoaXMuaGFzVGVtcG9yYXJ5UHJvZmlsZShwcm9maWxlLnR5cGVJ ZCkpCi0gICAgICAgICAgICB0aGlzLl9yZW1vdmVUZW1wb3JhcnlQcm9maWxlKCk7CisgICAgICAg IHRoaXMuX3JlbW92ZVRlbXBvcmFyeVByb2ZpbGUocHJvZmlsZS50eXBlSWQpOwogCiAgICAgICAg IHZhciB0eXBlSWQgPSBwcm9maWxlLnR5cGVJZDsKICAgICAgICAgdmFyIHByb2ZpbGVUeXBlID0g dGhpcy5nZXRQcm9maWxlVHlwZSh0eXBlSWQpOwpAQCAtMzczLDcgKzM5OSw2IEBAIFdlYkluc3Bl Y3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGlmICghdGhpcy52 aXNpYmxlVmlldykKICAgICAgICAgICAgICAgICB0aGlzLnNob3dQcm9maWxlKHByb2ZpbGUpOwog ICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoInByb2ZpbGUgYWRkZWQi KTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl90ZW1wb3JhcnlSZWNvcmRpbmdQcm9maWxlOwog ICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlBy b2ZpbGVzUGFuZWwuRXZlbnRUeXBlcy5Qcm9maWxlRmluaXNoZWQpOwogICAgICAgICAgICAgdGhp cy5yZWNvcmRCdXR0b24udG9nZ2xlZCA9IGZhbHNlOwogICAgICAgICB9IGVsc2UgewpAQCAtMzg0 LDEyICs0MDksNiBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMucmVjb3JkQnV0dG9uLnRpdGxlID0gdGhpcy5fc2VsZWN0ZWRQcm9maWxlVHlw ZS5idXR0b25Ub29sdGlwOwogICAgIH0sCiAKLSAgICBfcmVtb3ZlVGVtcG9yYXJ5UHJvZmlsZTog ZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5fcmVtb3ZlUHJvZmlsZUhlYWRlcih0aGlz Ll90ZW1wb3JhcnlSZWNvcmRpbmdQcm9maWxlKTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX3RlbXBv cmFyeVJlY29yZGluZ1Byb2ZpbGU7Ci0gICAgfSwKLQogICAgIF9yZW1vdmVQcm9maWxlSGVhZGVy OiBmdW5jdGlvbihwcm9maWxlKQogICAgIHsKICAgICAgICAgdmFyIHR5cGVJZCA9IHByb2ZpbGUu dHlwZUlkOwpAQCAtNDU2LDEzICs0NzUsMjAgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0sCiAKLSAgICBoYXNU ZW1wb3JhcnlQcm9maWxlOiBmdW5jdGlvbih0eXBlSWQpCisgICAgZmluZFRlbXBvcmFyeVByb2Zp bGU6IGZ1bmN0aW9uKHR5cGVJZCkKICAgICB7CiAgICAgICAgIHZhciBwcm9maWxlc0NvdW50ID0g dGhpcy5fcHJvZmlsZXMubGVuZ3RoOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb2Zp bGVzQ291bnQ7ICsraSkKICAgICAgICAgICAgIGlmICh0aGlzLl9wcm9maWxlc1tpXS50eXBlSWQg PT09IHR5cGVJZCAmJiB0aGlzLl9wcm9maWxlc1tpXS5pc1RlbXBvcmFyeSkKLSAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAg IHJldHVybiB0aGlzLl9wcm9maWxlc1tpXTsKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfSwK KworICAgIF9yZW1vdmVUZW1wb3JhcnlQcm9maWxlOiBmdW5jdGlvbih0eXBlSWQpCisgICAgewor ICAgICAgICB2YXIgdGVtcG9yYXJ5UHJvZmlsZSA9IHRoaXMuZmluZFRlbXBvcmFyeVByb2ZpbGUo dHlwZUlkKTsKKyAgICAgICAgaWYgKHRlbXBvcmFyeVByb2ZpbGUpCisgICAgICAgICAgICB0aGlz Ll9yZW1vdmVQcm9maWxlSGVhZGVyKHRlbXBvcmFyeVByb2ZpbGUpOwogICAgIH0sCiAKICAgICBo YXNQcm9maWxlOiBmdW5jdGlvbihwcm9maWxlKQpAQCAtODI1LDkgKzg1MSwxMyBAQCBXZWJJbnNw ZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICAgICAgcHJvZmlsZUhlYWRlcnMuc29ydChmdW5jdGlvbihhLCBiKSB7IHJldHVy biBhLnVpZCAtIGIudWlkOyB9KTsKICAgICAgICAgICAgIHZhciBwcm9maWxlSGVhZGVyc0xlbmd0 aCA9IHByb2ZpbGVIZWFkZXJzLmxlbmd0aDsKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgcHJvZmlsZUhlYWRlcnNMZW5ndGg7ICsraSkKLSAgICAgICAgICAgICAgICBpZiAoIXRoaXMu aGFzUHJvZmlsZShwcm9maWxlSGVhZGVyc1tpXSkpCi0gICAgICAgICAgICAgICAgICAgdGhpcy5h ZGRQcm9maWxlSGVhZGVyKHByb2ZpbGVIZWFkZXJzW2ldKTsKKyAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgcHJvZmlsZUhlYWRlcnNMZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAg IHZhciBwcm9maWxlSGVhZGVyID0gcHJvZmlsZUhlYWRlcnNbaV07CisgICAgICAgICAgICAgICAg aWYgKCF0aGlzLmhhc1Byb2ZpbGUocHJvZmlsZUhlYWRlcikpIHsKKyAgICAgICAgICAgICAgICAg ICAgdmFyIHByb2ZpbGVUeXBlID0gdGhpcy5nZXRQcm9maWxlVHlwZShwcm9maWxlSGVhZGVyLnR5 cGVJZCk7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuYWRkUHJvZmlsZUhlYWRlcihwcm9maWxl VHlwZS5jcmVhdGVQcm9maWxlKHByb2ZpbGVIZWFkZXIpKTsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICBQcm9maWxlckFnZW50LmdldFByb2Zp bGVIZWFkZXJzKHBvcHVsYXRlQ2FsbGJhY2suYmluZCh0aGlzKSk7CkBAIC04NDQsMzEgKzg3NCwy NSBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBzZXRS ZWNvcmRpbmdQcm9maWxlOiBmdW5jdGlvbihwcm9maWxlVHlwZSwgaXNQcm9maWxpbmcpCiAgICAg ewotICAgICAgICB0aGlzLmdldFByb2ZpbGVUeXBlKHByb2ZpbGVUeXBlKS5zZXRSZWNvcmRpbmdQ cm9maWxlKGlzUHJvZmlsaW5nKTsKLSAgICAgICAgaWYgKHRoaXMuaGFzVGVtcG9yYXJ5UHJvZmls ZShwcm9maWxlVHlwZSkgIT09IGlzUHJvZmlsaW5nKSB7Ci0gICAgICAgICAgICBpZiAoIXRoaXMu X3RlbXBvcmFyeVJlY29yZGluZ1Byb2ZpbGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fdGVtcG9y YXJ5UmVjb3JkaW5nUHJvZmlsZSA9IG5ldyBXZWJJbnNwZWN0b3IuUHJvZmlsZUhlYWRlcihwcm9m aWxlVHlwZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWNvcmRpbmdcdTIwMjYiKSwgLTEsIC0x LCB0cnVlKTsKLSAgICAgICAgICAgIGlmIChpc1Byb2ZpbGluZykgewotICAgICAgICAgICAgICAg IHRoaXMuYWRkUHJvZmlsZUhlYWRlcih0aGlzLl90ZW1wb3JhcnlSZWNvcmRpbmdQcm9maWxlKTsK LSAgICAgICAgICAgICAgICBpZiAocHJvZmlsZVR5cGUgPT09IFdlYkluc3BlY3Rvci5DUFVQcm9m aWxlVHlwZS5UeXBlSWQpCi0gICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci51c2VyTWV0 cmljcy5Qcm9maWxlc0NQVVByb2ZpbGVUYWtlbi5yZWNvcmQoKTsKLSAgICAgICAgICAgIH0gZWxz ZQotICAgICAgICAgICAgICAgIHRoaXMuX3JlbW92ZVRlbXBvcmFyeVByb2ZpbGUoKQotICAgICAg ICB9CisgICAgICAgIHZhciBwcm9maWxlVHlwZU9iamVjdCA9IHRoaXMuZ2V0UHJvZmlsZVR5cGUo cHJvZmlsZVR5cGUpOworICAgICAgICBwcm9maWxlVHlwZU9iamVjdC5zZXRSZWNvcmRpbmdQcm9m aWxlKGlzUHJvZmlsaW5nKTsKKyAgICAgICAgdmFyIHRlbXBvcmFyeVByb2ZpbGUgPSB0aGlzLmZp bmRUZW1wb3JhcnlQcm9maWxlKHByb2ZpbGVUeXBlKTsKKyAgICAgICAgaWYgKCEhdGVtcG9yYXJ5 UHJvZmlsZSA9PT0gaXNQcm9maWxpbmcpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlm ICghdGVtcG9yYXJ5UHJvZmlsZSkKKyAgICAgICAgICAgIHRlbXBvcmFyeVByb2ZpbGUgPSBwcm9m aWxlVHlwZU9iamVjdC5jcmVhdGVUZW1wb3JhcnlQcm9maWxlKCk7CisgICAgICAgIGlmIChpc1By b2ZpbGluZykKKyAgICAgICAgICAgIHRoaXMuYWRkUHJvZmlsZUhlYWRlcih0ZW1wb3JhcnlQcm9m aWxlKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fcmVtb3ZlVGVtcG9yYXJ5UHJv ZmlsZShwcm9maWxlVHlwZSk7CiAgICAgfSwKIAogICAgIHRha2VIZWFwU25hcHNob3Q6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5oYXNUZW1wb3JhcnlQcm9maWxlKFdlYklu c3BlY3Rvci5IZWFwU25hcHNob3RQcm9maWxlVHlwZS5UeXBlSWQpKSB7Ci0gICAgICAgICAgICBp ZiAoIXRoaXMuX3RlbXBvcmFyeVJlY29yZGluZ1Byb2ZpbGUpIHsKLSAgICAgICAgICAgICAgICB0 aGlzLl90ZW1wb3JhcnlSZWNvcmRpbmdQcm9maWxlID0gbmV3IFdlYkluc3BlY3Rvci5Qcm9maWxl SGVhZGVyKAotICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJv ZmlsZVR5cGUuVHlwZUlkLAotICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlNuYXBzaG90dGluZ1x1MjAyNiIpLAotICAgICAgICAgICAgICAgICAgICAtMSwKLSAgICAg ICAgICAgICAgICAgICAgLTEsCi0gICAgICAgICAgICAgICAgICAgIHRydWUpOwotICAgICAgICAg ICAgfQotICAgICAgICAgICAgdGhpcy5hZGRQcm9maWxlSGVhZGVyKHRoaXMuX3RlbXBvcmFyeVJl Y29yZGluZ1Byb2ZpbGUpOworICAgICAgICB2YXIgdGVtcG9yYXJ5UmVjb3JkaW5nUHJvZmlsZSA9 IHRoaXMuZmluZFRlbXBvcmFyeVByb2ZpbGUoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2Zp bGVUeXBlLlR5cGVJZCk7CisgICAgICAgIGlmICghdGVtcG9yYXJ5UmVjb3JkaW5nUHJvZmlsZSkg eworICAgICAgICAgICAgdmFyIHByb2ZpbGVUeXBlT2JqZWN0ID0gdGhpcy5nZXRQcm9maWxlVHlw ZShXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJvZmlsZVR5cGUuVHlwZUlkKTsKKyAgICAgICAg ICAgIHRoaXMuYWRkUHJvZmlsZUhlYWRlcihwcm9maWxlVHlwZU9iamVjdC5jcmVhdGVUZW1wb3Jh cnlQcm9maWxlKCkpOwogICAgICAgICB9CiAgICAgICAgIFByb2ZpbGVyQWdlbnQudGFrZUhlYXBT bmFwc2hvdCgpOwogICAgICAgICBXZWJJbnNwZWN0b3IudXNlck1ldHJpY3MuUHJvZmlsZXNIZWFw UHJvZmlsZVRha2VuLnJlY29yZCgpOwpAQCAtODc2LDExICs5MDAsMTIgQEAgV2ViSW5zcGVjdG9y LlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgX3JlcG9ydEhlYXBTbmFwc2hvdFBy b2dyZXNzOiBmdW5jdGlvbihkb25lLCB0b3RhbCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLmhh c1RlbXBvcmFyeVByb2ZpbGUoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2ZpbGVUeXBlLlR5 cGVJZCkpIHsKLSAgICAgICAgICAgIHRoaXMuX3RlbXBvcmFyeVJlY29yZGluZ1Byb2ZpbGUuc2lk ZWJhckVsZW1lbnQuc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiUuMmYlIiwgKGRv bmUgLyB0b3RhbCkgKiAxMDApOwotICAgICAgICAgICAgdGhpcy5fdGVtcG9yYXJ5UmVjb3JkaW5n UHJvZmlsZS5zaWRlYmFyRWxlbWVudC53YWl0ID0gdHJ1ZTsKKyAgICAgICAgdmFyIHRlbXBvcmFy eVByb2ZpbGUgPSB0aGlzLmZpbmRUZW1wb3JhcnlQcm9maWxlKFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RQcm9maWxlVHlwZS5UeXBlSWQpOworICAgICAgICBpZiAodGVtcG9yYXJ5UHJvZmlsZSkg eworICAgICAgICAgICAgdGVtcG9yYXJ5UHJvZmlsZS5zaWRlYmFyRWxlbWVudC5zdWJ0aXRsZSA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiUiLCAoZG9uZSAvIHRvdGFsKSAqIDEwMCk7Cisg ICAgICAgICAgICB0ZW1wb3JhcnlQcm9maWxlLnNpZGViYXJFbGVtZW50LndhaXQgPSB0cnVlOwog ICAgICAgICAgICAgaWYgKGRvbmUgPj0gdG90YWwpCi0gICAgICAgICAgICAgICAgdGhpcy5fcmVt b3ZlVGVtcG9yYXJ5UHJvZmlsZSgpOworICAgICAgICAgICAgICAgIHRoaXMuX3JlbW92ZVRlbXBv cmFyeVByb2ZpbGUoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2ZpbGVUeXBlLlR5cGVJZCk7 CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC05MDcsNyArOTMyLDggQEAgV2ViSW5zcGVjdG9yLlBy b2ZpbGVyRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgYWRkUHJvZmlsZUhl YWRlcjogZnVuY3Rpb24ocHJvZmlsZSkKICAgICB7Ci0gICAgICAgIHRoaXMuX3Byb2ZpbGVyLmFk ZFByb2ZpbGVIZWFkZXIobmV3IFdlYkluc3BlY3Rvci5Qcm9maWxlSGVhZGVyKHByb2ZpbGVbInR5 cGVJZCJdLCBwcm9maWxlWyJ0aXRsZSJdLCBwcm9maWxlWyJ1aWQiXSwgcHJvZmlsZVsibWF4SlNP YmplY3RJZCJdLCBmYWxzZSkpOworICAgICAgICB2YXIgcHJvZmlsZVR5cGUgPSB0aGlzLl9wcm9m aWxlci5nZXRQcm9maWxlVHlwZShwcm9maWxlLnR5cGVJZCk7CisgICAgICAgIHRoaXMuX3Byb2Zp bGVyLmFkZFByb2ZpbGVIZWFkZXIocHJvZmlsZVR5cGUuY3JlYXRlUHJvZmlsZShwcm9maWxlKSk7 CiAgICAgfSwKIAogICAgIGFkZEhlYXBTbmFwc2hvdENodW5rOiBmdW5jdGlvbih1aWQsIGNodW5r KQo=