179569 2017-11-10 17:19:41 -0800 Web Inspector: Network Detail Views - Split Metrics into Sizes and Timing 2017-11-14 15:22:50 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1370611 0 joepeck 2017-11-10 17:19:41 -0800 Network Detail Views - Split Metrics into Sizes and Timing To avoid possible issues in dock configurations, clash of styles, or emphasis of information, split them up into different sections. 1370634 1 webkit-bug-importer 2017-11-10 19:15:37 -0800 <rdar://problem/35484914> 1371567 2 326925 joepeck 2017-11-14 14:14:10 -0800 Created attachment 326925 [PATCH] Proposed Fix 1371590 3 326925 bburg 2017-11-14 15:02:39 -0800 Comment on attachment 326925 [PATCH] Proposed Fix r=me 1371601 4 326925 commit-queue 2017-11-14 15:22:49 -0800 Comment on attachment 326925 [PATCH] Proposed Fix Clearing flags on attachment: 326925 Committed r224851: <https://trac.webkit.org/changeset/224851> 1371602 5 commit-queue 2017-11-14 15:22:50 -0800 All reviewed patches have been landed. Closing bug. 326925 2017-11-14 14:14:10 -0800 2017-11-14 15:22:49 -0800 [PATCH] Proposed Fix split-1.patch text/plain 39691 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNjMTljMDIyMTFlLi5lMWQxNDc2OGI1OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTctMTEtMTQgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBOZXR3b3JrIERldGFpbCBWaWV3cyAtIFNwbGl0IE1ldHJpY3MgaW50byBTaXplcyBhbmQgVGlt aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk1 NjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1NDg0OTE0PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTWFpbi5odG1sOgor ICAgICAgICBOZXcgcmVzb3VyY2VzIGFuZCBzdHJpbmdzLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrUmVzb3VyY2VEZXRhaWxWaWV3LmpzOgorICAgICAgICAoV0kuTmV0 d29ya1Jlc291cmNlRGV0YWlsVmlldyk6CisgICAgICAgIChXSS5OZXR3b3JrUmVzb3VyY2VEZXRh aWxWaWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKyAgICAgICAgKFdJLk5ldHdvcmtSZXNv dXJjZURldGFpbFZpZXcucHJvdG90eXBlLl9zaG93UHJlZmVycmVkQ29udGVudFZpZXcpOgorICAg ICAgICAoV0kuTmV0d29ya1Jlc291cmNlRGV0YWlsVmlldy5wcm90b3R5cGUuX3Nob3dDb250ZW50 Vmlld0Zvck5hdmlnYXRpb25JdGVtKToKKyAgICAgICAgKFdJLk5ldHdvcmtSZXNvdXJjZURldGFp bFZpZXcucHJvdG90eXBlLnNpemVzQ29udGVudFZpZXdHb1RvSGVhZGVycyk6IFJlbmFtZWQuCisg ICAgICAgIChXSS5OZXR3b3JrUmVzb3VyY2VEZXRhaWxWaWV3LnByb3RvdHlwZS5zaXplc0NvbnRl bnRWaWV3R29Ub1JlcXVlc3RCb2R5KTogUmVuYW1lZC4KKyAgICAgICAgKFdJLk5ldHdvcmtSZXNv dXJjZURldGFpbFZpZXcucHJvdG90eXBlLnNpemVzQ29udGVudFZpZXdHb1RvUmVzcG9uc2VCb2R5 KTogUmVuYW1lZC4KKyAgICAgICAgU3BsaXQgaW50byB0d28gbmF2aWdhdGlvbiBpdGVtcyBhbmQg dmlld3MuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlTWV0cmljc0Nv bnRlbnRWaWV3LmNzczogUmVtb3ZlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlTWV0cmljc0NvbnRlbnRWaWV3LmpzOiBSZW1vdmVkLgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvUmVzb3VyY2VTaXplc0NvbnRlbnRWaWV3LmNzczogQWRkZWQuCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpemVzQ29udGVudFZpZXcuanM6IEFkZGVk LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1pbmdDb250ZW50Vmll dy5jc3M6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1p bmdDb250ZW50Vmlldy5qczogQWRkZWQuCisgICAgICAgIFNwbGl0IE1ldHJpY3MgaW50byB0d28g dmlld3MuCisKIDIwMTctMTEtMTQgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENsZWFudXAgbmF2aWdhdGlvbiBiYXIgZGl2aWRlcnMg YW5kIHNlcGFyYXRvcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDM5MjY3 MzNhMmViLi5iYmE4MzkxNWIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC01OTAsNyArNTkwLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siTWVtb3J5IHVzYWdlIG9mIHRoaXMg Y2FudmFzIl0gPSAiTWVtb3J5IHVzYWdlIG9mIHRoaXMgY2FudmFzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIk1lbW9yeTogJXMiXSA9ICJNZW1vcnk6ICVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIk1lc3Nh Z2UiXSA9ICJNZXNzYWdlIjsKIGxvY2FsaXplZFN0cmluZ3NbIk1ldGhvZCJdID0gIk1ldGhvZCI7 Ci1sb2NhbGl6ZWRTdHJpbmdzWyJNZXRyaWNzIl0gPSAiTWV0cmljcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJNaWNyb3Rhc2sgRGlzcGF0Y2hlZCJdID0gIk1pY3JvdGFzayBEaXNwYXRjaGVkIjsKIGxv Y2FsaXplZFN0cmluZ3NbIk1pbiJdID0gIk1pbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJNaXNzaW5n IERlcGVuZGVuY2llczolcyJdID0gIk1pc3NpbmcgRGVwZW5kZW5jaWVzOiVzIjsKQEAgLTg2OSw2 ICs4NjgsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93OiJdID0gIlNob3c6IjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlNocmluayJdID0gIlNocmluayI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaXplIl0g PSAiU2l6ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaXplIG9mIGN1cnJlbnQgb2JqZWN0IHBsdXMg YWxsIG9iamVjdHMgaXQga2VlcHMgYWxpdmUiXSA9ICJTaXplIG9mIGN1cnJlbnQgb2JqZWN0IHBs dXMgYWxsIG9iamVjdHMgaXQga2VlcHMgYWxpdmUiOworbG9jYWxpemVkU3RyaW5nc1siU2l6ZXMi XSA9ICJTaXplcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaXppbmciXSA9ICJTaXppbmciOwogbG9j YWxpemVkU3RyaW5nc1siU2xpY2UiXSA9ICJTbGljZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTbmFw c2hvdCAlZCJdID0gIlNuYXBzaG90ICVkIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01haW4uaHRtbAppbmRleCA4YWRmYmM2OTg0Yi4uNWQwMGU1MDg2ODUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAorKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKQEAgLTE0OCwx MSArMTQ4LDEyIEBACiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SZW5k ZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5jc3MiPgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIg aHJlZj0iVmlld3MvUmVzaXplci5jc3MiPgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJl Zj0iVmlld3MvUmVzb3VyY2VDb29raWVzQ29udGVudFZpZXcuY3NzIj4KLSAgICA8bGluayByZWw9 InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL1Jlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3LmNzcyI+ CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SZXNvdXJjZURldGFpbHNT ZWN0aW9uLmNzcyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SZXNv dXJjZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzIj4KICAgICA8bGluayByZWw9InN0eWxlc2hlZXQi IGhyZWY9IlZpZXdzL1Jlc291cmNlSGVhZGVyc0NvbnRlbnRWaWV3LmNzcyI+CiAgICAgPGxpbmsg cmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SZXNvdXJjZUljb25zLmNzcyI+CisgICAgPGxp bmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SZXNvdXJjZVNpemVzQ29udGVudFZpZXcu Y3NzIj4KKyAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL1Jlc291cmNlVGlt aW5nQ29udGVudFZpZXcuY3NzIj4KICAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZp ZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmNzcyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0 IiBocmVmPSJWaWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLmNzcyI+CiAgICAgPGxp bmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZp ZXcuY3NzIj4KQEAgLTY5MiwxMyArNjkzLDE0IEBACiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Jl c291cmNlQ2x1c3RlckNvbnRlbnRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0i Vmlld3MvUmVzb3VyY2VDb2xsZWN0aW9uQ29udGVudFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxz Y3JpcHQgc3JjPSJWaWV3cy9SZXNvdXJjZUNvb2tpZXNDb250ZW50Vmlldy5qcyI+PC9zY3JpcHQ+ Ci0gICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Jlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3LmpzIj48 L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvUmVzb3VyY2VEZXRhaWxzU2VjdGlvbi5q cyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Jlc291cmNlRGV0YWlsc1NpZGVi YXJQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Jlc291cmNlSGVh ZGVyc0NvbnRlbnRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvUmVz b3VyY2VTaWRlYmFyUGFuZWwuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9S ZXNvdXJjZVNpemVzQ29udGVudFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJW aWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWROb2RlLmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHNyYz0iVmlld3MvUmVzb3VyY2VUaW1pbmdCcmVha2Rvd25WaWV3LmpzIj48L3NjcmlwdD4K KyAgICA8c2NyaXB0IHNyYz0iVmlld3MvUmVzb3VyY2VUaW1pbmdDb250ZW50Vmlldy5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Jlc291cmNlVGltaW5nUG9wb3ZlckRhdGFH cmlkTm9kZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1J1bGVzU3R5bGVE ZXRhaWxzUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9TY29wZUJh ci5qcyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrUmVzb3VyY2VEZXRhaWxWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Jlc291cmNlRGV0YWlsVmlldy5q cwppbmRleCAzODcxYzk1MTFlNC4uMGQ5OGQ5YzNiM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtSZXNvdXJjZURldGFpbFZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a1Jlc291cmNlRGV0YWlsVmlldy5qcwpAQCAtNDAsNyArNDAsOCBAQCBXSS5OZXR3b3JrUmVzb3Vy Y2VEZXRhaWxWaWV3ID0gY2xhc3MgTmV0d29ya1Jlc291cmNlRGV0YWlsVmlldyBleHRlbmRzIFdJ LlZpZXcKICAgICAgICAgdGhpcy5fcmVzb3VyY2VDb250ZW50VmlldyA9IG51bGw7CiAgICAgICAg IHRoaXMuX2hlYWRlcnNDb250ZW50VmlldyA9IG51bGw7CiAgICAgICAgIHRoaXMuX2Nvb2tpZXND b250ZW50VmlldyA9IG51bGw7Ci0gICAgICAgIHRoaXMuX21ldHJpY3NDb250ZW50VmlldyA9IG51 bGw7CisgICAgICAgIHRoaXMuX3NpemVzQ29udGVudFZpZXcgPSBudWxsOworICAgICAgICB0aGlz Ll90aW1pbmdDb250ZW50VmlldyA9IG51bGw7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC03 NywyMSArNzgsMjEgQEAgV0kuTmV0d29ya1Jlc291cmNlRGV0YWlsVmlldyA9IGNsYXNzIE5ldHdv cmtSZXNvdXJjZURldGFpbFZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX3Jlc291 cmNlQ29udGVudFZpZXcuc2hvd1JlcXVlc3QoKTsKICAgICB9CiAKLSAgICAvLyBSZXNvdXJjZU1l dHJpY3NDb250ZW50VmlldyBkZWxlZ2F0ZQorICAgIC8vIFJlc291cmNlU2l6ZXNDb250ZW50Vmll dyBkZWxlZ2F0ZQogCi0gICAgbWV0cmljc0NvbnRlbnRWaWV3R29Ub0hlYWRlcnMobWV0cmljc0Nv bnRlbnRWaWV3KQorICAgIHNpemVzQ29udGVudFZpZXdHb1RvSGVhZGVycyhtZXRyaWNzQ29udGVu dFZpZXcpCiAgICAgewogICAgICAgICB0aGlzLl9jb250ZW50QnJvd3Nlci5uYXZpZ2F0aW9uQmFy LnNlbGVjdGVkTmF2aWdhdGlvbkl0ZW0gPSB0aGlzLl9oZWFkZXJzTmF2aWdhdGlvbkl0ZW07CiAg ICAgfQogCi0gICAgbWV0cmljc0NvbnRlbnRWaWV3R29Ub1JlcXVlc3RCb2R5KG1ldHJpY3NDb250 ZW50VmlldykKKyAgICBzaXplc0NvbnRlbnRWaWV3R29Ub1JlcXVlc3RCb2R5KG1ldHJpY3NDb250 ZW50VmlldykKICAgICB7CiAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25C YXIuc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSA9IHRoaXMuX3ByZXZpZXdOYXZpZ2F0aW9uSXRlbTsK IAogICAgICAgICB0aGlzLl9yZXNvdXJjZUNvbnRlbnRWaWV3LnNob3dSZXF1ZXN0KCk7CiAgICAg fQogCi0gICAgbWV0cmljc0NvbnRlbnRWaWV3R29Ub1Jlc3BvbnNlQm9keShtZXRyaWNzQ29udGVu dFZpZXcpCisgICAgc2l6ZXNDb250ZW50Vmlld0dvVG9SZXNwb25zZUJvZHkobWV0cmljc0NvbnRl bnRWaWV3KQogICAgIHsKICAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJh ci5zZWxlY3RlZE5hdmlnYXRpb25JdGVtID0gdGhpcy5fcHJldmlld05hdmlnYXRpb25JdGVtOwog CkBAIC0xMTcsNyArMTE4LDggQEAgV0kuTmV0d29ya1Jlc291cmNlRGV0YWlsVmlldyA9IGNsYXNz IE5ldHdvcmtSZXNvdXJjZURldGFpbFZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMu X3ByZXZpZXdOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVt KCJwcmV2aWV3IiwgV0kuVUlTdHJpbmcoIlByZXZpZXciKSk7CiAgICAgICAgIHRoaXMuX2hlYWRl cnNOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtKCJoZWFk ZXJzIiwgV0kuVUlTdHJpbmcoIkhlYWRlcnMiKSk7CiAgICAgICAgIHRoaXMuX2Nvb2tpZXNOYXZp Z2F0aW9uSXRlbSA9IG5ldyBXSS5SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtKCJjb29raWVzIiwg V0kuVUlTdHJpbmcoIkNvb2tpZXMiKSk7Ci0gICAgICAgIHRoaXMuX21ldHJpY3NOYXZpZ2F0aW9u SXRlbSA9IG5ldyBXSS5SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtKCJtZXRyaWNzIiwgV0kuVUlT dHJpbmcoIk1ldHJpY3MiKSk7CisgICAgICAgIHRoaXMuX3NpemVzTmF2aWdhdGlvbkl0ZW0gPSBu ZXcgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbSgic2l6ZXMiLCBXSS5VSVN0cmluZygiU2l6 ZXMiKSk7CisgICAgICAgIHRoaXMuX3RpbWluZ05hdmlnYXRpb25JdGVtID0gbmV3IFdJLlJhZGlv QnV0dG9uTmF2aWdhdGlvbkl0ZW0oInRpbWluZyIsIFdJLlVJU3RyaW5nKCJUaW1pbmciKSk7CiAK ICAgICAgICAgLy8gSW5zZXJ0IGFsbCBvZiBvdXIgY3VzdG9tIG5hdmlnYXRpb24gaXRlbXMgYXQg dGhlIHN0YXJ0IG9mIHRoZSBDb250ZW50QnJvd3NlcidzIE5hdmlnYXRpb25CYXIuCiAgICAgICAg IGxldCBpbmRleCA9IDA7CkBAIC0xMjYsNyArMTI4LDggQEAgV0kuTmV0d29ya1Jlc291cmNlRGV0 YWlsVmlldyA9IGNsYXNzIE5ldHdvcmtSZXNvdXJjZURldGFpbFZpZXcgZXh0ZW5kcyBXSS5WaWV3 CiAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25CYXIuaW5zZXJ0TmF2aWdh dGlvbkl0ZW0odGhpcy5fcHJldmlld05hdmlnYXRpb25JdGVtLCBpbmRleCsrKTsKICAgICAgICAg dGhpcy5fY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5pbnNlcnROYXZpZ2F0aW9uSXRlbSh0 aGlzLl9oZWFkZXJzTmF2aWdhdGlvbkl0ZW0sIGluZGV4KyspOwogICAgICAgICB0aGlzLl9jb250 ZW50QnJvd3Nlci5uYXZpZ2F0aW9uQmFyLmluc2VydE5hdmlnYXRpb25JdGVtKHRoaXMuX2Nvb2tp ZXNOYXZpZ2F0aW9uSXRlbSwgaW5kZXgrKyk7Ci0gICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2Vy Lm5hdmlnYXRpb25CYXIuaW5zZXJ0TmF2aWdhdGlvbkl0ZW0odGhpcy5fbWV0cmljc05hdmlnYXRp b25JdGVtLCBpbmRleCsrKTsKKyAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIubmF2aWdhdGlv bkJhci5pbnNlcnROYXZpZ2F0aW9uSXRlbSh0aGlzLl9zaXplc05hdmlnYXRpb25JdGVtLCBpbmRl eCsrKTsKKyAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5pbnNlcnRO YXZpZ2F0aW9uSXRlbSh0aGlzLl90aW1pbmdOYXZpZ2F0aW9uSXRlbSwgaW5kZXgrKyk7CiAgICAg ICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25CYXIuYWRkRXZlbnRMaXN0ZW5lcihX SS5OYXZpZ2F0aW9uQmFyLkV2ZW50Lk5hdmlnYXRpb25JdGVtU2VsZWN0ZWQsIHRoaXMuX25hdmln YXRpb25JdGVtU2VsZWN0ZWQsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlz Ll9jb250ZW50QnJvd3Nlcik7CkBAIC0xNDgsNyArMTUxLDggQEAgV0kuTmV0d29ya1Jlc291cmNl RGV0YWlsVmlldyA9IGNsYXNzIE5ldHdvcmtSZXNvdXJjZURldGFpbFZpZXcgZXh0ZW5kcyBXSS5W aWV3CiAgICAgICAgICAgICBpZiAobmF2aWdhdGlvbkl0ZW0gIT09IHRoaXMuX3ByZXZpZXdOYXZp Z2F0aW9uSXRlbQogICAgICAgICAgICAgICAgICYmIG5hdmlnYXRpb25JdGVtICE9PSB0aGlzLl9o ZWFkZXJzTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgICAgICAgICAmJiBuYXZpZ2F0aW9uSXRlbSAh PT0gdGhpcy5fY29va2llc05hdmlnYXRpb25JdGVtCi0gICAgICAgICAgICAgICAgJiYgbmF2aWdh dGlvbkl0ZW0gIT09IHRoaXMuX21ldHJpY3NOYXZpZ2F0aW9uSXRlbSkKKyAgICAgICAgICAgICAg ICAmJiBuYXZpZ2F0aW9uSXRlbSAhPT0gdGhpcy5fc2l6ZXNOYXZpZ2F0aW9uSXRlbQorICAgICAg ICAgICAgICAgICYmIG5hdmlnYXRpb25JdGVtICE9PSB0aGlzLl90aW1pbmdOYXZpZ2F0aW9uSXRl bSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgaWYgKCFmaXJzdE5h dmlnYXRpb25JdGVtKQpAQCAtMTgyLDEwICsxODYsMTUgQEAgV0kuTmV0d29ya1Jlc291cmNlRGV0 YWlsVmlldyA9IGNsYXNzIE5ldHdvcmtSZXNvdXJjZURldGFpbFZpZXcgZXh0ZW5kcyBXSS5WaWV3 CiAgICAgICAgICAgICAgICAgdGhpcy5fY29va2llc0NvbnRlbnRWaWV3ID0gbmV3IFdJLlJlc291 cmNlQ29va2llc0NvbnRlbnRWaWV3KHRoaXMuX3Jlc291cmNlKTsKICAgICAgICAgICAgIHRoaXMu X2NvbnRlbnRCcm93c2VyLnNob3dDb250ZW50Vmlldyh0aGlzLl9jb29raWVzQ29udGVudFZpZXcp OwogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgIm1ldHJpY3MiOgotICAgICAgICAg ICAgaWYgKCF0aGlzLl9tZXRyaWNzQ29udGVudFZpZXcpCi0gICAgICAgICAgICAgICAgdGhpcy5f bWV0cmljc0NvbnRlbnRWaWV3ID0gbmV3IFdJLlJlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3KHRo aXMuX3Jlc291cmNlLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLnNo b3dDb250ZW50Vmlldyh0aGlzLl9tZXRyaWNzQ29udGVudFZpZXcpOworICAgICAgICBjYXNlICJz aXplcyI6CisgICAgICAgICAgICBpZiAoIXRoaXMuX3NpemVzQ29udGVudFZpZXcpCisgICAgICAg ICAgICAgICAgdGhpcy5fc2l6ZXNDb250ZW50VmlldyA9IG5ldyBXSS5SZXNvdXJjZVNpemVzQ29u dGVudFZpZXcodGhpcy5fcmVzb3VyY2UsIHRoaXMpOworICAgICAgICAgICAgdGhpcy5fY29udGVu dEJyb3dzZXIuc2hvd0NvbnRlbnRWaWV3KHRoaXMuX3NpemVzQ29udGVudFZpZXcpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgInRpbWluZyI6CisgICAgICAgICAgICBpZiAoIXRo aXMuX3RpbWluZ0NvbnRlbnRWaWV3KQorICAgICAgICAgICAgICAgIHRoaXMuX3RpbWluZ0NvbnRl bnRWaWV3ID0gbmV3IFdJLlJlc291cmNlVGltaW5nQ29udGVudFZpZXcodGhpcy5fcmVzb3VyY2Up OworICAgICAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIuc2hvd0NvbnRlbnRWaWV3KHRoaXMu X3RpbWluZ0NvbnRlbnRWaWV3KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVzb3VyY2VNZXRyaWNzQ29udGVudFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VNZXRyaWNzQ29udGVudFZpZXcuY3NzCmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCBkMWQ1OGZkZjlmZS4uMDAwMDAwMDAwMDAKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VNZXRyaWNzQ29u dGVudFZpZXcuY3NzCisrKyAvZGV2L251bGwKQEAgLTEsMTg3ICswLDAgQEAKLS8qCi0gKiBDb3B5 cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgot ICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgot ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwot Ci0ucmVzb3VyY2UtbWV0cmljcyB7Ci0gICAgZm9udC1mYW1pbHk6ICctd2Via2l0LXN5c3RlbS1m b250JzsKLX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29udGVudCB7Ci0gICAgd2lkdGg6IDU1 MHB4OwotICAgIG1hcmdpbjogMCBhdXRvOwotfQotCi0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250 ZW50IC5sYWJlbCB7Ci0gICAgY29sb3I6IGdyYXk7Ci19Ci0KLS5yZXNvdXJjZS1tZXRyaWNzID4g LmNvbnRlbnQgPiBzZWN0aW9uIHsKLSAgICBwb3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgcGFkZGlu ZzogMTBweCAwOwotfQotCi0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4gc2VjdGlvbiAu c3VidGl0bGUgewotICAgIG1hcmdpbi1ib3R0b206IDEwcHg7Ci0gICAgZm9udC1zaXplOiAxNHB4 OwotICAgIHRleHQtYWxpZ246IGNlbnRlcjsKLSAgICBsZXR0ZXItc3BhY2luZzogMC4wNGVtOwot fQotCi0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4gc2VjdGlvbjpub3QoOmxhc3Qtb2Yt dHlwZSkgewotICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3Ip OwotfQotCi0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4gc2VjdGlvbi5zcGxpdCB7Ci0g ICAgZGlzcGxheTogZmxleDsKLSAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjsKLX0KLQotLnJl c291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24uc3BsaXQgPiAuc3Vic2VjdGlvbiB7 Ci0gICAgd2lkdGg6IDE2MHB4OwotICAgIG1hcmdpbjogMTBweCAwcHg7Ci19Ci0KLS5yZXNvdXJj ZS1tZXRyaWNzID4gLmNvbnRlbnQgPiBzZWN0aW9uLnNwbGl0ID4gLnN1YnNlY3Rpb24ubGFyZ2Ug Lmljb24gewotICAgIHdpZHRoOiAzMnB4OwotICAgIGhlaWdodDogMzJweDsKLX0KLQotLnJlc291 cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24uc3BsaXQgPiAuc3Vic2VjdGlvbiA+IHRh YmxlIHsKLSAgICBtYXJnaW46IDAgYXV0bzsKLX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29u dGVudCA+IHNlY3Rpb24uc3BsaXQgPiAuZGl2aWRlciB7Ci0gICAgbWFyZ2luOiAwIDEwcHg7Ci0g ICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgdmFyKC0tYm9yZGVyLWNvbG9yKTsKLX0KLQotLnJl c291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24ubmV0d29yayA+IC5zdWJzZWN0aW9u ID4gLmNvbnRhaW5lciB7Ci0gICAgZGlzcGxheTogZmxleDsKLSAgICBqdXN0aWZ5LWNvbnRlbnQ6 IGNlbnRlcjsKLSAgICBtYXJnaW4tYm90dG9tOiA4cHg7Ci19Ci0KLS5yZXNvdXJjZS1tZXRyaWNz ID4gLmNvbnRlbnQgPiBzZWN0aW9uLm5ldHdvcmsgLmJ5dGVzLWdyb3VwIHsKLSAgICB0ZXh0LWFs aWduOiBzdGFydDsKLX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24u bmV0d29yayAuYnl0ZXMgewotICAgIG1hcmdpbi10b3A6IDJweDsKLSAgICBmb250LXNpemU6IDI4 cHg7Ci0gICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwotfQotCi0ucmVzb3VyY2UtbWV0cmljcyA+ IC5jb250ZW50ID4gc2VjdGlvbi5uZXR3b3JrIHRhYmxlID4gdHIgPiB0ZC5sYWJlbCB7Ci0gICAg dGV4dC1hbGlnbjogZW5kOwotfQotCi0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4gc2Vj dGlvbi5uZXR3b3JrIC5zdWZmaXggewotICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICBt YXJnaW46IDEzcHggMXB4IDAgMXB4OwotICAgIGZvbnQtc2l6ZTogMTVweDsKLX0KLQotLnJlc291 cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24ubmV0d29yayBpbWcgewotICAgIHdpZHRo OiAzMnB4OwotICAgIGhlaWdodDogMzJweDsKLSAgICBtYXJnaW46IDNweDsKLX0KLQotLnJlc291 cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24ubmV0d29yayAuZ28tdG8tYXJyb3cgewot ICAgIGJvdHRvbTogLTFweDsKLSAgICBoZWlnaHQ6IDEycHg7Ci0gICAgdmVydGljYWwtYWxpZ246 IHRvcDsKLX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24ubmV0d29y ayAud2FybmluZyB7Ci0gICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwotICAgIHdpZHRoOiAxMHB4 OwotICAgIGhlaWdodDogMTBweDsKLSAgICAtd2Via2l0LW1hcmdpbi1zdGFydDogM3B4OwotfQot Ci0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4gc2VjdGlvbi50aW1pbmcgewotICAgIHBh ZGRpbmc6IDIwcHggMDsKLX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rp b24udGltaW5nIC5zdWJ0aXRsZSB7Ci0gICAgbGV0dGVyLXNwYWNpbmc6IDAuMDZlbTsKLX0KLQot LnJlc291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nID4gdWwgewotICAg IG1hcmdpbjogMDsKLSAgICBwYWRkaW5nOiAwOwotICAgIGxpc3Qtc3R5bGUtdHlwZTogbm9uZTsK LX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nID4gdWwg PiBsaSB7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZlOwotICAgIGhlaWdodDogMjBweDsKLSAgICBw YWRkaW5nOiAxcHggMDsKLSAgICBsaW5lLWhlaWdodDogMThweDsKLX0KLQotLnJlc291cmNlLW1l dHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nID4gLndhdGVyZmFsbCB7Ci0gICAgd2lk dGg6IDUwMHB4OwotICAgIG1hcmdpbjogYXV0bzsKLX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAu Y29udGVudCA+IHNlY3Rpb24udGltaW5nID4gLndhdGVyZmFsbCAuYmxvY2sgewotICAgIHRvcDog NHB4OwotICAgIG1pbi13aWR0aDogMXB4OwotICAgIGhlaWdodDogMTJweDsKLX0KLQotLnJlc291 cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nID4gdWwgPiBsaSA+IC5yb3ct bGFiZWwgewotICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKLSAgICBtaW4td2lkdGg6IDcwcHg7 Ci0gICAgY29sb3I6IGJsYWNrOwotfQotCi0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4g c2VjdGlvbi50aW1pbmcgPiB1bCA+IGxpID4gLnJvdy1sYWJlbCB7Ci0gICAgdGV4dC1hbGlnbjog ZW5kOwotfQotCi0ucmVzb3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4gc2VjdGlvbi50aW1pbmcg PiB1bCA+IGxpID4gLnRpbWUtbGFiZWwgewotICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB0 b3A6IDFweDsKLSAgICBjb2xvcjogZ3JheTsKLX0KLQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29u dGVudCA+IHNlY3Rpb24udGltaW5nID4gdWwgPiBsaS50b3RhbCAuYmxvY2sgewotICAgIGRpc3Bs YXk6IG5vbmU7Ci19Ci0KLS5yZXNvdXJjZS1tZXRyaWNzID4gLmNvbnRlbnQgPiBzZWN0aW9uLnRp bWluZyA+IHVsID4gbGkudG90YWwgLnRpbWUtbGFiZWwgewotICAgIGNvbG9yOiBibGFjazsKLX0K LQotLnJlc291cmNlLW1ldHJpY3MgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nIC5pbmRldGVy bWluYXRlLXByb2dyZXNzLXNwaW5uZXIgewotICAgIG1hcmdpbjogMCBhdXRvOwotfQotCi0ucmVz b3VyY2UtbWV0cmljcyA+IC5jb250ZW50ID4gc2VjdGlvbi50aW1pbmcgLmVtcHR5IHsKLSAgICB0 ZXh0LWFsaWduOiBjZW50ZXI7Ci0gICAgY29sb3I6IGdyYXk7Ci19CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpemVzQ29udGVu dFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VTaXplc0NvbnRlbnRWaWV3LmNzcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMC4uNGI4MmMyYTI0MzkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpemVzQ29udGVudFZpZXcuY3NzCkBA IC0wLDAgKzEsMTE4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJl IG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBU SU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworLnJlc291cmNlLXNpemVzIHsKKyAgICBmb250 LWZhbWlseTogJy13ZWJraXQtc3lzdGVtLWZvbnQnOworfQorCisucmVzb3VyY2Utc2l6ZXMgPiAu Y29udGVudCB7CisgICAgd2lkdGg6IDU1MHB4OworICAgIG1hcmdpbjogMCBhdXRvOworfQorCisu cmVzb3VyY2Utc2l6ZXMgPiAuY29udGVudCAubGFiZWwgeworICAgIGNvbG9yOiBncmF5OworfQor CisucmVzb3VyY2Utc2l6ZXMgPiAuY29udGVudCA+IHNlY3Rpb24geworICAgIHBvc2l0aW9uOiBy ZWxhdGl2ZTsKKyAgICBwYWRkaW5nOiAxMHB4IDA7Cit9CisKKy5yZXNvdXJjZS1zaXplcyA+IC5j b250ZW50ID4gc2VjdGlvbiAuc3VidGl0bGUgeworICAgIG1hcmdpbi1ib3R0b206IDEwcHg7Cisg ICAgZm9udC1zaXplOiAxNHB4OworICAgIHRleHQtYWxpZ246IGNlbnRlcjsKKyAgICBsZXR0ZXIt c3BhY2luZzogMC4wNGVtOworfQorCisucmVzb3VyY2Utc2l6ZXMgPiAuY29udGVudCA+IHNlY3Rp b24uc3BsaXQgeworICAgIGRpc3BsYXk6IGZsZXg7CisgICAganVzdGlmeS1jb250ZW50OiBjZW50 ZXI7Cit9CisKKy5yZXNvdXJjZS1zaXplcyA+IC5jb250ZW50ID4gc2VjdGlvbi5zcGxpdCA+IC5z dWJzZWN0aW9uIHsKKyAgICB3aWR0aDogMTYwcHg7CisgICAgbWFyZ2luOiAxMHB4IDBweDsKK30K KworLnJlc291cmNlLXNpemVzID4gLmNvbnRlbnQgPiBzZWN0aW9uLnNwbGl0ID4gLnN1YnNlY3Rp b24ubGFyZ2UgLmljb24geworICAgIHdpZHRoOiAzMnB4OworICAgIGhlaWdodDogMzJweDsKK30K KworLnJlc291cmNlLXNpemVzID4gLmNvbnRlbnQgPiBzZWN0aW9uLnNwbGl0ID4gLnN1YnNlY3Rp b24gPiB0YWJsZSB7CisgICAgbWFyZ2luOiAwIGF1dG87Cit9CisKKy5yZXNvdXJjZS1zaXplcyA+ IC5jb250ZW50ID4gc2VjdGlvbi5zcGxpdCA+IC5kaXZpZGVyIHsKKyAgICBtYXJnaW46IDAgMTBw eDsKKyAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOworfQor CisucmVzb3VyY2Utc2l6ZXMgPiAuY29udGVudCA+IHNlY3Rpb24ubmV0d29yayA+IC5zdWJzZWN0 aW9uID4gLmNvbnRhaW5lciB7CisgICAgZGlzcGxheTogZmxleDsKKyAgICBqdXN0aWZ5LWNvbnRl bnQ6IGNlbnRlcjsKKyAgICBtYXJnaW4tYm90dG9tOiA4cHg7Cit9CisKKy5yZXNvdXJjZS1zaXpl cyA+IC5jb250ZW50ID4gc2VjdGlvbi5uZXR3b3JrIC5ieXRlcy1ncm91cCB7CisgICAgdGV4dC1h bGlnbjogc3RhcnQ7Cit9CisKKy5yZXNvdXJjZS1zaXplcyA+IC5jb250ZW50ID4gc2VjdGlvbi5u ZXR3b3JrIC5ieXRlcyB7CisgICAgbWFyZ2luLXRvcDogMnB4OworICAgIGZvbnQtc2l6ZTogMjhw eDsKKyAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Cit9CisKKy5yZXNvdXJjZS1zaXplcyA+IC5j b250ZW50ID4gc2VjdGlvbi5uZXR3b3JrIHRhYmxlID4gdHIgPiB0ZC5sYWJlbCB7CisgICAgdGV4 dC1hbGlnbjogZW5kOworfQorCisucmVzb3VyY2Utc2l6ZXMgPiAuY29udGVudCA+IHNlY3Rpb24u bmV0d29yayAuc3VmZml4IHsKKyAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAgbWFyZ2lu OiAxM3B4IDFweCAwIDFweDsKKyAgICBmb250LXNpemU6IDE1cHg7Cit9CisKKy5yZXNvdXJjZS1z aXplcyA+IC5jb250ZW50ID4gc2VjdGlvbi5uZXR3b3JrIGltZyB7CisgICAgd2lkdGg6IDMycHg7 CisgICAgaGVpZ2h0OiAzMnB4OworICAgIG1hcmdpbjogM3B4OworfQorCisucmVzb3VyY2Utc2l6 ZXMgPiAuY29udGVudCA+IHNlY3Rpb24ubmV0d29yayAuZ28tdG8tYXJyb3cgeworICAgIGJvdHRv bTogLTFweDsKKyAgICBoZWlnaHQ6IDEycHg7CisgICAgdmVydGljYWwtYWxpZ246IHRvcDsKK30K KworLnJlc291cmNlLXNpemVzID4gLmNvbnRlbnQgPiBzZWN0aW9uLm5ldHdvcmsgLndhcm5pbmcg eworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICB3aWR0aDogMTBweDsKKyAgICBoZWln aHQ6IDEwcHg7CisgICAgLXdlYmtpdC1tYXJnaW4tc3RhcnQ6IDNweDsKK30KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlTWV0cmlj c0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUmVzb3VyY2VTaXplc0NvbnRlbnRWaWV3LmpzCnNpbWlsYXJpdHkgaW5kZXggNjklCnJlbmFt ZSBmcm9tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNl TWV0cmljc0NvbnRlbnRWaWV3LmpzCnJlbmFtZSB0byBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpemVzQ29udGVudFZpZXcuanMKaW5kZXggYTgzMWIz Nzg0NTguLmZmMDVhODEyN2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZU1ldHJpY3NDb250ZW50Vmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpemVzQ29udGVu dFZpZXcuanMKQEAgLTIzLDcgKzIzLDcgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KICAqLwogCi1XSS5SZXNvdXJjZU1ldHJpY3NDb250ZW50VmlldyA9IGNsYXNzIFJlc291 cmNlTWV0cmljc0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKK1dJLlJlc291cmNl U2l6ZXNDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlU2l6ZXNDb250ZW50VmlldyBleHRlbmRz IFdJLkNvbnRlbnRWaWV3CiB7CiAgICAgY29uc3RydWN0b3IocmVzb3VyY2UsIGRlbGVnYXRlKQog ICAgIHsKQEAgLTM2LDE1ICszNiwxMyBAQCBXSS5SZXNvdXJjZU1ldHJpY3NDb250ZW50VmlldyA9 IGNsYXNzIFJlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udAogICAgICAg ICB0aGlzLl9yZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKFdJLlJlc291cmNlLkV2ZW50LlNpemVE aWRDaGFuZ2UsIHRoaXMuX3Jlc291cmNlU2l6ZURpZENoYW5nZSwgdGhpcyk7CiAgICAgICAgIHRo aXMuX3Jlc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV0kuUmVzb3VyY2UuRXZlbnQuVHJhbnNmZXJT aXplRGlkQ2hhbmdlLCB0aGlzLl9yZXNvdXJjZVRyYW5zZmVyU2l6ZURpZENoYW5nZSwgdGhpcyk7 CiAgICAgICAgIHRoaXMuX3Jlc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV0kuUmVzb3VyY2UuRXZl bnQuTWV0cmljc0RpZENoYW5nZSwgdGhpcy5fcmVzb3VyY2VNZXRyaWNzRGlkQ2hhbmdlLCB0aGlz KTsKLSAgICAgICAgdGhpcy5fcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5lcihXSS5SZXNvdXJjZS5F dmVudC5UaW1lc3RhbXBzRGlkQ2hhbmdlLCB0aGlzLl9yZXNvdXJjZVRpbWVzdGFtcHNEaWRDaGFu Z2UsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGU7CiAKLSAgICAg ICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInJlc291cmNlLWRldGFpbHMiLCAicmVzb3Vy Y2UtbWV0cmljcyIpOworICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicmVzb3Vy Y2UtZGV0YWlscyIsICJyZXNvdXJjZS1zaXplcyIpOwogCiAgICAgICAgIHRoaXMuX25lZWRzVHJh bnNmZXJTaXplc1JlZnJlc2ggPSBmYWxzZTsKICAgICAgICAgdGhpcy5fbmVlZHNSZXNvdXJjZVNp emVSZWZyZXNoID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuX25lZWRzVGltaW5nUmVmcmVzaCA9IGZh bHNlOwogICAgIH0KIAogICAgIC8vIFByb3RlY3RlZApAQCAtNTYsOCArNTQsNiBAQCBXSS5SZXNv dXJjZU1ldHJpY3NDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuQ29udAogICAgICAgICBsZXQgY29udGVudEVsZW1lbnQgPSB0aGlzLmVsZW1l bnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwogICAgICAgICBj b250ZW50RWxlbWVudC5jbGFzc05hbWUgPSAiY29udGVudCI7CiAKLSAgICAgICAgLy8gTmV0d29y ay4KLQogICAgICAgICBsZXQgbmV0d29ya1NlY3Rpb24gPSBjb250ZW50RWxlbWVudC5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzZWN0aW9uIikpOwogICAgICAgICBuZXR3b3Jr U2VjdGlvbi5jbGFzc05hbWUgPSAibmV0d29yayBzcGxpdCI7CiAKQEAgLTE0MCwyNCArMTM2LDEx IEBAIFdJLlJlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VNZXRyaWNz Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250CiAgICAgICAgIHRoaXMuX2NvbXByZXNzaW9uRWxl bWVudCA9IHJlc291cmNlQ29tcG9uZW50cy52YWx1ZTFFbGVtZW50OwogICAgICAgICB0aGlzLl9j b250ZW50VHlwZUVsZW1lbnQgPSByZXNvdXJjZUNvbXBvbmVudHMudmFsdWUyRWxlbWVudDsKIAot ICAgICAgICAvLyBUaW1pbmcuCi0KLSAgICAgICAgdGhpcy5fdGltaW5nU2VjdGlvbiA9IGNvbnRl bnRFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNlY3Rpb24iKSk7 Ci0gICAgICAgIHRoaXMuX3RpbWluZ1NlY3Rpb24uY2xhc3NOYW1lID0gInRpbWluZyI7Ci0KLSAg ICAgICAgdGhpcy5fdGltaW5nU3VidGl0bGUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKLSAgICAgICAgdGhpcy5fdGltaW5nU3VidGl0bGUuY2xhc3NOYW1lID0gInN1YnRpdGxlIjsK LSAgICAgICAgdGhpcy5fdGltaW5nU3VidGl0bGUudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygi VGltaW5nIik7Ci0KLSAgICAgICAgLy8gUG9wdWxhdGUuCi0KICAgICAgICAgdGhpcy5fcmVmcmVz aFRyYW5zZmVyU2l6ZVNlY3Rpb25zKCk7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hSZXNvdXJjZVNp emVTZWN0aW9uKCk7Ci0gICAgICAgIHRoaXMuX3JlZnJlc2hUaW1pbmdTZWN0aW9uKCk7CiAKICAg ICAgICAgdGhpcy5fbmVlZHNUcmFuc2ZlclNpemVzUmVmcmVzaCA9IGZhbHNlOwogICAgICAgICB0 aGlzLl9uZWVkc1Jlc291cmNlU2l6ZVJlZnJlc2ggPSBmYWxzZTsKLSAgICAgICAgdGhpcy5fbmVl ZHNUaW1pbmdSZWZyZXNoID0gZmFsc2U7CiAgICAgfQogCiAgICAgbGF5b3V0KCkKQEAgLTE3Mywx MSArMTU2LDYgQEAgV0kuUmVzb3VyY2VNZXRyaWNzQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJj ZU1ldHJpY3NDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnQKICAgICAgICAgICAgIHRoaXMuX3Jl ZnJlc2hSZXNvdXJjZVNpemVTZWN0aW9uKCk7CiAgICAgICAgICAgICB0aGlzLl9uZWVkc1Jlc291 cmNlU2l6ZVJlZnJlc2ggPSBmYWxzZTsKICAgICAgICAgfQotCi0gICAgICAgIGlmICh0aGlzLl9u ZWVkc1RpbWluZ1JlZnJlc2gpIHsKLSAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hUaW1pbmdTZWN0 aW9uKCk7Ci0gICAgICAgICAgICB0aGlzLl9uZWVkc1RpbWluZ1JlZnJlc2ggPSBmYWxzZTsKLSAg ICAgICAgfQogICAgIH0KIAogICAgIGNsb3NlZCgpCkBAIC0yNDAsMTMgKzIxOCwxMyBAQCBXSS5S ZXNvdXJjZU1ldHJpY3NDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlTWV0cmljc0NvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udAogICAgICAgICB9CiAKICAgICAgICAgaWYgKGJ5dGVzU2VudEhl YWRlcikKLSAgICAgICAgICAgIGFwcGVuZEdvVG9BcnJvdyh0aGlzLl9zZW5kaW5nSGVhZGVyQnl0 ZXNFbGVtZW50LCAoKSA9PiB7IHRoaXMuX2RlbGVnYXRlLm1ldHJpY3NDb250ZW50Vmlld0dvVG9I ZWFkZXJzKHRoaXMpOyB9KTsKKyAgICAgICAgICAgIGFwcGVuZEdvVG9BcnJvdyh0aGlzLl9zZW5k aW5nSGVhZGVyQnl0ZXNFbGVtZW50LCAoKSA9PiB7IHRoaXMuX2RlbGVnYXRlLnNpemVzQ29udGVu dFZpZXdHb1RvSGVhZGVycyh0aGlzKTsgfSk7CiAgICAgICAgIGlmIChieXRlc1NlbnRCb2R5KQot ICAgICAgICAgICAgYXBwZW5kR29Ub0Fycm93KHRoaXMuX3NlbmRpbmdCb2R5Qnl0ZXNFbGVtZW50 LCAoKSA9PiB7IHRoaXMuX2RlbGVnYXRlLm1ldHJpY3NDb250ZW50Vmlld0dvVG9SZXF1ZXN0Qm9k eSh0aGlzKTsgfSk7CisgICAgICAgICAgICBhcHBlbmRHb1RvQXJyb3codGhpcy5fc2VuZGluZ0Jv ZHlCeXRlc0VsZW1lbnQsICgpID0+IHsgdGhpcy5fZGVsZWdhdGUuc2l6ZXNDb250ZW50Vmlld0dv VG9SZXF1ZXN0Qm9keSh0aGlzKTsgfSk7CiAgICAgICAgIGlmIChieXRlc1JlY2VpdmVkSGVhZGVy KQotICAgICAgICAgICAgYXBwZW5kR29Ub0Fycm93KHRoaXMuX3JlY2VpdmluZ0hlYWRlckJ5dGVz RWxlbWVudCwgKCkgPT4geyB0aGlzLl9kZWxlZ2F0ZS5tZXRyaWNzQ29udGVudFZpZXdHb1RvSGVh ZGVycyh0aGlzKTsgfSk7CisgICAgICAgICAgICBhcHBlbmRHb1RvQXJyb3codGhpcy5fcmVjZWl2 aW5nSGVhZGVyQnl0ZXNFbGVtZW50LCAoKSA9PiB7IHRoaXMuX2RlbGVnYXRlLnNpemVzQ29udGVu dFZpZXdHb1RvSGVhZGVycyh0aGlzKTsgfSk7CiAgICAgICAgIGlmIChieXRlc1JlY2VpdmVkQm9k eSkKLSAgICAgICAgICAgIGFwcGVuZEdvVG9BcnJvdyh0aGlzLl9yZWNlaXZpbmdCb2R5Qnl0ZXNF bGVtZW50LCAoKSA9PiB7IHRoaXMuX2RlbGVnYXRlLm1ldHJpY3NDb250ZW50Vmlld0dvVG9SZXNw b25zZUJvZHkodGhpcyk7IH0pOworICAgICAgICAgICAgYXBwZW5kR29Ub0Fycm93KHRoaXMuX3Jl Y2VpdmluZ0JvZHlCeXRlc0VsZW1lbnQsICgpID0+IHsgdGhpcy5fZGVsZWdhdGUuc2l6ZXNDb250 ZW50Vmlld0dvVG9SZXNwb25zZUJvZHkodGhpcyk7IH0pOwogICAgIH0KIAogICAgIF9yZWZyZXNo UmVzb3VyY2VTaXplU2VjdGlvbigpCkBAIC0yNzIsODUgKzI1MCw2IEBAIFdJLlJlc291cmNlTWV0 cmljc0NvbnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VNZXRyaWNzQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250CiAgICAgICAgICAgICB0aGlzLl9jb21wcmVzc2lvbkVsZW1lbnQuYXBwZW5kQ2hp bGQoV0kuSW1hZ2VVdGlsaXRpZXMudXNlU1ZHU3ltYm9sKCJJbWFnZXMvV2FybmluZy5zdmciLCAi d2FybmluZyIsIFdJLlVJU3RyaW5nKCJUaGlzIHRleHQgcmVzb3VyY2UgY291bGQgYmVuZWZpdCBm cm9tIGNvbXByZXNzaW9uIikpKTsKICAgICB9CiAKLSAgICBfcmVmcmVzaFRpbWluZ1NlY3Rpb24o KQotICAgIHsKLSAgICAgICAgdGhpcy5fdGltaW5nU2VjdGlvbi5yZW1vdmVDaGlsZHJlbigpOwot Ci0gICAgICAgIHRoaXMuX3RpbWluZ1NlY3Rpb24uYXBwZW5kQ2hpbGQodGhpcy5fdGltaW5nU3Vi dGl0bGUpOwotCi0gICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2UuaGFzUmVzcG9uc2UoKSkgewot ICAgICAgICAgICAgbGV0IHNwaW5uZXIgPSBuZXcgV0kuSW5kZXRlcm1pbmF0ZVByb2dyZXNzU3Bp bm5lcjsKLSAgICAgICAgICAgIHRoaXMuX3RpbWluZ1NlY3Rpb24uYXBwZW5kQ2hpbGQoc3Bpbm5l ci5lbGVtZW50KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGlm ICghdGhpcy5fcmVzb3VyY2UudGltaW5nRGF0YS5zdGFydFRpbWUgfHwgIXRoaXMuX3Jlc291cmNl LnRpbWluZ0RhdGEucmVzcG9uc2VFbmQpIHsKLSAgICAgICAgICAgIGxldCBwID0gdGhpcy5fdGlt aW5nU2VjdGlvbi5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJwIikpOwotICAg ICAgICAgICAgcC5jbGFzc05hbWUgPSAiZW1wdHkiOwotICAgICAgICAgICAgcC50ZXh0Q29udGVu dCA9IFdJLlVJU3RyaW5nKCJSZXNvdXJjZSBkb2VzIG5vdCBoYXZlIHRpbWluZyBkYXRhIik7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICAvLyBGSVhNRTogQ29udmVy Z2Ugb24gdXNpbmcgV0kuUmVzb3VyY2VUaW1pbmdCcmVha2Rvd25WaWV3IHdoZW4gYSBkZXNpZ24g aXMgZmluYWxpemVkLgotCi0gICAgICAgIGxldCBsaXN0RWxlbWVudCA9IHRoaXMuX3RpbWluZ1Nl Y3Rpb24uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidWwiKSk7Ci0gICAgICAg IGxpc3RFbGVtZW50LmNsYXNzTmFtZSA9ICJ3YXRlcmZhbGwiOyAvLyBJbmNsdWRlIHdhdGVyZmFs bCBibG9jayBzdHlsZXMuCi0KLSAgICAgICAgY29uc3QgZ3JhcGhXaWR0aCA9IDM4MDsKLSAgICAg ICAgY29uc3QgZ3JhcGhTdGFydE9mZnNldCA9IDgwOwotCi0gICAgICAgIGxldCB7c3RhcnRUaW1l LCBkb21haW5Mb29rdXBTdGFydCwgZG9tYWluTG9va3VwRW5kLCBjb25uZWN0U3RhcnQsIGNvbm5l Y3RFbmQsIHNlY3VyZUNvbm5lY3Rpb25TdGFydCwgcmVxdWVzdFN0YXJ0LCByZXNwb25zZVN0YXJ0 LCByZXNwb25zZUVuZH0gPSB0aGlzLl9yZXNvdXJjZS50aW1pbmdEYXRhOwotICAgICAgICBsZXQg Z3JhcGhTdGFydFRpbWUgPSBzdGFydFRpbWU7Ci0gICAgICAgIGxldCBncmFwaEVuZFRpbWUgPSBy ZXNwb25zZUVuZDsKLSAgICAgICAgbGV0IHNlY29uZHNQZXJQaXhlbCA9IChyZXNwb25zZUVuZCAt IHN0YXJ0VGltZSkgLyBncmFwaFdpZHRoOwotCi0gICAgICAgIGZ1bmN0aW9uIGNyZWF0ZUJsb2Nr KHN0YXJ0VGltZSwgZW5kVGltZSwgY2xhc3NOYW1lLCBtYWtlRW1wdHkpIHsKLSAgICAgICAgICAg IGxldCBzdGFydE9mZnNldCA9IGdyYXBoU3RhcnRPZmZzZXQgKyAoKHN0YXJ0VGltZSAtIGdyYXBo U3RhcnRUaW1lKSAvIHNlY29uZHNQZXJQaXhlbCk7Ci0gICAgICAgICAgICBsZXQgd2lkdGggPSBt YWtlRW1wdHkgPyAxIDogKGVuZFRpbWUgLSBzdGFydFRpbWUpIC8gc2Vjb25kc1BlclBpeGVsOwot ICAgICAgICAgICAgbGV0IGJsb2NrID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0g ICAgICAgICAgICBibG9jay5jbGFzc0xpc3QuYWRkKCJibG9jayIsIGNsYXNzTmFtZSk7Ci0gICAg ICAgICAgICBsZXQgcHJvcGVydHkgPSBXSS5yZXNvbHZlZExheW91dERpcmVjdGlvbigpID09PSBX SS5MYXlvdXREaXJlY3Rpb24uUlRMID8gInJpZ2h0IiA6ICJsZWZ0IjsKLSAgICAgICAgICAgIGJs b2NrLnN0eWxlW3Byb3BlcnR5XSA9IHN0YXJ0T2Zmc2V0ICsgInB4IjsKLSAgICAgICAgICAgIGJs b2NrLnN0eWxlLndpZHRoID0gd2lkdGggKyAicHgiOwotICAgICAgICAgICAgcmV0dXJuIGJsb2Nr OwotICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gY3JlYXRlVGltZUxhYmVsKGVuZFRpbWUs IGxhYmVsKSB7Ci0gICAgICAgICAgICBsZXQgcG9zaXRpb25PZmZzZXQgPSBncmFwaFN0YXJ0T2Zm c2V0ICsgKChlbmRUaW1lIC0gZ3JhcGhTdGFydFRpbWUpIC8gc2Vjb25kc1BlclBpeGVsKTsKLSAg ICAgICAgICAgIHBvc2l0aW9uT2Zmc2V0ICs9IDM7Ci0gICAgICAgICAgICBsZXQgdGltZUxhYmVs ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgICAgICB0aW1lTGFiZWwu Y2xhc3NOYW1lID0gInRpbWUtbGFiZWwiOwotICAgICAgICAgICAgdGltZUxhYmVsLnRleHRDb250 ZW50ID0gbGFiZWw7Ci0gICAgICAgICAgICBsZXQgcHJvcGVydHkgPSBXSS5yZXNvbHZlZExheW91 dERpcmVjdGlvbigpID09PSBXSS5MYXlvdXREaXJlY3Rpb24uUlRMID8gInJpZ2h0IiA6ICJsZWZ0 IjsKLSAgICAgICAgICAgIHRpbWVMYWJlbC5zdHlsZVtwcm9wZXJ0eV0gPSBwb3NpdGlvbk9mZnNl dCArICJweCI7Ci0gICAgICAgICAgICByZXR1cm4gdGltZUxhYmVsOwotICAgICAgICB9Ci0KLSAg ICAgICAgZnVuY3Rpb24gY3JlYXRlUm93KGxhYmVsLCBzdGFydFRpbWUsIGVuZFRpbWUsIGNsYXNz TmFtZSkgewotICAgICAgICAgICAgbGV0IHJvdyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImxp Iik7Ci0gICAgICAgICAgICBsZXQgbGFiZWxFbGVtZW50ID0gcm93LmFwcGVuZENoaWxkKGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKSk7Ci0gICAgICAgICAgICBsYWJlbEVsZW1lbnQuY2xh c3NOYW1lID0gInJvdy1sYWJlbCI7Ci0gICAgICAgICAgICBsYWJlbEVsZW1lbnQudGV4dENvbnRl bnQgPSBsYWJlbDsKLSAgICAgICAgICAgIHJvdy5hcHBlbmRDaGlsZChjcmVhdGVCbG9jayhzdGFy dFRpbWUsIGVuZFRpbWUsIGNsYXNzTmFtZSkpOwotICAgICAgICAgICAgcm93LmFwcGVuZENoaWxk KGNyZWF0ZVRpbWVMYWJlbChlbmRUaW1lLCBOdW1iZXIuc2Vjb25kc1RvTWlsbGlzZWNvbmRzU3Ry aW5nKGVuZFRpbWUgLSBzdGFydFRpbWUpKSk7Ci0gICAgICAgICAgICByZXR1cm4gcm93OwotICAg ICAgICB9Ci0KLSAgICAgICAgbGlzdEVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlUm93KFdJLlVJ U3RyaW5nKCJTY2hlZHVsZWQiKSwgc3RhcnRUaW1lLCBkb21haW5Mb29rdXBTdGFydCB8fCBjb25u ZWN0U3RhcnQgfHwgcmVxdWVzdFN0YXJ0LCAicXVldWUiKSk7Ci0gICAgICAgIGlmIChkb21haW5M b29rdXBTdGFydCkKLSAgICAgICAgICAgIGxpc3RFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZVJv dyhXSS5VSVN0cmluZygiRE5TIiksIGRvbWFpbkxvb2t1cFN0YXJ0LCBkb21haW5Mb29rdXBFbmQg fHwgY29ubmVjdFN0YXJ0IHx8IHJlcXVlc3RTdGFydCwgImRucyIpKTsKLSAgICAgICAgaWYgKGNv bm5lY3RTdGFydCkKLSAgICAgICAgICAgIGxpc3RFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZVJv dyhXSS5VSVN0cmluZygiVENQIiksIGNvbm5lY3RTdGFydCwgY29ubmVjdEVuZCB8fCByZXF1ZXN0 U3RhcnQsICJjb25uZWN0IikpOwotICAgICAgICBpZiAoc2VjdXJlQ29ubmVjdGlvblN0YXJ0KQot ICAgICAgICAgICAgbGlzdEVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlUm93KFdJLlVJU3RyaW5n KCJTZWN1cmUiKSwgc2VjdXJlQ29ubmVjdGlvblN0YXJ0LCBjb25uZWN0RW5kIHx8IHJlcXVlc3RT dGFydCwgInNlY3VyZSIpKTsKLSAgICAgICAgbGlzdEVsZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRl Um93KFdJLlVJU3RyaW5nKCJSZXF1ZXN0IiksIHJlcXVlc3RTdGFydCwgcmVzcG9uc2VTdGFydCwg InJlcXVlc3QiKSk7Ci0gICAgICAgIGxpc3RFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZVJvdyhX SS5VSVN0cmluZygiUmVzcG9uc2UiKSwgcmVzcG9uc2VTdGFydCwgcmVzcG9uc2VFbmQsICJyZXNw b25zZSIpKTsKLQotICAgICAgICBsZXQgdG90YWxSb3cgPSBjcmVhdGVSb3coV0kuVUlTdHJpbmco IlRvdGFsIiksIHN0YXJ0VGltZSwgcmVzcG9uc2VFbmQsICJ0b3RhbCIpOwotICAgICAgICBsaXN0 RWxlbWVudC5hcHBlbmRDaGlsZCh0b3RhbFJvdyk7Ci0gICAgICAgIHRvdGFsUm93LmNsYXNzTGlz dC5hZGQoInRvdGFsIik7Ci0gICAgfQotCiAgICAgX3Jlc291cmNlU2l6ZURpZENoYW5nZShldmVu dCkKICAgICB7CiAgICAgICAgIHRoaXMuX25lZWRzVHJhbnNmZXJTaXplc1JlZnJlc2ggPSB0cnVl OwpAQCAtMzY3LDEzICsyNjYsNiBAQCBXSS5SZXNvdXJjZU1ldHJpY3NDb250ZW50VmlldyA9IGNs YXNzIFJlc291cmNlTWV0cmljc0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udAogICAgIHsKICAg ICAgICAgdGhpcy5fbmVlZHNUcmFuc2ZlclNpemVzUmVmcmVzaCA9IHRydWU7CiAgICAgICAgIHRo aXMuX25lZWRzUmVzb3VyY2VTaXplUmVmcmVzaCA9IHRydWU7Ci0gICAgICAgIHRoaXMuX25lZWRz VGltaW5nUmVmcmVzaCA9IHRydWU7Ci0gICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKLSAgICB9 Ci0KLSAgICBfcmVzb3VyY2VUaW1lc3RhbXBzRGlkQ2hhbmdlKGV2ZW50KQotICAgIHsKLSAgICAg ICAgdGhpcy5fbmVlZHNUaW1pbmdSZWZyZXNoID0gdHJ1ZTsKICAgICAgICAgdGhpcy5uZWVkc0xh eW91dCgpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWluZ0NvbnRlbnRWaWV3LmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltaW5nQ29udGVudFZp ZXcuY3NzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5hOGYwYzRlNTky NgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Jlc291cmNlVGltaW5nQ29udGVudFZpZXcuY3NzCkBAIC0wLDAgKzEsOTggQEAKKy8q CisgKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0 cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJl cHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBB TkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBM SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElN UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQ TEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVO VCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKyAqLworCisucmVzb3VyY2UtdGltaW5nIHsKKyAgICBmb250LWZhbWlseTogJy13ZWJraXQt c3lzdGVtLWZvbnQnOworfQorCisucmVzb3VyY2UtdGltaW5nID4gLmNvbnRlbnQgeworICAgIHdp ZHRoOiA1NTBweDsKKyAgICBtYXJnaW46IDAgYXV0bzsKK30KKworLnJlc291cmNlLXRpbWluZyA+ IC5jb250ZW50IC5sYWJlbCB7CisgICAgY29sb3I6IGdyYXk7Cit9CisKKy5yZXNvdXJjZS10aW1p bmcgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nIHsKKyAgICBwYWRkaW5nOiAyMHB4IDA7Cit9 CisKKy5yZXNvdXJjZS10aW1pbmcgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nID4gdWwgewor ICAgIG1hcmdpbjogMDsKKyAgICBwYWRkaW5nOiAwOworICAgIGxpc3Qtc3R5bGUtdHlwZTogbm9u ZTsKK30KKworLnJlc291cmNlLXRpbWluZyA+IC5jb250ZW50ID4gc2VjdGlvbi50aW1pbmcgPiB1 bCA+IGxpIHsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgaGVpZ2h0OiAyMHB4OworICAg IHBhZGRpbmc6IDFweCAwOworICAgIGxpbmUtaGVpZ2h0OiAxOHB4OworfQorCisucmVzb3VyY2Ut dGltaW5nID4gLmNvbnRlbnQgPiBzZWN0aW9uLnRpbWluZyA+IC53YXRlcmZhbGwgeworICAgIHdp ZHRoOiA1MDBweDsKKyAgICBtYXJnaW46IGF1dG87Cit9CisKKy5yZXNvdXJjZS10aW1pbmcgPiAu Y29udGVudCA+IHNlY3Rpb24udGltaW5nID4gLndhdGVyZmFsbCAuYmxvY2sgeworICAgIHRvcDog NHB4OworICAgIG1pbi13aWR0aDogMXB4OworICAgIGhlaWdodDogMTJweDsKK30KKworLnJlc291 cmNlLXRpbWluZyA+IC5jb250ZW50ID4gc2VjdGlvbi50aW1pbmcgPiB1bCA+IGxpID4gLnJvdy1s YWJlbCB7CisgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgIG1pbi13aWR0aDogNzBweDsK KyAgICBjb2xvcjogYmxhY2s7Cit9CisKKy5yZXNvdXJjZS10aW1pbmcgPiAuY29udGVudCA+IHNl Y3Rpb24udGltaW5nID4gdWwgPiBsaSA+IC5yb3ctbGFiZWwgeworICAgIHRleHQtYWxpZ246IGVu ZDsKK30KKworLnJlc291cmNlLXRpbWluZyA+IC5jb250ZW50ID4gc2VjdGlvbi50aW1pbmcgPiB1 bCA+IGxpID4gLnRpbWUtbGFiZWwgeworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6 IDFweDsKKyAgICBjb2xvcjogZ3JheTsKK30KKworLnJlc291cmNlLXRpbWluZyA+IC5jb250ZW50 ID4gc2VjdGlvbi50aW1pbmcgPiB1bCA+IGxpLnRvdGFsIC5ibG9jayB7CisgICAgZGlzcGxheTog bm9uZTsKK30KKworLnJlc291cmNlLXRpbWluZyA+IC5jb250ZW50ID4gc2VjdGlvbi50aW1pbmcg PiB1bCA+IGxpLnRvdGFsIC50aW1lLWxhYmVsIHsKKyAgICBjb2xvcjogYmxhY2s7Cit9CisKKy5y ZXNvdXJjZS10aW1pbmcgPiAuY29udGVudCA+IHNlY3Rpb24udGltaW5nIC5pbmRldGVybWluYXRl LXByb2dyZXNzLXNwaW5uZXIgeworICAgIG1hcmdpbjogMCBhdXRvOworfQorCisucmVzb3VyY2Ut dGltaW5nID4gLmNvbnRlbnQgPiBzZWN0aW9uLnRpbWluZyAuZW1wdHkgeworICAgIHRleHQtYWxp Z246IGNlbnRlcjsKKyAgICBjb2xvcjogZ3JheTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltaW5nQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRp bWluZ0NvbnRlbnRWaWV3LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw Li5jMzJmYjJjZTYzOAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltaW5nQ29udGVudFZpZXcuanMKQEAgLTAsMCAr MSwxNjcgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0Ogor ICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhl CisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg QVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9S CisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgor ICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKyAqLworCitXSS5SZXNvdXJjZVRpbWluZ0NvbnRlbnRWaWV3ID0gY2xh c3MgUmVzb3VyY2VUaW1pbmdDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3Cit7Cisg ICAgY29uc3RydWN0b3IocmVzb3VyY2UpCisgICAgeworICAgICAgICBzdXBlcihudWxsKTsKKwor ICAgICAgICBjb25zb2xlLmFzc2VydChyZXNvdXJjZSBpbnN0YW5jZW9mIFdJLlJlc291cmNlKTsK KworICAgICAgICB0aGlzLl9yZXNvdXJjZSA9IHJlc291cmNlOworICAgICAgICB0aGlzLl9yZXNv dXJjZS5hZGRFdmVudExpc3RlbmVyKFdJLlJlc291cmNlLkV2ZW50Lk1ldHJpY3NEaWRDaGFuZ2Us IHRoaXMuX3Jlc291cmNlTWV0cmljc0RpZENoYW5nZSwgdGhpcyk7CisgICAgICAgIHRoaXMuX3Jl c291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV0kuUmVzb3VyY2UuRXZlbnQuVGltZXN0YW1wc0RpZENo YW5nZSwgdGhpcy5fcmVzb3VyY2VUaW1lc3RhbXBzRGlkQ2hhbmdlLCB0aGlzKTsKKworICAgICAg ICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgicmVzb3VyY2UtZGV0YWlscyIsICJyZXNvdXJj ZS10aW1pbmciKTsKKworICAgICAgICB0aGlzLl9uZWVkc1RpbWluZ1JlZnJlc2ggPSBmYWxzZTsK KyAgICB9CisKKyAgICAvLyBQcm90ZWN0ZWQKKworICAgIGluaXRpYWxMYXlvdXQoKQorICAgIHsK KyAgICAgICAgc3VwZXIuaW5pdGlhbExheW91dCgpOworCisgICAgICAgIGxldCBjb250ZW50RWxl bWVudCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKSk7CisgICAgICAgIGNvbnRlbnRFbGVtZW50LmNsYXNzTmFtZSA9ICJjb250ZW50IjsKKwor ICAgICAgICB0aGlzLl90aW1pbmdTZWN0aW9uID0gY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic2VjdGlvbiIpKTsKKyAgICAgICAgdGhpcy5fdGltaW5n U2VjdGlvbi5jbGFzc05hbWUgPSAidGltaW5nIjsKKworICAgICAgICB0aGlzLl9yZWZyZXNoVGlt aW5nU2VjdGlvbigpOworCisgICAgICAgIHRoaXMuX25lZWRzVGltaW5nUmVmcmVzaCA9IGZhbHNl OworICAgIH0KKworICAgIGxheW91dCgpCisgICAgeworICAgICAgICBzdXBlci5sYXlvdXQoKTsK KworICAgICAgICBpZiAodGhpcy5fbmVlZHNUaW1pbmdSZWZyZXNoKSB7CisgICAgICAgICAgICB0 aGlzLl9yZWZyZXNoVGltaW5nU2VjdGlvbigpOworICAgICAgICAgICAgdGhpcy5fbmVlZHNUaW1p bmdSZWZyZXNoID0gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBjbG9zZWQoKQorICAg IHsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2UucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxs LCB0aGlzKTsKKworICAgICAgICBzdXBlci5jbG9zZWQoKTsKKyAgICB9CisKKyAgICAvLyBQcml2 YXRlCisKKyAgICBfcmVmcmVzaFRpbWluZ1NlY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5f dGltaW5nU2VjdGlvbi5yZW1vdmVDaGlsZHJlbigpOworCisgICAgICAgIGlmICghdGhpcy5fcmVz b3VyY2UuaGFzUmVzcG9uc2UoKSkgeworICAgICAgICAgICAgbGV0IHNwaW5uZXIgPSBuZXcgV0ku SW5kZXRlcm1pbmF0ZVByb2dyZXNzU3Bpbm5lcjsKKyAgICAgICAgICAgIHRoaXMuX3RpbWluZ1Nl Y3Rpb24uYXBwZW5kQ2hpbGQoc3Bpbm5lci5lbGVtZW50KTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCisgICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2UudGltaW5nRGF0YS5zdGFy dFRpbWUgfHwgIXRoaXMuX3Jlc291cmNlLnRpbWluZ0RhdGEucmVzcG9uc2VFbmQpIHsKKyAgICAg ICAgICAgIGxldCBwID0gdGhpcy5fdGltaW5nU2VjdGlvbi5hcHBlbmRDaGlsZChkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJwIikpOworICAgICAgICAgICAgcC5jbGFzc05hbWUgPSAiZW1wdHkiOwor ICAgICAgICAgICAgcC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJSZXNvdXJjZSBkb2VzIG5v dCBoYXZlIHRpbWluZyBkYXRhIik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwor ICAgICAgICAvLyBGSVhNRTogQ29udmVyZ2Ugb24gdXNpbmcgV0kuUmVzb3VyY2VUaW1pbmdCcmVh a2Rvd25WaWV3IHdoZW4gYSBkZXNpZ24gaXMgZmluYWxpemVkLgorCisgICAgICAgIGxldCBsaXN0 RWxlbWVudCA9IHRoaXMuX3RpbWluZ1NlY3Rpb24uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgidWwiKSk7CisgICAgICAgIGxpc3RFbGVtZW50LmNsYXNzTmFtZSA9ICJ3YXRlcmZh bGwiOyAvLyBJbmNsdWRlIHdhdGVyZmFsbCBibG9jayBzdHlsZXMuCisKKyAgICAgICAgY29uc3Qg Z3JhcGhXaWR0aCA9IDM4MDsKKyAgICAgICAgY29uc3QgZ3JhcGhTdGFydE9mZnNldCA9IDgwOwor CisgICAgICAgIGxldCB7c3RhcnRUaW1lLCBkb21haW5Mb29rdXBTdGFydCwgZG9tYWluTG9va3Vw RW5kLCBjb25uZWN0U3RhcnQsIGNvbm5lY3RFbmQsIHNlY3VyZUNvbm5lY3Rpb25TdGFydCwgcmVx dWVzdFN0YXJ0LCByZXNwb25zZVN0YXJ0LCByZXNwb25zZUVuZH0gPSB0aGlzLl9yZXNvdXJjZS50 aW1pbmdEYXRhOworICAgICAgICBsZXQgZ3JhcGhTdGFydFRpbWUgPSBzdGFydFRpbWU7CisgICAg ICAgIGxldCBncmFwaEVuZFRpbWUgPSByZXNwb25zZUVuZDsKKyAgICAgICAgbGV0IHNlY29uZHNQ ZXJQaXhlbCA9IChyZXNwb25zZUVuZCAtIHN0YXJ0VGltZSkgLyBncmFwaFdpZHRoOworCisgICAg ICAgIGZ1bmN0aW9uIGNyZWF0ZUJsb2NrKHN0YXJ0VGltZSwgZW5kVGltZSwgY2xhc3NOYW1lLCBt YWtlRW1wdHkpIHsKKyAgICAgICAgICAgIGxldCBzdGFydE9mZnNldCA9IGdyYXBoU3RhcnRPZmZz ZXQgKyAoKHN0YXJ0VGltZSAtIGdyYXBoU3RhcnRUaW1lKSAvIHNlY29uZHNQZXJQaXhlbCk7Cisg ICAgICAgICAgICBsZXQgd2lkdGggPSBtYWtlRW1wdHkgPyAxIDogKGVuZFRpbWUgLSBzdGFydFRp bWUpIC8gc2Vjb25kc1BlclBpeGVsOworICAgICAgICAgICAgbGV0IGJsb2NrID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICBibG9jay5jbGFzc0xpc3QuYWRkKCJi bG9jayIsIGNsYXNzTmFtZSk7CisgICAgICAgICAgICBsZXQgcHJvcGVydHkgPSBXSS5yZXNvbHZl ZExheW91dERpcmVjdGlvbigpID09PSBXSS5MYXlvdXREaXJlY3Rpb24uUlRMID8gInJpZ2h0IiA6 ICJsZWZ0IjsKKyAgICAgICAgICAgIGJsb2NrLnN0eWxlW3Byb3BlcnR5XSA9IHN0YXJ0T2Zmc2V0 ICsgInB4IjsKKyAgICAgICAgICAgIGJsb2NrLnN0eWxlLndpZHRoID0gd2lkdGggKyAicHgiOwor ICAgICAgICAgICAgcmV0dXJuIGJsb2NrOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24g Y3JlYXRlVGltZUxhYmVsKGVuZFRpbWUsIGxhYmVsKSB7CisgICAgICAgICAgICBsZXQgcG9zaXRp b25PZmZzZXQgPSBncmFwaFN0YXJ0T2Zmc2V0ICsgKChlbmRUaW1lIC0gZ3JhcGhTdGFydFRpbWUp IC8gc2Vjb25kc1BlclBpeGVsKTsKKyAgICAgICAgICAgIHBvc2l0aW9uT2Zmc2V0ICs9IDM7Cisg ICAgICAgICAgICBsZXQgdGltZUxhYmVsID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CisgICAgICAgICAgICB0aW1lTGFiZWwuY2xhc3NOYW1lID0gInRpbWUtbGFiZWwiOworICAgICAg ICAgICAgdGltZUxhYmVsLnRleHRDb250ZW50ID0gbGFiZWw7CisgICAgICAgICAgICBsZXQgcHJv cGVydHkgPSBXSS5yZXNvbHZlZExheW91dERpcmVjdGlvbigpID09PSBXSS5MYXlvdXREaXJlY3Rp b24uUlRMID8gInJpZ2h0IiA6ICJsZWZ0IjsKKyAgICAgICAgICAgIHRpbWVMYWJlbC5zdHlsZVtw cm9wZXJ0eV0gPSBwb3NpdGlvbk9mZnNldCArICJweCI7CisgICAgICAgICAgICByZXR1cm4gdGlt ZUxhYmVsOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gY3JlYXRlUm93KGxhYmVsLCBz dGFydFRpbWUsIGVuZFRpbWUsIGNsYXNzTmFtZSkgeworICAgICAgICAgICAgbGV0IHJvdyA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImxpIik7CisgICAgICAgICAgICBsZXQgbGFiZWxFbGVtZW50 ID0gcm93LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKSk7CisgICAg ICAgICAgICBsYWJlbEVsZW1lbnQuY2xhc3NOYW1lID0gInJvdy1sYWJlbCI7CisgICAgICAgICAg ICBsYWJlbEVsZW1lbnQudGV4dENvbnRlbnQgPSBsYWJlbDsKKyAgICAgICAgICAgIHJvdy5hcHBl bmRDaGlsZChjcmVhdGVCbG9jayhzdGFydFRpbWUsIGVuZFRpbWUsIGNsYXNzTmFtZSkpOworICAg ICAgICAgICAgcm93LmFwcGVuZENoaWxkKGNyZWF0ZVRpbWVMYWJlbChlbmRUaW1lLCBOdW1iZXIu c2Vjb25kc1RvTWlsbGlzZWNvbmRzU3RyaW5nKGVuZFRpbWUgLSBzdGFydFRpbWUpKSk7CisgICAg ICAgICAgICByZXR1cm4gcm93OworICAgICAgICB9CisKKyAgICAgICAgbGlzdEVsZW1lbnQuYXBw ZW5kQ2hpbGQoY3JlYXRlUm93KFdJLlVJU3RyaW5nKCJTY2hlZHVsZWQiKSwgc3RhcnRUaW1lLCBk b21haW5Mb29rdXBTdGFydCB8fCBjb25uZWN0U3RhcnQgfHwgcmVxdWVzdFN0YXJ0LCAicXVldWUi KSk7CisgICAgICAgIGlmIChkb21haW5Mb29rdXBTdGFydCkKKyAgICAgICAgICAgIGxpc3RFbGVt ZW50LmFwcGVuZENoaWxkKGNyZWF0ZVJvdyhXSS5VSVN0cmluZygiRE5TIiksIGRvbWFpbkxvb2t1 cFN0YXJ0LCBkb21haW5Mb29rdXBFbmQgfHwgY29ubmVjdFN0YXJ0IHx8IHJlcXVlc3RTdGFydCwg ImRucyIpKTsKKyAgICAgICAgaWYgKGNvbm5lY3RTdGFydCkKKyAgICAgICAgICAgIGxpc3RFbGVt ZW50LmFwcGVuZENoaWxkKGNyZWF0ZVJvdyhXSS5VSVN0cmluZygiVENQIiksIGNvbm5lY3RTdGFy dCwgY29ubmVjdEVuZCB8fCByZXF1ZXN0U3RhcnQsICJjb25uZWN0IikpOworICAgICAgICBpZiAo c2VjdXJlQ29ubmVjdGlvblN0YXJ0KQorICAgICAgICAgICAgbGlzdEVsZW1lbnQuYXBwZW5kQ2hp bGQoY3JlYXRlUm93KFdJLlVJU3RyaW5nKCJTZWN1cmUiKSwgc2VjdXJlQ29ubmVjdGlvblN0YXJ0 LCBjb25uZWN0RW5kIHx8IHJlcXVlc3RTdGFydCwgInNlY3VyZSIpKTsKKyAgICAgICAgbGlzdEVs ZW1lbnQuYXBwZW5kQ2hpbGQoY3JlYXRlUm93KFdJLlVJU3RyaW5nKCJSZXF1ZXN0IiksIHJlcXVl c3RTdGFydCwgcmVzcG9uc2VTdGFydCwgInJlcXVlc3QiKSk7CisgICAgICAgIGxpc3RFbGVtZW50 LmFwcGVuZENoaWxkKGNyZWF0ZVJvdyhXSS5VSVN0cmluZygiUmVzcG9uc2UiKSwgcmVzcG9uc2VT dGFydCwgcmVzcG9uc2VFbmQsICJyZXNwb25zZSIpKTsKKworICAgICAgICBsZXQgdG90YWxSb3cg PSBjcmVhdGVSb3coV0kuVUlTdHJpbmcoIlRvdGFsIiksIHN0YXJ0VGltZSwgcmVzcG9uc2VFbmQs ICJ0b3RhbCIpOworICAgICAgICBsaXN0RWxlbWVudC5hcHBlbmRDaGlsZCh0b3RhbFJvdyk7Cisg ICAgICAgIHRvdGFsUm93LmNsYXNzTGlzdC5hZGQoInRvdGFsIik7CisgICAgfQorCisgICAgX3Jl c291cmNlTWV0cmljc0RpZENoYW5nZShldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX25lZWRz VGltaW5nUmVmcmVzaCA9IHRydWU7CisgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKKyAgICB9 CisKKyAgICBfcmVzb3VyY2VUaW1lc3RhbXBzRGlkQ2hhbmdlKGV2ZW50KQorICAgIHsKKyAgICAg ICAgdGhpcy5fbmVlZHNUaW1pbmdSZWZyZXNoID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5uZWVkc0xh eW91dCgpOworICAgIH0KK307Cg==