195038 2019-02-25 22:43:02 -0800 Web Inspector: Rename LineChart to AreaChart 2019-02-25 23:41:21 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1509957 0 joepeck 2019-02-25 22:43:02 -0800 Rename LineChart to AreaChart 1509960 1 362965 joepeck 2019-02-25 22:44:20 -0800 Created attachment 362965 [PATCH] Proposed Fix 1509963 2 362965 mattbaker 2019-02-25 23:07:06 -0800 Comment on attachment 362965 [PATCH] Proposed Fix rs=me 1509971 3 joepeck 2019-02-25 23:40:24 -0800 <https://trac.webkit.org/changeset/242077/webkit> 1509972 4 webkit-bug-importer 2019-02-25 23:41:21 -0800 <rdar://problem/48392698> 362965 2019-02-25 22:44:20 -0800 2019-02-25 23:07:06 -0800 [PATCH] Proposed Fix rename-1.patch text/plain 31112 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDliNzQxMjVhMTc3Li41N2RmZDRjNDgyNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDItMjUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW5hbWUgTGluZUNoYXJ0IHRvIEFyZWFDaGFydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDoKKyAgICAg ICAgTmV3IGZpbGUgbmFtZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0FyZWFD aGFydC5qczogUmVuYW1lZCBmcm9tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xpbmVDaGFydC5qcy4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1N0YWNr ZWRBcmVhQ2hhcnQuanM6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TdGFja2VkTGluZUNoYXJ0LmpzLgorICAgICAgICBSZW5hbWVkLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZVZpZXcuY3NzOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVXNhZ2VTdGFja2VkVmlldy5jc3M6CisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9DUFVVc2FnZVN0YWNrZWRWaWV3LmpzOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVXNhZ2VWaWV3LmNzczoKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0NQVVVzYWdlVmlldy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0xlZ2FjeUNQVVRpbWVsaW5lVmlldy5jc3M6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9NZW1vcnlDYXRlZ29yeVZpZXcuY3NzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvTWVtb3J5Q2F0ZWdvcnlWaWV3LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv TWVtb3J5VGltZWxpbmVPdmVydmlld0dyYXBoLmNzczoKKyAgICAgICAgVXBkYXRlIHJlZmVyZW5j ZXMuCisKIDIwMTktMDItMjUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDUFUgVXNhZ2UgVGltZWxpbmUgLSBNYWluIFRocmVh ZCBJbmRpY2F0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01haW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4u aHRtbAppbmRleCAzNjgzMmMxNmM1Mi4uZjhiYjVmZDY4YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAorKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKQEAgLTU4Myw2ICs1ODMsNyBAQAogICAg IDxzY3JpcHQgc3JjPSJWaWV3cy9BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmlldy5qcyI+ PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0FwcGxpY2F0aW9uQ2FjaGVGcmFtZVRy ZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvQXBwbGljYXRp b25DYWNoZU1hbmlmZXN0VHJlZUVsZW1lbnQuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9BcmVhQ2hhcnQuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9B dWRpdE5hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9BdWRpdFRlc3RDYXNlQ29udGVudFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJWaWV3cy9BdWRpdFRlc3RHcm91cENvbnRlbnRWaWV3LmpzIj48L3NjcmlwdD4KQEAg LTcxMiw3ICs3MTMsNiBAQAogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9MYXlvdXRUaW1lbGluZU92 ZXJ2aWV3R3JhcGguanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9MYXlvdXRU aW1lbGluZVZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9MZWdhY3lD UFVUaW1lbGluZVZpZXcuanMiPjwvc2NyaXB0PgotICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9MaW5l Q2hhcnQuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9Mb2dDb250ZW50Vmll dy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL01lZGlhVGltZWxpbmVEYXRh R3JpZE5vZGUuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9NZWRpYVRpbWVs aW5lT3ZlcnZpZXdHcmFwaC5qcyI+PC9zY3JpcHQ+CkBAIC04MTEsOCArODExLDggQEAKICAgICA8 c2NyaXB0IHNyYz0iVmlld3MvU3ByaW5nRWRpdG9yLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHNyYz0iVmlld3MvU1ZHSW1hZ2VSZXNvdXJjZUNsdXN0ZXJDb250ZW50Vmlldy5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1N0YWNrVHJhY2VWaWV3LmpzIj48L3NjcmlwdD4K KyAgICA8c2NyaXB0IHNyYz0iVmlld3MvU3RhY2tlZEFyZWFDaGFydC5qcyI+PC9zY3JpcHQ+CiAg ICAgPHNjcmlwdCBzcmM9IlZpZXdzL1N0YWNrZWRDb2x1bW5DaGFydC5qcyI+PC9zY3JpcHQ+Ci0g ICAgPHNjcmlwdCBzcmM9IlZpZXdzL1N0YWNrZWRMaW5lQ2hhcnQuanMiPjwvc2NyaXB0PgogICAg IDxzY3JpcHQgc3JjPSJWaWV3cy9TdG9yYWdlU2lkZWJhclBhbmVsLmpzIj48L3NjcmlwdD4KICAg ICA8c2NyaXB0IHNyYz0iVmlld3MvU3ludGF4SGlnaGxpZ2h0aW5nU3VwcG9ydC5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1RleHRDb250ZW50Vmlldy5qcyI+PC9zY3JpcHQ+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9B cmVhQ2hhcnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9B cmVhQ2hhcnQuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmM4ZDQ1 NjlmZTc5Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQXJlYUNoYXJ0LmpzCkBAIC0wLDAgKzEsMTExIEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor Ly8gQXJlYUNoYXJ0IGNyZWF0ZXMgYSBzaW5nbGUgZmlsbGVkIGFyZWEgY2hhcnQuCisvLworLy8g SW5pdGlhbGl6ZSB0aGUgY2hhcnQgd2l0aCBhIHNpemUuIFlvdSBjYW4gdGhlbiBpbmNsdWRlIGEg bmV3IHBvaW50CisvLyBpbiB0aGUgYXJlYSBjaGFydCBieSBwcm92aWRpbmcgYW4gKHgsIHkpIHBv aW50IHZpYSBgYWRkUG9pbnRgLgorLy8KKy8vIFNWRzoKKy8vCisvLyAtIFRoZXJlIGlzIGEgc2lu Z2xlIHBhdGggZm9yIGxpbmUuCisvLworLy8gIDxkaXYgY2xhc3M9ImFyZWEtY2hhcnQiPgorLy8g ICAgICA8c3ZnIHZpZXdCb3g9IjAgMCA4MDAgNzUiPgorLy8gICAgICAgICAgPHBhdGggZD0iLi4u Ii8+CisvLyAgICAgIDwvc3ZnPgorLy8gIDwvZGl2PgorCitXSS5BcmVhQ2hhcnQgPSBjbGFzcyBB cmVhQ2hhcnQgZXh0ZW5kcyBXSS5WaWV3Cit7CisgICAgY29uc3RydWN0b3IoKQorICAgIHsKKyAg ICAgICAgc3VwZXIoKTsKKworICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiYXJl YS1jaGFydCIpOworCisgICAgICAgIHRoaXMuX2NoYXJ0RWxlbWVudCA9IHRoaXMuZWxlbWVudC5h cHBlbmRDaGlsZChjcmVhdGVTVkdFbGVtZW50KCJzdmciKSk7CisgICAgICAgIHRoaXMuX2NoYXJ0 RWxlbWVudC5zZXRBdHRyaWJ1dGUoInByZXNlcnZlQXNwZWN0UmF0aW8iLCAibm9uZSIpOworCisg ICAgICAgIHRoaXMuX3BhdGhFbGVtZW50ID0gdGhpcy5fY2hhcnRFbGVtZW50LmFwcGVuZENoaWxk KGNyZWF0ZVNWR0VsZW1lbnQoInBhdGgiKSk7CisKKyAgICAgICAgdGhpcy5fcG9pbnRzID0gW107 CisgICAgICAgIHRoaXMuX3NpemUgPSBudWxsOworICAgIH0KKworICAgIC8vIFB1YmxpYworCisg ICAgZ2V0IHNpemUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NpemU7CisgICAgfQor CisgICAgc2V0IHNpemUoc2l6ZSkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9zaXplICYmIHRo aXMuX3NpemUuZXF1YWxzKHNpemUpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRo aXMuX3NpemUgPSBzaXplOworCisgICAgICAgIHRoaXMuX2NoYXJ0RWxlbWVudC5zZXRBdHRyaWJ1 dGUoInZpZXdCb3giLCBgMCAwICR7c2l6ZS53aWR0aH0gJHtzaXplLmhlaWdodH1gKTsKKworICAg ICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CisgICAgfQorCisgICAgYWRkUG9pbnQoeCwgeSkKKyAg ICB7CisgICAgICAgIHRoaXMuX3BvaW50cy5wdXNoKHt4LCB5fSk7CisgICAgfQorCisgICAgY2xl YXIoKQorICAgIHsKKyAgICAgICAgdGhpcy5fcG9pbnRzID0gW107CisgICAgfQorCisgICAgLy8g UHJvdGVjdGVkCisKKyAgICBsYXlvdXQoKQorICAgIHsKKyAgICAgICAgc3VwZXIubGF5b3V0KCk7 CisKKyAgICAgICAgaWYgKHRoaXMubGF5b3V0UmVhc29uID09PSBXSS5WaWV3LkxheW91dFJlYXNv bi5SZXNpemUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKCF0aGlzLl9zaXpl KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGxldCBwYXRoQ29tcG9uZW50cyA9IFtd OworICAgICAgICBwYXRoQ29tcG9uZW50cy5wdXNoKGBNIDAgJHt0aGlzLl9zaXplLmhlaWdodH1g KTsKKyAgICAgICAgZm9yIChsZXQgcG9pbnQgb2YgdGhpcy5fcG9pbnRzKQorICAgICAgICAgICAg cGF0aENvbXBvbmVudHMucHVzaChgTCAke3BvaW50Lnh9ICR7cG9pbnQueX1gKTsKKworICAgICAg ICBsZXQgbGFzdFggPSB0aGlzLl9wb2ludHMubGVuZ3RoID8gdGhpcy5fcG9pbnRzLmxhc3RWYWx1 ZS54IDogMDsKKyAgICAgICAgcGF0aENvbXBvbmVudHMucHVzaChgTCAke2xhc3RYfSAke3RoaXMu X3NpemUuaGVpZ2h0fWApOworICAgICAgICBwYXRoQ29tcG9uZW50cy5wdXNoKCJaIik7CisKKyAg ICAgICAgbGV0IHBhdGhTdHJpbmcgPSBwYXRoQ29tcG9uZW50cy5qb2luKCIgIik7CisgICAgICAg IHRoaXMuX3BhdGhFbGVtZW50LnNldEF0dHJpYnV0ZSgiZCIsIHBhdGhTdHJpbmcpOworICAgIH0K K307CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DUFVUaW1lbGluZVZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmNzcwppbmRleCBiMzM0YjQxZWFhYi4uMTdlNDBkZmQ4 MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NQVVRpbWVsaW5lVmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmNzcwpAQCAtMTgzLDcgKzE4Myw3IEBAIGJvZHlb ZGlyPXJ0bF0gLnRpbWVsaW5lLXZpZXcuY3B1ID4gLmNvbnRlbnQgPiAuZGV0YWlscyA+IC50aW1l bGluZS1ydWxlciB7CiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotLnRpbWVsaW5lLXZpZXcuY3B1 IDptYXRjaGVzKC5saW5lLWNoYXJ0LCAuc3RhY2tlZC1saW5lLWNoYXJ0KSAubWFya2VycyB7Cisu dGltZWxpbmUtdmlldy5jcHUgOm1hdGNoZXMoLmFyZWEtY2hhcnQsIC5zdGFja2VkLWFyZWEtY2hh cnQpIC5tYXJrZXJzIHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgdG9wOiAwOwogICAg IGxlZnQ6IDA7CkBAIC0xOTIsNyArMTkyLDcgQEAgYm9keVtkaXI9cnRsXSAudGltZWxpbmUtdmll dy5jcHUgPiAuY29udGVudCA+IC5kZXRhaWxzID4gLnRpbWVsaW5lLXJ1bGVyIHsKICAgICBwb2lu dGVyLWV2ZW50czogbm9uZTsKIH0KIAotLnRpbWVsaW5lLXZpZXcuY3B1IDptYXRjaGVzKC5saW5l LWNoYXJ0LCAuc3RhY2tlZC1saW5lLWNoYXJ0KSAubWFya2VycyA+IGRpdiB7CisudGltZWxpbmUt dmlldy5jcHUgOm1hdGNoZXMoLmFyZWEtY2hhcnQsIC5zdGFja2VkLWFyZWEtY2hhcnQpIC5tYXJr ZXJzID4gZGl2IHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgei1pbmRleDogMTA7CiAg ICAgd2lkdGg6IDEwMCU7CkBAIC0yMDAsMTUgKzIwMCwxNSBAQCBib2R5W2Rpcj1ydGxdIC50aW1l bGluZS12aWV3LmNwdSA+IC5jb250ZW50ID4gLmRldGFpbHMgPiAudGltZWxpbmUtcnVsZXIgewog ICAgIGJhY2tncm91bmQtY29sb3I6IGhzbGEoMCwgMCUsIHZhcigtLWZvcmVncm91bmQtbGlnaHRu ZXNzKSwgMC4wNyk7CiB9CiAKLWJvZHlbZGlyPWx0cl0gLnRpbWVsaW5lLXZpZXcuY3B1IDptYXRj aGVzKC5saW5lLWNoYXJ0LCAuc3RhY2tlZC1saW5lLWNoYXJ0KSAubWFya2VycyA+IGRpdiB7Citi b2R5W2Rpcj1sdHJdIC50aW1lbGluZS12aWV3LmNwdSA6bWF0Y2hlcyguYXJlYS1jaGFydCwgLnN0 YWNrZWQtYXJlYS1jaGFydCkgLm1hcmtlcnMgPiBkaXYgewogICAgIHRleHQtYWxpZ246IGVuZDsK IH0KIAotYm9keVtkaXI9cnRsXSAudGltZWxpbmUtdmlldy5jcHUgOm1hdGNoZXMoLmxpbmUtY2hh cnQsIC5zdGFja2VkLWxpbmUtY2hhcnQpIC5tYXJrZXJzID4gZGl2IHsKK2JvZHlbZGlyPXJ0bF0g LnRpbWVsaW5lLXZpZXcuY3B1IDptYXRjaGVzKC5hcmVhLWNoYXJ0LCAuc3RhY2tlZC1hcmVhLWNo YXJ0KSAubWFya2VycyA+IGRpdiB7CiAgICAgdHJhbnNmb3JtOiBzY2FsZVgoLTEpOwogfQogCi0u dGltZWxpbmUtdmlldy5jcHUgOm1hdGNoZXMoLmxpbmUtY2hhcnQsIC5zdGFja2VkLWxpbmUtY2hh cnQpIC5tYXJrZXJzID4gZGl2ID4gLmxhYmVsIHsKKy50aW1lbGluZS12aWV3LmNwdSA6bWF0Y2hl cyguYXJlYS1jaGFydCwgLnN0YWNrZWQtYXJlYS1jaGFydCkgLm1hcmtlcnMgPiBkaXYgPiAubGFi ZWwgewogICAgIHBhZGRpbmc6IDJweDsKICAgICBmb250LXNpemU6IDhweDsKICAgICBjb2xvcjog dmFyKC0tdGV4dC1jb2xvci1zZWNvbmRhcnkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVXNhZ2VTdGFja2VkVmlldy5jc3MgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVVc2FnZVN0YWNrZWRWaWV3 LmNzcwppbmRleCBlZTA3YmRmMGQ1ZS4uYTA0YzVlYzUzMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NQVVVzYWdlU3RhY2tlZFZpZXcuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NQVVVzYWdl U3RhY2tlZFZpZXcuY3NzCkBAIC01Nyw4ICs1Nyw4IEBAIGJvZHlbZGlyPXJ0bF0gLmNwdS11c2Fn ZS1zdGFja2VkLXZpZXcgPiAuZ3JhcGggewogfQogCiAuY3B1LXVzYWdlLXN0YWNrZWQtdmlldyA+ IC5ncmFwaCwKLS5jcHUtdXNhZ2Utc3RhY2tlZC12aWV3ID4gLmdyYXBoID4gLnN0YWNrZWQtbGlu ZS1jaGFydCwKLS5jcHUtdXNhZ2Utc3RhY2tlZC12aWV3ID4gLmdyYXBoID4gLnN0YWNrZWQtbGlu ZS1jaGFydCA+IHN2ZyB7CisuY3B1LXVzYWdlLXN0YWNrZWQtdmlldyA+IC5ncmFwaCA+IC5zdGFj a2VkLWFyZWEtY2hhcnQsCisuY3B1LXVzYWdlLXN0YWNrZWQtdmlldyA+IC5ncmFwaCA+IC5zdGFj a2VkLWFyZWEtY2hhcnQgPiBzdmcgewogICAgIHdpZHRoOiAxMDAlOwogICAgIGhlaWdodDogMTAw JTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NQVVVzYWdlU3RhY2tlZFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9DUFVVc2FnZVN0YWNrZWRWaWV3LmpzCmluZGV4IGExNzBmMGQ4Zjk2Li4x MDk1NmJhYTNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ1BVVXNhZ2VTdGFja2VkVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVVc2FnZVN0YWNrZWRWaWV3LmpzCkBAIC00OSw3ICs0 OSw3IEBAIFdJLkNQVVVzYWdlU3RhY2tlZFZpZXcgPSBjbGFzcyBDUFVVc2FnZVN0YWNrZWRWaWV3 IGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlzLl9ncmFwaEVsZW1lbnQgPSB0aGlzLmVsZW1l bnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwogICAgICAgICB0 aGlzLl9ncmFwaEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZ3JhcGgiKTsKIAotICAgICAgICB0aGlz Ll9jaGFydCA9IG5ldyBXSS5TdGFja2VkTGluZUNoYXJ0OworICAgICAgICB0aGlzLl9jaGFydCA9 IG5ldyBXSS5TdGFja2VkQXJlYUNoYXJ0OwogICAgICAgICB0aGlzLl9jaGFydC5pbml0aWFsaXpl U2VjdGlvbnMoWyJtYWluLXRocmVhZC11c2FnZSIsICJ3b3JrZXItdGhyZWFkLXVzYWdlIiwgInRv dGFsLXVzYWdlIl0pOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fY2hhcnQpOwogICAg ICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY2hhcnQuZWxlbWVudCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D UFVVc2FnZVZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ1BVVXNhZ2VWaWV3LmNzcwppbmRleCA5MWIxMGY2MmVjNC4uYTA4YTVlZDNmZGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NQVVVzYWdl Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q1BVVXNhZ2VWaWV3LmNzcwpAQCAtNTcsOCArNTcsOCBAQCBib2R5W2Rpcj1ydGxdIC5jcHUtdXNh Z2UtdmlldyA+IC5ncmFwaCB7CiB9CiAKIC5jcHUtdXNhZ2UtdmlldyA+IC5ncmFwaCwKLS5jcHUt dXNhZ2UtdmlldyA+IC5ncmFwaCA+IC5saW5lLWNoYXJ0LAotLmNwdS11c2FnZS12aWV3ID4gLmdy YXBoID4gLmxpbmUtY2hhcnQgPiBzdmcgeworLmNwdS11c2FnZS12aWV3ID4gLmdyYXBoID4gLmFy ZWEtY2hhcnQsCisuY3B1LXVzYWdlLXZpZXcgPiAuZ3JhcGggPiAuYXJlYS1jaGFydCA+IHN2ZyB7 CiAgICAgd2lkdGg6IDEwMCU7CiAgICAgaGVpZ2h0OiAxMDAlOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVXNhZ2VWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVXNhZ2VWaWV3Lmpz CmluZGV4IDgwOTg4ZDJhODk1Li45NjIyMjQ4NGJhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVXNhZ2VWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NQVVVzYWdlVmlldy5qcwpAQCAt NDksNyArNDksNyBAQCBXSS5DUFVVc2FnZVZpZXcgPSBjbGFzcyBDUFVVc2FnZVZpZXcgZXh0ZW5k cyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudCA9IHRoaXMuZWxlbWVudC5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CiAgICAgICAgIHRoaXMuX2dy YXBoRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJncmFwaCIpOwogCi0gICAgICAgIHRoaXMuX2NoYXJ0 ID0gbmV3IFdJLkxpbmVDaGFydDsKKyAgICAgICAgdGhpcy5fY2hhcnQgPSBuZXcgV0kuQXJlYUNo YXJ0OwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fY2hhcnQpOwogICAgICAgICB0aGlz Ll9ncmFwaEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY2hhcnQuZWxlbWVudCk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGVn YWN5Q1BVVGltZWxpbmVWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0xlZ2FjeUNQVVRpbWVsaW5lVmlldy5jc3MKaW5kZXggNDhhZDNhZjMyNTcuLmQ1 YTRmZjA2NmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MZWdhY3lDUFVUaW1lbGluZVZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeUNQVVRpbWVsaW5lVmlldy5jc3MKQEAgLTYz LDcgKzYzLDcgQEAgYm9keVtkaXI9cnRsXSAudGltZWxpbmUtdmlldy5sZWdhY3ktY3B1ID4gLmNv bnRlbnQgPiAuZGV0YWlscyA+IC50aW1lbGluZS1ydWxlcgogICAgIGJvcmRlci1ib3R0b206IDFw eCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOwogfQogCi0udGltZWxpbmUtdmlldy5sZWdhY3kt Y3B1IC5jcHUtdXNhZ2UtdmlldyAubGluZS1jaGFydCA+IHN2ZyA+IHBhdGggeworLnRpbWVsaW5l LXZpZXcubGVnYWN5LWNwdSAuY3B1LXVzYWdlLXZpZXcgLmFyZWEtY2hhcnQgPiBzdmcgPiBwYXRo IHsKICAgICBzdHJva2U6IHZhcigtLWNwdS1zdHJva2UtY29sb3IpOwogICAgIGZpbGw6IHZhcigt LWNwdS1tYWluLXRocmVhZC1maWxsLWNvbG9yKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xpbmVDaGFydC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xpbmVDaGFydC5qcwpkZWxldGVkIGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMTllZDBhNWRlMGQuLjAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xpbmVDaGFydC5qcworKysgL2Rldi9u dWxsCkBAIC0xLDExMSArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDE2IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwot ICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElT IFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0g KiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICog QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotLy8gTGluZUNoYXJ0IGNyZWF0ZXMg YSBzaW5nbGUgZmlsbGVkIGxpbmUgY2hhcnQuCi0vLwotLy8gSW5pdGlhbGl6ZSB0aGUgY2hhcnQg d2l0aCBhIHNpemUuIFlvdSBjYW4gdGhlbiBpbmNsdWRlIGEgbmV3IHBvaW50Ci0vLyBpbiB0aGUg bGluZSBjaGFydCBieSBwcm92aWRpbmcgYW4gKHgsIHkpIHBvaW50IHZpYSBgYWRkUG9pbnRgLgot Ly8KLS8vIFNWRzoKLS8vCi0vLyAtIFRoZXJlIGlzIGEgc2luZ2xlIHBhdGggZm9yIGxpbmUuCi0v LwotLy8gIDxkaXYgY2xhc3M9ImxpbmUtY2hhcnQiPgotLy8gICAgICA8c3ZnIHZpZXdCb3g9IjAg MCA4MDAgNzUiPgotLy8gICAgICAgICAgPHBhdGggZD0iLi4uIi8+Ci0vLyAgICAgIDwvc3ZnPgot Ly8gIDwvZGl2PgotCi1XSS5MaW5lQ2hhcnQgPSBjbGFzcyBMaW5lQ2hhcnQgZXh0ZW5kcyBXSS5W aWV3Ci17Ci0gICAgY29uc3RydWN0b3IoKQotICAgIHsKLSAgICAgICAgc3VwZXIoKTsKLQotICAg ICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibGluZS1jaGFydCIpOwotCi0gICAgICAg IHRoaXMuX2NoYXJ0RWxlbWVudCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChjcmVhdGVTVkdF bGVtZW50KCJzdmciKSk7Ci0gICAgICAgIHRoaXMuX2NoYXJ0RWxlbWVudC5zZXRBdHRyaWJ1dGUo InByZXNlcnZlQXNwZWN0UmF0aW8iLCAibm9uZSIpOwotCi0gICAgICAgIHRoaXMuX3BhdGhFbGVt ZW50ID0gdGhpcy5fY2hhcnRFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZVNWR0VsZW1lbnQoInBh dGgiKSk7Ci0KLSAgICAgICAgdGhpcy5fcG9pbnRzID0gW107Ci0gICAgICAgIHRoaXMuX3NpemUg PSBudWxsOwotICAgIH0KLQotICAgIC8vIFB1YmxpYwotCi0gICAgZ2V0IHNpemUoKQotICAgIHsK LSAgICAgICAgcmV0dXJuIHRoaXMuX3NpemU7Ci0gICAgfQotCi0gICAgc2V0IHNpemUoc2l6ZSkK LSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9zaXplICYmIHRoaXMuX3NpemUuZXF1YWxzKHNpemUp KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMuX3NpemUgPSBzaXplOwotCi0g ICAgICAgIHRoaXMuX2NoYXJ0RWxlbWVudC5zZXRBdHRyaWJ1dGUoInZpZXdCb3giLCBgMCAwICR7 c2l6ZS53aWR0aH0gJHtzaXplLmhlaWdodH1gKTsKLQotICAgICAgICB0aGlzLm5lZWRzTGF5b3V0 KCk7Ci0gICAgfQotCi0gICAgYWRkUG9pbnQoeCwgeSkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3Bv aW50cy5wdXNoKHt4LCB5fSk7Ci0gICAgfQotCi0gICAgY2xlYXIoKQotICAgIHsKLSAgICAgICAg dGhpcy5fcG9pbnRzID0gW107Ci0gICAgfQotCi0gICAgLy8gUHJvdGVjdGVkCi0KLSAgICBsYXlv dXQoKQotICAgIHsKLSAgICAgICAgc3VwZXIubGF5b3V0KCk7Ci0KLSAgICAgICAgaWYgKHRoaXMu bGF5b3V0UmVhc29uID09PSBXSS5WaWV3LkxheW91dFJlYXNvbi5SZXNpemUpCi0gICAgICAgICAg ICByZXR1cm47Ci0KLSAgICAgICAgaWYgKCF0aGlzLl9zaXplKQotICAgICAgICAgICAgcmV0dXJu OwotCi0gICAgICAgIGxldCBwYXRoQ29tcG9uZW50cyA9IFtdOwotICAgICAgICBwYXRoQ29tcG9u ZW50cy5wdXNoKGBNIDAgJHt0aGlzLl9zaXplLmhlaWdodH1gKTsKLSAgICAgICAgZm9yIChsZXQg cG9pbnQgb2YgdGhpcy5fcG9pbnRzKQotICAgICAgICAgICAgcGF0aENvbXBvbmVudHMucHVzaChg TCAke3BvaW50Lnh9ICR7cG9pbnQueX1gKTsKLQotICAgICAgICBsZXQgbGFzdFggPSB0aGlzLl9w b2ludHMubGVuZ3RoID8gdGhpcy5fcG9pbnRzLmxhc3RWYWx1ZS54IDogMDsKLSAgICAgICAgcGF0 aENvbXBvbmVudHMucHVzaChgTCAke2xhc3RYfSAke3RoaXMuX3NpemUuaGVpZ2h0fWApOwotICAg ICAgICBwYXRoQ29tcG9uZW50cy5wdXNoKCJaIik7Ci0KLSAgICAgICAgbGV0IHBhdGhTdHJpbmcg PSBwYXRoQ29tcG9uZW50cy5qb2luKCIgIik7Ci0gICAgICAgIHRoaXMuX3BhdGhFbGVtZW50LnNl dEF0dHJpYnV0ZSgiZCIsIHBhdGhTdHJpbmcpOwotICAgIH0KLX07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlDYXRlZ29yeVZpZXcu Y3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5Q2F0 ZWdvcnlWaWV3LmNzcwppbmRleCAzNmMwZGU4NDE4MC4uMTFkODQ5YjE5NGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeUNhdGVnb3J5 Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TWVtb3J5Q2F0ZWdvcnlWaWV3LmNzcwpAQCAtNTMsOCArNTMsOCBAQCBib2R5W2Rpcj1ydGxdIC5t ZW1vcnktY2F0ZWdvcnktdmlldyA+IC5ncmFwaCB7CiB9CiAKIC5tZW1vcnktY2F0ZWdvcnktdmll dyA+IC5ncmFwaCwKLS5tZW1vcnktY2F0ZWdvcnktdmlldyA+IC5ncmFwaCA+IC5saW5lLWNoYXJ0 LAotLm1lbW9yeS1jYXRlZ29yeS12aWV3ID4gLmdyYXBoID4gLmxpbmUtY2hhcnQgPiBzdmcgewor Lm1lbW9yeS1jYXRlZ29yeS12aWV3ID4gLmdyYXBoID4gLmFyZWEtY2hhcnQsCisubWVtb3J5LWNh dGVnb3J5LXZpZXcgPiAuZ3JhcGggPiAuYXJlYS1jaGFydCA+IHN2ZyB7CiAgICAgd2lkdGg6IDEw MCU7CiAgICAgaGVpZ2h0OiAxMDAlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5Q2F0ZWdvcnlWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5Q2F0ZWdvcnlWaWV3LmpzCmlu ZGV4IGNlYTIzMzc1ZWQ4Li41Yzk5OTFmZDRlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5Q2F0ZWdvcnlWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeUNhdGVnb3J5Vmll dy5qcwpAQCAtNTAsNyArNTAsNyBAQCBXSS5NZW1vcnlDYXRlZ29yeVZpZXcgPSBjbGFzcyBNZW1v cnlDYXRlZ29yeVZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX2dyYXBoRWxlbWVu dCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KSk7CiAgICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJncmFwaCIpOwog Ci0gICAgICAgIHRoaXMuX2NoYXJ0ID0gbmV3IFdJLkxpbmVDaGFydDsKKyAgICAgICAgdGhpcy5f Y2hhcnQgPSBuZXcgV0kuQXJlYUNoYXJ0OwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5f Y2hhcnQpOwogICAgICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY2hh cnQuZWxlbWVudCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVPdmVydmlld0dyYXBoLmNzcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeVRpbWVsaW5lT3ZlcnZp ZXdHcmFwaC5jc3MKaW5kZXggMGRiMzgwMDk4ZTAuLmVhZjk0ZGU3NTFmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZU92 ZXJ2aWV3R3JhcGguY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL01lbW9yeVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5jc3MKQEAgLTcxLDI2ICs3MSwyNiBA QCBib2R5W2Rpcj1ydGxdIC50aW1lbGluZS1vdmVydmlldy1ncmFwaC5tZW1vcnkgLm1lbW9yeS1w cmVzc3VyZS1ldmVudCB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tdGltZWxpbmUtZXZl bi1iYWNrZ3JvdW5kLWNvbG9yKTsKIH0KIAotYm9keVtkaXI9cnRsXSAudGltZWxpbmUtb3ZlcnZp ZXctZ3JhcGgubWVtb3J5ID4gLnN0YWNrZWQtbGluZS1jaGFydCB7Citib2R5W2Rpcj1ydGxdIC50 aW1lbGluZS1vdmVydmlldy1ncmFwaC5tZW1vcnkgPiAuc3RhY2tlZC1hcmVhLWNoYXJ0IHsKICAg ICB0cmFuc2Zvcm06IHNjYWxlWCgtMSk7CiB9CiAKLS50aW1lbGluZS1vdmVydmlldy1ncmFwaC5t ZW1vcnkgPiAuc3RhY2tlZC1saW5lLWNoYXJ0ID4gc3ZnID4gcGF0aC5qYXZhc2NyaXB0IHsKKy50 aW1lbGluZS1vdmVydmlldy1ncmFwaC5tZW1vcnkgPiAuc3RhY2tlZC1hcmVhLWNoYXJ0ID4gc3Zn ID4gcGF0aC5qYXZhc2NyaXB0IHsKICAgICBzdHJva2U6IHZhcigtLW1lbW9yeS1qYXZhc2NyaXB0 LXN0cm9rZS1jb2xvcik7CiAgICAgZmlsbDogdmFyKC0tbWVtb3J5LWphdmFzY3JpcHQtZmlsbC1j b2xvcik7CiB9CiAKLS50aW1lbGluZS1vdmVydmlldy1ncmFwaC5tZW1vcnkgPiAuc3RhY2tlZC1s aW5lLWNoYXJ0ID4gc3ZnID4gcGF0aC5pbWFnZXMgeworLnRpbWVsaW5lLW92ZXJ2aWV3LWdyYXBo Lm1lbW9yeSA+IC5zdGFja2VkLWFyZWEtY2hhcnQgPiBzdmcgPiBwYXRoLmltYWdlcyB7CiAgICAg c3Ryb2tlOiB2YXIoLS1tZW1vcnktaW1hZ2VzLXN0cm9rZS1jb2xvcik7CiAgICAgZmlsbDogdmFy KC0tbWVtb3J5LWltYWdlcy1maWxsLWNvbG9yKTsKIH0KIAotLnRpbWVsaW5lLW92ZXJ2aWV3LWdy YXBoLm1lbW9yeSA+IC5zdGFja2VkLWxpbmUtY2hhcnQgPiBzdmcgPiBwYXRoLmxheWVycyB7Cisu dGltZWxpbmUtb3ZlcnZpZXctZ3JhcGgubWVtb3J5ID4gLnN0YWNrZWQtYXJlYS1jaGFydCA+IHN2 ZyA+IHBhdGgubGF5ZXJzIHsKICAgICBzdHJva2U6IHZhcigtLW1lbW9yeS1sYXllcnMtc3Ryb2tl LWNvbG9yKTsKICAgICBmaWxsOiB2YXIoLS1tZW1vcnktbGF5ZXJzLWZpbGwtY29sb3IpOwogfQog Ci0udGltZWxpbmUtb3ZlcnZpZXctZ3JhcGgubWVtb3J5ID4gLnN0YWNrZWQtbGluZS1jaGFydCA+ IHN2ZyA+IHBhdGgucGFnZSB7CisudGltZWxpbmUtb3ZlcnZpZXctZ3JhcGgubWVtb3J5ID4gLnN0 YWNrZWQtYXJlYS1jaGFydCA+IHN2ZyA+IHBhdGgucGFnZSB7CiAgICAgc3Ryb2tlOiB2YXIoLS1t ZW1vcnktcGFnZS1zdHJva2UtY29sb3IpOwogICAgIGZpbGw6IHZhcigtLW1lbW9yeS1wYWdlLWZp bGwtY29sb3IpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVPdmVydmlld0dyYXBoLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVPdmVydmlld0dyYXBo LmpzCmluZGV4IDQ5ODI3MGRjY2QwLi5jMTg0Y2RmNjRhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVPdmVydmlld0dy YXBoLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01l bW9yeVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwpAQCAtMzksNyArMzksNyBAQCBXSS5NZW1vcnlU aW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBNZW1vcnlUaW1lbGluZU92ZXJ2aWV3R3JhcGgg ZXh0ZW5kcyBXSS5UaQogCiAgICAgICAgIHRoaXMuX2RpZEluaXRpYWxpemVDYXRlZ29yaWVzID0g ZmFsc2U7CiAKLSAgICAgICAgdGhpcy5fY2hhcnQgPSBuZXcgV0kuU3RhY2tlZExpbmVDaGFydDsK KyAgICAgICAgdGhpcy5fY2hhcnQgPSBuZXcgV0kuU3RhY2tlZEFyZWFDaGFydDsKICAgICAgICAg dGhpcy5fY2hhcnQuc2l6ZSA9IG5ldyBXSS5TaXplKDAsIHRoaXMuaGVpZ2h0KTsKICAgICAgICAg dGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2NoYXJ0KTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX2NoYXJ0LmVsZW1lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVWaWV3LmNzcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeVRpbWVsaW5lVmlldy5j c3MKaW5kZXggNDhmNTkwNjdmYzkuLjljNWMyMjYyZDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcuY3NzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeVRpbWVs aW5lVmlldy5jc3MKQEAgLTE1MSwyNSArMTUxLDI1IEBAIGJvZHlbZGlyPXJ0bF0gLnRpbWVsaW5l LXZpZXcubWVtb3J5ID4gLmNvbnRlbnQgPiAub3ZlcnZpZXcgPiAuZGl2aWRlciB7CiB9CiAKIC50 aW1lbGluZS12aWV3Lm1lbW9yeSAuY2lyY2xlLWNoYXJ0ID4gc3ZnID4gcGF0aC5qYXZhc2NyaXB0 LAotLm1lbW9yeS1jYXRlZ29yeS12aWV3LmphdmFzY3JpcHQgLmxpbmUtY2hhcnQgPiBzdmcgPiBw YXRoIHsKKy5tZW1vcnktY2F0ZWdvcnktdmlldy5qYXZhc2NyaXB0IC5hcmVhLWNoYXJ0ID4gc3Zn ID4gcGF0aCB7CiAgICAgc3Ryb2tlOiB2YXIoLS1tZW1vcnktamF2YXNjcmlwdC1zdHJva2UtY29s b3IpOwogICAgIGZpbGw6IHZhcigtLW1lbW9yeS1qYXZhc2NyaXB0LWZpbGwtY29sb3IpOwogfQog CiAudGltZWxpbmUtdmlldy5tZW1vcnkgLmNpcmNsZS1jaGFydCA+IHN2ZyA+IHBhdGguaW1hZ2Vz LAotLm1lbW9yeS1jYXRlZ29yeS12aWV3LmltYWdlcyAubGluZS1jaGFydCA+IHN2ZyA+IHBhdGgg eworLm1lbW9yeS1jYXRlZ29yeS12aWV3LmltYWdlcyAuYXJlYS1jaGFydCA+IHN2ZyA+IHBhdGgg ewogICAgIHN0cm9rZTogdmFyKC0tbWVtb3J5LWltYWdlcy1zdHJva2UtY29sb3IpOwogICAgIGZp bGw6IHZhcigtLW1lbW9yeS1pbWFnZXMtZmlsbC1jb2xvcik7CiB9CiAKIC50aW1lbGluZS12aWV3 Lm1lbW9yeSAuY2lyY2xlLWNoYXJ0ID4gc3ZnID4gcGF0aC5sYXllcnMsCi0ubWVtb3J5LWNhdGVn b3J5LXZpZXcubGF5ZXJzIC5saW5lLWNoYXJ0ID4gc3ZnID4gcGF0aCB7CisubWVtb3J5LWNhdGVn b3J5LXZpZXcubGF5ZXJzIC5hcmVhLWNoYXJ0ID4gc3ZnID4gcGF0aCB7CiAgICAgc3Ryb2tlOiB2 YXIoLS1tZW1vcnktbGF5ZXJzLXN0cm9rZS1jb2xvcik7CiAgICAgZmlsbDogdmFyKC0tbWVtb3J5 LWxheWVycy1maWxsLWNvbG9yKTsKIH0KIAogLnRpbWVsaW5lLXZpZXcubWVtb3J5IC5jaXJjbGUt Y2hhcnQgPiBzdmcgPiBwYXRoLnBhZ2UsCi0ubWVtb3J5LWNhdGVnb3J5LXZpZXcucGFnZSAubGlu ZS1jaGFydCA+IHN2ZyA+IHBhdGggeworLm1lbW9yeS1jYXRlZ29yeS12aWV3LnBhZ2UgLmFyZWEt Y2hhcnQgPiBzdmcgPiBwYXRoIHsKICAgICBzdHJva2U6IHZhcigtLW1lbW9yeS1wYWdlLXN0cm9r ZS1jb2xvcik7CiAgICAgZmlsbDogdmFyKC0tbWVtb3J5LXBhZ2UtZmlsbC1jb2xvcik7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TdGFj a2VkQXJlYUNoYXJ0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU3RhY2tlZEFyZWFDaGFydC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMC4uNDg0Y2VlNmQxMTkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TdGFja2VkQXJlYUNoYXJ0LmpzCkBAIC0wLDAgKzEsMTQw IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAq IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICog Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisgKi8KKworLy8gU3RhY2tlZEFyZWFDaGFydCBjcmVhdGVzIGEgYXJlYSBjaGFy dCBzdHJhdGlmaWVkIHdpdGggc2VjdGlvbnMuCisvLworLy8gSW5pdGlhbGl6ZSB0aGUgY2hhcnQg d2l0aCBhIHNpemUuCisvLyBUbyBwb3B1bGF0ZSB3aXRoIGRhdGEsIGZpcnN0IGluaXRpYWxpemUg dGhlIHNlY3Rpb25zLiBUaGUgY2xhc3MgbmFtZXMgeW91CisvLyBwcm92aWRlIGZvciB0aGUgc2Vn bWVudHMgd2lsbCBhbGxvdyB5b3UgdG8gc3R5bGUgdGhlbS4gWW91IGNhbiB0aGVuIGluY2x1ZGUK Ky8vIGEgbmV3IHNldCBvZiAoeCwgW3kxLCB5MiwgeTNdKSBwb2ludHMgaW4gdGhlIGNoYXJ0IHZp YSBgYWRkUG9pbnRTZXRgLiBUaGUKKy8vIG9yZGVyIG9mIGB5YCB2YWx1ZXMgbXVzdCBiZSBpbiB0 aGUgc2FtZSBvcmRlciBhcyB0aGUgc2VjdGlvbnMuCisvLworLy8gU1ZHOgorLy8KKy8vIC0gVGhl cmUgaXMgYSBzaW5nbGUgcGF0aCBmb3IgZWFjaCBzdHJhdGlmaWNhdGlvbi4KKy8vIC0gRWFjaCBw YXRoIGV4dGVuZHMgYWxsIHRoZSB3YXkgZG93biB0byB0aGUgYm90dG9tLCB0aGV5IGFyZSBsYXll cmVkIHN1Y2gKKy8vICAgdGhhdCB0aGUgcGF0aHMgZm9yIGxvd2VyIHNlY3Rpb25zIG92ZXJsYXAg dGhlIHBhdGhzIGZvciB1cHBlciBzZWN0aW9ucy4KKy8vCisvLyAgPGRpdiBjbGFzcz0ic3RhY2tl ZC1hcmVhLWNoYXJ0Ij4KKy8vICAgICAgPHN2ZyB2aWV3Qm94PSIwIDAgMTAwMCAxMDAiPgorLy8g ICAgICAgICAgPHBhdGggY2xhc3M9InNlY3Rpb24tY2xhc3MtbmFtZS0yIiBkPSIuLi4iLz4KKy8v ICAgICAgICAgIDxwYXRoIGNsYXNzPSJzZWN0aW9uLWNsYXNzLW5hbWUtMSIgZD0iLi4uIi8+Cisv LyAgICAgIDwvc3ZnPgorLy8gIDwvZGl2PgorCitXSS5TdGFja2VkQXJlYUNoYXJ0ID0gY2xhc3Mg U3RhY2tlZEFyZWFDaGFydCBleHRlbmRzIFdJLlZpZXcKK3sKKyAgICBjb25zdHJ1Y3RvcigpCisg ICAgeworICAgICAgICBzdXBlcigpOworCisgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3Qu YWRkKCJzdGFja2VkLWFyZWEtY2hhcnQiKTsKKworICAgICAgICB0aGlzLl9jaGFydEVsZW1lbnQg PSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlU1ZHRWxlbWVudCgic3ZnIikpOworICAg ICAgICB0aGlzLl9jaGFydEVsZW1lbnQuc2V0QXR0cmlidXRlKCJwcmVzZXJ2ZUFzcGVjdFJhdGlv IiwgIm5vbmUiKTsKKworICAgICAgICB0aGlzLl9wYXRoRWxlbWVudHMgPSBbXTsKKworICAgICAg ICB0aGlzLl9wb2ludHMgPSBbXTsKKyAgICAgICAgdGhpcy5fc2l6ZSA9IG51bGw7CisgICAgfQor CisgICAgLy8gUHVibGljCisKKyAgICBnZXQgc2l6ZSgpCisgICAgeworICAgICAgICByZXR1cm4g dGhpcy5fc2l6ZTsKKyAgICB9CisKKyAgICBzZXQgc2l6ZShzaXplKQorICAgIHsKKyAgICAgICAg aWYgKHRoaXMuX3NpemUgJiYgdGhpcy5fc2l6ZS5lcXVhbHMoc2l6ZSkpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2l6ZSA9IHNpemU7CisKKyAgICAgICAgdGhpcy5fY2hh cnRFbGVtZW50LnNldEF0dHJpYnV0ZSgidmlld0JveCIsIGAwIDAgJHtzaXplLndpZHRofSAke3Np emUuaGVpZ2h0fWApOworCisgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKKyAgICB9CisKKyAg ICBpbml0aWFsaXplU2VjdGlvbnMoc2VjdGlvbkNsYXNzTmFtZXMpCisgICAgeworICAgICAgICBj b25zb2xlLmFzc2VydCghdGhpcy5fcGF0aEVsZW1lbnRzLmxlbmd0aCwgIlNob3VsZCBub3QgaW5p dGlhbGl6ZSBtdWx0aXBsZSB0aW1lcyIpOworCisgICAgICAgIHNlY3Rpb25DbGFzc05hbWVzLnJl dmVyc2UoKTsKKworICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IHNlY3Rpb25DbGFzc05hbWVz Lmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICBsZXQgcGF0aEVsZW1lbnQgPSB0aGlzLl9jaGFy dEVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlU1ZHRWxlbWVudCgicGF0aCIpKTsKKyAgICAgICAg ICAgIHBhdGhFbGVtZW50LmNsYXNzTGlzdC5hZGQoc2VjdGlvbkNsYXNzTmFtZXNbaV0pOworICAg ICAgICAgICAgdGhpcy5fcGF0aEVsZW1lbnRzLnB1c2gocGF0aEVsZW1lbnQpOworICAgICAgICB9 CisKKyAgICAgICAgdGhpcy5fcGF0aEVsZW1lbnRzLnJldmVyc2UoKTsKKyAgICB9CisKKyAgICBh ZGRQb2ludFNldCh4LCB5cykKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHlzLmxlbmd0 aCA9PT0gdGhpcy5fcGF0aEVsZW1lbnRzLmxlbmd0aCk7CisgICAgICAgIHRoaXMuX3BvaW50cy5w dXNoKHt4LCB5c30pOworICAgIH0KKworICAgIGNsZWFyKCkKKyAgICB7CisgICAgICAgIHRoaXMu X3BvaW50cyA9IFtdOworICAgIH0KKworICAgIC8vIFByb3RlY3RlZAorCisgICAgbGF5b3V0KCkK KyAgICB7CisgICAgICAgIHN1cGVyLmxheW91dCgpOworCisgICAgICAgIGlmICh0aGlzLmxheW91 dFJlYXNvbiA9PT0gV0kuVmlldy5MYXlvdXRSZWFzb24uUmVzaXplKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIGlmICghdGhpcy5fc2l6ZSkKKyAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICBsZXQgcGF0aENvbXBvbmVudHMgPSBbXTsKKyAgICAgICAgbGV0IGxlbmd0aCA9IHRo aXMuX3BhdGhFbGVtZW50cy5sZW5ndGg7CisKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBs ZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHBhdGhDb21wb25lbnRzW2ldID0gW2BNIDAgJHt0aGlz Ll9zaXplLmhlaWdodH1gXTsKKworICAgICAgICBmb3IgKGxldCB7eCwgeXN9IG9mIHRoaXMuX3Bv aW50cykgeworICAgICAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkKKyAg ICAgICAgICAgICAgICBwYXRoQ29tcG9uZW50c1tpXS5wdXNoKGBMICR7eH0gJHt5c1tpXX1gKTsK KyAgICAgICAgfQorCisgICAgICAgIGxldCBsYXN0WCA9IHRoaXMuX3BvaW50cy5sZW5ndGggPyB0 aGlzLl9wb2ludHMubGFzdFZhbHVlLnggOiAwOworICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8 IGxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICBwYXRoQ29tcG9uZW50c1tpXS5wdXNoKGBMICR7 bGFzdFh9ICR7dGhpcy5fc2l6ZS5oZWlnaHR9YCk7CisgICAgICAgICAgICBwYXRoQ29tcG9uZW50 c1tpXS5wdXNoKCJaIik7CisgICAgICAgICAgICBsZXQgcGF0aFN0cmluZyA9IHBhdGhDb21wb25l bnRzW2ldLmpvaW4oIiAiKTsKKyAgICAgICAgICAgIHRoaXMuX3BhdGhFbGVtZW50c1tpXS5zZXRB dHRyaWJ1dGUoImQiLCBwYXRoU3RyaW5nKTsKKyAgICAgICAgfQorICAgIH0KK307CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TdGFja2VkTGlu ZUNoYXJ0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3Rh Y2tlZExpbmVDaGFydC5qcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZWEwYTAwZjAw N2YuLjAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1N0YWNrZWRMaW5lQ2hhcnQuanMKKysrIC9kZXYvbnVsbApAQCAtMSwxNDAgKzAsMCBA QAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKLSAqIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GCi0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCi0gKiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgotICovCi0KLS8vIFN0YWNrZWRMaW5lQ2hhcnQgY3JlYXRlcyBhIGxpbmUgY2hhcnQg c3RyYXRpZmllZCB3aXRoIHNlY3Rpb25zLgotLy8KLS8vIEluaXRpYWxpemUgdGhlIGNoYXJ0IHdp dGggYSBzaXplLgotLy8gVG8gcG9wdWxhdGUgd2l0aCBkYXRhLCBmaXJzdCBpbml0aWFsaXplIHRo ZSBzZWN0aW9ucy4gVGhlIGNsYXNzIG5hbWVzIHlvdQotLy8gcHJvdmlkZSBmb3IgdGhlIHNlZ21l bnRzIHdpbGwgYWxsb3cgeW91IHRvIHN0eWxlIHRoZW0uIFlvdSBjYW4gdGhlbiBpbmNsdWRlCi0v LyBhIG5ldyBzZXQgb2YgKHgsIFt5MSwgeTIsIHkzXSkgcG9pbnRzIGluIHRoZSBjaGFydCB2aWEg YGFkZFBvaW50U2V0YC4gVGhlCi0vLyBvcmRlciBvZiBgeWAgdmFsdWVzIG11c3QgYmUgaW4gdGhl IHNhbWUgb3JkZXIgYXMgdGhlIHNlY3Rpb25zLgotLy8KLS8vIFNWRzoKLS8vCi0vLyAtIFRoZXJl IGlzIGEgc2luZ2xlIHBhdGggZm9yIGVhY2ggc3RyYXRpZmljYXRpb24uCi0vLyAtIEVhY2ggcGF0 aCBleHRlbmRzIGFsbCB0aGUgd2F5IGRvd24gdG8gdGhlIGJvdHRvbSwgdGhleSBhcmUgbGF5ZXJl ZCBzdWNoCi0vLyAgIHRoYXQgdGhlIHBhdGhzIGZvciBsb3dlciBzZWN0aW9ucyBvdmVybGFwIHRo ZSBwYXRocyBmb3IgdXBwZXIgc2VjdGlvbnMuCi0vLwotLy8gIDxkaXYgY2xhc3M9InN0YWNrZWQt bGluZS1jaGFydCI+Ci0vLyAgICAgIDxzdmcgdmlld0JveD0iMCAwIDEwMDAgMTAwIj4KLS8vICAg ICAgICAgIDxwYXRoIGNsYXNzPSJzZWN0aW9uLWNsYXNzLW5hbWUtMiIgZD0iLi4uIi8+Ci0vLyAg ICAgICAgICA8cGF0aCBjbGFzcz0ic2VjdGlvbi1jbGFzcy1uYW1lLTEiIGQ9Ii4uLiIvPgotLy8g ICAgICA8L3N2Zz4KLS8vICA8L2Rpdj4KLQotV0kuU3RhY2tlZExpbmVDaGFydCA9IGNsYXNzIFN0 YWNrZWRMaW5lQ2hhcnQgZXh0ZW5kcyBXSS5WaWV3Ci17Ci0gICAgY29uc3RydWN0b3IoKQotICAg IHsKLSAgICAgICAgc3VwZXIoKTsKLQotICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgic3RhY2tlZC1saW5lLWNoYXJ0Iik7Ci0KLSAgICAgICAgdGhpcy5fY2hhcnRFbGVtZW50ID0g dGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZVNWR0VsZW1lbnQoInN2ZyIpKTsKLSAgICAg ICAgdGhpcy5fY2hhcnRFbGVtZW50LnNldEF0dHJpYnV0ZSgicHJlc2VydmVBc3BlY3RSYXRpbyIs ICJub25lIik7Ci0KLSAgICAgICAgdGhpcy5fcGF0aEVsZW1lbnRzID0gW107Ci0KLSAgICAgICAg dGhpcy5fcG9pbnRzID0gW107Ci0gICAgICAgIHRoaXMuX3NpemUgPSBudWxsOwotICAgIH0KLQot ICAgIC8vIFB1YmxpYwotCi0gICAgZ2V0IHNpemUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRo aXMuX3NpemU7Ci0gICAgfQotCi0gICAgc2V0IHNpemUoc2l6ZSkKLSAgICB7Ci0gICAgICAgIGlm ICh0aGlzLl9zaXplICYmIHRoaXMuX3NpemUuZXF1YWxzKHNpemUpKQotICAgICAgICAgICAgcmV0 dXJuOwotCi0gICAgICAgIHRoaXMuX3NpemUgPSBzaXplOwotCi0gICAgICAgIHRoaXMuX2NoYXJ0 RWxlbWVudC5zZXRBdHRyaWJ1dGUoInZpZXdCb3giLCBgMCAwICR7c2l6ZS53aWR0aH0gJHtzaXpl LmhlaWdodH1gKTsKLQotICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7Ci0gICAgfQotCi0gICAg aW5pdGlhbGl6ZVNlY3Rpb25zKHNlY3Rpb25DbGFzc05hbWVzKQotICAgIHsKLSAgICAgICAgY29u c29sZS5hc3NlcnQoIXRoaXMuX3BhdGhFbGVtZW50cy5sZW5ndGgsICJTaG91bGQgbm90IGluaXRp YWxpemUgbXVsdGlwbGUgdGltZXMiKTsKLQotICAgICAgICBzZWN0aW9uQ2xhc3NOYW1lcy5yZXZl cnNlKCk7Ci0KLSAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBzZWN0aW9uQ2xhc3NOYW1lcy5s ZW5ndGg7ICsraSkgewotICAgICAgICAgICAgbGV0IHBhdGhFbGVtZW50ID0gdGhpcy5fY2hhcnRF bGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZVNWR0VsZW1lbnQoInBhdGgiKSk7Ci0gICAgICAgICAg ICBwYXRoRWxlbWVudC5jbGFzc0xpc3QuYWRkKHNlY3Rpb25DbGFzc05hbWVzW2ldKTsKLSAgICAg ICAgICAgIHRoaXMuX3BhdGhFbGVtZW50cy5wdXNoKHBhdGhFbGVtZW50KTsKLSAgICAgICAgfQot Ci0gICAgICAgIHRoaXMuX3BhdGhFbGVtZW50cy5yZXZlcnNlKCk7Ci0gICAgfQotCi0gICAgYWRk UG9pbnRTZXQoeCwgeXMpCi0gICAgewotICAgICAgICBjb25zb2xlLmFzc2VydCh5cy5sZW5ndGgg PT09IHRoaXMuX3BhdGhFbGVtZW50cy5sZW5ndGgpOwotICAgICAgICB0aGlzLl9wb2ludHMucHVz aCh7eCwgeXN9KTsKLSAgICB9Ci0KLSAgICBjbGVhcigpCi0gICAgewotICAgICAgICB0aGlzLl9w b2ludHMgPSBbXTsKLSAgICB9Ci0KLSAgICAvLyBQcm90ZWN0ZWQKLQotICAgIGxheW91dCgpCi0g ICAgewotICAgICAgICBzdXBlci5sYXlvdXQoKTsKLQotICAgICAgICBpZiAodGhpcy5sYXlvdXRS ZWFzb24gPT09IFdJLlZpZXcuTGF5b3V0UmVhc29uLlJlc2l6ZSkKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICBpZiAoIXRoaXMuX3NpemUpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAg ICAgICAgbGV0IHBhdGhDb21wb25lbnRzID0gW107Ci0gICAgICAgIGxldCBsZW5ndGggPSB0aGlz Ll9wYXRoRWxlbWVudHMubGVuZ3RoOwotCi0gICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgbGVu Z3RoOyArK2kpCi0gICAgICAgICAgICBwYXRoQ29tcG9uZW50c1tpXSA9IFtgTSAwICR7dGhpcy5f c2l6ZS5oZWlnaHR9YF07Ci0KLSAgICAgICAgZm9yIChsZXQge3gsIHlzfSBvZiB0aGlzLl9wb2lu dHMpIHsKLSAgICAgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCi0gICAg ICAgICAgICAgICAgcGF0aENvbXBvbmVudHNbaV0ucHVzaChgTCAke3h9ICR7eXNbaV19YCk7Ci0g ICAgICAgIH0KLQotICAgICAgICBsZXQgbGFzdFggPSB0aGlzLl9wb2ludHMubGVuZ3RoID8gdGhp cy5fcG9pbnRzLmxhc3RWYWx1ZS54IDogMDsKLSAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBs ZW5ndGg7ICsraSkgewotICAgICAgICAgICAgcGF0aENvbXBvbmVudHNbaV0ucHVzaChgTCAke2xh c3RYfSAke3RoaXMuX3NpemUuaGVpZ2h0fWApOwotICAgICAgICAgICAgcGF0aENvbXBvbmVudHNb aV0ucHVzaCgiWiIpOwotICAgICAgICAgICAgbGV0IHBhdGhTdHJpbmcgPSBwYXRoQ29tcG9uZW50 c1tpXS5qb2luKCIgIik7Ci0gICAgICAgICAgICB0aGlzLl9wYXRoRWxlbWVudHNbaV0uc2V0QXR0 cmlidXRlKCJkIiwgcGF0aFN0cmluZyk7Ci0gICAgICAgIH0KLSAgICB9Ci19Owo=