108319 2013-01-30 03:08:09 -0800 Web Inspector: [Canvas] support instrumenting canvases in iframes (frontend side) 2013-01-30 04:02:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 107951 1 aandrey aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 820026 0 aandrey 2013-01-30 03:08:09 -0800 Patch to follow. 820029 1 185455 aandrey 2013-01-30 03:16:15 -0800 Created attachment 185455 Patch 820036 2 185457 aandrey 2013-01-30 03:22:15 -0800 Created attachment 185457 Patch 820070 3 185457 webkit.review.bot 2013-01-30 04:02:39 -0800 Comment on attachment 185457 Patch Clearing flags on attachment: 185457 Committed r141250: <http://trac.webkit.org/changeset/141250> 820071 4 webkit.review.bot 2013-01-30 04:02:45 -0800 All reviewed patches have been landed. Closing bug. 185455 2013-01-30 03:16:15 -0800 2013-01-30 03:22:12 -0800 Patch bug-108319-20130130151300.patch text/plain 13101 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNiN2IzMDkyNjZiNzAw ZTI5YzRkMTUyYWIwZWNiYjhmYmIyNmU1Ny4uMzU3ZjcwYmY3YjhiMjRkODBlNTA4N2IyODU0ZGJl MWU3ZmI3OTQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAxLTMwICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIHN1cHBvcnQgaW5zdHJ1bWVudGluZyBjYW52YXNlcyBpbiBpZnJhbWVzIChm cm9udGVuZCBzaWRlKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA4MzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGEgZnJhbWUgc2VsZWN0b3IgdG8gY2hvb3NlIGJldHdlZW4gZnJhbWVzIHdpdGgg Y2FudmFzZXMuIFNob3cgdGhpcyBzZWxlY3RvciBpbiB0aGUgc3RhdHVzCisgICAgICAgIGJhciBv bmx5IGlmIHRoZXJlIGFyZSAyIG9yIG1vcmUgZnJhbWVzIHdpdGggY2FudnNlcy4gT3RoZXJ3aXNl LCBhc3N1bWUgc2lsZW50bHkgdGhlIG9ubHkKKyAgICAgICAgZnJhbWUgd2l0aCBjYW52YXNlcyAo bW9zdCBjb21tb24gdXNlIGNhc2UpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmls ZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlLnByb3RvdHlwZS5nZXQgc3RhdHVz QmFySXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlLnByb3Rv dHlwZS5fcnVuU2luZ2xlRnJhbWVDYXB0dXJpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNh bnZhc1Byb2ZpbGVUeXBlLnByb3RvdHlwZS5fc3RhcnRGcmFtZUNhcHR1cmluZyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGUucHJvdG90eXBlLl9mcmFtZUFkZGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVHlwZS5wcm90b3R5cGUuX2FkZEZy YW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVHlwZS5wcm90b3R5cGUu X2ZyYW1lUmVtb3ZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGUu cHJvdG90eXBlLl9jb250ZXh0Q3JlYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFz UHJvZmlsZVR5cGUucHJvdG90eXBlLl9zZWxlY3RlZEZyYW1lSWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlLnByb3RvdHlwZS5fZGlzcGF0Y2hWaWV3VXBkYXRlZEV2 ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNEaXNwYXRjaGVyKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5DYW52YXNEaXNwYXRjaGVyLnByb3RvdHlwZS5jb250ZXh0Q3JlYXRlZCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVUeXBlLnByb3RvdHlwZS5jcmVhdGVQcm9maWxlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fb25Qcm9maWxlVHlw ZVNlbGVjdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlw ZS5fdXBkYXRlUHJvZmlsZVR5cGVTcGVjaWZpY1VJKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLnByb3RvdHlwZS5fcmVnaXN0ZXJQcm9maWxlVHlwZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3RhdHVzQmFyQ29tYm9Cb3gucHJvdG90eXBlLnNpemUpOgorCiAyMDEzLTAxLTMwICBE b21pbmlrIFLDtnR0c2NoZXMgIDxkb21pbmlrLnJvdHRzY2hlc0BpbnRlbC5jb20+CiAKICAgICAg ICAgW0hhcmZCdXp6XSBSZW1vdmUgdGhlIEhhcmZCdXp6LW9sZCBjb2RlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2Uv V2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggNmM2YmNhYjA5 MTQwNzRiN2Q5MjgxMTRlZjFiYTY5YWJkODZlOTljMS4uZTMxYjkwN2NkMGU3MzJmODgzNWZiMzFl NzJlYTQ3YTM1ZDU4NDc2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtNzc4LDYgKzc3OCwxMiBAQCBsb2NhbGl6ZWRTdHJpbmdz WyJDYXB0dXJlIENhbnZhcyBGcmFtZSJdID0gIkNhcHR1cmUgQ2FudmFzIEZyYW1lIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkNhcHR1cmUgbmV4dCBjYW52YXMgZnJhbWUuIl0gPSAiQ2FwdHVyZSBuZXh0 IGNhbnZhcyBmcmFtZS4iOwogbG9jYWxpemVkU3RyaW5nc1siU3RvcCBjYXB0dXJpbmcgY2FudmFz IGZyYW1lcy4iXSA9ICJTdG9wIGNhcHR1cmluZyBjYW52YXMgZnJhbWVzLiI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTdGFydCBjYXB0dXJpbmcgY2FudmFzIGZyYW1lcy4iXSA9ICJTdGFydCBjYXB0dXJp bmcgY2FudmFzIGZyYW1lcy4iOworbG9jYWxpemVkU3RyaW5nc1siQ2FudmFzIGNhcHR1cmUgbW9k ZSJdID0gIkNhbnZhcyBjYXB0dXJlIG1vZGUiOworbG9jYWxpemVkU3RyaW5nc1siU2luZ2xlIEZy YW1lIl0gPSAiU2luZ2xlIEZyYW1lIjsKK2xvY2FsaXplZFN0cmluZ3NbIkNhcHR1cmUgYSBzaW5n bGUgY2FudmFzIGZyYW1lLiJdID0gIkNhcHR1cmUgYSBzaW5nbGUgY2FudmFzIGZyYW1lLiI7Cits b2NhbGl6ZWRTdHJpbmdzWyJDb25zZWN1dGl2ZSBGcmFtZXMiXSA9ICJDb25zZWN1dGl2ZSBGcmFt ZXMiOworbG9jYWxpemVkU3RyaW5nc1siQ2FwdHVyZSBjb25zZWN1dGl2ZSBjYW52YXMgZnJhbWVz LiJdID0gIkNhcHR1cmUgY29uc2VjdXRpdmUgY2FudmFzIGZyYW1lcy4iOworbG9jYWxpemVkU3Ry aW5nc1siRnJhbWUgY29udGFpbmluZyB0aGUgY2FudmFzZXMgdG8gY2FwdHVyZS4iXSA9ICJGcmFt ZSBjb250YWluaW5nIHRoZSBjYW52YXNlcyB0byBjYXB0dXJlLiI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJUcmFjZSBMb2cgJWQiXSA9ICJUcmFjZSBMb2cgJWQiOwogbG9jYWxpemVkU3RyaW5nc1siQ0FO VkFTIFBST0ZJTEUiXSA9ICJDQU5WQVMgUFJPRklMRSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW52 YXMgY2FsbHMgaW5zdHJ1bWVudGF0aW9uIl0gPSAiQ2FudmFzIGNhbGxzIGluc3RydW1lbnRhdGlv biI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZh c1Byb2ZpbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52 YXNQcm9maWxlVmlldy5qcwppbmRleCA4ZDZmMjA1ZTY1ZWM4MmY4MDVlMGFkMjRiNGFlNWQ3YmZh ZTJkNTNhLi42YmVkOTY1NmRkMTczNWI4ZTlhMzAyZGNiYjk1MzQyOWM4Njg4MTczIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1Byb2ZpbGVWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmls ZVZpZXcuanMKQEAgLTM4MCwxMSArMzgwLDI0IEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxl VHlwZSA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9yZWNvcmRpbmcgPSBmYWxzZTsKICAgICB0aGlz Ll9sYXN0UHJvZmlsZUhlYWRlciA9IG51bGw7CiAKLSAgICB0aGlzLl9jYXB0dXJpbmdNb2RlU2Vs ZWN0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckNvbWJvQm94KG51bGwpOworICAgIHRo aXMuX2NhcHR1cmluZ01vZGVTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQ29t Ym9Cb3godGhpcy5fZGlzcGF0Y2hWaWV3VXBkYXRlZEV2ZW50LmJpbmQodGhpcykpOwogICAgIHRo aXMuX2NhcHR1cmluZ01vZGVTZWxlY3Rvci5lbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDYW52YXMgY2FwdHVyZSBtb2RlLiIpOwogICAgIHRoaXMuX2NhcHR1cmluZ01vZGVT ZWxlY3Rvci5jcmVhdGVPcHRpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaW5nbGUgRnJhbWUi KSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYXB0dXJlIGEgc2luZ2xlIGNhbnZhcyBmcmFtZS4i KSwgIiIpOwogICAgIHRoaXMuX2NhcHR1cmluZ01vZGVTZWxlY3Rvci5jcmVhdGVPcHRpb24oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJDb25zZWN1dGl2ZSBGcmFtZXMiKSwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDYXB0dXJlIGNvbnNlY3V0aXZlIGNhbnZhcyBmcmFtZXMuIiksICIxIik7CiAKKyAg ICAvKiogQHR5cGUgeyFPYmplY3QuPHN0cmluZywgRWxlbWVudD59ICovCisgICAgdGhpcy5fZnJh bWVPcHRpb25zID0ge307CisKKyAgICAvKiogQHR5cGUgeyFPYmplY3QuPHN0cmluZywgYm9vbGVh bj59ICovCisgICAgdGhpcy5fZnJhbWVzV2l0aENhbnZhc2VzID0ge307CisKKyAgICB0aGlzLl9m cmFtZVNlbGVjdG9yID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJDb21ib0JveCh0aGlzLl9k aXNwYXRjaFZpZXdVcGRhdGVkRXZlbnQuYmluZCh0aGlzKSk7CisgICAgdGhpcy5fZnJhbWVTZWxl Y3Rvci5lbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGcmFtZSBjb250YWlu aW5nIHRoZSBjYW52YXNlcyB0byBjYXB0dXJlLiIpOworICAgIHRoaXMuX2ZyYW1lU2VsZWN0b3Iu ZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICBXZWJJbnNwZWN0b3IucnVudGlt ZU1vZGVsLmNvbnRleHRMaXN0cygpLmZvckVhY2godGhpcy5fYWRkRnJhbWUsIHRoaXMpOworICAg IFdlYkluc3BlY3Rvci5ydW50aW1lTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu UnVudGltZU1vZGVsLkV2ZW50cy5GcmFtZUV4ZWN1dGlvbkNvbnRleHRMaXN0QWRkZWQsIHRoaXMu X2ZyYW1lQWRkZWQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUnVudGltZU1vZGVsLkV2ZW50cy5GcmFtZUV4ZWN1dGlv bkNvbnRleHRMaXN0UmVtb3ZlZCwgdGhpcy5fZnJhbWVSZW1vdmVkLCB0aGlzKTsKKwogICAgIHRo aXMuX2RlY29yYXRpb25FbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAg ICAgdGhpcy5fZGVjb3JhdGlvbkVsZW1lbnQuYWRkU3R5bGVDbGFzcygicHJvZmlsZS1jYW52YXMt ZGVjb3JhdGlvbiIpOwogICAgIHRoaXMuX2RlY29yYXRpb25FbGVtZW50LmFkZFN0eWxlQ2xhc3Mo ImhpZGRlbiIpOwpAQCAtMzk0LDYgKzQwNyw4IEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxl VHlwZSA9IGZ1bmN0aW9uKCkKICAgICByZWxvYWRQYWdlQnV0dG9uLnRleHRDb250ZW50ID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJSZWxvYWQiKTsKICAgICByZWxvYWRQYWdlQnV0dG9uLmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fb25SZWxvYWRQYWdlQnV0dG9uQ2xpY2suYmluZCh0 aGlzKSwgZmFsc2UpOwogCisgICAgdGhpcy5fZGlzcGF0Y2hlciA9IG5ldyBXZWJJbnNwZWN0b3Iu Q2FudmFzRGlzcGF0Y2hlcih0aGlzKTsKKwogICAgIC8vIEZJWE1FOiBlbmFibGUvZGlzYWJsZSBi eSBhIFVJIGFjdGlvbj8KICAgICBDYW52YXNBZ2VudC5lbmFibGUodGhpcy5fdXBkYXRlRGVjb3Jh dGlvbkVsZW1lbnQuYmluZCh0aGlzKSk7CiAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1v ZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50 VHlwZXMuTWFpbkZyYW1lTmF2aWdhdGVkLCB0aGlzLl91cGRhdGVEZWNvcmF0aW9uRWxlbWVudCwg dGhpcyk7CkBAIC00MDQsNyArNDE5LDcgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBl LlR5cGVJZCA9ICJDQU5WQVNfUFJPRklMRSI7CiBXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5 cGUucHJvdG90eXBlID0gewogICAgIGdldCBzdGF0dXNCYXJJdGVtcygpCiAgICAgewotICAgICAg ICByZXR1cm4gW3RoaXMuX2NhcHR1cmluZ01vZGVTZWxlY3Rvci5lbGVtZW50XTsKKyAgICAgICAg cmV0dXJuIFt0aGlzLl9jYXB0dXJpbmdNb2RlU2VsZWN0b3IuZWxlbWVudCwgdGhpcy5fZnJhbWVT ZWxlY3Rvci5lbGVtZW50XTsKICAgICB9LAogCiAgICAgZ2V0IGJ1dHRvblRvb2x0aXAoKQpAQCAt NDQxLDcgKzQ1Niw3IEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVHlwZS5wcm90b3R5cGUg PSB7CiAgICAgICovCiAgICAgX3J1blNpbmdsZUZyYW1lQ2FwdHVyaW5nOiBmdW5jdGlvbihwcm9m aWxlc1BhbmVsKQogICAgIHsKLSAgICAgICAgQ2FudmFzQWdlbnQuY2FwdHVyZUZyYW1lKHRoaXMu X2RpZFN0YXJ0Q2FwdHVyaW5nRnJhbWUuYmluZCh0aGlzLCBwcm9maWxlc1BhbmVsKSk7CisgICAg ICAgIENhbnZhc0FnZW50LmNhcHR1cmVGcmFtZSh0aGlzLl9zZWxlY3RlZEZyYW1lSWQoKSwgdGhp cy5fZGlkU3RhcnRDYXB0dXJpbmdGcmFtZS5iaW5kKHRoaXMsIHByb2ZpbGVzUGFuZWwpKTsKICAg ICB9LAogCiAgICAgLyoqCkBAIC00NDksNyArNDY0LDcgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1By b2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfc3RhcnRGcmFtZUNhcHR1cmlu ZzogZnVuY3Rpb24ocHJvZmlsZXNQYW5lbCkKICAgICB7Ci0gICAgICAgIENhbnZhc0FnZW50LnN0 YXJ0Q2FwdHVyaW5nKHRoaXMuX2RpZFN0YXJ0Q2FwdHVyaW5nRnJhbWUuYmluZCh0aGlzLCBwcm9m aWxlc1BhbmVsKSk7CisgICAgICAgIENhbnZhc0FnZW50LnN0YXJ0Q2FwdHVyaW5nKHRoaXMuX3Nl bGVjdGVkRnJhbWVJZCgpLCB0aGlzLl9kaWRTdGFydENhcHR1cmluZ0ZyYW1lLmJpbmQodGhpcywg cHJvZmlsZXNQYW5lbCkpOwogICAgIH0sCiAKICAgICBfc3RvcEZyYW1lQ2FwdHVyaW5nOiBmdW5j dGlvbigpCkBAIC01NjUsMTEgKzU4MCwxMTAgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVU eXBlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuICF0aGlzLl9jYXB0dXJpbmdNb2RlU2Vs ZWN0b3Iuc2VsZWN0ZWRPcHRpb24oKS52YWx1ZTsKICAgICB9LAogCisgICAgLyoqCisgICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2ZyYW1lQWRk ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIGNvbnRleHRMaXN0ID0gLyoq IEB0eXBlIHtXZWJJbnNwZWN0b3IuRnJhbWVFeGVjdXRpb25Db250ZXh0TGlzdH0gKi8gKGV2ZW50 LmRhdGEpOworICAgICAgICB0aGlzLl9hZGRGcmFtZShjb250ZXh0TGlzdCk7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkZyYW1lRXhlY3V0aW9uQ29udGV4 dExpc3R9IGNvbnRleHRMaXN0CisgICAgICovCisgICAgX2FkZEZyYW1lOiBmdW5jdGlvbihjb250 ZXh0TGlzdCkKKyAgICB7CisgICAgICAgIHZhciBmcmFtZUlkID0gY29udGV4dExpc3QuZnJhbWVJ ZDsKKyAgICAgICAgdmFyIG9wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIp OworICAgICAgICBvcHRpb24udGV4dCA9IGNvbnRleHRMaXN0LmRpc3BsYXlOYW1lOworICAgICAg ICBvcHRpb24udGl0bGUgPSBjb250ZXh0TGlzdC51cmw7CisgICAgICAgIG9wdGlvbi52YWx1ZSA9 IGZyYW1lSWQ7CisKKyAgICAgICAgdGhpcy5fZnJhbWVPcHRpb25zW2ZyYW1lSWRdID0gb3B0aW9u OworCisgICAgICAgIGlmICh0aGlzLl9mcmFtZXNXaXRoQ2FudmFzZXNbZnJhbWVJZF0pIHsKKyAg ICAgICAgICAgIHRoaXMuX2ZyYW1lU2VsZWN0b3IuYWRkT3B0aW9uKG9wdGlvbik7CisgICAgICAg ICAgICB0aGlzLl9kaXNwYXRjaFZpZXdVcGRhdGVkRXZlbnQoKTsKKyAgICAgICAgfQorICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQKKyAg ICAgKi8KKyAgICBfZnJhbWVSZW1vdmVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAg IHZhciBjb250ZXh0TGlzdCA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLkZyYW1lRXhlY3V0aW9u Q29udGV4dExpc3R9ICovIChldmVudC5kYXRhKTsKKyAgICAgICAgdmFyIGZyYW1lSWQgPSBjb250 ZXh0TGlzdC5mcmFtZUlkOworICAgICAgICB2YXIgb3B0aW9uID0gdGhpcy5fZnJhbWVPcHRpb25z W2ZyYW1lSWRdOworICAgICAgICBpZiAob3B0aW9uICYmIHRoaXMuX2ZyYW1lc1dpdGhDYW52YXNl c1tmcmFtZUlkXSkgeworICAgICAgICAgICAgdGhpcy5fZnJhbWVTZWxlY3Rvci5yZW1vdmVPcHRp b24ob3B0aW9uKTsKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoVmlld1VwZGF0ZWRFdmVudCgp OworICAgICAgICB9CisgICAgICAgIGRlbGV0ZSB0aGlzLl9mcmFtZU9wdGlvbnNbZnJhbWVJZF07 CisgICAgICAgIGRlbGV0ZSB0aGlzLl9mcmFtZXNXaXRoQ2FudmFzZXNbZnJhbWVJZF07CisgICAg fSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBmcmFtZUlkCisgICAgICovCisg ICAgX2NvbnRleHRDcmVhdGVkOiBmdW5jdGlvbihmcmFtZUlkKQorICAgIHsKKyAgICAgICAgaWYg KHRoaXMuX2ZyYW1lc1dpdGhDYW52YXNlc1tmcmFtZUlkXSkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgdGhpcy5fZnJhbWVzV2l0aENhbnZhc2VzW2ZyYW1lSWRdID0gdHJ1ZTsKKyAgICAg ICAgdmFyIG9wdGlvbiA9IHRoaXMuX2ZyYW1lT3B0aW9uc1tmcmFtZUlkXTsKKyAgICAgICAgaWYg KG9wdGlvbikgeworICAgICAgICAgICAgdGhpcy5fZnJhbWVTZWxlY3Rvci5hZGRPcHRpb24ob3B0 aW9uKTsKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoVmlld1VwZGF0ZWRFdmVudCgpOworICAg ICAgICB9CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ3x1bmRlZmlu ZWR9CisgICAgICovCisgICAgX3NlbGVjdGVkRnJhbWVJZDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgdmFyIG9wdGlvbiA9IHRoaXMuX2ZyYW1lU2VsZWN0b3Iuc2VsZWN0ZWRPcHRpb24oKTsK KyAgICAgICAgZm9yICh2YXIgZnJhbWVJZCBpbiB0aGlzLl9mcmFtZU9wdGlvbnMpIHsKKyAgICAg ICAgICAgIGlmICh0aGlzLl9mcmFtZU9wdGlvbnNbZnJhbWVJZF0gPT09IG9wdGlvbikKKyAgICAg ICAgICAgICAgICByZXR1cm4gZnJhbWVJZDsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gdW5k ZWZpbmVkOworICAgIH0sCisKKyAgICBfZGlzcGF0Y2hWaWV3VXBkYXRlZEV2ZW50OiBmdW5jdGlv bigpCisgICAgeworICAgICAgICB0aGlzLl9mcmFtZVNlbGVjdG9yLmVsZW1lbnQuZW5hYmxlU3R5 bGVDbGFzcygiaGlkZGVuIiwgdGhpcy5fZnJhbWVTZWxlY3Rvci5zaXplKCkgPD0gMSk7CisgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Qcm9maWxlVHlw ZS5FdmVudHMuVmlld1VwZGF0ZWQpOworICAgIH0sCisKICAgICBfX3Byb3RvX186IFdlYkluc3Bl Y3Rvci5Qcm9maWxlVHlwZS5wcm90b3R5cGUKIH0KIAogLyoqCiAgKiBAY29uc3RydWN0b3IKKyAq IEBpbXBsZW1lbnRzIHtDYW52YXNBZ2VudC5EaXNwYXRjaGVyfQorICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGV9IHByb2ZpbGVUeXBlCisgKi8KK1dlYkluc3BlY3Rvci5D YW52YXNEaXNwYXRjaGVyID0gZnVuY3Rpb24ocHJvZmlsZVR5cGUpCit7CisgICAgdGhpcy5fcHJv ZmlsZVR5cGUgPSBwcm9maWxlVHlwZTsKKyAgICBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ2Fu dmFzRGlzcGF0Y2hlcih0aGlzKTsKK30KKworV2ViSW5zcGVjdG9yLkNhbnZhc0Rpc3BhdGNoZXIu cHJvdG90eXBlID0geworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBmcmFtZUlkCisg ICAgICovCisgICAgY29udGV4dENyZWF0ZWQ6IGZ1bmN0aW9uKGZyYW1lSWQpCisgICAgeworICAg ICAgICB0aGlzLl9wcm9maWxlVHlwZS5fY29udGV4dENyZWF0ZWQoZnJhbWVJZCk7CisgICAgfQor fQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5Qcm9m aWxlSGVhZGVyfQogICogQHBhcmFtIHshV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlfSB0 eXBlCiAgKiBAcGFyYW0ge3N0cmluZ30gdGl0bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwppbmRleCBmMTU2MmY0NzQ1NTQ5MTE4 NzcxOTZjNWJlMzBiZTM0ZDE2ZTE2OTUzLi43MjkyOWIyMDkwNTRjYTZhNWZlMzE4N2ZiZjA0Y2Ew YTRjMTExNjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Byb2ZpbGVzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC0yNyw2ICsyNyw3IEBAIGNvbnN0IFVzZXJJbml0aWF0ZWRQ cm9maWxlTmFtZSA9ICJvcmcud2Via2l0LnByb2ZpbGVzLnVzZXItaW5pdGlhdGVkIjsKIAogLyoq CiAgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0fQogICog QHBhcmFtIHtzdHJpbmd9IGlkCiAgKiBAcGFyYW0ge3N0cmluZ30gbmFtZQogICovCkBAIC00MCw2 ICs0MSwxMCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGUgPSBmdW5jdGlvbihpZCwgbmFtZSkK ICAgICB0aGlzLnRyZWVFbGVtZW50ID0gbnVsbDsKIH0KIAorV2ViSW5zcGVjdG9yLlByb2ZpbGVU eXBlLkV2ZW50cyA9IHsKKyAgVmlld1VwZGF0ZWQ6ICJ2aWV3LXVwZGF0ZWQiLAorfQorCiBXZWJJ bnNwZWN0b3IuUHJvZmlsZVR5cGUucHJvdG90eXBlID0gewogICAgIGdldCBzdGF0dXNCYXJJdGVt cygpCiAgICAgewpAQCAtMTA5LDcgKzExNCw5IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlVHlwZS5w cm90b3R5cGUgPSB7CiAgICAgY3JlYXRlUHJvZmlsZTogZnVuY3Rpb24ocHJvZmlsZSkKICAgICB7 CiAgICAgICAgIHRocm93IG5ldyBFcnJvcigiTm90IHN1cHBvcnRlZCBmb3IgIiArIHRoaXMuX25h bWUgKyAiIHByb2ZpbGVzLiIpOwotICAgIH0KKyAgICB9LAorCisgICAgX19wcm90b19fOiBXZWJJ bnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZQogfQogCiAvKioKQEAgLTM2Niw2ICszNzMsMTEgQEAg V2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgIF9vblByb2ZpbGVU eXBlU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fc2VsZWN0 ZWRQcm9maWxlVHlwZSA9IC8qKiBAdHlwZSB7IVdlYkluc3BlY3Rvci5Qcm9maWxlVHlwZX0gKi8g KGV2ZW50LmRhdGEpOworICAgICAgICB0aGlzLl91cGRhdGVQcm9maWxlVHlwZVNwZWNpZmljVUko KTsKKyAgICB9LAorCisgICAgX3VwZGF0ZVByb2ZpbGVUeXBlU3BlY2lmaWNVSTogZnVuY3Rpb24o KQorICAgIHsKICAgICAgICAgdGhpcy5yZWNvcmRCdXR0b24udGl0bGUgPSB0aGlzLl9zZWxlY3Rl ZFByb2ZpbGVUeXBlLmJ1dHRvblRvb2x0aXA7CiAKICAgICAgICAgdGhpcy5fcHJvZmlsZVR5cGVT dGF0dXNCYXJJdGVtc0NvbnRhaW5lci5yZW1vdmVDaGlsZHJlbigpOwpAQCAtNDU0LDYgKzQ2Niw3 IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcHJv ZmlsZVR5cGUudHJlZUVsZW1lbnQuaGlkZGVuID0gdHJ1ZTsKICAgICAgICAgdGhpcy5zaWRlYmFy VHJlZS5hcHBlbmRDaGlsZChwcm9maWxlVHlwZS50cmVlRWxlbWVudCk7CiAgICAgICAgIHByb2Zp bGVUeXBlLnRyZWVFbGVtZW50LmNoaWxkcmVuTGlzdEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi Y29udGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50LmJpbmQodGhpcyksIHRy dWUpOworICAgICAgICBwcm9maWxlVHlwZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Q cm9maWxlVHlwZS5FdmVudHMuVmlld1VwZGF0ZWQsIHRoaXMuX3VwZGF0ZVByb2ZpbGVUeXBlU3Bl Y2lmaWNVSSwgdGhpcyk7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qcwppbmRleCBiYmVlZWJk YWFiYjUzMDg3MjdkNmQ5NzNiZjY4NTFmMDNjOGYzMzI4Li4yMzYzZDA5OGRmZDdkN2FjMjk5Yzc0 ZjQ0MTNhODA0NTQ1ZmU0MDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qcwpAQCAtMjg5LDYgKzI4OSwxNCBAQCBXZWJJ bnNwZWN0b3IuU3RhdHVzQmFyQ29tYm9Cb3ggPSBmdW5jdGlvbihjaGFuZ2VIYW5kbGVyLCBjbGFz c05hbWUpCiAKIFdlYkluc3BlY3Rvci5TdGF0dXNCYXJDb21ib0JveC5wcm90b3R5cGUgPSB7CiAg ICAgLyoqCisgICAgICogQHJldHVybiB7bnVtYmVyfQorICAgICAqLworICAgIHNpemU6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zZWxlY3RFbGVtZW50LmNoaWxkRWxl bWVudENvdW50OworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0geyFFbGVtZW50fSBv cHRpb24KICAgICAgKi8KICAgICBhZGRPcHRpb246IGZ1bmN0aW9uKG9wdGlvbikK 185457 2013-01-30 03:22:15 -0800 2013-01-30 04:02:39 -0800 Patch bug-108319-20130130151900.patch text/plain 12973 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNiN2IzMDkyNjZiNzAw ZTI5YzRkMTUyYWIwZWNiYjhmYmIyNmU1Ny4uMzU3ZjcwYmY3YjhiMjRkODBlNTA4N2IyODU0ZGJl MWU3ZmI3OTQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAxLTMwICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIHN1cHBvcnQgaW5zdHJ1bWVudGluZyBjYW52YXNlcyBpbiBpZnJhbWVzIChm cm9udGVuZCBzaWRlKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA4MzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGEgZnJhbWUgc2VsZWN0b3IgdG8gY2hvb3NlIGJldHdlZW4gZnJhbWVzIHdpdGgg Y2FudmFzZXMuIFNob3cgdGhpcyBzZWxlY3RvciBpbiB0aGUgc3RhdHVzCisgICAgICAgIGJhciBv bmx5IGlmIHRoZXJlIGFyZSAyIG9yIG1vcmUgZnJhbWVzIHdpdGggY2FudnNlcy4gT3RoZXJ3aXNl LCBhc3N1bWUgc2lsZW50bHkgdGhlIG9ubHkKKyAgICAgICAgZnJhbWUgd2l0aCBjYW52YXNlcyAo bW9zdCBjb21tb24gdXNlIGNhc2UpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmls ZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlLnByb3RvdHlwZS5nZXQgc3RhdHVz QmFySXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlLnByb3Rv dHlwZS5fcnVuU2luZ2xlRnJhbWVDYXB0dXJpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNh bnZhc1Byb2ZpbGVUeXBlLnByb3RvdHlwZS5fc3RhcnRGcmFtZUNhcHR1cmluZyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGUucHJvdG90eXBlLl9mcmFtZUFkZGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVHlwZS5wcm90b3R5cGUuX2FkZEZy YW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVHlwZS5wcm90b3R5cGUu X2ZyYW1lUmVtb3ZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5cGUu cHJvdG90eXBlLl9jb250ZXh0Q3JlYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFz UHJvZmlsZVR5cGUucHJvdG90eXBlLl9zZWxlY3RlZEZyYW1lSWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlLnByb3RvdHlwZS5fZGlzcGF0Y2hWaWV3VXBkYXRlZEV2 ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNEaXNwYXRjaGVyKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5DYW52YXNEaXNwYXRjaGVyLnByb3RvdHlwZS5jb250ZXh0Q3JlYXRlZCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVUeXBlLnByb3RvdHlwZS5jcmVhdGVQcm9maWxlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5fb25Qcm9maWxlVHlw ZVNlbGVjdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlw ZS5fdXBkYXRlUHJvZmlsZVR5cGVTcGVjaWZpY1VJKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLnByb3RvdHlwZS5fcmVnaXN0ZXJQcm9maWxlVHlwZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3RhdHVzQmFyQ29tYm9Cb3gucHJvdG90eXBlLnNpemUpOgorCiAyMDEzLTAxLTMwICBE b21pbmlrIFLDtnR0c2NoZXMgIDxkb21pbmlrLnJvdHRzY2hlc0BpbnRlbC5jb20+CiAKICAgICAg ICAgW0hhcmZCdXp6XSBSZW1vdmUgdGhlIEhhcmZCdXp6LW9sZCBjb2RlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2Uv V2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggNmM2YmNhYjA5 MTQwNzRiN2Q5MjgxMTRlZjFiYTY5YWJkODZlOTljMS4uZTMxYjkwN2NkMGU3MzJmODgzNWZiMzFl NzJlYTQ3YTM1ZDU4NDc2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtNzc4LDYgKzc3OCwxMiBAQCBsb2NhbGl6ZWRTdHJpbmdz WyJDYXB0dXJlIENhbnZhcyBGcmFtZSJdID0gIkNhcHR1cmUgQ2FudmFzIEZyYW1lIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkNhcHR1cmUgbmV4dCBjYW52YXMgZnJhbWUuIl0gPSAiQ2FwdHVyZSBuZXh0 IGNhbnZhcyBmcmFtZS4iOwogbG9jYWxpemVkU3RyaW5nc1siU3RvcCBjYXB0dXJpbmcgY2FudmFz IGZyYW1lcy4iXSA9ICJTdG9wIGNhcHR1cmluZyBjYW52YXMgZnJhbWVzLiI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTdGFydCBjYXB0dXJpbmcgY2FudmFzIGZyYW1lcy4iXSA9ICJTdGFydCBjYXB0dXJp bmcgY2FudmFzIGZyYW1lcy4iOworbG9jYWxpemVkU3RyaW5nc1siQ2FudmFzIGNhcHR1cmUgbW9k ZSJdID0gIkNhbnZhcyBjYXB0dXJlIG1vZGUiOworbG9jYWxpemVkU3RyaW5nc1siU2luZ2xlIEZy YW1lIl0gPSAiU2luZ2xlIEZyYW1lIjsKK2xvY2FsaXplZFN0cmluZ3NbIkNhcHR1cmUgYSBzaW5n bGUgY2FudmFzIGZyYW1lLiJdID0gIkNhcHR1cmUgYSBzaW5nbGUgY2FudmFzIGZyYW1lLiI7Cits b2NhbGl6ZWRTdHJpbmdzWyJDb25zZWN1dGl2ZSBGcmFtZXMiXSA9ICJDb25zZWN1dGl2ZSBGcmFt ZXMiOworbG9jYWxpemVkU3RyaW5nc1siQ2FwdHVyZSBjb25zZWN1dGl2ZSBjYW52YXMgZnJhbWVz LiJdID0gIkNhcHR1cmUgY29uc2VjdXRpdmUgY2FudmFzIGZyYW1lcy4iOworbG9jYWxpemVkU3Ry aW5nc1siRnJhbWUgY29udGFpbmluZyB0aGUgY2FudmFzZXMgdG8gY2FwdHVyZS4iXSA9ICJGcmFt ZSBjb250YWluaW5nIHRoZSBjYW52YXNlcyB0byBjYXB0dXJlLiI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJUcmFjZSBMb2cgJWQiXSA9ICJUcmFjZSBMb2cgJWQiOwogbG9jYWxpemVkU3RyaW5nc1siQ0FO VkFTIFBST0ZJTEUiXSA9ICJDQU5WQVMgUFJPRklMRSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYW52 YXMgY2FsbHMgaW5zdHJ1bWVudGF0aW9uIl0gPSAiQ2FudmFzIGNhbGxzIGluc3RydW1lbnRhdGlv biI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZh c1Byb2ZpbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52 YXNQcm9maWxlVmlldy5qcwppbmRleCA4ZDZmMjA1ZTY1ZWM4MmY4MDVlMGFkMjRiNGFlNWQ3YmZh ZTJkNTNhLi5hM2JkZWZhY2JlZDRjMGMwMTRlZjJkZGNjNjY0NDI1MjViMTU3MDlmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1Byb2ZpbGVWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmls ZVZpZXcuanMKQEAgLTM4MCwxMSArMzgwLDI0IEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxl VHlwZSA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9yZWNvcmRpbmcgPSBmYWxzZTsKICAgICB0aGlz Ll9sYXN0UHJvZmlsZUhlYWRlciA9IG51bGw7CiAKLSAgICB0aGlzLl9jYXB0dXJpbmdNb2RlU2Vs ZWN0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckNvbWJvQm94KG51bGwpOworICAgIHRo aXMuX2NhcHR1cmluZ01vZGVTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQ29t Ym9Cb3godGhpcy5fZGlzcGF0Y2hWaWV3VXBkYXRlZEV2ZW50LmJpbmQodGhpcykpOwogICAgIHRo aXMuX2NhcHR1cmluZ01vZGVTZWxlY3Rvci5lbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDYW52YXMgY2FwdHVyZSBtb2RlLiIpOwogICAgIHRoaXMuX2NhcHR1cmluZ01vZGVT ZWxlY3Rvci5jcmVhdGVPcHRpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaW5nbGUgRnJhbWUi KSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYXB0dXJlIGEgc2luZ2xlIGNhbnZhcyBmcmFtZS4i KSwgIiIpOwogICAgIHRoaXMuX2NhcHR1cmluZ01vZGVTZWxlY3Rvci5jcmVhdGVPcHRpb24oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJDb25zZWN1dGl2ZSBGcmFtZXMiKSwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJDYXB0dXJlIGNvbnNlY3V0aXZlIGNhbnZhcyBmcmFtZXMuIiksICIxIik7CiAKKyAg ICAvKiogQHR5cGUgeyFPYmplY3QuPHN0cmluZywgRWxlbWVudD59ICovCisgICAgdGhpcy5fZnJh bWVPcHRpb25zID0ge307CisKKyAgICAvKiogQHR5cGUgeyFPYmplY3QuPHN0cmluZywgYm9vbGVh bj59ICovCisgICAgdGhpcy5fZnJhbWVzV2l0aENhbnZhc2VzID0ge307CisKKyAgICB0aGlzLl9m cmFtZVNlbGVjdG9yID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJDb21ib0JveCh0aGlzLl9k aXNwYXRjaFZpZXdVcGRhdGVkRXZlbnQuYmluZCh0aGlzKSk7CisgICAgdGhpcy5fZnJhbWVTZWxl Y3Rvci5lbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGcmFtZSBjb250YWlu aW5nIHRoZSBjYW52YXNlcyB0byBjYXB0dXJlLiIpOworICAgIHRoaXMuX2ZyYW1lU2VsZWN0b3Iu ZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICBXZWJJbnNwZWN0b3IucnVudGlt ZU1vZGVsLmNvbnRleHRMaXN0cygpLmZvckVhY2godGhpcy5fYWRkRnJhbWUsIHRoaXMpOworICAg IFdlYkluc3BlY3Rvci5ydW50aW1lTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu UnVudGltZU1vZGVsLkV2ZW50cy5GcmFtZUV4ZWN1dGlvbkNvbnRleHRMaXN0QWRkZWQsIHRoaXMu X2ZyYW1lQWRkZWQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5ydW50aW1lTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUnVudGltZU1vZGVsLkV2ZW50cy5GcmFtZUV4ZWN1dGlv bkNvbnRleHRMaXN0UmVtb3ZlZCwgdGhpcy5fZnJhbWVSZW1vdmVkLCB0aGlzKTsKKwogICAgIHRo aXMuX2RlY29yYXRpb25FbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAg ICAgdGhpcy5fZGVjb3JhdGlvbkVsZW1lbnQuYWRkU3R5bGVDbGFzcygicHJvZmlsZS1jYW52YXMt ZGVjb3JhdGlvbiIpOwogICAgIHRoaXMuX2RlY29yYXRpb25FbGVtZW50LmFkZFN0eWxlQ2xhc3Mo ImhpZGRlbiIpOwpAQCAtMzk0LDYgKzQwNyw4IEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxl VHlwZSA9IGZ1bmN0aW9uKCkKICAgICByZWxvYWRQYWdlQnV0dG9uLnRleHRDb250ZW50ID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJSZWxvYWQiKTsKICAgICByZWxvYWRQYWdlQnV0dG9uLmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fb25SZWxvYWRQYWdlQnV0dG9uQ2xpY2suYmluZCh0 aGlzKSwgZmFsc2UpOwogCisgICAgdGhpcy5fZGlzcGF0Y2hlciA9IG5ldyBXZWJJbnNwZWN0b3Iu Q2FudmFzRGlzcGF0Y2hlcih0aGlzKTsKKwogICAgIC8vIEZJWE1FOiBlbmFibGUvZGlzYWJsZSBi eSBhIFVJIGFjdGlvbj8KICAgICBDYW52YXNBZ2VudC5lbmFibGUodGhpcy5fdXBkYXRlRGVjb3Jh dGlvbkVsZW1lbnQuYmluZCh0aGlzKSk7CiAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1v ZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50 VHlwZXMuTWFpbkZyYW1lTmF2aWdhdGVkLCB0aGlzLl91cGRhdGVEZWNvcmF0aW9uRWxlbWVudCwg dGhpcyk7CkBAIC00MDQsNyArNDE5LDcgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBl LlR5cGVJZCA9ICJDQU5WQVNfUFJPRklMRSI7CiBXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVR5 cGUucHJvdG90eXBlID0gewogICAgIGdldCBzdGF0dXNCYXJJdGVtcygpCiAgICAgewotICAgICAg ICByZXR1cm4gW3RoaXMuX2NhcHR1cmluZ01vZGVTZWxlY3Rvci5lbGVtZW50XTsKKyAgICAgICAg cmV0dXJuIFt0aGlzLl9jYXB0dXJpbmdNb2RlU2VsZWN0b3IuZWxlbWVudCwgdGhpcy5fZnJhbWVT ZWxlY3Rvci5lbGVtZW50XTsKICAgICB9LAogCiAgICAgZ2V0IGJ1dHRvblRvb2x0aXAoKQpAQCAt NDQxLDcgKzQ1Niw3IEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVHlwZS5wcm90b3R5cGUg PSB7CiAgICAgICovCiAgICAgX3J1blNpbmdsZUZyYW1lQ2FwdHVyaW5nOiBmdW5jdGlvbihwcm9m aWxlc1BhbmVsKQogICAgIHsKLSAgICAgICAgQ2FudmFzQWdlbnQuY2FwdHVyZUZyYW1lKHRoaXMu X2RpZFN0YXJ0Q2FwdHVyaW5nRnJhbWUuYmluZCh0aGlzLCBwcm9maWxlc1BhbmVsKSk7CisgICAg ICAgIENhbnZhc0FnZW50LmNhcHR1cmVGcmFtZSh0aGlzLl9zZWxlY3RlZEZyYW1lSWQoKSwgdGhp cy5fZGlkU3RhcnRDYXB0dXJpbmdGcmFtZS5iaW5kKHRoaXMsIHByb2ZpbGVzUGFuZWwpKTsKICAg ICB9LAogCiAgICAgLyoqCkBAIC00NDksNyArNDY0LDcgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1By b2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfc3RhcnRGcmFtZUNhcHR1cmlu ZzogZnVuY3Rpb24ocHJvZmlsZXNQYW5lbCkKICAgICB7Ci0gICAgICAgIENhbnZhc0FnZW50LnN0 YXJ0Q2FwdHVyaW5nKHRoaXMuX2RpZFN0YXJ0Q2FwdHVyaW5nRnJhbWUuYmluZCh0aGlzLCBwcm9m aWxlc1BhbmVsKSk7CisgICAgICAgIENhbnZhc0FnZW50LnN0YXJ0Q2FwdHVyaW5nKHRoaXMuX3Nl bGVjdGVkRnJhbWVJZCgpLCB0aGlzLl9kaWRTdGFydENhcHR1cmluZ0ZyYW1lLmJpbmQodGhpcywg cHJvZmlsZXNQYW5lbCkpOwogICAgIH0sCiAKICAgICBfc3RvcEZyYW1lQ2FwdHVyaW5nOiBmdW5j dGlvbigpCkBAIC01NjUsMTEgKzU4MCwxMDYgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVU eXBlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuICF0aGlzLl9jYXB0dXJpbmdNb2RlU2Vs ZWN0b3Iuc2VsZWN0ZWRPcHRpb24oKS52YWx1ZTsKICAgICB9LAogCisgICAgLyoqCisgICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2ZyYW1lQWRk ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIGNvbnRleHRMaXN0ID0gLyoq IEB0eXBlIHtXZWJJbnNwZWN0b3IuRnJhbWVFeGVjdXRpb25Db250ZXh0TGlzdH0gKi8gKGV2ZW50 LmRhdGEpOworICAgICAgICB0aGlzLl9hZGRGcmFtZShjb250ZXh0TGlzdCk7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkZyYW1lRXhlY3V0aW9uQ29udGV4 dExpc3R9IGNvbnRleHRMaXN0CisgICAgICovCisgICAgX2FkZEZyYW1lOiBmdW5jdGlvbihjb250 ZXh0TGlzdCkKKyAgICB7CisgICAgICAgIHZhciBmcmFtZUlkID0gY29udGV4dExpc3QuZnJhbWVJ ZDsKKyAgICAgICAgdmFyIG9wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9wdGlvbiIp OworICAgICAgICBvcHRpb24udGV4dCA9IGNvbnRleHRMaXN0LmRpc3BsYXlOYW1lOworICAgICAg ICBvcHRpb24udGl0bGUgPSBjb250ZXh0TGlzdC51cmw7CisgICAgICAgIG9wdGlvbi52YWx1ZSA9 IGZyYW1lSWQ7CisKKyAgICAgICAgdGhpcy5fZnJhbWVPcHRpb25zW2ZyYW1lSWRdID0gb3B0aW9u OworCisgICAgICAgIGlmICh0aGlzLl9mcmFtZXNXaXRoQ2FudmFzZXNbZnJhbWVJZF0pIHsKKyAg ICAgICAgICAgIHRoaXMuX2ZyYW1lU2VsZWN0b3IuYWRkT3B0aW9uKG9wdGlvbik7CisgICAgICAg ICAgICB0aGlzLl9kaXNwYXRjaFZpZXdVcGRhdGVkRXZlbnQoKTsKKyAgICAgICAgfQorICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQKKyAg ICAgKi8KKyAgICBfZnJhbWVSZW1vdmVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAg IHZhciBjb250ZXh0TGlzdCA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLkZyYW1lRXhlY3V0aW9u Q29udGV4dExpc3R9ICovIChldmVudC5kYXRhKTsKKyAgICAgICAgdmFyIGZyYW1lSWQgPSBjb250 ZXh0TGlzdC5mcmFtZUlkOworICAgICAgICB2YXIgb3B0aW9uID0gdGhpcy5fZnJhbWVPcHRpb25z W2ZyYW1lSWRdOworICAgICAgICBpZiAob3B0aW9uICYmIHRoaXMuX2ZyYW1lc1dpdGhDYW52YXNl c1tmcmFtZUlkXSkgeworICAgICAgICAgICAgdGhpcy5fZnJhbWVTZWxlY3Rvci5yZW1vdmVPcHRp b24ob3B0aW9uKTsKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoVmlld1VwZGF0ZWRFdmVudCgp OworICAgICAgICB9CisgICAgICAgIGRlbGV0ZSB0aGlzLl9mcmFtZU9wdGlvbnNbZnJhbWVJZF07 CisgICAgICAgIGRlbGV0ZSB0aGlzLl9mcmFtZXNXaXRoQ2FudmFzZXNbZnJhbWVJZF07CisgICAg fSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBmcmFtZUlkCisgICAgICovCisg ICAgX2NvbnRleHRDcmVhdGVkOiBmdW5jdGlvbihmcmFtZUlkKQorICAgIHsKKyAgICAgICAgaWYg KHRoaXMuX2ZyYW1lc1dpdGhDYW52YXNlc1tmcmFtZUlkXSkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgdGhpcy5fZnJhbWVzV2l0aENhbnZhc2VzW2ZyYW1lSWRdID0gdHJ1ZTsKKyAgICAg ICAgdmFyIG9wdGlvbiA9IHRoaXMuX2ZyYW1lT3B0aW9uc1tmcmFtZUlkXTsKKyAgICAgICAgaWYg KG9wdGlvbikgeworICAgICAgICAgICAgdGhpcy5fZnJhbWVTZWxlY3Rvci5hZGRPcHRpb24ob3B0 aW9uKTsKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoVmlld1VwZGF0ZWRFdmVudCgpOworICAg ICAgICB9CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ3x1bmRlZmlu ZWR9CisgICAgICovCisgICAgX3NlbGVjdGVkRnJhbWVJZDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgdmFyIG9wdGlvbiA9IHRoaXMuX2ZyYW1lU2VsZWN0b3Iuc2VsZWN0ZWRPcHRpb24oKTsK KyAgICAgICAgcmV0dXJuIG9wdGlvbiA/IG9wdGlvbi52YWx1ZSA6IHVuZGVmaW5lZDsKKyAgICB9 LAorCisgICAgX2Rpc3BhdGNoVmlld1VwZGF0ZWRFdmVudDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgdGhpcy5fZnJhbWVTZWxlY3Rvci5lbGVtZW50LmVuYWJsZVN0eWxlQ2xhc3MoImhpZGRl biIsIHRoaXMuX2ZyYW1lU2VsZWN0b3Iuc2l6ZSgpIDw9IDEpOworICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGUuRXZlbnRzLlZpZXdV cGRhdGVkKTsKKyAgICB9LAorCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuUHJvZmlsZVR5 cGUucHJvdG90eXBlCiB9CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAaW1wbGVtZW50cyB7 Q2FudmFzQWdlbnQuRGlzcGF0Y2hlcn0KKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNhbnZhc1By b2ZpbGVUeXBlfSBwcm9maWxlVHlwZQorICovCitXZWJJbnNwZWN0b3IuQ2FudmFzRGlzcGF0Y2hl ciA9IGZ1bmN0aW9uKHByb2ZpbGVUeXBlKQoreworICAgIHRoaXMuX3Byb2ZpbGVUeXBlID0gcHJv ZmlsZVR5cGU7CisgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNhbnZhc0Rpc3BhdGNoZXIo dGhpcyk7Cit9CisKK1dlYkluc3BlY3Rvci5DYW52YXNEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsK KyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gZnJhbWVJZAorICAgICAqLworICAgIGNv bnRleHRDcmVhdGVkOiBmdW5jdGlvbihmcmFtZUlkKQorICAgIHsKKyAgICAgICAgdGhpcy5fcHJv ZmlsZVR5cGUuX2NvbnRleHRDcmVhdGVkKGZyYW1lSWQpOworICAgIH0KK30KKworLyoqCisgKiBA Y29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuUHJvZmlsZUhlYWRlcn0KICAq IEBwYXJhbSB7IVdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVHlwZX0gdHlwZQogICogQHBhcmFt IHtzdHJpbmd9IHRpdGxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Byb2ZpbGVzUGFuZWwuanMKaW5kZXggZjE1NjJmNDc0NTU0OTExODc3MTk2YzViZTMwYmUz NGQxNmUxNjk1My4uNzI5MjliMjA5MDU0Y2E2YTVmZTMxODdmYmYwNGNhMGE0YzExMTY1NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVs LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5l bC5qcwpAQCAtMjcsNiArMjcsNyBAQCBjb25zdCBVc2VySW5pdGlhdGVkUHJvZmlsZU5hbWUgPSAi b3JnLndlYmtpdC5wcm9maWxlcy51c2VyLWluaXRpYXRlZCI7CiAKIC8qKgogICogQGNvbnN0cnVj dG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KICAqIEBwYXJhbSB7c3RyaW5n fSBpZAogICogQHBhcmFtIHtzdHJpbmd9IG5hbWUKICAqLwpAQCAtNDAsNiArNDEsMTAgQEAgV2Vi SW5zcGVjdG9yLlByb2ZpbGVUeXBlID0gZnVuY3Rpb24oaWQsIG5hbWUpCiAgICAgdGhpcy50cmVl RWxlbWVudCA9IG51bGw7CiB9CiAKK1dlYkluc3BlY3Rvci5Qcm9maWxlVHlwZS5FdmVudHMgPSB7 CisgIFZpZXdVcGRhdGVkOiAidmlldy11cGRhdGVkIiwKK30KKwogV2ViSW5zcGVjdG9yLlByb2Zp bGVUeXBlLnByb3RvdHlwZSA9IHsKICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKQEAg LTEwOSw3ICsxMTQsOSBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGUucHJvdG90eXBlID0gewog ICAgIGNyZWF0ZVByb2ZpbGU6IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgewogICAgICAgICB0aHJv dyBuZXcgRXJyb3IoIk5vdCBzdXBwb3J0ZWQgZm9yICIgKyB0aGlzLl9uYW1lICsgIiBwcm9maWxl cy4iKTsKLSAgICB9CisgICAgfSwKKworICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLk9iamVj dC5wcm90b3R5cGUKIH0KIAogLyoqCkBAIC0zNjYsNiArMzczLDExIEBAIFdlYkluc3BlY3Rvci5Q cm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfb25Qcm9maWxlVHlwZVNlbGVjdGVkOiBm dW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkUHJvZmlsZVR5cGUg PSAvKiogQHR5cGUgeyFXZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGV9ICovIChldmVudC5kYXRhKTsK KyAgICAgICAgdGhpcy5fdXBkYXRlUHJvZmlsZVR5cGVTcGVjaWZpY1VJKCk7CisgICAgfSwKKwor ICAgIF91cGRhdGVQcm9maWxlVHlwZVNwZWNpZmljVUk6IGZ1bmN0aW9uKCkKKyAgICB7CiAgICAg ICAgIHRoaXMucmVjb3JkQnV0dG9uLnRpdGxlID0gdGhpcy5fc2VsZWN0ZWRQcm9maWxlVHlwZS5i dXR0b25Ub29sdGlwOwogCiAgICAgICAgIHRoaXMuX3Byb2ZpbGVUeXBlU3RhdHVzQmFySXRlbXND b250YWluZXIucmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTQ1NCw2ICs0NjYsNyBAQCBXZWJJbnNwZWN0 b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHByb2ZpbGVUeXBlLnRyZWVF bGVtZW50LmhpZGRlbiA9IHRydWU7CiAgICAgICAgIHRoaXMuc2lkZWJhclRyZWUuYXBwZW5kQ2hp bGQocHJvZmlsZVR5cGUudHJlZUVsZW1lbnQpOwogICAgICAgICBwcm9maWxlVHlwZS50cmVlRWxl bWVudC5jaGlsZHJlbkxpc3RFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51Iiwg dGhpcy5faGFuZGxlQ29udGV4dE1lbnVFdmVudC5iaW5kKHRoaXMpLCB0cnVlKTsKKyAgICAgICAg cHJvZmlsZVR5cGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUHJvZmlsZVR5cGUuRXZl bnRzLlZpZXdVcGRhdGVkLCB0aGlzLl91cGRhdGVQcm9maWxlVHlwZVNwZWNpZmljVUksIHRoaXMp OwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdGF0dXNCYXJCdXR0b24uanMKaW5kZXggYmJlZWViZGFhYmI1MzA4NzI3ZDZk OTczYmY2ODUxZjAzYzhmMzMyOC4uMjM2M2QwOThkZmQ3ZDdhYzI5OWM3NGY0NDEzYTgwNDU0NWZl NDA5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0 dXNCYXJCdXR0b24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T dGF0dXNCYXJCdXR0b24uanMKQEAgLTI4OSw2ICsyODksMTQgQEAgV2ViSW5zcGVjdG9yLlN0YXR1 c0JhckNvbWJvQm94ID0gZnVuY3Rpb24oY2hhbmdlSGFuZGxlciwgY2xhc3NOYW1lKQogCiBXZWJJ bnNwZWN0b3IuU3RhdHVzQmFyQ29tYm9Cb3gucHJvdG90eXBlID0gewogICAgIC8qKgorICAgICAq IEByZXR1cm4ge251bWJlcn0KKyAgICAgKi8KKyAgICBzaXplOiBmdW5jdGlvbigpCisgICAgewor ICAgICAgICByZXR1cm4gdGhpcy5fc2VsZWN0RWxlbWVudC5jaGlsZEVsZW1lbnRDb3VudDsKKyAg ICB9LAorCisgICAgLyoqCiAgICAgICogQHBhcmFtIHshRWxlbWVudH0gb3B0aW9uCiAgICAgICov CiAgICAgYWRkT3B0aW9uOiBmdW5jdGlvbihvcHRpb24pCg==