45955 2010-09-17 03:20:26 -0700 Web Inspector: [Extensions API] Provide a way for extension to create a status bar icon 2011-11-18 02:22:36 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 caseq caseq bweinstein joepeck keishi loislo pfeldman pmuellr rik yurys oldest_to_newest 280595 0 caseq 2010-09-17 03:20:26 -0700 For many types of extensions, rendering an own panel or sidebar is an overkill. It is suggested to allow extensions to add their own status bar icons to be able to trigger basic actions. 505577 1 115758 caseq 2011-11-18 00:48:19 -0800 Created attachment 115758 Patch 505612 2 115758 pfeldman 2011-11-18 01:59:49 -0800 Comment on attachment 115758 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115758&action=review > Source/WebCore/ChangeLog:3 > + Web Inspector: [Extensions API] Provide a way for extension to create a status bar icon status bar button? > Source/WebCore/inspector/front-end/ExtensionPanel.js:114 > + this._statusBarItems = []; statusBarButtons ? > Source/WebCore/inspector/front-end/ExtensionPanel.js:199 > + * @param {?string} iconURL Are these nullable or optional? 505628 3 caseq 2011-11-18 02:22:36 -0800 Committed r100735: <http://trac.webkit.org/changeset/100735> 115758 2011-11-18 00:48:19 -0800 2011-11-18 01:59:49 -0800 Patch bug-45955-20111118124817.patch text/plain 15502 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI3N2Y4Mzg5ODQ0NTVl OTk1ZmI0ZmViMGVhZjU4YzRjMjk1NzczYi4uMjVlZjViYjdmMDViY2UwMjQyNGY5N2VmYzkxYmQx YzI0MGU5NjFhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDExLTExLTE4ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW0V4dGVuc2lvbnMgQVBJXSBQcm92aWRlIGEgd2F5IGZvciBleHRlbnNpb24gdG8gY3JlYXRl IGEgc3RhdHVzIGJhciBpY29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00NTk1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanM6CisgICAgICAg IChpbmplY3RlZEV4dGVuc2lvbkFQSS5FeHRlbnNpb25QYW5lbEltcGwucHJvdG90eXBlLmNyZWF0 ZVN0YXR1c0JhckJ1dHRvbik6CisgICAgICAgIChpbmplY3RlZEV4dGVuc2lvbkFQSSk6CisgICAg ICAgIChpbmplY3RlZEV4dGVuc2lvbkFQSS5CdXR0b25JbXBsLnByb3RvdHlwZS51cGRhdGUpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4 dGVuc2lvblBhbmVsLnByb3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkV4dGVuc2lvblBhbmVsLnByb3RvdHlwZS5hZGRTdGF0dXNCYXJJdGVtKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5FeHRlbnNpb25CdXR0b24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkV4dGVuc2lvbkJ1dHRvbi5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5FeHRlbnNpb25CdXR0b24ucHJvdG90eXBlLl9vbkNsaWNrZWQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkV4dGVuc2lvblNlcnZlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2Vy dmVyLnByb3RvdHlwZS5ub3RpZnlCdXR0b25DbGlja2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9vbkNyZWF0ZVN0YXR1c0JhckJ1dHRvbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZS5fb25VcGRhdGVC dXR0b24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90b3R5cGUu X29uQ3JlYXRlU2lkZWJhclBhbmUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmNzczoKKyAgICAgICAgKGJ1dHRvbi5zdGF0dXMtYmFyLWl0ZW0uZXh0ZW5zaW9uKToK KwogMjAxMS0xMS0xNyAgS2VuaWNoaSBJc2hpYmFzaGkgIDxiYXNoaUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgY3Jhc2g6IFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OnJvdW5kc0dseXBoQWR2 YW5jZXMgb24gTGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9FeHRlbnNpb25BUEkuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0V4dGVuc2lvbkFQSS5qcwppbmRleCBkZTIwOWZjZGQ3ODFkMzdkMDE2YmY5YjA1MzZhYTk1ZWFi YTU1ZDZlLi45ODI2Y2MyNDQ1NWYzMjQ1ODk3ODFiMjU5MTE1OTI1ZTE1NWFmYjY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcwpA QCAtMzM2LDYgKzMzNiwyMyBAQCBmdW5jdGlvbiBFeHRlbnNpb25QYW5lbEltcGwoaWQpCiAgICAg dGhpcy5vblNlYXJjaCA9IG5ldyBFdmVudFNpbmsoInBhbmVsLXNlYXJjaC0iICsgaWQpOwogfQog CitFeHRlbnNpb25QYW5lbEltcGwucHJvdG90eXBlID0geworICAgIGNyZWF0ZVN0YXR1c0JhckJ1 dHRvbjogZnVuY3Rpb24oaWNvblBhdGgsIHRvb2x0aXBUZXh0LCBkaXNhYmxlZCkKKyAgICB7Cisg ICAgICAgIHZhciBpZCA9ICJidXR0b24tIiArIGV4dGVuc2lvblNlcnZlci5uZXh0T2JqZWN0SWQo KTsKKyAgICAgICAgdmFyIHJlcXVlc3QgPSB7CisgICAgICAgICAgICBjb21tYW5kOiAiY3JlYXRl U3RhdHVzQmFyQnV0dG9uIiwKKyAgICAgICAgICAgIHBhbmVsOiB0aGlzLl9pZCwKKyAgICAgICAg ICAgIGlkOiBpZCwKKyAgICAgICAgICAgIGljb246IGljb25QYXRoLAorICAgICAgICAgICAgdG9v bHRpcDogdG9vbHRpcFRleHQsCisgICAgICAgICAgICBkaXNhYmxlZDogISFkaXNhYmxlZAorICAg ICAgICB9OworICAgICAgICBleHRlbnNpb25TZXJ2ZXIuc2VuZFJlcXVlc3QocmVxdWVzdCk7Cisg ICAgICAgIHJldHVybiBuZXcgQnV0dG9uKGlkKTsKKyAgICB9Cit9OworCiBFeHRlbnNpb25QYW5l bEltcGwucHJvdG90eXBlLl9fcHJvdG9fXyA9IEV4dGVuc2lvblZpZXdJbXBsLnByb3RvdHlwZTsK IAogLyoqCkBAIC0zNzIsNiArMzg5LDI5IEBAIEV4dGVuc2lvblNpZGViYXJQYW5lSW1wbC5wcm90 b3R5cGUgPSB7CiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICovCitmdW5jdGlvbiBCdXR0b25JbXBs KGlkKQoreworICAgIHRoaXMuX2lkID0gaWQ7CisgICAgdGhpcy5vbkNsaWNrZWQgPSBuZXcgRXZl bnRTaW5rKCJidXR0b24tY2xpY2tlZC0iICsgaWQpOworfQorCitCdXR0b25JbXBsLnByb3RvdHlw ZSA9IHsKKyAgICB1cGRhdGU6IGZ1bmN0aW9uKGljb25QYXRoLCB0b29sdGlwVGV4dCwgZGlzYWJs ZWQpCisgICAgeworICAgICAgICB2YXIgcmVxdWVzdCA9IHsKKyAgICAgICAgICAgIGNvbW1hbmQ6 ICJ1cGRhdGVCdXR0b24iLAorICAgICAgICAgICAgaWQ6IHRoaXMuX2lkLAorICAgICAgICAgICAg aWNvbjogaWNvblBhdGgsCisgICAgICAgICAgICB0b29sdGlwOiB0b29sdGlwVGV4dCwKKyAgICAg ICAgICAgIGRpc2FibGVkOiAhIWRpc2FibGVkCisgICAgICAgIH07CisgICAgICAgIGV4dGVuc2lv blNlcnZlci5zZW5kUmVxdWVzdChyZXF1ZXN0KTsKKyAgICB9Cit9OworCisvKioKKyAqIEBjb25z dHJ1Y3RvcgorICovCiBmdW5jdGlvbiBBdWRpdHMoKQogewogfQpAQCAtNzA0LDYgKzc0NCw3IEBA IGZ1bmN0aW9uIGRlZmluZURlcHJlY2F0ZWRQcm9wZXJ0eShvYmplY3QsIGNsYXNzTmFtZSwgb2xk TmFtZSwgbmV3TmFtZSkKIAogdmFyIEF1ZGl0Q2F0ZWdvcnkgPSBkZWNsYXJlSW50ZXJmYWNlQ2xh c3MoQXVkaXRDYXRlZ29yeUltcGwpOwogdmFyIEF1ZGl0UmVzdWx0ID0gZGVjbGFyZUludGVyZmFj ZUNsYXNzKEF1ZGl0UmVzdWx0SW1wbCk7Cit2YXIgQnV0dG9uID0gZGVjbGFyZUludGVyZmFjZUNs YXNzKEJ1dHRvbkltcGwpOwogdmFyIEV2ZW50U2luayA9IGRlY2xhcmVJbnRlcmZhY2VDbGFzcyhF dmVudFNpbmtJbXBsKTsKIHZhciBFeHRlbnNpb25QYW5lbCA9IGRlY2xhcmVJbnRlcmZhY2VDbGFz cyhFeHRlbnNpb25QYW5lbEltcGwpOwogdmFyIEV4dGVuc2lvblNpZGViYXJQYW5lID0gZGVjbGFy ZUludGVyZmFjZUNsYXNzKEV4dGVuc2lvblNpZGViYXJQYW5lSW1wbCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblBhbmVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25QYW5lbC5qcwppbmRleCA2 YzMxNDg5ZDgyN2RlNzIwM2QwYzUyYzQzZDQ3MmRkNDg3ODUxOWZiLi45NmVjYjJjNGY5NWZkNjUy ODRkMGI2ZTliOTU5YmZjMTkzMDE0ZDRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uUGFuZWwuanMKQEAgLTExMSw2ICsxMTEsOCBAQCBX ZWJJbnNwZWN0b3IuRXh0ZW5zaW9uUGFuZWwgPSBmdW5jdGlvbihpZCwgbGFiZWwsIHBhZ2VVUkws IGljb25VUkwpCiAgICAgV2ViSW5zcGVjdG9yLlBhbmVsLmNhbGwodGhpcywgaWQpOwogICAgIHRo aXMuc2V0SGlkZU9uRGV0YWNoKCk7CiAgICAgdGhpcy5fdG9vbGJhckl0ZW1MYWJlbCA9IGxhYmVs OworICAgIHRoaXMuX3N0YXR1c0Jhckl0ZW1zID0gW107CisKICAgICBpZiAoaWNvblVSTCkgewog ICAgICAgICB0aGlzLl9hZGRTdHlsZVJ1bGUoIi50b29sYmFyLWl0ZW0uIiArIGlkICsgIiAudG9v bGJhci1pY29uIiwgImJhY2tncm91bmQtaW1hZ2U6IHVybCgiICsgaWNvblVSTCArICIpOyIpOwog ICAgICAgICB0aGlzLl9hZGRTdHlsZVJ1bGUoIi50b29sYmFyLXNtYWxsIC50b29sYmFyLWl0ZW0u IiArIGlkICsgIiAudG9vbGJhci1pY29uIiwgImJhY2tncm91bmQtcG9zaXRpb24teDogLTMycHg7 Iik7CkBAIC0xMjksNiArMTMxLDE5IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25QYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLnNpZGViYXJUcmVlRWxlbWVudCB8fCB0aGlz LmVsZW1lbnQ7CiAgICAgfSwKIAorICAgIGdldCBzdGF0dXNCYXJJdGVtcygpCisgICAgeworICAg ICAgICByZXR1cm4gdGhpcy5fc3RhdHVzQmFySXRlbXM7CisgICAgfSwKKworICAgIC8qKgorICAg ICAqIEBwYXJhbSB7RWxlbWVudH0gZWxlbWVudAorICAgICAqLworICAgIGFkZFN0YXR1c0Jhckl0 ZW06IGZ1bmN0aW9uKGVsZW1lbnQpCisgICAgeworICAgICAgICB0aGlzLl9zdGF0dXNCYXJJdGVt cy5wdXNoKGVsZW1lbnQpOworICAgIH0sCisKICAgICBzZWFyY2hDYW5jZWxlZDogZnVuY3Rpb24o c3RhcnRpbmdOZXdTZWFyY2gpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuZXh0ZW5zaW9u U2VydmVyLm5vdGlmeVNlYXJjaEFjdGlvbih0aGlzLl9pZCwgImNhbmNlbFNlYXJjaCIpOwpAQCAt MTY1LDYgKzE4MCw0NCBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uUGFuZWwucHJvdG90eXBlLl9f cHJvdG9fXyA9IFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGU7CiAKIC8qKgogICogQGNvbnN0 cnVjdG9yCisgKiBAcGFyYW0ge3N0cmluZ30gaWQKKyAqIEBwYXJhbSB7c3RyaW5nfSBpY29uVVJM CisgKiBAcGFyYW0ge3N0cmluZ30gdG9vbHRpcAorICogQHBhcmFtIHs/Ym9vbGVhbn0gZGlzYWJs ZWQKKyAqLworV2ViSW5zcGVjdG9yLkV4dGVuc2lvbkJ1dHRvbiA9IGZ1bmN0aW9uKGlkLCBpY29u VVJMLCB0b29sdGlwLCBkaXNhYmxlZCkKK3sKKyAgICB0aGlzLl9pZCA9IGlkOworICAgIHRoaXMu ZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpOworICAgIHRoaXMuZWxl bWVudC5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIGV4dGVuc2lvbiI7CisgICAgdGhpcy5l bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fb25DbGlja2VkLmJpbmQodGhp cyksIGZhbHNlKTsKKyAgICB0aGlzLnVwZGF0ZShpY29uVVJMLCB0b29sdGlwLCBkaXNhYmxlZCk7 Cit9CisKK1dlYkluc3BlY3Rvci5FeHRlbnNpb25CdXR0b24ucHJvdG90eXBlID0geworICAgIC8q KgorICAgICAqIEBwYXJhbSB7P3N0cmluZ30gaWNvblVSTAorICAgICAqIEBwYXJhbSB7P3N0cmlu Z30gdG9vbHRpcAorICAgICAqIEBwYXJhbSB7P2Jvb2xlYW59IGRpc2FibGVkCisgICAgICovCisg ICAgdXBkYXRlOiBmdW5jdGlvbihpY29uVVJMLCB0b29sdGlwLCBkaXNhYmxlZCkKKyAgICB7Cisg ICAgICAgIGlmIChpY29uVVJMKQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLmJhY2tn cm91bmRJbWFnZSA9ICJ1cmwoIiArIGljb25VUkwgKyAiKSI7CisgICAgICAgIGlmICh0b29sdGlw KQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LnRpdGxlID0gdG9vbHRpcDsKKyAgICAgICAgaWYg KHR5cGVvZiBkaXNhYmxlZCA9PT0gImJvb2xlYW4iKQorICAgICAgICAgICAgdGhpcy5lbGVtZW50 LmRpc2FibGVkID0gZGlzYWJsZWQ7CisgICAgfSwKKworICAgIF9vbkNsaWNrZWQ6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIubm90aWZ5QnV0 dG9uQ2xpY2tlZCh0aGlzLl9pZCk7CisgICAgfQorfQorCisvKioKKyAqIEBjb25zdHJ1Y3Rvcgog ICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5TaWRlYmFyUGFuZX0KICAqIEBwYXJhbSB7c3RyaW5n fSB0aXRsZQogICogQHBhcmFtIHtzdHJpbmd9IGlkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCmluZGV4IGNiYjY0MTk5YjM0 Y2RhN2Q2NThlMWQyYjZhYjc0NDc3OWQ0M2I1NTkuLmQxMGFiMGFiMGI5ZDJhYzNiMDkwZmM1Mzkz YjMzMjEzMDQxZDgyY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC01MCw2ICs1MCw3IEBAIFdlYkluc3BlY3Rv ci5FeHRlbnNpb25TZXJ2ZXIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVy KCJhZGRSZXF1ZXN0SGVhZGVycyIsIHRoaXMuX29uQWRkUmVxdWVzdEhlYWRlcnMuYmluZCh0aGlz KSk7CiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJjcmVhdGVQYW5lbCIsIHRoaXMuX29uQ3Jl YXRlUGFuZWwuYmluZCh0aGlzKSk7CiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJjcmVhdGVT aWRlYmFyUGFuZSIsIHRoaXMuX29uQ3JlYXRlU2lkZWJhclBhbmUuYmluZCh0aGlzKSk7CisgICAg dGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJjcmVhdGVTdGF0dXNCYXJCdXR0b24iLCB0aGlzLl9vbkNy ZWF0ZVN0YXR1c0JhckJ1dHRvbi5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRs ZXIoImV2YWx1YXRlT25JbnNwZWN0ZWRQYWdlIiwgdGhpcy5fb25FdmFsdWF0ZU9uSW5zcGVjdGVk UGFnZS5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRsZXIoImdldEhBUiIsIHRo aXMuX29uR2V0SEFSLmJpbmQodGhpcykpOwogICAgIHRoaXMuX3JlZ2lzdGVySGFuZGxlcigiZ2V0 Q29uc29sZU1lc3NhZ2VzIiwgdGhpcy5fb25HZXRDb25zb2xlTWVzc2FnZXMuYmluZCh0aGlzKSk7 CkBAIC02Niw2ICs2Nyw3IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIgPSBmdW5jdGlv bigpCiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJzdG9wQXVkaXRDYXRlZ29yeVJ1biIsIHRo aXMuX29uU3RvcEF1ZGl0Q2F0ZWdvcnlSdW4uYmluZCh0aGlzKSk7CiAgICAgdGhpcy5fcmVnaXN0 ZXJIYW5kbGVyKCJzdWJzY3JpYmUiLCB0aGlzLl9vblN1YnNjcmliZS5iaW5kKHRoaXMpKTsKICAg ICB0aGlzLl9yZWdpc3RlckhhbmRsZXIoInVuc3Vic2NyaWJlIiwgdGhpcy5fb25VbnN1YnNjcmli ZS5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLl9yZWdpc3RlckhhbmRsZXIoInVwZGF0ZUJ1dHRvbiIs IHRoaXMuX29uVXBkYXRlQnV0dG9uLmJpbmQodGhpcykpOwogCiAgICAgd2luZG93LmFkZEV2ZW50 TGlzdGVuZXIoIm1lc3NhZ2UiLCB0aGlzLl9vbldpbmRvd01lc3NhZ2UuYmluZCh0aGlzKSwgZmFs c2UpOwogfQpAQCAtOTEsNiArOTMsMTEgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Bvc3ROb3RpZmljYXRpb24oInZpZXctaGlkZGVu LSIgKyBpZGVudGlmaWVyKTsKICAgICB9LAogCisgICAgbm90aWZ5QnV0dG9uQ2xpY2tlZDogZnVu Y3Rpb24oaWRlbnRpZmllcikKKyAgICB7CisgICAgICAgIHRoaXMuX3Bvc3ROb3RpZmljYXRpb24o ImJ1dHRvbi1jbGlja2VkLSIgKyBpZGVudGlmaWVyKTsKKyAgICB9LAorCiAgICAgX2luc3BlY3Rl ZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fcmVxdWVz dHMgPSB7fTsKQEAgLTIwMCw3ICsyMDcsMjcgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZl ci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zdGF0dXMuT0soKTsKICAgICB9 LAogCi0gICAgX29uQ3JlYXRlU2lkZWJhclBhbmU6IGZ1bmN0aW9uKG1lc3NhZ2UsIGNvbnN0cnVj dG9yKQorICAgIF9vbkNyZWF0ZVN0YXR1c0JhckJ1dHRvbjogZnVuY3Rpb24obWVzc2FnZSwgcG9y dCkKKyAgICB7CisgICAgICAgIHZhciBwYW5lbCA9IHRoaXMuX2NsaWVudE9iamVjdHNbbWVzc2Fn ZS5wYW5lbF07CisgICAgICAgIGlmICghcGFuZWwgfHwgIShwYW5lbCBpbnN0YW5jZW9mIFdlYklu c3BlY3Rvci5FeHRlbnNpb25QYW5lbCkpCisgICAgICAgICAgICByZXR1cm4gdGhpcy5fc3RhdHVz LkVfTk9URk9VTkQobWVzc2FnZS5wYW5lbCk7CisgICAgICAgIHZhciBidXR0b24gPSBuZXcgV2Vi SW5zcGVjdG9yLkV4dGVuc2lvbkJ1dHRvbihtZXNzYWdlLmlkLCB0aGlzLl9leHBhbmRSZXNvdXJj ZVBhdGgocG9ydC5fZXh0ZW5zaW9uT3JpZ2luLCBtZXNzYWdlLmljb24pLCBtZXNzYWdlLnRvb2x0 aXAsIG1lc3NhZ2UuZGlzYWJsZWQpOworICAgICAgICB0aGlzLl9jbGllbnRPYmplY3RzW21lc3Nh Z2UuaWRdID0gYnV0dG9uOworICAgICAgICBwYW5lbC5hZGRTdGF0dXNCYXJJdGVtKGJ1dHRvbi5l bGVtZW50KTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXR1cy5PSygpOworICAgIH0sCisKKyAg ICBfb25VcGRhdGVCdXR0b246IGZ1bmN0aW9uKG1lc3NhZ2UsIHBvcnQpCisgICAgeworICAgICAg ICB2YXIgYnV0dG9uID0gdGhpcy5fY2xpZW50T2JqZWN0c1ttZXNzYWdlLmlkXTsKKyAgICAgICAg aWYgKCFidXR0b24gfHwgIShidXR0b24gaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9u QnV0dG9uKSkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9zdGF0dXMuRV9OT1RGT1VORChtZXNz YWdlLmlkKTsKKyAgICAgICAgYnV0dG9uLnVwZGF0ZSh0aGlzLl9leHBhbmRSZXNvdXJjZVBhdGgo cG9ydC5fZXh0ZW5zaW9uT3JpZ2luLCBtZXNzYWdlLmljb24pLCBtZXNzYWdlLnRvb2x0aXAsIG1l c3NhZ2UuZGlzYWJsZWQpOworICAgICAgICByZXR1cm4gdGhpcy5fc3RhdHVzLk9LKCk7CisgICAg fSwKKworICAgIF9vbkNyZWF0ZVNpZGViYXJQYW5lOiBmdW5jdGlvbihtZXNzYWdlKQogICAgIHsK ICAgICAgICAgdmFyIHBhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVsc1ttZXNzYWdlLnBhbmVsXTsK ICAgICAgICAgaWYgKCFwYW5lbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmNzcwppbmRleCA3Njk4ODBkNzM2M2U3OTJjM2IyNDdmMjRjOTUwNWRm MDI4YmQ5ODliLi5kMDMxODQyNmUyMzZhZTk2MDM1ZDllMTUwNDE5NTgwY2E2MGY4MDFlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCkBA IC00OTYsNiArNDk2LDExIEBAIGJ1dHRvbi5zdGF0dXMtYmFyLWl0ZW06ZGlzYWJsZWQgewogICAg IGJhY2tncm91bmQtcG9zaXRpb246IDAgMCAhaW1wb3J0YW50OwogfQogCitidXR0b24uc3RhdHVz LWJhci1pdGVtLmV4dGVuc2lvbiB7CisgICAgYmFja2dyb3VuZC1pbWFnZTogbm9uZTsKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiBhdXRvOworfQorCiBzZWxlY3Quc3RhdHVzLWJhci1pdGVtIHsKICAg ICBtaW4td2lkdGg6IDQ4cHg7CiAgICAgYm9yZGVyLXdpZHRoOiAwIDE3cHggMCAycHg7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggNzlhMWZlMTAwODVmNGUxN2NhMTk4ZGM2NGExYzQ3NDRhMTc4MWNmMy4uNDBhYzE4NzI3YWMz MDM4NWNmZmRlNDBkNjg2MTEyMGQ3OGVkYTgyZiAxMDA3NTUKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEx LTExLTE4ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogW0V4dGVuc2lvbnMgQVBJXSBQcm92aWRlIGEgd2F5IGZvciBleHRlbnNp b24gdG8gY3JlYXRlIGEgc3RhdHVzIGJhciBpY29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTk1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1w YW5lbC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5z aW9ucy1wYW5lbC5odG1sOgorCiAyMDExLTExLTE3ICBHYWJvciBMb2tpICA8bG9raUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFtRdF0gUkVHUkVTU0lPTihyMTAwNTEwKTogRW5hYmxlIDggQml0IFN0 cmluZ3MgaW4gSmF2YVNjcmlwdENvcmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9leHRlbnNpb25zL2V4dGVuc2lvbnMtcGFuZWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1wYW5lbC1leHBlY3RlZC50eHQKaW5kZXgg MjhlZDlkYmZkZTcwM2RhZDRhNGI5YTczMGYzNGUxZGI5NmY1MTZlNy4uMTcyMDcwOWVmYTA5ZDJk NzA1YzkxNjVlYTFhNGNjZDc4NDRhMDMzMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1wYW5lbC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1wYW5lbC1leHBlY3RlZC50eHQK QEAgLTE3LDcgKzE3LDI2IEBAIFBhbmVsIGNyZWF0ZWQKICAgICAgICAgYWRkTGlzdGVuZXIgOiA8 ZnVuY3Rpb24+CiAgICAgICAgIHJlbW92ZUxpc3RlbmVyIDogPGZ1bmN0aW9uPgogICAgIH0KKyAg ICBjcmVhdGVTdGF0dXNCYXJCdXR0b24gOiA8ZnVuY3Rpb24+CiB9CiBFeHRlbnNpb24gcGFuZWwg c2l6ZSBjb3JyZWN0CitSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0U3RhdHVzQmFyQnV0dG9u cworQ3JlYXRlZCBhIHN0YXR1cyBiYXIgYnV0dG9uLCBkdW1wIGZvbGxvd3M6Cit7CisgICAgb25D bGlja2VkIDogeworICAgICAgICBhZGRMaXN0ZW5lciA6IDxmdW5jdGlvbj4KKyAgICAgICAgcmVt b3ZlTGlzdGVuZXIgOiA8ZnVuY3Rpb24+CisgICAgfQorICAgIHVwZGF0ZSA6IDxmdW5jdGlvbj4K K30KK2J1dHRvbjEgY2xpY2tlZAorU3RhdHVzIGJhciBidXR0b25zIHN0YXRlOgorc3RhdHVzIGJh ciBpdGVtIDAsIGljb246IC4uLi9pbnNwZWN0b3IvcmVzb3VyY2VzL2J1dHRvbjEucG5nLCB0b29s dGlwOiAnQnV0dG9uIE9uZSB0b29sdGlwJywgZGlzYWJsZWQ6IGZhbHNlCitzdGF0dXMgYmFyIGl0 ZW0gMSwgaWNvbjogLi4uL2luc3BlY3Rvci9yZXNvdXJjZXMvYnV0dG9uMi5wbmcsIHRvb2x0aXA6 ICdCdXR0b24gVHdvIHRvb2x0aXAnLCBkaXNhYmxlZDogdHJ1ZQorVXBkYXRlZCBzdGF0dXMgYmFy IGJ1dHRvbnMKK1N0YXR1cyBiYXIgYnV0dG9ucyBzdGF0ZToKK3N0YXR1cyBiYXIgaXRlbSAwLCBp Y29uOiAuLi4vaW5zcGVjdG9yL3Jlc291cmNlcy9idXR0b24xLXVwZGF0ZWQucG5nLCB0b29sdGlw OiAnQnV0dG9uIE9uZSB0b29sdGlwJywgZGlzYWJsZWQ6IGZhbHNlCitzdGF0dXMgYmFyIGl0ZW0g MSwgaWNvbjogLi4uL2luc3BlY3Rvci9yZXNvdXJjZXMvYnV0dG9uMi5wbmcsIHRvb2x0aXA6ICdC dXR0b24gVHdvIHVwZGF0ZWQgdG9vbHRpcCcsIGRpc2FibGVkOiBmYWxzZQorYnV0dG9uMiBjbGlj a2VkCiBBbGwgdGVzdHMgZG9uZS4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1wYW5lbC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1wYW5lbC5odG1sCmluZGV4IDVmYzA5MTcwMWYwZmQwZGRm YWQ5MDBjZDU3ZTZkYWMzYzVhYTAzOWQuLjg3M2MxNTJkMTk2MGU2ODgzYWI2M2E5ZmU5YTkxNDEw MDEzZTA2ZjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4 dGVuc2lvbnMtcGFuZWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9u cy9leHRlbnNpb25zLXBhbmVsLmh0bWwKQEAgLTI5LDYgKzI5LDI5IEBAIGZ1bmN0aW9uIGluaXRp YWxpemVfZXh0ZW5zaW9uc1BhbmVsVGVzdCgpCiAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0 RXF1YWxzKGJvdW5kaW5nUmVjdC5oZWlnaHQsIGhlaWdodCwgInBhbmVsIGhlaWdodCBtaXNtYXRj aCIpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiRXh0ZW5zaW9uIHBhbmVsIHNp emUgY29ycmVjdCIpOwogICAgIH0KKworICAgIEluc3BlY3RvclRlc3QuZHVtcFN0YXR1c0JhckJ1 dHRvbnMgPSBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgcGFuZWwgPSBXZWJJbnNwZWN0 b3IuaW5zcGVjdG9yVmlldy5jdXJyZW50UGFuZWwoKTsKKyAgICAgICAgdmFyIGl0ZW1zID0gcGFu ZWwuc3RhdHVzQmFySXRlbXM7CisgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJTdGF0 dXMgYmFyIGJ1dHRvbnMgc3RhdGU6Iik7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgaXRl bXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBpdGVtID0gaXRlbXNbaV07ICAgCisg ICAgICAgICAgICBpZiAoIShpdGVtIGluc3RhbmNlb2YgSFRNTEJ1dHRvbkVsZW1lbnQpKSB7Cisg ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoInN0YXR1cyBiYXIgaXRlbSAi ICsgaSArICIgaXMgbm90IGEgYnV0dG9uLiIpOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgLy8gU3RyaXAgdXJsKC4uLikgYW5kIHByZWZpeCBv ZiB0aGUgVVJMIHdpdGhpbiwgbGVhdmUganVzdCBsYXN0IDMgY29tcG9uZW50cy4KKyAgICAgICAg ICAgIHZhciB1cmwgPSBpdGVtLnN0eWxlLmJhY2tncm91bmRJbWFnZS5yZXBsYWNlKC9edXJsXCgu KigoWy9dW14vXSopezN9W14vKV0qKVwpJC8sICIuLi4kMSIpOworICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5hZGRSZXN1bHQoInN0YXR1cyBiYXIgaXRlbSAiICsgaSArICIsIGljb246ICIgKyB1 cmwgKyAiLCB0b29sdGlwOiAnIiArIGl0ZW0udGl0bGUgKyAiJywgZGlzYWJsZWQ6ICIgKyBpdGVt LmRpc2FibGVkKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIEluc3BlY3RvclRlc3QuY2xpY2tC dXR0b24gPSBmdW5jdGlvbihpbmRleCkKKyAgICB7CisgICAgICAgIHZhciBwYW5lbCA9IFdlYklu c3BlY3Rvci5pbnNwZWN0b3JWaWV3LmN1cnJlbnRQYW5lbCgpOworICAgICAgICBwYW5lbC5zdGF0 dXNCYXJJdGVtc1tpbmRleF0uY2xpY2soKTsKKyAgICB9CiB9CiAKIGZ1bmN0aW9uIGV4dGVuc2lv bl90ZXN0Q3JlYXRlUGFuZWwobmV4dFRlc3QpCkBAIC00OCw2ICs3MSwzNyBAQCBmdW5jdGlvbiBl eHRlbnNpb25fdGVzdENyZWF0ZVBhbmVsKG5leHRUZXN0KQogICAgIHdlYkluc3BlY3Rvci5wYW5l bHMuY3JlYXRlKCJUZXN0IFBhbmVsIiwgYmFzZVBhdGggKyAiZXh0ZW5zaW9uLXBhbmVsLnBuZyIs IGJhc2VQYXRoICsgImV4dGVuc2lvbi1wYW5lbC5odG1sIiwgb25QYW5lbENyZWF0ZWQpOwogfQog CitmdW5jdGlvbiBleHRlbnNpb25fdGVzdFN0YXR1c0JhckJ1dHRvbnMobmV4dFRlc3QpCit7Cisg ICAgdmFyIGJhc2VQYXRoID0gbG9jYXRpb24ucGF0aG5hbWUucmVwbGFjZSgvXC9bXi9dKiQvLCAi LyIpOworCisgICAgZnVuY3Rpb24gb25QYW5lbENyZWF0ZWQocGFuZWwpCisgICAgeworICAgICAg ICB2YXIgYnV0dG9uMSA9IHBhbmVsLmNyZWF0ZVN0YXR1c0JhckJ1dHRvbihiYXNlUGF0aCArICJi dXR0b24xLnBuZyIsICJCdXR0b24gT25lIHRvb2x0aXAiKTsKKyAgICAgICAgdmFyIGJ1dHRvbjIg PSBwYW5lbC5jcmVhdGVTdGF0dXNCYXJCdXR0b24oYmFzZVBhdGggKyAiYnV0dG9uMi5wbmciLCAi QnV0dG9uIFR3byB0b29sdGlwIiwgdHJ1ZSk7CisgICAgICAgIG91dHB1dCgiQ3JlYXRlZCBhIHN0 YXR1cyBiYXIgYnV0dG9uLCBkdW1wIGZvbGxvd3M6Iik7CisgICAgICAgIGR1bXBPYmplY3QoYnV0 dG9uMSk7CisgICAgICAgIGZ1bmN0aW9uIHVwZGF0ZUJ1dHRvbnMoKQorICAgICAgICB7CisgICAg ICAgICAgICBidXR0b24xLnVwZGF0ZShiYXNlUGF0aCArICJidXR0b24xLXVwZGF0ZWQucG5nIik7 CisgICAgICAgICAgICBidXR0b24yLnVwZGF0ZShudWxsLCAiQnV0dG9uIFR3byB1cGRhdGVkIHRv b2x0aXAiLCBmYWxzZSk7CisgICAgICAgICAgICBvdXRwdXQoIlVwZGF0ZWQgc3RhdHVzIGJhciBi dXR0b25zIik7CisgICAgICAgICAgICBldmFsdWF0ZU9uRnJvbnRlbmQoIkluc3BlY3RvclRlc3Qu ZHVtcFN0YXR1c0JhckJ1dHRvbnMoKTsgSW5zcGVjdG9yVGVzdC5jbGlja0J1dHRvbigxKTsiKTsK KyAgICAgICAgfQorICAgICAgICBidXR0b24xLm9uQ2xpY2tlZC5hZGRMaXN0ZW5lcihmdW5jdGlv bigpIHsKKyAgICAgICAgICAgIG91dHB1dCgiYnV0dG9uMSBjbGlja2VkIik7CisgICAgICAgICAg ICBldmFsdWF0ZU9uRnJvbnRlbmQoIkluc3BlY3RvclRlc3QuZHVtcFN0YXR1c0JhckJ1dHRvbnMo KTsgcmVwbHkoKTsiLCB1cGRhdGVCdXR0b25zKTsKKyAgICAgICAgfSk7CisgICAgICAgIGJ1dHRv bjIub25DbGlja2VkLmFkZExpc3RlbmVyKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgb3V0cHV0 KCJidXR0b24yIGNsaWNrZWQiKTsKKyAgICAgICAgICAgIG5leHRUZXN0KCk7CisgICAgICAgIH0p OworICAgICAgICBldmFsdWF0ZU9uRnJvbnRlbmQoIkluc3BlY3RvclRlc3Quc2hvd1BhbmVsKCdl eHRlbnNpb24nKTsgSW5zcGVjdG9yVGVzdC5jbGlja0J1dHRvbigxKTsgSW5zcGVjdG9yVGVzdC5j bGlja0J1dHRvbigwKTsiLCB1cGRhdGVCdXR0b25zKTsKKyAgICB9CisKKyAgICB3ZWJJbnNwZWN0 b3IucGFuZWxzLmNyZWF0ZSgiQnV0dG9ucyBQYW5lbCIsIGJhc2VQYXRoICsgImV4dGVuc2lvbi1w YW5lbC5wbmciLCBiYXNlUGF0aCArICJub24tZXhpc3RlbnQuaHRtbCIsIG9uUGFuZWxDcmVhdGVk KTsKK30KKwogPC9zY3JpcHQ+CiA8L2hlYWQ+CiA8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cg==