135170 2014-07-22 13:14:32 -0700 Web Inspector: show a replay dashboard when capturing or replaying 2014-08-11 16:41:48 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 135130 135225 1 burg burg graouts joepeck timothy webkit-bug-importer oldest_to_newest 1024046 0 burg 2014-07-22 13:14:32 -0700 Since replay is a system-wide property, the user should be able to see the system's replay status when it is relevant to the inspected web content. For example, the replay dashboard should be automatically shown when capturing or replaying starts. 1024047 1 webkit-bug-importer 2014-07-22 13:15:05 -0700 <rdar://problem/17767423> 1024100 2 burg 2014-07-22 16:02:54 -0700 Eventually I want to get some sort of mini-timeline ported to the new replay infrastructure (the one in trunk). There is also some more plumbing needed in the replay protocol domain so that recordings can be ejected and imported/exported from file. My current WIP patch adds record/play/pause buttons that are correctly synced to events from the WebInspector.ReplayManager. Since this UI isn't visible by default, I could submit just this functionality and incrementally add the other pieces. In any case, the UI will not be terribly useful until major replay blockers are landed in the next few months. Landing incrementally just reduces bitrot and branch drift. 1026904 3 timothy 2014-08-05 11:40:29 -0700 Missing patch? Looks like bug 135225 builds on this. 1026923 4 236043 burg 2014-08-05 12:24:22 -0700 Created attachment 236043 Patch 1028183 5 236043 timothy 2014-08-11 07:48:19 -0700 Comment on attachment 236043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236043&action=review > Source/WebInspectorUI/ChangeLog:20 > + * UserInterface/Images/ReplayPauseButton.svg: Added. > + * UserInterface/Images/ReplayPlayButton.svg: Added. > + * UserInterface/Images/ReplayRecordingButton.svg: Added. Once this lands I will take a look at making new icons for these to match 10.10. > Source/WebInspectorUI/UserInterface/Views/ReplayDashboardView.js:62 > + if (WebInspector.replayManager.sessionState === WebInspector.ReplayManager.SessionState.Capturing) > + this._captureStarted(); > + else if (WebInspector.replayManager.sessionState === WebInspector.ReplayManager.SessionState.Inactive) > + this._captureStopped(); > + // ReplayManager.sessionState must be Replaying. > + else if (WebInspector.replayManager.segmentState === WebInspector.ReplayManager.SegmentState.Dispatching) > + this._playbackStarted(); > + // ReplayManager.sessionState must be Unloaded or Loaded, so execution is paused. > + else > + this._playbackPaused(); switch? 1028357 6 burg 2014-08-11 16:41:48 -0700 Committed r172420: <http://trac.webkit.org/changeset/172420> 236043 2014-08-05 12:24:22 -0700 2014-08-11 07:48:18 -0700 Patch bug-135170-20140805122415.patch text/plain 21618 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi ZmM5ZjgwMGY1Njc5OTEwY2QwOGYzOGE4YjFlNTIxNDdjNjU1MDNiLi5iY2ZkZWIwNDdiYTQyYzUx ZTg2NTEwYjNjODJiNGZhZDk3MTVkMTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0NSBAQAorMjAxNC0wNy0yMiAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc2hvdyBhIHJlcGxheSBkYXNoYm9hcmQg d2hlbiBjYXB0dXJpbmcgb3IgcmVwbGF5aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUxNzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSByZXBsYXkgZGFzaGJvYXJkIHdp dGggcmVjb3JkL3BsYXkvcGF1c2UgYnV0dG9ucy4gSXQKKyAgICAgICAgaXMgc2hvd24gYXV0b21h dGljYWxseSB3aGVuIHRoZSB1c2VyIHN0YXJ0cyBjYXB0dXJpbmcgYW4gZXhlY3V0aW9uIGZyb20K KyAgICAgICAgdGhlIHJlcGxheSBtZW51IGluIHRoZSBUaW1lbGluZXMgc2lkZWJhciBwYW5lbC4K KworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5sb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9jYXB0dXJlRGlkU3RhcnQpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGFzaGJvYXJkTWFuYWdlci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXNoYm9hcmRNYW5hZ2VyKToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0ltYWdlcy9SZXBsYXlQYXVzZUJ1dHRvbi5zdmc6IEFkZGVkLgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvSW1hZ2VzL1JlcGxheVBsYXlCdXR0b24uc3ZnOiBBZGRlZC4KKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL0ltYWdlcy9SZXBsYXlSZWNvcmRpbmdCdXR0b24uc3ZnOiBBZGRl ZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDoKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL01vZGVscy9SZXBsYXlEYXNoYm9hcmQuanM6IEFkZGVkLgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlcGxheURhc2hib2FyZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9C dXR0b25OYXZpZ2F0aW9uSXRlbS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CdXR0b25OYXZp Z2F0aW9uSXRlbS5wcm90b3R5cGUuX3VwZGF0ZUltYWdlKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0Rhc2hib2FyZFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGFzaGJv YXJkVmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXBsYXlEYXNoYm9hcmRW aWV3LmNzczogQWRkZWQuCisgICAgICAgICgudG9vbGJhciAuZGFzaGJvYXJkLnJlcGxheSk6Cisg ICAgICAgICgudG9vbGJhciAuZGFzaGJvYXJkLnJlcGxheSBkaXYubmF2aWdhdGlvbi1iYXIpOgor ICAgICAgICAoLnRvb2xiYXIgLmRhc2hib2FyZC5yZXBsYXkgLml0ZW0uYnV0dG9uID4gLmdseXBo KToKKyAgICAgICAgKC50b29sYmFyLmxhYmVsLW9ubHkgLmRhc2hib2FyZC5yZXBsYXkgLml0ZW0u YnV0dG9uID4gLmdseXBoKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlcGxheURh c2hib2FyZFZpZXcuanM6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlcGxheURhc2hi b2FyZFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlcGxheURhc2hib2FyZFZpZXcucHJv dG90eXBlLl9jYXB0dXJlQnV0dG9uSXRlbUNsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlcGxheURhc2hib2FyZFZpZXcucHJvdG90eXBlLl9yZXBsYXlCdXR0b25JdGVtQ2xpY2tlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVwbGF5RGFzaGJvYXJkVmlldy5wcm90b3R5cGUuX2Nh cHR1cmVTdGFydGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXBsYXlEYXNoYm9hcmRWaWV3 LnByb3RvdHlwZS5fY2FwdHVyZVN0b3BwZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlcGxh eURhc2hib2FyZFZpZXcucHJvdG90eXBlLl9wbGF5YmFja1N0YXJ0ZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlJlcGxheURhc2hib2FyZFZpZXcucHJvdG90eXBlLl9wbGF5YmFja1BhdXNlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVwbGF5RGFzaGJvYXJkVmlldy5wcm90b3R5cGUuX3Bs YXliYWNrRmluaXNoZWQpOgorCiAyMDE0LTA3LTIxICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53 YXNoaW5ndG9uLmVkdT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBjYW5ub3QgbmF2aWdhdGUg YmV0d2VlbiBtdWx0aXBsZSBhcHBsaWNhYmxlIGRhc2hib2FyZHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzCmluZGV4IDIxNDdlOGEwNTQ1OGJhOTI0NTU1Y2EyNjJmNzYwNmIxNzUwOTM4 N2UuLjdlMjAxNTBmMTlkZjMzNmNkN2U1YTgwZTY2ZmFmNThiYWI4NWU4ZDUgMTAwNjQ0CkdJVCBi aW5hcnkgcGF0Y2gKZGVsdGEgMTU0CnpjbWRuRGl1dTQ9PF8reWU7PzR8MzQ1PHU+Mz8pRVAwWjF6 X195Smt2bGxTZFdsKkEjJnBmTEh0WX0/SzRNdndHNAp6R2EyJDJHOHV7KUdDJiU1LUdGUTtBRjMh bD42ME9FNCQkMDZwdmZmKzg0UmYpZ0BPU0xDfUwyPjtadlNGMDA4eCUKQkVVZj9sCgpkZWx0YSAy NApnY21YQEdtVS1WUTxfK3llbj87UXU+Mko8V3skUk5JX1NCfmkwRnN7IUpwY2R6CgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDJk NTBiNzM0YTc3NGJmNDU3NjQ3MGU1NWYxMGMwODg3NTk3MjBjNTQuLmU5YmQ2YzE4YWQ4OTI4NjI2 ZWNjMGFkM2M5OWNlZjc0MTYyMzljMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTEyNCw2ICsxMjQsNyBAQCBXZWJJbnNwZWN0 b3IubG9hZGVkID0gZnVuY3Rpb24oKQogICAgICAgICBDb25zb2xlQWdlbnQuZW5hYmxlKCk7CiAK ICAgICAvLyBSZWdpc3RlciBmb3IgZXZlbnRzLgorICAgIHRoaXMucmVwbGF5TWFuYWdlci5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXBsYXlNYW5hZ2VyLkV2ZW50LkNhcHR1cmVTdGFy dGVkLCB0aGlzLl9jYXB0dXJlRGlkU3RhcnQsIHRoaXMpOwogICAgIHRoaXMuZGVidWdnZXJNYW5h Z2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5Q YXVzZWQsIHRoaXMuX2RlYnVnZ2VyRGlkUGF1c2UsIHRoaXMpOwogICAgIHRoaXMuZGVidWdnZXJN YW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTWFuYWdlci5FdmVu dC5SZXN1bWVkLCB0aGlzLl9kZWJ1Z2dlckRpZFJlc3VtZSwgdGhpcyk7CiAgICAgdGhpcy5kb21U cmVlTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5F dmVudC5JbnNwZWN0TW9kZVN0YXRlQ2hhbmdlZCwgdGhpcy5faW5zcGVjdE1vZGVTdGF0ZUNoYW5n ZWQsIHRoaXMpOwpAQCAtNzQ0LDYgKzc0NSwxMSBAQCBXZWJJbnNwZWN0b3IuX2RyYWdPdmVyID0g ZnVuY3Rpb24oZXZlbnQpCiAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKIH0KIAorV2ViSW5z cGVjdG9yLl9jYXB0dXJlRGlkU3RhcnQgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICB0aGlzLmRh c2hib2FyZENvbnRhaW5lci5zaG93RGFzaGJvYXJkVmlld0ZvclJlcHJlc2VudGVkT2JqZWN0KHRo aXMuZGFzaGJvYXJkTWFuYWdlci5kYXNoYm9hcmRzLnJlcGxheSk7Cit9CisKIFdlYkluc3BlY3Rv ci5fZGVidWdnZXJEaWRQYXVzZSA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHRoaXMuZGVidWdn ZXJTaWRlYmFyUGFuZWwuc2hvdygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGFzaGJvYXJkTWFuYWdlci5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0Rhc2hib2FyZE1hbmFnZXIu anMKaW5kZXggNzgxYzgxOTlmN2MzMzQ0Y2YwOWY3NDRhZWM3YThhZGZkZDhmNmQyOC4uOTQyNWE1 ZWQ0ZGI4NWM4MjM1ZTliN2FiOGUxMTg1N2NlOWNiOWY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGFzaGJvYXJkTWFuYWdlci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9E YXNoYm9hcmRNYW5hZ2VyLmpzCkBAIC0yOSw2ICsyOSw3IEBAIFdlYkluc3BlY3Rvci5EYXNoYm9h cmRNYW5hZ2VyID0gZnVuY3Rpb24oKSB7CiAgICAgdGhpcy5fZGFzaGJvYXJkcyA9IHt9OwogICAg IHRoaXMuX2Rhc2hib2FyZHMuZGVmYXVsdCA9IG5ldyBXZWJJbnNwZWN0b3IuRGVmYXVsdERhc2hi b2FyZDsKICAgICB0aGlzLl9kYXNoYm9hcmRzLmRlYnVnZ2VyID0gbmV3IFdlYkluc3BlY3Rvci5E ZWJ1Z2dlckRhc2hib2FyZDsKKyAgICB0aGlzLl9kYXNoYm9hcmRzLnJlcGxheSA9IG5ldyBXZWJJ bnNwZWN0b3IuUmVwbGF5RGFzaGJvYXJkOwogfTsKIAogV2ViSW5zcGVjdG9yLkRhc2hib2FyZE1h bmFnZXIucHJvdG90eXBlID0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvSW1hZ2VzL1JlcGxheVBhdXNlQnV0dG9uLnN2ZyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9SZXBsYXlQYXVzZUJ1dHRvbi5zdmcKbmV3IGZp bGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZDliNWU5YzI4YjEwMzM1ZjdlZTAxMmI2YTIzZjEwZjk4ODg5MWFiMQotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9SZXBs YXlQYXVzZUJ1dHRvbi5zdmcKQEAgLTAsMCArMSwxMCBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBl bmNvZGluZz0idXRmLTgiPz4KKzwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNC4w LjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDQzMzYzKSAg LS0+Cis8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRw Oi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPgorPHN2ZyB2ZXJz aW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmci IHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBw eCIKKwkgd2lkdGg9IjM2cHgiIGhlaWdodD0iMzZweCIgdmlld0JveD0iMCAwIDM2IDM2IiBlbmFi bGUtYmFja2dyb3VuZD0ibmV3IDAgMCAzNiAzNiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+Cis8Zz4K Kwk8cmVjdCB4PSI1LjY1NiIgeT0iNC4yMDIiIHdpZHRoPSI5LjI1NSIgaGVpZ2h0PSIyNy41OTci Lz4KKwk8cmVjdCB4PSIyMS4wOSIgeT0iNC4yMDIiIHdpZHRoPSI5LjI1NCIgaGVpZ2h0PSIyNy41 OTciLz4KKzwvZz4KKzwvc3ZnPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvSW1hZ2VzL1JlcGxheVBsYXlCdXR0b24uc3ZnIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL1JlcGxheVBsYXlCdXR0b24uc3ZnCm5ldyBmaWxl IG1vZGUgMTAwNzU1CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjQ1MGQ1MzlmN2FiOGU5ZjFiNTU4NWZlOWMyYTFmNDVlYzU5YmJjOTQKLS0tIC9kZXYvbnVs bAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvUmVwbGF5 UGxheUJ1dHRvbi5zdmcKQEAgLTAsMCArMSw3IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29k aW5nPSJ1dGYtOCI/PgorPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE0LjAuMCwg U1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgNDMzNjMpICAtLT4K KzwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93 d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+Cis8c3ZnIHZlcnNpb249 IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1s bnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Igor CSB3aWR0aD0iMzZweCIgaGVpZ2h0PSIzNnB4IiB2aWV3Qm94PSIwIDAgMzYgMzYiIGVuYWJsZS1i YWNrZ3JvdW5kPSJuZXcgMCAwIDM2IDM2IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KKzxwb2x5Z29u IGZpbGw9IiMzOEFGNEEiIHBvaW50cz0iNS42MjUsNC4yMSAzMC4zNzUsMTggNS42MjUsMzEuNzkg Ii8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0ltYWdlcy9SZXBsYXlSZWNvcmRpbmdCdXR0b24uc3ZnIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL1JlcGxheVJlY29yZGluZ0J1dHRvbi5zdmcKbmV3IGZp bGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uODA0MGUwNzNmYTU0YjM4N2ZjYzIxYjJhNjMzNjcwNDQwYmJkZTQzYQotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9SZXBs YXlSZWNvcmRpbmdCdXR0b24uc3ZnCkBAIC0wLDAgKzEsNyBAQAorPD94bWwgdmVyc2lvbj0iMS4w IiBlbmNvZGluZz0idXRmLTgiPz4KKzwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAx NC4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDQzMzYz KSAgLS0+Cis8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJo dHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPgorPHN2ZyB2 ZXJzaW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9z dmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9 IjBweCIKKwkgd2lkdGg9IjM2cHgiIGhlaWdodD0iMzZweCIgdmlld0JveD0iMCAwIDM2IDM2IiBl bmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAzNiAzNiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+Cis8 Y2lyY2xlIGZpbGw9IiNFRTJEMjQiIGN4PSIxOCIgY3k9IjE4IiByPSIxMy42MDUiLz4KKzwvc3Zn PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5o dG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCmluZGV4 IGMxZTJkOTRlYWViNDk5MzdlMTRmZTk2MDc2YzE3MDRiNzNmZWZhN2UuLjcwMTdkMjljMDIwNzli MTZjMzJlOTZmYWIwY2U1ZmQ1ZDliM2IzZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9NYWluLmh0bWwKQEAgLTEwNiw2ICsxMDYsNyBAQAogICAgIDxsaW5rIHJl bD0ic3R5bGVzaGVldCIgaHJlZj0iVmlld3MvUHJvYmVTZXREYXRhR3JpZC5jc3MiPgogICAgIDxs aW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iVmlld3MvUXVpY2tDb25zb2xlLmNzcyI+CiAgICAg PGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SYWRpb0J1dHRvbk5hdmlnYXRpb25J dGVtLmNzcyI+CisgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SZXBsYXlE YXNoYm9hcmRWaWV3LmNzcyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3 cy9SZXNvdXJjZUljb25zLmNzcyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJW aWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5jc3MiPgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVl dCIgaHJlZj0iVmlld3MvUmVzb3VyY2VUcmVlRWxlbWVudC5jc3MiPgpAQCAtMjQ4LDYgKzI0OSw3 IEBACiAgICAgPHNjcmlwdCBzcmM9Ik1vZGVscy9Qcm9maWxlLmpzIj48L3NjcmlwdD4KICAgICA8 c2NyaXB0IHNyYz0iTW9kZWxzL1Byb2ZpbGVOb2RlLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHNyYz0iTW9kZWxzL1Byb2ZpbGVOb2RlQ2FsbC5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBz cmM9Ik1vZGVscy9SZXBsYXlEYXNoYm9hcmQuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJNb2RlbHMvUmVwbGF5U2Vzc2lvbi5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9Ik1v ZGVscy9SZXBsYXlTZXNzaW9uU2VnbWVudC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9 Ik1vZGVscy9SZXNvdXJjZS5qcyI+PC9zY3JpcHQ+CkBAIC00MTksNiArNDIxLDcgQEAKICAgICA8 c2NyaXB0IHNyYz0iVmlld3MvUXVpY2tDb25zb2xlLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHNyYz0iVmlld3MvUXVpY2tDb25zb2xlTmF2aWdhdGlvbkJhci5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCBzcmM9IlZpZXdzL1JhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0uanMiPjwvc2NyaXB0 PgorICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9SZXBsYXlEYXNoYm9hcmRWaWV3LmpzIj48L3Njcmlw dD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvUmVzb3VyY2VDbHVzdGVyQ29udGVudFZpZXcuanMi Pjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9SZXNvdXJjZURldGFpbHNTaWRlYmFy UGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9SZXNvdXJjZVNpZGVi YXJQYW5lbC5qcyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvUmVwbGF5RGFzaGJvYXJkLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlcGxheURhc2hib2FyZC5qcwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li44ZGI1YzFiNDk2MzliN2IxNmQ1YzRmZGU0ZWVlMWRiNDgxNTgwMGNmCi0tLSAvZGV2L251bGwK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlcGxheURh c2hib2FyZC5qcwpAQCAtMCwwICsxLDMzIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IFVu aXZlcnNpdHkgb2YgV2FzaGluZ3Rvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor V2ViSW5zcGVjdG9yLlJlcGxheURhc2hib2FyZCA9IGZ1bmN0aW9uKCkgeworICAgIFdlYkluc3Bl Y3Rvci5PYmplY3QuY2FsbCh0aGlzKTsKK307CisKK1dlYkluc3BlY3Rvci5SZXBsYXlEYXNoYm9h cmQucHJvdG90eXBlID0geworICAgIGNvbnN0cnVjdG9yOiBXZWJJbnNwZWN0b3IuUmVwbGF5RGFz aGJvYXJkLAorICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGUsCit9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGFzaGJvYXJkVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0Rhc2hib2FyZFZpZXcuanMKaW5kZXggMWRlZDUxNTg2ZjdlYzIxYjMxZWI0ZjMwNjk0MGRh NjI2NGZhYWIzYy4uODdjYjg4YTg1YzhlNDgyMTg2OTViYzk5MjAzYTNlMTUyZmZhZTQyZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGFzaGJv YXJkVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EYXNoYm9hcmRWaWV3LmpzCkBAIC0zNSw2ICszNSw5IEBAIFdlYkluc3BlY3Rvci5EYXNoYm9h cmRWaWV3ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QsIGlkZW50aWZpZXIpCiAgICAgICAg IGlmIChyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5EZWJ1Z2dlckRh c2hib2FyZCkKICAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyRGFz aGJvYXJkVmlldyhyZXByZXNlbnRlZE9iamVjdCk7CiAKKyAgICAgICAgaWYgKHJlcHJlc2VudGVk T2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlcGxheURhc2hib2FyZCkKKyAgICAgICAg ICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlcGxheURhc2hib2FyZFZpZXcocmVwcmVzZW50 ZWRPYmplY3QpOworCiAgICAgICAgIHRocm93ICJDYW4ndCBtYWtlIGEgRGFzaGJvYXJkVmlldyBm b3IgYW4gdW5rbm93biByZXByZXNlbnRlZE9iamVjdC4iOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVwbGF5RGFzaGJvYXJk Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXBs YXlEYXNoYm9hcmRWaWV3LmNzcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMWI2ZTZlZjgxNWQyM2ZjNjQwNjExYjM5 NDNkY2Q2YTFhMGQwODkyCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVwbGF5RGFzaGJvYXJkVmlldy5jc3MKQEAgLTAsMCArMSw1 NSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNCBVbml2ZXJzaXR5IG9mIFdhc2hpbmd0b24u IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAq IGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICog QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBX SEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisudG9vbGJhciAuZGFzaGJvYXJkLnJlcGxh eSB7CisgICAgZGlzcGxheTogLXdlYmtpdC1mbGV4OworICAgIC13ZWJraXQtZmxleC13cmFwOiBu b3dyYXA7CisgICAgLXdlYmtpdC1qdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjsKKyAgICAtd2Via2l0 LWFsaWduLWl0ZW1zOiBjZW50ZXI7CisKKyAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CisgICAgdGV4 dC1zaGFkb3c6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC41KSAwIDFweCAwOworICAgIGNvbG9yOiBy Z2IoNjAsIDYwLCA2MCk7CisgICAgcGFkZGluZzogMCA1cHg7Cit9CisKKy50b29sYmFyIC5kYXNo Ym9hcmQucmVwbGF5IGRpdi5uYXZpZ2F0aW9uLWJhciB7CisgICAgYm9yZGVyLWJvdHRvbTogbm9u ZSAhaW1wb3J0YW50OworfQorCisudG9vbGJhciAuZGFzaGJvYXJkLnJlcGxheSAuaXRlbS5idXR0 b24gPiAuZ2x5cGggeworICAgIC8qIEJ1dHRvbk5hdmlnYXRpb25JdGVtIGlzIG5vdCBhd2FyZSBv ZiBhbHRlcm5hdGUgYnV0dG9uIHNpemVzLCBzbyBvdmVycmlkZSBoZXJlLiAqLworICAgIHdpZHRo OiAxNnB4ICFpbXBvcnRhbnQ7CisgICAgaGVpZ2h0OiAxNnB4ICFpbXBvcnRhbnQ7Cit9CisKKy50 b29sYmFyLmxhYmVsLW9ubHkgLmRhc2hib2FyZC5yZXBsYXkgLml0ZW0uYnV0dG9uID4gLmdseXBo IHsKKyAgICAvKiBUaGUgZGVmYXVsdCBzdHlsZXMgaGVyZSB3aWxsIHRyeSB0byBlbGlkZSBidXR0 b25zIGluIGxhYmVsLW9ubHkgbW9kZS4gKi8KKyAgICBkaXNwbGF5OiAtd2Via2l0LWZsZXggIWlt cG9ydGFudDsKKworICAgIC8qIEJ1dHRvbk5hdmlnYXRpb25JdGVtIGlzIG5vdCBhd2FyZSBvZiBh bHRlcm5hdGUgYnV0dG9uIHNpemVzLCBzbyBvdmVycmlkZSBoZXJlLiAqLworICAgIHdpZHRoOiAx NHB4ICFpbXBvcnRhbnQ7CisgICAgaGVpZ2h0OiAxNHB4ICFpbXBvcnRhbnQ7Cit9CisKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlcGxheURh c2hib2FyZFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXBsYXlEYXNoYm9hcmRWaWV3LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjZlMGNjYmM1ZDgyNzcxMzgyMzhl OTcxY2IxYzc5ZDA0NGM2YTdiNDUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXBsYXlEYXNoYm9hcmRWaWV3LmpzCkBAIC0wLDAg KzEsMTI2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IFVuaXZlcnNpdHkgb2YgV2FzaGlu Z3Rvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn CisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwor ICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICog SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVjdG9yLlJlcGxh eURhc2hib2FyZFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKK3sKKyAgICBXZWJJ bnNwZWN0b3IuRGFzaGJvYXJkVmlldy5jYWxsKHRoaXMsIHJlcHJlc2VudGVkT2JqZWN0LCAicmVw bGF5Iik7CisKKyAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyID0gbmV3IFdlYkluc3BlY3Rvci5OYXZp Z2F0aW9uQmFyOworICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0aW9u QmFyLmVsZW1lbnQpOworCisgICAgcmVwbGF5TWFuYWdlciA9IFdlYkluc3BlY3Rvci5yZXBsYXlN YW5hZ2VyOworCisgICAgdGhpcy5fY2FwdHVyZUJ1dHRvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9y LkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInJlcGxheS1kYXNoYm9hcmQtY2FwdHVyZSIs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQgUmVjb3JkaW5nIiksIFdlYkluc3BlY3Rvci5V SVN0cmluZygiU3RvcCBSZWNvcmRpbmciKSwgIkltYWdlcy9SZXBsYXlSZWFkeUJ1dHRvbi5zdmci LCAxNiwgMTYpOworICAgIHRoaXMuX2NhcHR1cmVCdXR0b25JdGVtLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2Nh cHR1cmVCdXR0b25JdGVtQ2xpY2tlZCwgdGhpcyk7CisgICAgdGhpcy5fY2FwdHVyZUJ1dHRvbkl0 ZW0uaGlkZGVuID0gdHJ1ZTsKKyAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25J dGVtKHRoaXMuX2NhcHR1cmVCdXR0b25JdGVtKTsKKworICAgIHRoaXMuX3JlcGxheUJ1dHRvbkl0 ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLlRvZ2dsZUJ1dHRvbk5hdmlnYXRpb25JdGVtKCJyZXBsYXkt ZGFzaGJvYXJkLXJlcGxheSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQgUGxheWJhY2si KSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXVzZSBQbGF5YmFjayIpLCAiSW1hZ2VzL1JlcGxh eVBsYXlCdXR0b24uc3ZnIiwgIkltYWdlcy9SZXBsYXlQYXVzZUJ1dHRvbi5zdmciLCAxNiwgMTYp OworICAgIHRoaXMuX3JlcGxheUJ1dHRvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fcmVwbGF5QnV0dG9u SXRlbUNsaWNrZWQsIHRoaXMpOworICAgIHRoaXMuX3JlcGxheUJ1dHRvbkl0ZW0uaGlkZGVuID0g dHJ1ZTsKKyAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX3Jl cGxheUJ1dHRvbkl0ZW0pOworCisgICAgLy8gQWRkIGV2ZW50cyByZXF1aXJlZCB0byB0cmFjayBj YXB0dXJlIGFuZCByZXBsYXkgc3RhdGUuCisgICAgV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVwbGF5TWFuYWdlci5FdmVudC5DYXB0dXJl U3RhcnRlZCwgdGhpcy5fY2FwdHVyZVN0YXJ0ZWQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5y ZXBsYXlNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFnZXIu RXZlbnQuQ2FwdHVyZVN0b3BwZWQsIHRoaXMuX2NhcHR1cmVTdG9wcGVkLCB0aGlzKTsKKyAgICBX ZWJJbnNwZWN0b3IucmVwbGF5TWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5S ZXBsYXlNYW5hZ2VyLkV2ZW50LlBsYXliYWNrU3RhcnRlZCwgdGhpcy5fcGxheWJhY2tTdGFydGVk LCB0aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IucmVwbGF5TWFuYWdlci5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5SZXBsYXlNYW5hZ2VyLkV2ZW50LlBsYXliYWNrUGF1c2VkLCB0aGlzLl9w bGF5YmFja1BhdXNlZCwgdGhpcyk7CisgICAgV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVwbGF5TWFuYWdlci5FdmVudC5QbGF5YmFja0Zp bmlzaGVkLCB0aGlzLl9wbGF5YmFja0ZpbmlzaGVkLCB0aGlzKTsKKworICAgIC8vIE1hbnVhbGx5 IGluaXRpYWxpemUgc3R5bGUgY2xhc3NlcyBieSBxdWVyeWluZyBjdXJyZW50IHJlcGxheSBzdGF0 ZS4KKyAgICBpZiAoV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIuc2Vzc2lvblN0YXRlID09PSBX ZWJJbnNwZWN0b3IuUmVwbGF5TWFuYWdlci5TZXNzaW9uU3RhdGUuQ2FwdHVyaW5nKQorICAgICAg ICB0aGlzLl9jYXB0dXJlU3RhcnRlZCgpOworICAgIGVsc2UgaWYgKFdlYkluc3BlY3Rvci5yZXBs YXlNYW5hZ2VyLnNlc3Npb25TdGF0ZSA9PT0gV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFnZXIuU2Vz c2lvblN0YXRlLkluYWN0aXZlKQorICAgICAgICB0aGlzLl9jYXB0dXJlU3RvcHBlZCgpOworICAg IC8vIFJlcGxheU1hbmFnZXIuc2Vzc2lvblN0YXRlIG11c3QgYmUgUmVwbGF5aW5nLgorICAgIGVs c2UgaWYgKFdlYkluc3BlY3Rvci5yZXBsYXlNYW5hZ2VyLnNlZ21lbnRTdGF0ZSA9PT0gV2ViSW5z cGVjdG9yLlJlcGxheU1hbmFnZXIuU2VnbWVudFN0YXRlLkRpc3BhdGNoaW5nKQorICAgICAgICB0 aGlzLl9wbGF5YmFja1N0YXJ0ZWQoKTsKKyAgICAvLyBSZXBsYXlNYW5hZ2VyLnNlc3Npb25TdGF0 ZSBtdXN0IGJlIFVubG9hZGVkIG9yIExvYWRlZCwgc28gZXhlY3V0aW9uIGlzIHBhdXNlZC4KKyAg ICBlbHNlCisgICAgICAgIHRoaXMuX3BsYXliYWNrUGF1c2VkKCk7Cit9OworCisvLyBDbGFzcyBu YW1lcyBmb3IgdG9wLWxldmVsIGZsZXggaXRlbXMgd2l0aGluIHRoZSByZXBsYXkgZGFzaGJvYXJk LgorV2ViSW5zcGVjdG9yLlJlcGxheURhc2hib2FyZFZpZXcuUmVjb3JkaW5nQ29udGFpbmVyU3R5 bGVDbGFzc05hbWUgPSAicmVjb3JkaW5nLWNvbnRhaW5lciI7CisKKy8vIENsYXNzIG5hbWVzIGZv ciBzaW5nbGUgYnV0dG9ucy4KK1dlYkluc3BlY3Rvci5SZXBsYXlEYXNoYm9hcmRWaWV3LlJlY29y ZEJ1dHRvblN0eWxlQ2xhc3NOYW1lID0gInJlY29yZC1idXR0b24iOworV2ViSW5zcGVjdG9yLlJl cGxheURhc2hib2FyZFZpZXcuUmVwbGF5QnV0dG9uU3R5bGVDbGFzc05hbWUgPSAicmVwbGF5LWJ1 dHRvbiI7CisKK1dlYkluc3BlY3Rvci5SZXBsYXlEYXNoYm9hcmRWaWV3LnByb3RvdHlwZSA9IHsK KyAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLlJlcGxheURhc2hib2FyZFZpZXcsCisgICAg X19wcm90b19fOiBXZWJJbnNwZWN0b3IuRGFzaGJvYXJkVmlldy5wcm90b3R5cGUsCisKKyAgICAv LyBQcml2YXRlCisKKyAgICBfY2FwdHVyZUJ1dHRvbkl0ZW1DbGlja2VkOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIuc2Vzc2lvblN0YXRl ICE9PSBXZWJJbnNwZWN0b3IuUmVwbGF5TWFuYWdlci5TZXNzaW9uU3RhdGUuQ2FwdHVyaW5nKQor ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIuc3RhcnRDYXB0dXJpbmcoKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIuc3Rv cENhcHR1cmluZygpOworICAgIH0sCisKKyAgICBfcmVwbGF5QnV0dG9uSXRlbUNsaWNrZWQ6IGZ1 bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoV2ViSW5zcGVjdG9y LnJlcGxheU1hbmFnZXIuc2Vzc2lvblN0YXRlICE9PSBXZWJJbnNwZWN0b3IuUmVwbGF5TWFuYWdl ci5TZXNzaW9uU3RhdGUuQ2FwdHVyaW5nLCAiVHJpZWQgdG8gc3RhcnQgcmVwbGF5aW5nIHdoaWxl IFNlc3Npb25TdGF0ZSBpcyBDYXB0dXJpbmchIik7CisKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5yZXBsYXlNYW5hZ2VyLnNlc3Npb25TdGF0ZSA9PT0gV2ViSW5zcGVjdG9yLlJlcGxheU1hbmFn ZXIuU2Vzc2lvblN0YXRlLkluYWN0aXZlKQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlcGxh eU1hbmFnZXIucmVwbGF5VG9Db21wbGV0aW9uKCk7CisgICAgICAgIGVsc2UgaWYgKFdlYkluc3Bl Y3Rvci5yZXBsYXlNYW5hZ2VyLnNlZ21lbnRTdGF0ZSA9PT0gV2ViSW5zcGVjdG9yLlJlcGxheU1h bmFnZXIuU2VnbWVudFN0YXRlLkRpc3BhdGNoaW5nKQorICAgICAgICAgICAgV2ViSW5zcGVjdG9y LnJlcGxheU1hbmFnZXIucGF1c2VQbGF5YmFjaygpOworICAgICAgICBlbHNlCisgICAgICAgICAg ICBXZWJJbnNwZWN0b3IucmVwbGF5TWFuYWdlci5yZXBsYXlUb0NvbXBsZXRpb24oKTsKKyAgICB9 LAorCisgICAgX2NhcHR1cmVTdGFydGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlz Ll9jYXB0dXJlQnV0dG9uSXRlbS5oaWRkZW4gPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fY2FwdHVy ZUJ1dHRvbkl0ZW0uYWN0aXZhdGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fcmVwbGF5QnV0dG9u SXRlbS5oaWRkZW4gPSB0cnVlOworICAgIH0sCisKKyAgICBfY2FwdHVyZVN0b3BwZWQ6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2NhcHR1cmVCdXR0b25JdGVtLmFjdGl2YXRlZCA9 IGZhbHNlOworICAgICAgICB0aGlzLl9jYXB0dXJlQnV0dG9uSXRlbS5oaWRkZW4gPSB0cnVlOwor ICAgICAgICB0aGlzLl9yZXBsYXlCdXR0b25JdGVtLmhpZGRlbiA9IGZhbHNlOworICAgIH0sCisK KyAgICBfcGxheWJhY2tTdGFydGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9y ZXBsYXlCdXR0b25JdGVtLnRvZ2dsZWQgPSB0cnVlOworICAgIH0sCisKKyAgICBfcGxheWJhY2tQ YXVzZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3JlcGxheUJ1dHRvbkl0ZW0u dG9nZ2xlZCA9IGZhbHNlOworICAgIH0sCisKKyAgICBfcGxheWJhY2tGaW5pc2hlZDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVwbGF5QnV0dG9uSXRlbS50b2dnbGVkID0gZmFs c2U7CisgICAgfQorfTsK