87479 2012-05-25 02:31:11 -0700 Web Inspector: make some profiler methods private 2012-05-25 02:45:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 87262 0 yurys yurys alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 633741 0 yurys 2012-05-25 02:31:11 -0700 Also call ProfileLauncherView methods directly from ProfilesPanel instead of dispatching events. 633746 1 144015 yurys 2012-05-25 02:34:09 -0700 Created attachment 144015 Patch 633759 2 yurys 2012-05-25 02:45:02 -0700 Committed r118503: <http://trac.webkit.org/changeset/118503> 144015 2012-05-25 02:34:09 -0700 2012-05-25 02:40:03 -0700 Patch bug-87479-20120525133408.patch text/plain 10951 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE0OWE1ZTFhZjQ3Y2E4 YjExM2U3NTg0Njk5NzJiMTIwOWNhOTVhMS4uMzU1NWQzYmRmNjU0ZjdkY2Y2NTJkMzM2MjBhODY0 NjcxZjYwMTY5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA1LTI1ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1ha2Ugc29tZSBwcm9maWxlciBtZXRob2RzIHByaXZhdGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NDc5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBSZW1vdmVkIHVudXNlZCBtZXRob2RzLgor ICAgICAgICAtIFJlbmFtZWQgcHJpdmF0ZSBtZXRob2RzIHNvIHRoYXQgdGhlaXIgbmFtZXMgc3Rh cnQgd2l0aCB1bmRlcnNjb3JlLiAKKyAgICAgICAgLSBQcm9maWxlTGF1bmNoZXJWaWV3IG1ldGhv ZHMgYXJlIGNhbGxlZCBkaXJlY3RseSBmcm9tIFByb2ZpbGVzUGFuZWwgaW5zdGVhZAorICAgICAg ICAgIG9mIHNlbmRpbmcgZXZlbnRzLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D UFVQcm9maWxlVmlldy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1NlbGVj dG9yUHJvZmlsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU2VsZWN0b3JQcm9m aWxlVHlwZS5wcm90b3R5cGUuYnV0dG9uQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q1NTU2VsZWN0b3JQcm9maWxlVHlwZS5wcm90b3R5cGUuX3N0YXJ0UmVjb3JkaW5nUHJvZmlsZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU2VsZWN0b3JQcm9maWxlVHlwZS5wcm90b3R5cGUu Y3JlYXRlVGVtcG9yYXJ5UHJvZmlsZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Q cm9maWxlTGF1bmNoZXJWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVMYXVu Y2hlclZpZXcucHJvdG90eXBlLnByb2ZpbGVTdGFydGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Qcm9maWxlTGF1bmNoZXJWaWV3LnByb3RvdHlwZS5wcm9maWxlRmluaXNoZWQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qcm9maWxlVHlwZS5wcm90b3R5cGUuY3JlYXRlUHJvZmlsZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUudG9nZ2xlUmVjb3JkQnV0dG9uKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fcmVzZXQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZVBy b2ZpbGVzLnBvcHVsYXRlQ2FsbGJhY2sudmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9m aWxlc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVQcm9maWxlcy5wb3B1bGF0ZUNhbGxiYWNrKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVQ cm9maWxlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUu c2V0UmVjb3JkaW5nUHJvZmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5l bC5wcm90b3R5cGUudGFrZUhlYXBTbmFwc2hvdC5kb25lKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS50YWtlSGVhcFNuYXBzaG90KToKKwogMjAxMi0wNS0y NCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLiBDaHJvbWl1bSBNYWMgYnVpbGQgZml4IGFmdGVyIHIxMTgzNTcuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NQVVByb2ZpbGVWaWV3LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DUFVQcm9maWxlVmlldy5qcwppbmRl eCBmZTBjNDFjZmJkZTUwYTliMDMxNjZiOGYzYzkyNzVmZTNmZDgzM2QyLi5lYjcxZmY4YTU2YjI4 ZDRlMDk2ODI3NGQyMDY0MmI4OGVkNGE2MzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NQVVByb2ZpbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ1BVUHJvZmlsZVZpZXcuanMKQEAgLTExMiwxNiArMTEyLDYg QEAgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIFt0aGlzLnZpZXdTZWxlY3RFbGVtZW50LCB0aGlzLnBlcmNlbnRCdXR0b24uZWxlbWVudCwg dGhpcy5mb2N1c0J1dHRvbi5lbGVtZW50LCB0aGlzLmV4Y2x1ZGVCdXR0b24uZWxlbWVudCwgdGhp cy5yZXNldEJ1dHRvbi5lbGVtZW50XTsKICAgICB9LAogCi0gICAgZ2V0IHByb2ZpbGUoKQotICAg IHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Byb2ZpbGU7Ci0gICAgfSwKLQotICAgIHNldCBwcm9m aWxlKHByb2ZpbGUpCi0gICAgewotICAgICAgICB0aGlzLl9wcm9maWxlID0gcHJvZmlsZTsKLSAg ICB9LAotCiAgICAgZ2V0IGJvdHRvbVVwUHJvZmlsZURhdGFHcmlkVHJlZSgpCiAgICAgewogICAg ICAgICBpZiAoIXRoaXMuX2JvdHRvbVVwUHJvZmlsZURhdGFHcmlkVHJlZSkgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTZWxlY3RvclByb2ZpbGVW aWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTZWxlY3RvclBy b2ZpbGVWaWV3LmpzCmluZGV4IDc2MmIwYzliMWQ5ZjQ0ZjBhODkzMWMwMjcxNzQxMjAyMzZmM2M3 NWYuLjZiOWQwMDcyODU2OTMxMTc3NWUzZmVkNjVmMmQ1ZTQ4NDMwZmEyNmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU2VsZWN0b3JQcm9maWxlVmll dy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1NlbGVjdG9y UHJvZmlsZVZpZXcuanMKQEAgLTI5MSwxMCArMjkxLDEwIEBAIFdlYkluc3BlY3Rvci5DU1NTZWxl Y3RvclByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAgICBidXR0b25DbGlja2VkOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nKSB7Ci0gICAgICAgICAgICB0 aGlzLnN0b3BSZWNvcmRpbmdQcm9maWxlKCk7CisgICAgICAgICAgICB0aGlzLl9zdG9wUmVjb3Jk aW5nUHJvZmlsZSgpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgdGhpcy5zdGFydFJlY29yZGluZ1Byb2ZpbGUoKTsKKyAgICAgICAgICAg IHRoaXMuX3N0YXJ0UmVjb3JkaW5nUHJvZmlsZSgpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIH0KICAgICB9LApAQCAtMzE0LDI0ICszMTQsMTkgQEAgV2ViSW5zcGVjdG9yLkNT U1NlbGVjdG9yUHJvZmlsZVR5cGUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9wcm9maWxl VWlkID0gMTsKICAgICB9LAogCi0gICAgaXNSZWNvcmRpbmdQcm9maWxlOiBmdW5jdGlvbigpCi0g ICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmVjb3JkaW5nOwotICAgIH0sCi0KICAgICBzZXRS ZWNvcmRpbmdQcm9maWxlOiBmdW5jdGlvbihpc1Byb2ZpbGluZykKICAgICB7CiAgICAgICAgIHRo aXMuX3JlY29yZGluZyA9IGlzUHJvZmlsaW5nOwogICAgIH0sCiAKLSAgICBzdGFydFJlY29yZGlu Z1Byb2ZpbGU6IGZ1bmN0aW9uKCkKKyAgICBfc3RhcnRSZWNvcmRpbmdQcm9maWxlOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICB0aGlzLl9yZWNvcmRpbmcgPSB0cnVlOwogICAgICAgICBDU1NB Z2VudC5zdGFydFNlbGVjdG9yUHJvZmlsZXIoKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVs cy5wcm9maWxlcy5zZXRSZWNvcmRpbmdQcm9maWxlKFdlYkluc3BlY3Rvci5DU1NTZWxlY3RvclBy b2ZpbGVUeXBlLlR5cGVJZCwgdHJ1ZSk7CiAgICAgfSwKIAotICAgIHN0b3BSZWNvcmRpbmdQcm9m aWxlOiBmdW5jdGlvbigpCisgICAgX3N0b3BSZWNvcmRpbmdQcm9maWxlOiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICAvKioKICAgICAgICAgICogQHBhcmFtIHs/UHJvdG9jb2wuRXJyb3J9IGVy cm9yCkBAIC0zNjIsMTYgKzM1Nyw2IEBAIFdlYkluc3BlY3Rvci5DU1NTZWxlY3RvclByb2ZpbGVU eXBlLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRpdGxlID0gdGl0bGUgfHwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJSZWNvcmRpbmdcdTIwMjYiKTsKICAgICAgICAgcmV0dXJuIG5ldyBX ZWJJbnNwZWN0b3IuQ1NTUHJvZmlsZUhlYWRlcih0aGlzLCB0aXRsZSk7Ci0gICAgfSwKLQotICAg IC8qKgotICAgICAqIEBvdmVycmlkZQotICAgICAqIEBwYXJhbSB7Q1NTQWdlbnQuU2VsZWN0b3JQ cm9maWxlfSBwcm9maWxlCi0gICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlByb2ZpbGVIZWFk ZXJ9Ci0gICAgICovCi0gICAgY3JlYXRlUHJvZmlsZTogZnVuY3Rpb24ocHJvZmlsZSkKLSAgICB7 Ci0gICAgICAgIHRocm93IG5ldyBFcnJvcigiVW5yZWFjaGFibGUiKTsKICAgICB9CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZUxhdW5j aGVyVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZUxh dW5jaGVyVmlldy5qcwppbmRleCBkMmI2OWIzNWYxZTZkYzI5YmYxZTA0OGM3MWNjMjU5YTg2MDJi ZjZjLi43ZWZkMTA0Yzg0OWJhMjE3ZmY0Njc0ODcwZjk5NGFkMzc0N2M3MzJhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVMYXVuY2hlclZpZXcu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlTGF1bmNo ZXJWaWV3LmpzCkBAIC02MiwxMiArNjIsNiBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZUxhdW5jaGVy Vmlldy5FdmVudFR5cGVzID0gewogfQogCiBXZWJJbnNwZWN0b3IuUHJvZmlsZUxhdW5jaGVyVmll dy5wcm90b3R5cGUgPSB7Ci0gICAgc2V0VXBFdmVudExpc3RlbmVyczogZnVuY3Rpb24oKQotICAg IHsKLSAgICAgICAgdGhpcy5fcGFuZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUHJv ZmlsZXNQYW5lbC5FdmVudFR5cGVzLlByb2ZpbGVTdGFydGVkLCB0aGlzLl9vblByb2ZpbGVTdGFy dGVkLCB0aGlzKTsKLSAgICAgICAgdGhpcy5fcGFuZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuUHJvZmlsZXNQYW5lbC5FdmVudFR5cGVzLlByb2ZpbGVGaW5pc2hlZCwgdGhpcy5fb25Q cm9maWxlRmluaXNoZWQsIHRoaXMpOwotICAgIH0sCi0KICAgICAvKioKICAgICAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5Qcm9maWxlVHlwZX0gcHJvZmlsZVR5cGUKICAgICAgKi8KQEAgLTExNSwx MyArMTA5LDEzIEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlTGF1bmNoZXJWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlBy b2ZpbGVMYXVuY2hlclZpZXcuRXZlbnRUeXBlcy5Qcm9maWxlVHlwZVNlbGVjdGVkLCBwcm9maWxl VHlwZSk7CiAgICAgfSwKIAotICAgIF9vblByb2ZpbGVTdGFydGVkOiBmdW5jdGlvbihldmVudCkK KyAgICBwcm9maWxlU3RhcnRlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5faXNQ cm9maWxpbmcgPSB0cnVlOwogICAgICAgICB0aGlzLl91cGRhdGVDb250cm9scygpOwogICAgIH0s CiAKLSAgICBfb25Qcm9maWxlRmluaXNoZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHByb2ZpbGVG aW5pc2hlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5faXNQcm9maWxpbmcgPSBm YWxzZTsKICAgICAgICAgdGhpcy5fdXBkYXRlQ29udHJvbHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwppbmRleCA0YTkyNmVi MTViZTlkN2Y4YzdlZjg4NTg2ZDkyMjNhNmJiOWNiY2MwLi5mMDk1ZGFjMmVmOGQ0Zjc4ODM2NWIw YjVkNzQwNWQ4MzdmZGI1MGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC04OCwxNCArODgsMTMgQEAgV2ViSW5zcGVj dG9yLlByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJO ZWVkcyBpbXBsZW1lbnRlZC4iKTsKICAgICB9LAogCi0gICAgLy8gTXVzdCBiZSBpbXBsZW1lbnRl ZCBieSBzdWJjbGFzc2VzLgogICAgIC8qKgogICAgICAqIEBwYXJhbSB7UHJvZmlsZXJBZ2VudC5Q cm9maWxlSGVhZGVyfSBwcm9maWxlCiAgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlByb2Zp bGVIZWFkZXJ9CiAgICAgICovCiAgICAgY3JlYXRlUHJvZmlsZTogZnVuY3Rpb24ocHJvZmlsZSkK ICAgICB7Ci0gICAgICAgIHRocm93IG5ldyBFcnJvcigiTmVlZHMgaW1wbGVtZW50ZWQuIik7Cisg ICAgICAgIHRocm93IG5ldyBFcnJvcigiTm90IHN1cHBvcnRlZCBmb3IgIiArIHRoaXMuX25hbWUg KyAiIHByb2ZpbGVzLiIpOwogICAgIH0KIH0KIApAQCAtMjM1LDcgKzIzNCw2IEBAIFdlYkluc3Bl Y3Rvci5Qcm9maWxlc1BhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2xhdW5jaGVyVmlldyA9 IG5ldyBXZWJJbnNwZWN0b3IuUHJvZmlsZUxhdW5jaGVyVmlldyh0aGlzKTsKICAgICB0aGlzLl9s YXVuY2hlclZpZXcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUHJvZmlsZUxhdW5jaGVy Vmlldy5FdmVudFR5cGVzLlByb2ZpbGVUeXBlU2VsZWN0ZWQsIHRoaXMuX29uUHJvZmlsZVR5cGVT ZWxlY3RlZCwgdGhpcyk7CiAgICAgdGhpcy5fcmVzZXQoKTsKLSAgICB0aGlzLl9sYXVuY2hlclZp ZXcuc2V0VXBFdmVudExpc3RlbmVycygpOwogCiAgICAgdGhpcy5fcmVnaXN0ZXJQcm9maWxlVHlw ZShuZXcgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlKCkpOwogICAgIGlmICghV2ViSW5zcGVj dG9yLldvcmtlck1hbmFnZXIuaXNXb3JrZXJGcm9udGVuZCgpKQpAQCAtMjU0LDExICsyNTIsNiBA QCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0 b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uYWRkQ29udGV4dE1lbnVQcm92aWRlcihuZXcgV2Vi SW5zcGVjdG9yLlJldmVhbEluSGVhcFNuYXBzaG90Q29udGV4dE1lbnVQcm92aWRlcigpKTsKIH0K IAotV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwuRXZlbnRUeXBlcyA9IHsKLSAgICBQcm9maWxl U3RhcnRlZDogInByb2ZpbGUtc3RhcnRlZCIsCi0gICAgUHJvZmlsZUZpbmlzaGVkOiAicHJvZmls ZS1maW5pc2hlZCIKLX0KLQogV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0g ewogICAgIF9jcmVhdGVGaWxlU2VsZWN0b3JFbGVtZW50OiBmdW5jdGlvbigpCiAgICAgewpAQCAt MzA5LDcgKzMwMiwxMCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgdG9nZ2xlUmVjb3JkQnV0dG9uOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIg aXNQcm9maWxpbmcgPSB0aGlzLl9zZWxlY3RlZFByb2ZpbGVUeXBlLmJ1dHRvbkNsaWNrZWQoKTsK LSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoaXNQcm9maWxpbmcgPyBXZWJJ bnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5FdmVudFR5cGVzLlByb2ZpbGVTdGFydGVkIDogV2ViSW5z cGVjdG9yLlByb2ZpbGVzUGFuZWwuRXZlbnRUeXBlcy5Qcm9maWxlRmluaXNoZWQpOworICAgICAg ICBpZiAoaXNQcm9maWxpbmcpCisgICAgICAgICAgICB0aGlzLl9sYXVuY2hlclZpZXcucHJvZmls ZVN0YXJ0ZWQoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fbGF1bmNoZXJWaWV3 LnByb2ZpbGVGaW5pc2hlZCgpOwogICAgIH0sCiAKICAgICB3YXNTaG93bjogZnVuY3Rpb24oKQpA QCAtMzgyLDcgKzM3OCw2IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5wcm9maWxlVmlld1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyLnJlbW92 ZUNoaWxkcmVuKCk7CiAKICAgICAgICAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTsKLSAgICAg ICAgdGhpcy5fbGF1bmNoZXJWaWV3LnNldFVwRXZlbnRMaXN0ZW5lcnMoKTsKIAogICAgICAgICB0 aGlzLl91cGRhdGVJbnRlcmZhY2UoKTsKICAgICAgICAgdGhpcy5wcm9maWxlc0l0ZW1UcmVlRWxl bWVudC5zZWxlY3QoKTsKQEAgLTY0MiwxNCArNjM3LDYgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVz UGFuZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1By b2ZpbGVyQWdlbnQuUHJvZmlsZUhlYWRlcn0gcHJvZmlsZQotICAgICAqLwotICAgIGhhc1Byb2Zp bGU6IGZ1bmN0aW9uKHByb2ZpbGUpCi0gICAgewotICAgICAgICByZXR1cm4gISF0aGlzLl9wcm9m aWxlc0lkTWFwW3RoaXMuX21ha2VLZXkocHJvZmlsZS51aWQsIHByb2ZpbGUudHlwZUlkKV07Ci0g ICAgfSwKLQotICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0eXBlSWQKICAgICAgKiBA cGFyYW0ge251bWJlcn0gdWlkCiAgICAgICovCkBAIC0xMDAyLDEwICs5ODksOCBAQCBXZWJJbnNw ZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgcHJvZmls ZUhlYWRlcnNMZW5ndGggPSBwcm9maWxlSGVhZGVycy5sZW5ndGg7CiAgICAgICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHByb2ZpbGVIZWFkZXJzTGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAg ICAgICB2YXIgcHJvZmlsZUhlYWRlciA9IHByb2ZpbGVIZWFkZXJzW2ldOwotICAgICAgICAgICAg ICAgIGlmICghdGhpcy5oYXNQcm9maWxlKHByb2ZpbGVIZWFkZXIpKSB7Ci0gICAgICAgICAgICAg ICAgICAgIHZhciBwcm9maWxlVHlwZSA9IHRoaXMuZ2V0UHJvZmlsZVR5cGUocHJvZmlsZUhlYWRl ci50eXBlSWQpOwotICAgICAgICAgICAgICAgICAgICB0aGlzLmFkZFByb2ZpbGVIZWFkZXIocHJv ZmlsZVR5cGUuY3JlYXRlUHJvZmlsZShwcm9maWxlSGVhZGVyKSk7Ci0gICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIHZhciBwcm9maWxlVHlwZSA9IHRoaXMuZ2V0UHJvZmlsZVR5cGUo cHJvZmlsZUhlYWRlci50eXBlSWQpOworICAgICAgICAgICAgICAgIHRoaXMuYWRkUHJvZmlsZUhl YWRlcihwcm9maWxlVHlwZS5jcmVhdGVQcm9maWxlKHByb2ZpbGVIZWFkZXIpKTsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogCkBAIC0xMDQwLDcgKzEwMjUsMTAgQEAgV2ViSW5zcGVjdG9yLlBy b2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fcmVtb3ZlVGVtcG9y YXJ5UHJvZmlsZShwcm9maWxlVHlwZSk7CiAgICAgICAgIHRoaXMucmVjb3JkQnV0dG9uLnRvZ2ds ZWQgPSBpc1Byb2ZpbGluZzsKICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udGl0bGUgPSBwcm9m aWxlVHlwZU9iamVjdC5idXR0b25Ub29sdGlwOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhpc1Byb2ZpbGluZyA/IFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLkV2ZW50 VHlwZXMuUHJvZmlsZVN0YXJ0ZWQgOiBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5FdmVudFR5 cGVzLlByb2ZpbGVGaW5pc2hlZCk7CisgICAgICAgIGlmIChpc1Byb2ZpbGluZykKKyAgICAgICAg ICAgIHRoaXMuX2xhdW5jaGVyVmlldy5wcm9maWxlU3RhcnRlZCgpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICB0aGlzLl9sYXVuY2hlclZpZXcucHJvZmlsZUZpbmlzaGVkKCk7CiAgICAgfSwK IAogICAgIHRha2VIZWFwU25hcHNob3Q6IGZ1bmN0aW9uKCkKQEAgLTEwNTAsOSArMTAzOCw5IEBA IFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZh ciBwcm9maWxlVHlwZU9iamVjdCA9IHRoaXMuZ2V0UHJvZmlsZVR5cGUoV2ViSW5zcGVjdG9yLkhl YXBTbmFwc2hvdFByb2ZpbGVUeXBlLlR5cGVJZCk7CiAgICAgICAgICAgICB0aGlzLmFkZFByb2Zp bGVIZWFkZXIocHJvZmlsZVR5cGVPYmplY3QuY3JlYXRlVGVtcG9yYXJ5UHJvZmlsZSgpKTsKICAg ICAgICAgfQotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbC5FdmVudFR5cGVzLlByb2ZpbGVTdGFydGVkKTsKKyAgICAgICAgdGhp cy5fbGF1bmNoZXJWaWV3LnByb2ZpbGVTdGFydGVkKCk7CiAgICAgICAgIGZ1bmN0aW9uIGRvbmUo KSB7Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbC5FdmVudFR5cGVzLlByb2ZpbGVGaW5pc2hlZCk7CisgICAgICAgICAg ICB0aGlzLl9sYXVuY2hlclZpZXcucHJvZmlsZUZpbmlzaGVkKCk7CiAgICAgICAgIH0KICAgICAg ICAgUHJvZmlsZXJBZ2VudC50YWtlSGVhcFNuYXBzaG90KGRvbmUuYmluZCh0aGlzKSk7CiAgICAg ICAgIFdlYkluc3BlY3Rvci51c2VyTWV0cmljcy5Qcm9maWxlc0hlYXBQcm9maWxlVGFrZW4ucmVj b3JkKCk7Cg==