148114 2015-08-17 17:55:35 -0700 Web Inspector: Style changes to Visual sidebar selector items 2015-08-17 21:12:27 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 147563 1 hi hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1118346 0 hi 2015-08-17 17:55:35 -0700 Fixes a few minor issues with the styles sidebar: - Removes the white outline on the checkboxes in the selector section when unchecked. - Modifying a selector now updates the title of that tree item - Adds highlighting to the margin/padding links when they are hovered 1118347 1 webkit-bug-importer 2015-08-17 17:55:53 -0700 <rdar://problem/22318289> 1118348 2 259218 hi 2015-08-17 18:05:34 -0700 Created attachment 259218 Patch 1118350 3 259219 hi 2015-08-17 18:07:44 -0700 Created attachment 259219 Patch 1118407 4 259219 commit-queue 2015-08-17 21:12:23 -0700 Comment on attachment 259219 Patch Clearing flags on attachment: 259219 Committed r188572: <http://trac.webkit.org/changeset/188572> 1118408 5 commit-queue 2015-08-17 21:12:27 -0700 All reviewed patches have been landed. Closing bug. 259218 2015-08-17 18:05:34 -0700 2015-08-17 18:07:40 -0700 Patch bug-148114-20150817180532.patch text/plain 13117 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBmODEwOWFiMGE4NTQwMmMwOWI0NDI4ZTAyNDdj ZGEzODFmZTg1YmEuLjdiZTRhNmU2YzA0YjZmYzhmZWI1ZWZkNWU2MzJjMGU1YjY0MzRhOTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE1LTA4LTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZSBjaGFuZ2VzIHRvIFZpc3VhbCBzaWRlYmFyIHNlbGVjdG9yIGl0ZW1zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgxMTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0dlbmVyYWxUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5HZW5lcmFsVHJl ZUVsZW1lbnQucHJvdG90eXBlLl91cGRhdGVUaXRsZUVsZW1lbnRzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQucHJvdG90eXBlLl91cGRhdGVUaXRsZVRvb2x0aXAp OgorICAgICAgICBNb3ZlZCB0aGUgY29kZSB0byB1cGRhdGUgdGhlIGl0ZW0gdG9vbHRpcCB0byBp dHMgb3duIGZ1bmN0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZURldGFpbHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURl dGFpbHNQYW5lbC5wcm90b3R5cGUuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycy5lZGl0b3JNb3Vz ZW92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnBy b3RvdHlwZS5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzLmVkaXRvck1vdXNlb3V0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX2FkZE1l dHJpY3NNb3VzZUxpc3RlbmVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwucHJvdG90eXBlLl9nZW5lcmF0ZU1ldHJpY1NlY3Rpb25Sb3dzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX3BvcHVs YXRlTWFyZ2luU2VjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRh aWxzUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZVBhZGRpbmdTZWN0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX2FkZE1ldHJpY3NN b3VzZUxpc3RlbmVycy5vbkVkaXRvck1vdXNlb3Zlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLl9hZGRNZXRyaWNzTW91 c2VMaXN0ZW5lcnMub25FZGl0b3JNb3VzZW91dCk6IERlbGV0ZWQuCisgICAgICAgIEFkZGVkIG9u LWhvdmVyIG5vZGUvc2VsZWN0b3IgaGlnaGxpZ2h0aW5nIHRvIG1hcmdpbiBhbmQgcGFkZGluZyBl ZGl0b3IgbGlua3MuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl TnVtYmVySW5wdXRCb3guanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1i ZXJJbnB1dEJveCk6CisgICAgICAgIFJlcGxhY2VkICJObyBVbml0cyIgd2l0aCAiTnVtYmVyIiBm b3IgYmV0dGVyIGNsYXJpdHkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3M6CisgICAgICAgIChib2R5Om5vdCgud2luZG93LWlu YWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLml0ZW0udmlzdWFsLXN0eWxlLXNlbGVj dG9yLWl0ZW0uc2VsZWN0ZWQgPiBpbnB1dFt0eXBlPSJjaGVja2JveCJdOmNoZWNrZWQ6OmJlZm9y ZSk6CisgICAgICAgICguaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5zZWxlY3RlZCA+ IGlucHV0W3R5cGU9ImNoZWNrYm94Il06OmJlZm9yZSk6IERlbGV0ZWQuCisgICAgICAgIFJlbW92 ZXMgdGhlIHdoaXRlIGJvcmRlciB3aGVuIHRoZSB3aW5kb3cgaXMgaW5hY3RpdmUgYW5kIHdoZW4g dGhlIGNoZWNrYm94IGlzIHVuY2hlY2tlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5wcm90b3R5cGUuX2NvbW1pdFNlbGVjdG9yKToK KyAgICAgICAgTm93IHVwZGF0ZXMgdGhlIHRpdGxlIG9mIHRoZSBpdGVtIHdoZW4gdGhlIHNlbGVj dG9yIGNoYW5nZXMuCisKIDIwMTUtMDgtMTQgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5hdmlnYXRpb25CYXIudXBkYXRlTGF5b3V0 U29vbiBzaG91bGQgdXNlIHJlcXVlc3RBbmltYXRpb25GcmFtZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKaW5kZXggN2E5MGE5NTQ1OWIyZTZkOTY5MDJkMWZkODRjMjBlMTk2NmE4ZmI3 ZS4uZTczMDkwOWQzY2ZlMDYzODBkODE4MjRiNmI3Mjc3ODY3OWJlN2I3NiAxMDA2NDQKR0lUIGJp bmFyeSBwYXRjaApkZWx0YSAzNQpxY21kbVNmQEsyYC1RRzFoYiteam9jcGF8SUB3KzNLQ2RWJDdt fFZacVoxZVdMamNFV21WRyRHbgoKZGVsdGEgNDUKemNtVit8ME1oQGskT08yXjFoQ3Q+MGFjVUd6 Ny0yajBCLTt3MDk2MlAwQk10T1dHfENYdT9EbC14YHFPP3VmMmgwCkR1N25jbgoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxUcmVl RWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dl bmVyYWxUcmVlRWxlbWVudC5qcwppbmRleCA3NjY0MTliNGVmZTdmZjIzM2YwZTQ3OGY2ZDNlNmYy YWQzOGM1YTdkLi4zNzhhZDA2OWM3NGJlYmUwNDZjNTA2YTYyNjZlMDI5ZWQxNGU4ODNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFs VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzCkBAIC0zNDIsMjEgKzM0MiwyNiBAQCBXZWJJbnNw ZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50ID0gY2xhc3MgR2VuZXJhbFRyZWVFbGVtZW50IGV4dGVu ZHMgV2ViSW5zcGVjdG9yLgogICAgICAgICB9CiAKICAgICAgICAgLy8gU2V0IGEgZGVmYXVsdCB0 b29sdGlwIGlmIHRoZXJlIGlzbid0IGEgY3VzdG9tIG9uZSBhbHJlYWR5IGFzc2lnbmVkLgotICAg ICAgICBpZiAoIXRoaXMudG9vbHRpcCAmJiAhdGhpcy5fdG9vbHRpcEhhbmRsZWRTZXBhcmF0ZWx5 KSB7Ci0gICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9saXN0SXRlbU5vZGUpOwotCi0g ICAgICAgICAgICAvLyBHZXQgdGhlIHRleHRDb250ZW50IGZvciB0aGUgZWxlbWVudHMgc2luY2Ug dGhleSBjYW4gY29udGFpbiBvdGhlciBub2RlcywKLSAgICAgICAgICAgIC8vIGFuZCB0aGUgdG9v bCB0aXAgb25seSBjYXJlcyBhYm91dCB0aGUgdGV4dC4KLSAgICAgICAgICAgIHZhciBtYWluVGl0 bGVUZXh0ID0gdGhpcy5fbWFpblRpdGxlRWxlbWVudC50ZXh0Q29udGVudDsKLSAgICAgICAgICAg IHZhciBzdWJ0aXRsZVRleHQgPSB0aGlzLl9zdWJ0aXRsZUVsZW1lbnQgPyB0aGlzLl9zdWJ0aXRs ZUVsZW1lbnQudGV4dENvbnRlbnQgOiAiIjsKLQotICAgICAgICAgICAgaWYgKG1haW5UaXRsZVRl eHQgJiYgc3VidGl0bGVUZXh0KQotICAgICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS50 aXRsZSA9IG1haW5UaXRsZVRleHQgKyAodGhpcy5fc21hbGwgJiYgIXRoaXMuX3R3b0xpbmUgPyAi IFx1MjAxNCAiIDogIlxuIikgKyBzdWJ0aXRsZVRleHQ7Ci0gICAgICAgICAgICBlbHNlIGlmICht YWluVGl0bGVUZXh0KQotICAgICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS50aXRsZSA9 IG1haW5UaXRsZVRleHQ7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgdGhpcy5f bGlzdEl0ZW1Ob2RlLnRpdGxlID0gc3VidGl0bGVUZXh0OwotICAgICAgICB9CisgICAgICAgIGlm ICghdGhpcy50b29sdGlwICYmICF0aGlzLl90b29sdGlwSGFuZGxlZFNlcGFyYXRlbHkpCisgICAg ICAgICAgICB0aGlzLl91cGRhdGVUaXRsZVRvb2x0aXAoKTsKKyAgICB9CisKKyAgICBfdXBkYXRl VGl0bGVUb29sdGlwKCkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2xpc3RJ dGVtTm9kZSk7CisgICAgICAgIGlmICghdGhpcy5fbGlzdEl0ZW1Ob2RlKQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIC8vIEdldCB0aGUgdGV4dENvbnRlbnQgZm9yIHRoZSBlbGVtZW50 cyBzaW5jZSB0aGV5IGNhbiBjb250YWluIG90aGVyIG5vZGVzLAorICAgICAgICAvLyBhbmQgdGhl IHRvb2wgdGlwIG9ubHkgY2FyZXMgYWJvdXQgdGhlIHRleHQuCisgICAgICAgIGxldCBtYWluVGl0 bGVUZXh0ID0gdGhpcy5fbWFpblRpdGxlRWxlbWVudC50ZXh0Q29udGVudDsKKyAgICAgICAgbGV0 IHN1YnRpdGxlVGV4dCA9IHRoaXMuX3N1YnRpdGxlRWxlbWVudCA/IHRoaXMuX3N1YnRpdGxlRWxl bWVudC50ZXh0Q29udGVudCA6ICIiOworICAgICAgICBpZiAobWFpblRpdGxlVGV4dCAmJiBzdWJ0 aXRsZVRleHQpCisgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUudGl0bGUgPSBtYWluVGl0 bGVUZXh0ICsgKHRoaXMuX3NtYWxsICYmICF0aGlzLl90d29MaW5lID8gIiBcdTIwMTQgIiA6ICJc biIpICsgc3VidGl0bGVUZXh0OworICAgICAgICBlbHNlIGlmIChtYWluVGl0bGVUZXh0KQorICAg ICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLnRpdGxlID0gbWFpblRpdGxlVGV4dDsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLnRpdGxlID0gc3VidGl0bGVU ZXh0OwogICAgIH0KIAogICAgIF91cGRhdGVTdGF0dXNFbGVtZW50KCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWls c1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlz dWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggZjgwNjEyNTM0OGNhOThiMDRhNzY3YzhjNWQ2 ZjZmNTAwMTliY2UxNy4uOTkyYTFjMzljZDRmMzliZjQxYzdmYTUwNDIxNjk4NjM3ZDI3NDQyNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlz dWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAgLTMyOCw3ICszMjgs MjkgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFs U3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAgICAgdGhpcy5fcG9wdWxhdGVTZWN0 aW9uKGdyb3VwLCBbZGlzcGxheUdyb3VwXSk7CiAgICAgfQogCi0gICAgX2dlbmVyYXRlTWV0cmlj U2VjdGlvblJvd3MoZ3JvdXAsIHByZWZpeCwgYWxsb3dOZWdhdGl2ZXMpCisgICAgX2FkZE1ldHJp Y3NNb3VzZUxpc3RlbmVycyhlZGl0b3IsIG1vZGUpCisgICAgeworICAgICAgICBmdW5jdGlvbiBl ZGl0b3JNb3VzZW92ZXIoKSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuX2N1cnJlbnRTdHlsZSkK KyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGlmICghdGhpcy5fY3VycmVu dFN0eWxlLm93bmVyUnVsZSkgeworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVl TWFuYWdlci5oaWdobGlnaHRET01Ob2RlKHRoaXMuX2N1cnJlbnRTdHlsZS5ub2RlLmlkLCBtb2Rl KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5oaWdobGlnaHRTZWxlY3Rvcih0aGlzLl9jdXJy ZW50U3R5bGUub3duZXJSdWxlLnNlbGVjdG9yVGV4dCwgdGhpcy5fY3VycmVudFN0eWxlLm5vZGUu b3duZXJEb2N1bWVudC5mcmFtZUlkZW50aWZpZXIsIG1vZGUpOworICAgICAgICB9CisKKyAgICAg ICAgZnVuY3Rpb24gZWRpdG9yTW91c2VvdXQoKSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tVHJlZU1hbmFnZXIuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsKKyAgICAgICAgfQorCisgICAg ICAgIGVkaXRvci5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIsIGVkaXRvck1v dXNlb3Zlci5iaW5kKHRoaXMpKTsKKyAgICAgICAgZWRpdG9yLmVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigibW91c2VvdXQiLCBlZGl0b3JNb3VzZW91dCk7CisgICAgfQorCisgICAgX2dlbmVyYXRl TWV0cmljU2VjdGlvblJvd3MoZ3JvdXAsIHByZWZpeCwgYWxsb3dOZWdhdGl2ZXMsIGhpZ2hsaWdo dE9uSG92ZXIpCiAgICAgewogICAgICAgICBsZXQgcHJvcGVydGllcyA9IGdyb3VwLnByb3BlcnRp ZXM7CiAKQEAgLTM2NCw2ICszODYsMTYgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWls c1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAg ICAgbGV0IGFsbExpbmsgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0 b3JMaW5rKFtwcm9wZXJ0aWVzW3RvcF0sIHByb3BlcnRpZXNbYm90dG9tXSwgcHJvcGVydGllc1ts ZWZ0XSwgcHJvcGVydGllc1tyaWdodF1dLCAibGluay1hbGwiLCBbdmVydGljYWxMaW5rLCBob3Jp em9udGFsTGlua10pOwogICAgICAgICBhbGxMaW5rUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQoYWxs TGluay5lbGVtZW50KTsKIAorICAgICAgICBpZiAoaGlnaGxpZ2h0T25Ib3ZlcikgeworICAgICAg ICAgICAgdGhpcy5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKHByb3BlcnRpZXNbdG9wXSwgcHJl Zml4KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyh2ZXJ0aWNh bExpbmssIHByZWZpeCk7CisgICAgICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5l cnMocHJvcGVydGllc1tib3R0b21dLCBwcmVmaXgpOworICAgICAgICAgICAgdGhpcy5fYWRkTWV0 cmljc01vdXNlTGlzdGVuZXJzKGFsbExpbmssIHByZWZpeCk7CisgICAgICAgICAgICB0aGlzLl9h ZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMocHJvcGVydGllc1tsZWZ0XSwgcHJlZml4KTsKKyAgICAg ICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhob3Jpem9udGFsTGluaywgcHJl Zml4KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhwcm9wZXJ0 aWVzW3JpZ2h0XSwgcHJlZml4KTsKKyAgICAgICAgfQorCiAgICAgICAgIHJldHVybiBbdmVydGlj YWwsIGFsbExpbmtSb3csIGhvcml6b250YWxdOwogICAgIH0KIApAQCAtNDEwLDI4ICs0NDIsNiBA QCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFzcyBWaXN1YWxTdHls ZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgICAgICB0aGlzLl9wb3B1bGF0ZVNlY3Rpb24o Z3JvdXAsIFtmbG9hdEdyb3VwXSk7CiAgICAgfQogCi0gICAgX2FkZE1ldHJpY3NNb3VzZUxpc3Rl bmVycyhlZGl0b3IsIG1vZGUpCi0gICAgewotICAgICAgICBmdW5jdGlvbiBvbkVkaXRvck1vdXNl b3ZlcigpIHsKLSAgICAgICAgICAgIGlmICghdGhpcy5fc3R5bGUpCi0gICAgICAgICAgICAgICAg cmV0dXJuOwotCi0gICAgICAgICAgICBpZiAoIXRoaXMuX3N0eWxlLm93bmVyUnVsZSkgewotICAg ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5oaWdobGlnaHRET01Ob2Rl KHRoaXMuX3N0eWxlLm5vZGUuaWQsIG1vZGUpOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgICAgIH0KLQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLmhp Z2hsaWdodFNlbGVjdG9yKHRoaXMuX3N0eWxlLm93bmVyUnVsZS5zZWxlY3RvclRleHQsIHRoaXMu X3N0eWxlLm5vZGUub3duZXJEb2N1bWVudC5mcmFtZUlkZW50aWZpZXIsIG1vZGUpOwotICAgICAg ICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gb25FZGl0b3JNb3VzZW91dCgpIHsKLSAgICAgICAgICAg IFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdodCgpOwotICAg ICAgICB9Ci0KLSAgICAgICAgZWRpdG9yLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vv dmVyIiwgb25FZGl0b3JNb3VzZW92ZXIuYmluZChlZGl0b3IpKTsKLSAgICAgICAgZWRpdG9yLmVs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCBvbkVkaXRvck1vdXNlb3V0LmJpbmQo ZWRpdG9yKSk7Ci0gICAgfQotCiAgICAgX3BvcHVsYXRlRGltZW5zaW9uc1NlY3Rpb24oKQogICAg IHsKICAgICAgICAgbGV0IGdyb3VwID0gdGhpcy5fZ3JvdXBzLmRpbWVuc2lvbnM7CkBAIC01MDQs MTQgKzUxNCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNz IFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgX3BvcHVsYXRlTWFyZ2lu U2VjdGlvbigpCiAgICAgewogICAgICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91cHMubWFyZ2lu OwotICAgICAgICBsZXQgcm93cyA9IHRoaXMuX2dlbmVyYXRlTWV0cmljU2VjdGlvblJvd3MoZ3Jv dXAsICJtYXJnaW4iLCB0cnVlKTsKLQotICAgICAgICBsZXQgaGlnaGxpZ2h0TW9kZSA9ICJtYXJn aW4iOwotICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVy dGllcy5tYXJnaW5Ub3AsIGhpZ2hsaWdodE1vZGUpOwotICAgICAgICB0aGlzLl9hZGRNZXRyaWNz TW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVydGllcy5tYXJnaW5Cb3R0b20sIGhpZ2hsaWdodE1v ZGUpOwotICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVy dGllcy5tYXJnaW5MZWZ0LCBoaWdobGlnaHRNb2RlKTsKLSAgICAgICAgdGhpcy5fYWRkTWV0cmlj c01vdXNlTGlzdGVuZXJzKGdyb3VwLnByb3BlcnRpZXMubWFyZ2luUmlnaHQsIGhpZ2hsaWdodE1v ZGUpOwotCisgICAgICAgIGxldCByb3dzID0gdGhpcy5fZ2VuZXJhdGVNZXRyaWNTZWN0aW9uUm93 cyhncm91cCwgIm1hcmdpbiIsIHRydWUsIHRydWUpOwogICAgICAgICBsZXQgbWFyZ2luR3JvdXAg PSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAocm93cyk7CiAgICAgICAgIHRo aXMuX3BvcHVsYXRlU2VjdGlvbihncm91cCwgW21hcmdpbkdyb3VwXSk7CiAgICAgfQpAQCAtNTE5 LDE0ICs1MjIsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFz cyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgIF9wb3B1bGF0ZVBhZGRp bmdTZWN0aW9uKCkKICAgICB7CiAgICAgICAgIGxldCBncm91cCA9IHRoaXMuX2dyb3Vwcy5wYWRk aW5nOwotICAgICAgICBsZXQgcm93cyA9IHRoaXMuX2dlbmVyYXRlTWV0cmljU2VjdGlvblJvd3Mo Z3JvdXAsICJwYWRkaW5nIik7Ci0KLSAgICAgICAgbGV0IGhpZ2hsaWdodE1vZGUgPSAicGFkZGlu ZyI7Ci0gICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhncm91cC5wcm9wZXJ0 aWVzLnBhZGRpbmdUb3AsIGhpZ2hsaWdodE1vZGUpOwotICAgICAgICB0aGlzLl9hZGRNZXRyaWNz TW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVydGllcy5wYWRkaW5nQm90dG9tLCBoaWdobGlnaHRN b2RlKTsKLSAgICAgICAgdGhpcy5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKGdyb3VwLnByb3Bl cnRpZXMucGFkZGluZ0xlZnQsIGhpZ2hsaWdodE1vZGUpOwotICAgICAgICB0aGlzLl9hZGRNZXRy aWNzTW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVydGllcy5wYWRkaW5nUmlnaHQsIGhpZ2hsaWdo dE1vZGUpOwotCisgICAgICAgIGxldCByb3dzID0gdGhpcy5fZ2VuZXJhdGVNZXRyaWNTZWN0aW9u Um93cyhncm91cCwgInBhZGRpbmciLCBmYWxzZSwgdHJ1ZSk7CiAgICAgICAgIGxldCBwYWRkaW5n R3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAocm93cyk7CiAgICAg ICAgIHRoaXMuX3BvcHVsYXRlU2VjdGlvbihncm91cCwgW3BhZGRpbmdHcm91cF0pOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlTnVtYmVySW5wdXRCb3guanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94LmpzCmluZGV4IDVhZmVjOGU0 OGFlOTcyYTBmMTVjODMxOTgwOTA2ZDkzODFmYTViMWEuLjRiOGU0MTA2YWJlMjIzZjY1MmM5MTY0 MTc4OTdlZWU0YjYxZTliZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVOdW1iZXJJbnB1 dEJveC5qcwpAQCAtMjcsNyArMjcsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJ bnB1dEJveCA9IGNsYXNzIFZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3ggZXh0ZW5kcwogewogICAg IGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZXMsIHRleHQsIHBvc3NpYmxlVmFsdWVzLCBwb3NzaWJs ZVVuaXRzLCBhbGxvd05lZ2F0aXZlVmFsdWVzLCBsYXlvdXRSZXZlcnNlZCkKICAgICB7Ci0gICAg ICAgIHN1cGVyKHByb3BlcnR5TmFtZXMsIHRleHQsIHBvc3NpYmxlVmFsdWVzLCBwb3NzaWJsZVVu aXRzIHx8IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vIFVuaXRzIildLCAibnVtYmVyLWlucHV0 LWJveCIsIGxheW91dFJldmVyc2VkKTsKKyAgICAgICAgc3VwZXIocHJvcGVydHlOYW1lcywgdGV4 dCwgcG9zc2libGVWYWx1ZXMsIHBvc3NpYmxlVW5pdHMgfHwgW1dlYkluc3BlY3Rvci5VSVN0cmlu ZygiTnVtYmVyIildLCAibnVtYmVyLWlucHV0LWJveCIsIGxheW91dFJldmVyc2VkKTsKIAogICAg ICAgICB0aGlzLl9oYXNVbml0cyA9ICEhcG9zc2libGVVbml0czsKICAgICAgICAgdGhpcy5fYWxs b3dOZWdhdGl2ZVZhbHVlcyA9ICEhYWxsb3dOZWdhdGl2ZVZhbHVlcyB8fCBmYWxzZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0 eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uY3NzCmluZGV4IGM3ZmQ3ZDdk Yjc3NjNkYmZkZGFjYjE0MmQ0ZDg4NDJmMzNmNDUxZmIuLmU3MDFjNDhjYTZhODA2Mjg5ZDU4NjU3 MDA5OWFlZTdlZjMxZWM4N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3Rv clRyZWVJdGVtLmNzcwpAQCAtNDYsNyArNDYsNyBAQAogICAgIG1hcmdpbjogNC41cHggMCA0cHgg NXB4OwogfQogCi0uaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5zZWxlY3RlZCA+IGlu cHV0W3R5cGU9ImNoZWNrYm94Il06OmJlZm9yZSB7Citib2R5Om5vdCgud2luZG93LWluYWN0aXZl LCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLml0ZW0udmlzdWFsLXN0eWxlLXNlbGVjdG9yLWl0 ZW0uc2VsZWN0ZWQgPiBpbnB1dFt0eXBlPSJjaGVja2JveCJdOmNoZWNrZWQ6OmJlZm9yZSB7CiAg ICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRvcDogMDsKICAgICByaWdodDogMDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0 eWxlU2VsZWN0b3JUcmVlSXRlbS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcwppbmRleCAxZDQyOWQ0Mjkz ZGMzYWNkY2U3NTYzNmJiOGQyMjc5YWJlMDE0MDk2Li4zZmQxNzgzZjJhYjIzZmQ4MDA3YzkzMzRj ZmYxNTRhMGRkYzE1Yjg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRy ZWVJdGVtLmpzCkBAIC0xOTEsNiArMTkxLDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2Vs ZWN0b3JUcmVlSXRlbSA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbSBleHQKICAg ICB7CiAgICAgICAgIHRoaXMuX2hpZGVET01Ob2RlSGlnaGxpZ2h0KCk7CiAgICAgICAgIHRoaXMu X2xpc3RJdGVtTm9kZS5jbGFzc0xpc3QucmVtb3ZlKCJlZGl0YWJsZSIpOworICAgICAgICB0aGlz Ll91cGRhdGVUaXRsZVRvb2x0aXAoKTsKIAogICAgICAgICBsZXQgdmFsdWUgPSB0aGlzLnNlbGVj dG9yVGV4dDsKICAgICAgICAgaWYgKHZhbHVlID09PSB0aGlzLl9sYXN0VmFsdWUgJiYgdGhpcy5f dmFsaWQpCg== 259219 2015-08-17 18:07:44 -0700 2015-08-17 21:12:23 -0700 Patch bug-148114-20150817180742.patch text/plain 13069 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZhNTU2MWJkZDMwZjc2ZTMzYTFkZDQ5MzBmYjM0 NWIxMzM4OTk1NDEuLmM0MTQ2MTMyOTM0ZmQ5MTYxZTlhM2EyZTlhNzE5YTU3MTFkMjYyNmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE1LTA4LTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZSBjaGFuZ2VzIHRvIFZpc3VhbCBzaWRlYmFyIHNlbGVjdG9yIGl0ZW1zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgxMTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0dlbmVyYWxUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5HZW5lcmFsVHJl ZUVsZW1lbnQucHJvdG90eXBlLl91cGRhdGVUaXRsZUVsZW1lbnRzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQucHJvdG90eXBlLl91cGRhdGVUaXRsZVRvb2x0aXAp OgorICAgICAgICBNb3ZlZCB0aGUgY29kZSB0byB1cGRhdGUgdGhlIGl0ZW0gdG9vbHRpcCB0byBp dHMgb3duIGZ1bmN0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZURldGFpbHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURl dGFpbHNQYW5lbC5wcm90b3R5cGUuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycy5lZGl0b3JNb3Vz ZW92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnBy b3RvdHlwZS5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzLmVkaXRvck1vdXNlb3V0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX2FkZE1l dHJpY3NNb3VzZUxpc3RlbmVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwucHJvdG90eXBlLl9nZW5lcmF0ZU1ldHJpY1NlY3Rpb25Sb3dzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX3BvcHVs YXRlTWFyZ2luU2VjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRh aWxzUGFuZWwucHJvdG90eXBlLl9wb3B1bGF0ZVBhZGRpbmdTZWN0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX2FkZE1ldHJpY3NN b3VzZUxpc3RlbmVycy5vbkVkaXRvck1vdXNlb3Zlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLl9hZGRNZXRyaWNzTW91 c2VMaXN0ZW5lcnMub25FZGl0b3JNb3VzZW91dCk6IERlbGV0ZWQuCisgICAgICAgIEFkZGVkIG9u LWhvdmVyIG5vZGUvc2VsZWN0b3IgaGlnaGxpZ2h0aW5nIHRvIG1hcmdpbiBhbmQgcGFkZGluZyBl ZGl0b3IgbGlua3MuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl TnVtYmVySW5wdXRCb3guanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1i ZXJJbnB1dEJveCk6CisgICAgICAgIFJlcGxhY2VkICJObyBVbml0cyIgd2l0aCAiTnVtYmVyIiBm b3IgYmV0dGVyIGNsYXJpdHkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3M6CisgICAgICAgIChib2R5Om5vdCgud2luZG93LWlu YWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLml0ZW0udmlzdWFsLXN0eWxlLXNlbGVj dG9yLWl0ZW0uc2VsZWN0ZWQgPiBpbnB1dFt0eXBlPSJjaGVja2JveCJdOmNoZWNrZWQ6OmJlZm9y ZSk6CisgICAgICAgICguaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5zZWxlY3RlZCA+ IGlucHV0W3R5cGU9ImNoZWNrYm94Il06OmJlZm9yZSk6IERlbGV0ZWQuCisgICAgICAgIFJlbW92 ZXMgdGhlIHdoaXRlIGJvcmRlciB3aGVuIHRoZSB3aW5kb3cgaXMgaW5hY3RpdmUgYW5kIHdoZW4g dGhlIGNoZWNrYm94IGlzIHVuY2hlY2tlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5wcm90b3R5cGUuX2NvbW1pdFNlbGVjdG9yKToK KyAgICAgICAgTm93IHVwZGF0ZXMgdGhlIHRpdGxlIG9mIHRoZSBpdGVtIHdoZW4gdGhlIHNlbGVj dG9yIGNoYW5nZXMuCisKIDIwMTUtMDgtMTcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxk QGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgSW50ZWdlckhhc2hlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggODhmZjRiZmFhYWNkZTU1YmE0ZDcyMGYwMDcxN2Zi MjI4YjA2NzA0Ni4uYzM5NmM2NmZiNjFkOTlmOGJhNDg3OTg4OGI3N2IwNGI1NGRiNDQ0YiAxMDA2 NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSA0Nwp6Y21jYX5oVUxeNW1KTUlgWjEmI1UjdzZ+P1B8 QT9Za2k/TTZQe2czYjVYKyN6VTw8QGJsVj5iOS0rWGFAVjtUVW0KQ21KcVQ0CgpkZWx0YSAzNwpx Y21YP2doVUw7M21KTUlgdSFsMF9GPVI1N09pdEo7JF9pJDBLQ292dSk4Pj09OGBBKFlKYGgwdwoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dl bmVyYWxUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5qcwppbmRleCA3NjY0MTliNGVmZTdmZjIzM2YwZTQ3 OGY2ZDNlNmYyYWQzOGM1YTdkLi4zNzhhZDA2OWM3NGJlYmUwNDZjNTA2YTYyNjZlMDI5ZWQxNGU4 ODNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzCkBAIC0zNDIsMjEgKzM0MiwyNiBA QCBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50ID0gY2xhc3MgR2VuZXJhbFRyZWVFbGVt ZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAgICB9CiAKICAgICAgICAgLy8gU2V0IGEg ZGVmYXVsdCB0b29sdGlwIGlmIHRoZXJlIGlzbid0IGEgY3VzdG9tIG9uZSBhbHJlYWR5IGFzc2ln bmVkLgotICAgICAgICBpZiAoIXRoaXMudG9vbHRpcCAmJiAhdGhpcy5fdG9vbHRpcEhhbmRsZWRT ZXBhcmF0ZWx5KSB7Ci0gICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9saXN0SXRlbU5v ZGUpOwotCi0gICAgICAgICAgICAvLyBHZXQgdGhlIHRleHRDb250ZW50IGZvciB0aGUgZWxlbWVu dHMgc2luY2UgdGhleSBjYW4gY29udGFpbiBvdGhlciBub2RlcywKLSAgICAgICAgICAgIC8vIGFu ZCB0aGUgdG9vbCB0aXAgb25seSBjYXJlcyBhYm91dCB0aGUgdGV4dC4KLSAgICAgICAgICAgIHZh ciBtYWluVGl0bGVUZXh0ID0gdGhpcy5fbWFpblRpdGxlRWxlbWVudC50ZXh0Q29udGVudDsKLSAg ICAgICAgICAgIHZhciBzdWJ0aXRsZVRleHQgPSB0aGlzLl9zdWJ0aXRsZUVsZW1lbnQgPyB0aGlz Ll9zdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgOiAiIjsKLQotICAgICAgICAgICAgaWYgKG1h aW5UaXRsZVRleHQgJiYgc3VidGl0bGVUZXh0KQotICAgICAgICAgICAgICAgIHRoaXMuX2xpc3RJ dGVtTm9kZS50aXRsZSA9IG1haW5UaXRsZVRleHQgKyAodGhpcy5fc21hbGwgJiYgIXRoaXMuX3R3 b0xpbmUgPyAiIFx1MjAxNCAiIDogIlxuIikgKyBzdWJ0aXRsZVRleHQ7Ci0gICAgICAgICAgICBl bHNlIGlmIChtYWluVGl0bGVUZXh0KQotICAgICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9k ZS50aXRsZSA9IG1haW5UaXRsZVRleHQ7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLnRpdGxlID0gc3VidGl0bGVUZXh0OwotICAgICAgICB9Cisg ICAgICAgIGlmICghdGhpcy50b29sdGlwICYmICF0aGlzLl90b29sdGlwSGFuZGxlZFNlcGFyYXRl bHkpCisgICAgICAgICAgICB0aGlzLl91cGRhdGVUaXRsZVRvb2x0aXAoKTsKKyAgICB9CisKKyAg ICBfdXBkYXRlVGl0bGVUb29sdGlwKCkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRo aXMuX2xpc3RJdGVtTm9kZSk7CisgICAgICAgIGlmICghdGhpcy5fbGlzdEl0ZW1Ob2RlKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIEdldCB0aGUgdGV4dENvbnRlbnQgZm9yIHRo ZSBlbGVtZW50cyBzaW5jZSB0aGV5IGNhbiBjb250YWluIG90aGVyIG5vZGVzLAorICAgICAgICAv LyBhbmQgdGhlIHRvb2wgdGlwIG9ubHkgY2FyZXMgYWJvdXQgdGhlIHRleHQuCisgICAgICAgIGxl dCBtYWluVGl0bGVUZXh0ID0gdGhpcy5fbWFpblRpdGxlRWxlbWVudC50ZXh0Q29udGVudDsKKyAg ICAgICAgbGV0IHN1YnRpdGxlVGV4dCA9IHRoaXMuX3N1YnRpdGxlRWxlbWVudCA/IHRoaXMuX3N1 YnRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA6ICIiOworICAgICAgICBpZiAobWFpblRpdGxlVGV4 dCAmJiBzdWJ0aXRsZVRleHQpCisgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUudGl0bGUg PSBtYWluVGl0bGVUZXh0ICsgKHRoaXMuX3NtYWxsICYmICF0aGlzLl90d29MaW5lID8gIiBcdTIw MTQgIiA6ICJcbiIpICsgc3VidGl0bGVUZXh0OworICAgICAgICBlbHNlIGlmIChtYWluVGl0bGVU ZXh0KQorICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLnRpdGxlID0gbWFpblRpdGxlVGV4 dDsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLnRpdGxlID0g c3VidGl0bGVUZXh0OwogICAgIH0KIAogICAgIF91cGRhdGVTdGF0dXNFbGVtZW50KCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0 eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggZjgwNjEyNTM0OGNhOThiMDRh NzY3YzhjNWQ2ZjZmNTAwMTliY2UxNy4uOTkyYTFjMzljZDRmMzliZjQxYzdmYTUwNDIxNjk4NjM3 ZDI3NDQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAgLTMy OCw3ICszMjgsMjkgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xh c3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAgICAgdGhpcy5fcG9w dWxhdGVTZWN0aW9uKGdyb3VwLCBbZGlzcGxheUdyb3VwXSk7CiAgICAgfQogCi0gICAgX2dlbmVy YXRlTWV0cmljU2VjdGlvblJvd3MoZ3JvdXAsIHByZWZpeCwgYWxsb3dOZWdhdGl2ZXMpCisgICAg X2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhlZGl0b3IsIG1vZGUpCisgICAgeworICAgICAgICBm dW5jdGlvbiBlZGl0b3JNb3VzZW92ZXIoKSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuX2N1cnJl bnRTdHlsZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGlmICghdGhp cy5fY3VycmVudFN0eWxlLm93bmVyUnVsZSkgeworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5kb21UcmVlTWFuYWdlci5oaWdobGlnaHRET01Ob2RlKHRoaXMuX2N1cnJlbnRTdHlsZS5ub2Rl LmlkLCBtb2RlKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5oaWdobGlnaHRTZWxlY3Rvcih0 aGlzLl9jdXJyZW50U3R5bGUub3duZXJSdWxlLnNlbGVjdG9yVGV4dCwgdGhpcy5fY3VycmVudFN0 eWxlLm5vZGUub3duZXJEb2N1bWVudC5mcmFtZUlkZW50aWZpZXIsIG1vZGUpOworICAgICAgICB9 CisKKyAgICAgICAgZnVuY3Rpb24gZWRpdG9yTW91c2VvdXQoKSB7CisgICAgICAgICAgICBXZWJJ bnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsKKyAgICAgICAg fQorCisgICAgICAgIGVkaXRvci5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIs IGVkaXRvck1vdXNlb3Zlci5iaW5kKHRoaXMpKTsKKyAgICAgICAgZWRpdG9yLmVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCBlZGl0b3JNb3VzZW91dCk7CisgICAgfQorCisgICAg X2dlbmVyYXRlTWV0cmljU2VjdGlvblJvd3MoZ3JvdXAsIHByZWZpeCwgYWxsb3dOZWdhdGl2ZXMs IGhpZ2hsaWdodE9uSG92ZXIpCiAgICAgewogICAgICAgICBsZXQgcHJvcGVydGllcyA9IGdyb3Vw LnByb3BlcnRpZXM7CiAKQEAgLTM2NCw2ICszODYsMTYgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0 eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBX ZWIKICAgICAgICAgbGV0IGFsbExpbmsgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJv cGVydHlFZGl0b3JMaW5rKFtwcm9wZXJ0aWVzW3RvcF0sIHByb3BlcnRpZXNbYm90dG9tXSwgcHJv cGVydGllc1tsZWZ0XSwgcHJvcGVydGllc1tyaWdodF1dLCAibGluay1hbGwiLCBbdmVydGljYWxM aW5rLCBob3Jpem9udGFsTGlua10pOwogICAgICAgICBhbGxMaW5rUm93LmVsZW1lbnQuYXBwZW5k Q2hpbGQoYWxsTGluay5lbGVtZW50KTsKIAorICAgICAgICBpZiAoaGlnaGxpZ2h0T25Ib3Zlcikg eworICAgICAgICAgICAgdGhpcy5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKHByb3BlcnRpZXNb dG9wXSwgcHJlZml4KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVy cyh2ZXJ0aWNhbExpbmssIHByZWZpeCk7CisgICAgICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91 c2VMaXN0ZW5lcnMocHJvcGVydGllc1tib3R0b21dLCBwcmVmaXgpOworICAgICAgICAgICAgdGhp cy5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKGFsbExpbmssIHByZWZpeCk7CisgICAgICAgICAg ICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMocHJvcGVydGllc1tsZWZ0XSwgcHJlZml4 KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhob3Jpem9udGFs TGluaywgcHJlZml4KTsKKyAgICAgICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVy cyhwcm9wZXJ0aWVzW3JpZ2h0XSwgcHJlZml4KTsKKyAgICAgICAgfQorCiAgICAgICAgIHJldHVy biBbdmVydGljYWwsIGFsbExpbmtSb3csIGhvcml6b250YWxdOwogICAgIH0KIApAQCAtNDEwLDI4 ICs0NDIsNiBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFzcyBW aXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgICAgICB0aGlzLl9wb3B1bGF0 ZVNlY3Rpb24oZ3JvdXAsIFtmbG9hdEdyb3VwXSk7CiAgICAgfQogCi0gICAgX2FkZE1ldHJpY3NN b3VzZUxpc3RlbmVycyhlZGl0b3IsIG1vZGUpCi0gICAgewotICAgICAgICBmdW5jdGlvbiBvbkVk aXRvck1vdXNlb3ZlcigpIHsKLSAgICAgICAgICAgIGlmICghdGhpcy5fc3R5bGUpCi0gICAgICAg ICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICBpZiAoIXRoaXMuX3N0eWxlLm93bmVyUnVs ZSkgewotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5oaWdobGln aHRET01Ob2RlKHRoaXMuX3N0eWxlLm5vZGUuaWQsIG1vZGUpOwotICAgICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvbVRyZWVN YW5hZ2VyLmhpZ2hsaWdodFNlbGVjdG9yKHRoaXMuX3N0eWxlLm93bmVyUnVsZS5zZWxlY3RvclRl eHQsIHRoaXMuX3N0eWxlLm5vZGUub3duZXJEb2N1bWVudC5mcmFtZUlkZW50aWZpZXIsIG1vZGUp OwotICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gb25FZGl0b3JNb3VzZW91dCgpIHsKLSAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdlci5oaWRlRE9NTm9kZUhpZ2hsaWdo dCgpOwotICAgICAgICB9Ci0KLSAgICAgICAgZWRpdG9yLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigibW91c2VvdmVyIiwgb25FZGl0b3JNb3VzZW92ZXIuYmluZChlZGl0b3IpKTsKLSAgICAgICAg ZWRpdG9yLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCBvbkVkaXRvck1vdXNl b3V0LmJpbmQoZWRpdG9yKSk7Ci0gICAgfQotCiAgICAgX3BvcHVsYXRlRGltZW5zaW9uc1NlY3Rp b24oKQogICAgIHsKICAgICAgICAgbGV0IGdyb3VwID0gdGhpcy5fZ3JvdXBzLmRpbWVuc2lvbnM7 CkBAIC01MDQsMTQgKzUxNCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5l bCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgX3BvcHVs YXRlTWFyZ2luU2VjdGlvbigpCiAgICAgewogICAgICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91 cHMubWFyZ2luOwotICAgICAgICBsZXQgcm93cyA9IHRoaXMuX2dlbmVyYXRlTWV0cmljU2VjdGlv blJvd3MoZ3JvdXAsICJtYXJnaW4iLCB0cnVlKTsKLQotICAgICAgICBsZXQgaGlnaGxpZ2h0TW9k ZSA9ICJtYXJnaW4iOwotICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoZ3Jv dXAucHJvcGVydGllcy5tYXJnaW5Ub3AsIGhpZ2hsaWdodE1vZGUpOwotICAgICAgICB0aGlzLl9h ZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVydGllcy5tYXJnaW5Cb3R0b20sIGhp Z2hsaWdodE1vZGUpOwotICAgICAgICB0aGlzLl9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoZ3Jv dXAucHJvcGVydGllcy5tYXJnaW5MZWZ0LCBoaWdobGlnaHRNb2RlKTsKLSAgICAgICAgdGhpcy5f YWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKGdyb3VwLnByb3BlcnRpZXMubWFyZ2luUmlnaHQsIGhp Z2hsaWdodE1vZGUpOwotCisgICAgICAgIGxldCByb3dzID0gdGhpcy5fZ2VuZXJhdGVNZXRyaWNT ZWN0aW9uUm93cyhncm91cCwgIm1hcmdpbiIsIHRydWUsIHRydWUpOwogICAgICAgICBsZXQgbWFy Z2luR3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAocm93cyk7CiAg ICAgICAgIHRoaXMuX3BvcHVsYXRlU2VjdGlvbihncm91cCwgW21hcmdpbkdyb3VwXSk7CiAgICAg fQpAQCAtNTE5LDE0ICs1MjIsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwgPSBjbGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgIF9wb3B1 bGF0ZVBhZGRpbmdTZWN0aW9uKCkKICAgICB7CiAgICAgICAgIGxldCBncm91cCA9IHRoaXMuX2dy b3Vwcy5wYWRkaW5nOwotICAgICAgICBsZXQgcm93cyA9IHRoaXMuX2dlbmVyYXRlTWV0cmljU2Vj dGlvblJvd3MoZ3JvdXAsICJwYWRkaW5nIik7Ci0KLSAgICAgICAgbGV0IGhpZ2hsaWdodE1vZGUg PSAicGFkZGluZyI7Ci0gICAgICAgIHRoaXMuX2FkZE1ldHJpY3NNb3VzZUxpc3RlbmVycyhncm91 cC5wcm9wZXJ0aWVzLnBhZGRpbmdUb3AsIGhpZ2hsaWdodE1vZGUpOwotICAgICAgICB0aGlzLl9h ZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVydGllcy5wYWRkaW5nQm90dG9tLCBo aWdobGlnaHRNb2RlKTsKLSAgICAgICAgdGhpcy5fYWRkTWV0cmljc01vdXNlTGlzdGVuZXJzKGdy b3VwLnByb3BlcnRpZXMucGFkZGluZ0xlZnQsIGhpZ2hsaWdodE1vZGUpOwotICAgICAgICB0aGlz Ll9hZGRNZXRyaWNzTW91c2VMaXN0ZW5lcnMoZ3JvdXAucHJvcGVydGllcy5wYWRkaW5nUmlnaHQs IGhpZ2hsaWdodE1vZGUpOwotCisgICAgICAgIGxldCByb3dzID0gdGhpcy5fZ2VuZXJhdGVNZXRy aWNTZWN0aW9uUm93cyhncm91cCwgInBhZGRpbmciLCBmYWxzZSwgdHJ1ZSk7CiAgICAgICAgIGxl dCBwYWRkaW5nR3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAocm93 cyk7CiAgICAgICAgIHRoaXMuX3BvcHVsYXRlU2VjdGlvbihncm91cCwgW3BhZGRpbmdHcm91cF0p OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94LmpzCmluZGV4 IDVhZmVjOGU0OGFlOTcyYTBmMTVjODMxOTgwOTA2ZDkzODFmYTViMWEuLjRiOGU0MTA2YWJlMjIz ZjY1MmM5MTY0MTc4OTdlZWU0YjYxZTliZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVO dW1iZXJJbnB1dEJveC5qcwpAQCAtMjcsNyArMjcsNyBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVOdW1iZXJJbnB1dEJveCA9IGNsYXNzIFZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3ggZXh0ZW5k cwogewogICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZXMsIHRleHQsIHBvc3NpYmxlVmFsdWVz LCBwb3NzaWJsZVVuaXRzLCBhbGxvd05lZ2F0aXZlVmFsdWVzLCBsYXlvdXRSZXZlcnNlZCkKICAg ICB7Ci0gICAgICAgIHN1cGVyKHByb3BlcnR5TmFtZXMsIHRleHQsIHBvc3NpYmxlVmFsdWVzLCBw b3NzaWJsZVVuaXRzIHx8IFtXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vIFVuaXRzIildLCAibnVt YmVyLWlucHV0LWJveCIsIGxheW91dFJldmVyc2VkKTsKKyAgICAgICAgc3VwZXIocHJvcGVydHlO YW1lcywgdGV4dCwgcG9zc2libGVWYWx1ZXMsIHBvc3NpYmxlVW5pdHMgfHwgW1dlYkluc3BlY3Rv ci5VSVN0cmluZygiTnVtYmVyIildLCAibnVtYmVyLWlucHV0LWJveCIsIGxheW91dFJldmVyc2Vk KTsKIAogICAgICAgICB0aGlzLl9oYXNVbml0cyA9ICEhcG9zc2libGVVbml0czsKICAgICAgICAg dGhpcy5fYWxsb3dOZWdhdGl2ZVZhbHVlcyA9ICEhYWxsb3dOZWdhdGl2ZVZhbHVlcyB8fCBmYWxz ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uY3NzCmluZGV4 IGM3ZmQ3ZDdkYjc3NjNkYmZkZGFjYjE0MmQ0ZDg4NDJmMzNmNDUxZmIuLmU3MDFjNDhjYTZhODA2 Mjg5ZDU4NjU3MDA5OWFlZTdlZjMxZWM4N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5jc3MK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5 bGVTZWxlY3RvclRyZWVJdGVtLmNzcwpAQCAtNDYsNyArNDYsNyBAQAogICAgIG1hcmdpbjogNC41 cHggMCA0cHggNXB4OwogfQogCi0uaXRlbS52aXN1YWwtc3R5bGUtc2VsZWN0b3ItaXRlbS5zZWxl Y3RlZCA+IGlucHV0W3R5cGU9ImNoZWNrYm94Il06OmJlZm9yZSB7Citib2R5Om5vdCgud2luZG93 LWluYWN0aXZlLCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLml0ZW0udmlzdWFsLXN0eWxlLXNl bGVjdG9yLWl0ZW0uc2VsZWN0ZWQgPiBpbnB1dFt0eXBlPSJjaGVja2JveCJdOmNoZWNrZWQ6OmJl Zm9yZSB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRvcDogMDsKICAgICByaWdodDog MDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcwppbmRleCAx ZDQyOWQ0MjkzZGMzYWNkY2U3NTYzNmJiOGQyMjc5YWJlMDE0MDk2Li4zZmQxNzgzZjJhYjIzZmQ4 MDA3YzkzMzRjZmYxNTRhMGRkYzE1Yjg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVT ZWxlY3RvclRyZWVJdGVtLmpzCkBAIC0xOTEsNiArMTkxLDcgQEAgV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlU2VsZWN0b3JUcmVlSXRlbSA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRl bSBleHQKICAgICB7CiAgICAgICAgIHRoaXMuX2hpZGVET01Ob2RlSGlnaGxpZ2h0KCk7CiAgICAg ICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5jbGFzc0xpc3QucmVtb3ZlKCJlZGl0YWJsZSIpOworICAg ICAgICB0aGlzLl91cGRhdGVUaXRsZVRvb2x0aXAoKTsKIAogICAgICAgICBsZXQgdmFsdWUgPSB0 aGlzLnNlbGVjdG9yVGV4dDsKICAgICAgICAgaWYgKHZhbHVlID09PSB0aGlzLl9sYXN0VmFsdWUg JiYgdGhpcy5fdmFsaWQpCg==