184558 2018-04-12 14:49:24 -0700 Web Inspector: Refactoring: move popover styles from JS to CSS 2018-04-12 18:10:21 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg commit-queue inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1414183 0 nvasilyev 2018-04-12 14:49:24 -0700 Introduce CSS variables to customize popover appearance in CSS and not JavaScript. 1414186 1 337840 nvasilyev 2018-04-12 14:57:43 -0700 Created attachment 337840 Patch 1414192 2 337840 bburg 2018-04-12 15:18:40 -0700 Comment on attachment 337840 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337840&action=review r=me > Source/WebInspectorUI/UserInterface/Views/Popover.css:34 > + --popover-color: black; Nit: popover-text-color 1414193 3 337841 nvasilyev 2018-04-12 15:22:44 -0700 Created attachment 337841 Patch 1414194 4 337841 commit-queue 2018-04-12 15:23:35 -0700 Comment on attachment 337841 Patch Rejecting attachment 337841 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 337841, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebInspectorUI/ChangeLog contains OOPS!. Full output: http://webkit-queues.webkit.org/results/7298498 1414195 5 337842 nvasilyev 2018-04-12 15:29:36 -0700 Created attachment 337842 Patch 1414260 6 337842 commit-queue 2018-04-12 18:09:56 -0700 Comment on attachment 337842 Patch Clearing flags on attachment: 337842 Committed r230618: <https://trac.webkit.org/changeset/230618> 1414261 7 commit-queue 2018-04-12 18:09:57 -0700 All reviewed patches have been landed. Closing bug. 1414262 8 webkit-bug-importer 2018-04-12 18:10:21 -0700 <rdar://problem/39400882> 337840 2018-04-12 14:57:43 -0700 2018-04-12 15:22:44 -0700 Patch patch.txt text/plain 9162 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI5MDVmZDFiY2Q3Li5lMWFmNGE3ZWFkYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTgtMDQtMTIgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVmYWN0b3Jpbmc6IG1vdmUgcG9wb3ZlciBzdHlsZXMgZnJvbSBKUyB0byBDU1MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDU1OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZSBzZXZl cmFsIENTUyB2YXJpYWJsZXMgdG8gY3VzdG9taXplIHBvcG92ZXIgYXBwZWFyYW5jZSBpbiBDU1MK KyAgICAgICAgYW5kIG5vdCBKYXZhU2NyaXB0LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fd2F0ZXJmYWxsUG9wb3ZlckNvbnRlbnRGb3JSZXNvdXJj ZSk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRs ZU1vdXNlZG93bldhdGVyZmFsbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qb3Bv dmVyLmNzczoKKyAgICAgICAgKC5wb3BvdmVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1BvcG92ZXIuanM6CisgICAgICAgIChXSS5Qb3BvdmVyKToKKyAgICAgICAgKFdJLlBvcG92 ZXIucHJvdG90eXBlLl9kcmF3QmFja2dyb3VuZCk6CisgICAgICAgIFJlcGxhY2UgYHZhcmAgd2l0 aCBgbGV0YC4KKworICAgICAgICAoV0kuUG9wb3Zlci5wcm90b3R5cGUuZ2V0IGJhY2tncm91bmRT dHlsZSk6IERlbGV0ZWQuCisgICAgICAgIChXSS5Qb3BvdmVyLnByb3RvdHlwZS5zZXQgYmFja2dy b3VuZFN0eWxlKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlVGltaW5nQnJlYWtkb3duVmlldy5jc3M6CisgICAgICAgICgucG9wb3Zlci53YXRlcmZhbGwt cG9wb3Zlcik6CisgICAgICAgICgud2F0ZXJmYWxsLXBvcG92ZXItY29udGVudCAucmVzb3VyY2Ut dGltaW5nLWJyZWFrZG93bik6CisgICAgICAgICgud2F0ZXJmYWxsLXBvcG92ZXIgLnJlc291cmNl LXRpbWluZy1icmVha2Rvd24pOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fd2F0ZXJmYWxsUG9wb3ZlckNvbnRlbnRGb3JSZXNvdXJj ZSk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRs ZU1vdXNlZG93bldhdGVyZmFsbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qb3Bv dmVyLmNzczoKKyAgICAgICAgKC5wb3BvdmVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1BvcG92ZXIuanM6CisgICAgICAgIChXSS5Qb3BvdmVyKToKKyAgICAgICAgKFdJLlBvcG92 ZXIucHJvdG90eXBlLl9kcmF3QmFja2dyb3VuZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcuY3NzOgorICAgICAgICAoLnBvcG92ZXIu d2F0ZXJmYWxsLXBvcG92ZXIpOgorICAgICAgICAoLndhdGVyZmFsbC1wb3BvdmVyLWNvbnRlbnQg LnJlc291cmNlLXRpbWluZy1icmVha2Rvd24pOgorCiAyMDE4LTA0LTA3ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVycm9y cyBnbHlwaCBkb2Vzbid0IGZ1bGx5IGNoYW5nZSB0byBibHVlIHdoZW4gYWN0aXZlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFi bGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCmluZGV4IGI3ZGU3YjczMThiLi5lYzUyYjI4 ZWE2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKQEAgLTE0MDQs NyArMTQwNCw3IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1Rh YmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgX3dhdGVyZmFsbFBvcG92 ZXJDb250ZW50Rm9yUmVzb3VyY2UocmVzb3VyY2UpCiAgICAgewogICAgICAgICBsZXQgY29udGVu dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgY29udGVu dEVsZW1lbnQuY2xhc3NOYW1lID0gIndhdGVyZmFsbC1wb3BvdmVyIjsKKyAgICAgICAgY29udGVu dEVsZW1lbnQuY2xhc3NOYW1lID0gIndhdGVyZmFsbC1wb3BvdmVyLWNvbnRlbnQiOwogCiAgICAg ICAgIGlmICghcmVzb3VyY2UuaGFzUmVzcG9uc2UoKSB8fCAhcmVzb3VyY2UudGltaW5nRGF0YS5z dGFydFRpbWUgfHwgIXJlc291cmNlLnRpbWluZ0RhdGEucmVzcG9uc2VFbmQpIHsKICAgICAgICAg ICAgIGNvbnRlbnRFbGVtZW50LnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIlJlc291cmNlIGhh cyBubyB0aW1pbmcgZGF0YSIpOwpAQCAtMTQyMiw3ICsxNDIyLDcgQEAgV0kuTmV0d29ya1RhYmxl Q29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bnRlbnRWaWUKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fd2F0ZXJmYWxsUG9wb3Zlcikgewog ICAgICAgICAgICAgdGhpcy5fd2F0ZXJmYWxsUG9wb3ZlciA9IG5ldyBXSS5Qb3BvdmVyOwotICAg ICAgICAgICAgdGhpcy5fd2F0ZXJmYWxsUG9wb3Zlci5iYWNrZ3JvdW5kU3R5bGUgPSBXSS5Qb3Bv dmVyLkJhY2tncm91bmRTdHlsZS5XaGl0ZTsKKyAgICAgICAgICAgIHRoaXMuX3dhdGVyZmFsbFBv cG92ZXIuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ3YXRlcmZhbGwtcG9wb3ZlciIpOwogICAgICAg ICB9CiAKICAgICAgICAgaWYgKHRoaXMuX3dhdGVyZmFsbFBvcG92ZXIudmlzaWJsZSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIu Y3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5j c3MKaW5kZXggNGQ1ZGI0Mzc2ZjMuLmRjMzM5N2ZmZDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmNzcwpAQCAtMjgsOSAr MjgsMTUgQEAKICAgICBtaW4td2lkdGg6IDIwcHg7CiAgICAgbWluLWhlaWdodDogMjBweDsKICAg ICBib3gtc2l6aW5nOiBib3JkZXItYm94OwotICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQt Y2FudmFzKHBvcG92ZXIpOwogICAgIHBvaW50ZXItZXZlbnRzOiBub25lOwogICAgIHotaW5kZXg6 IHZhcigtLXotaW5kZXgtcG9wb3Zlcik7CisKKyAgICAtLXBvcG92ZXItY29sb3I6IGJsYWNrOwor ICAgIC0tcG9wb3Zlci1iYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1wYW5lbC1iYWNrZ3JvdW5kLWNv bG9yKTsKKyAgICAtLXBvcG92ZXItYm9yZGVyLWNvbG9yOiBoc2xhKDAsIDAlLCAwJSwgMC4yNSk7 CisgICAgLS1wb3BvdmVyLXNoYWRvdy1jb2xvcjogaHNsYSgwLCAwJSwgMCUsIDAuNSk7CisKKyAg ICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWNhbnZhcyhwb3BvdmVyKTsKIH0KIAogLnBvcG92 ZXIuYXJyb3ctdXAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUG9wb3Zlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1BvcG92ZXIuanMKaW5kZXggZWJkMTAzNGVhMWMuLjJjN2RjYzRmYzU1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92 ZXIuanMKQEAgLTM3LDcgKzM3LDYgQEAgV0kuUG9wb3ZlciA9IGNsYXNzIFBvcG92ZXIgZXh0ZW5k cyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fYW5jaG9yUG9pbnQgPSBuZXcgV0kuUG9pbnQ7CiAg ICAgICAgIHRoaXMuX3ByZWZlcnJlZEVkZ2VzID0gbnVsbDsKICAgICAgICAgdGhpcy5fcmVzaXpl SGFuZGxlciA9IG51bGw7Ci0gICAgICAgIHRoaXMuX2JhY2tncm91bmRTdHlsZSA9IFdJLlBvcG92 ZXIuQmFja2dyb3VuZFN0eWxlLkRlZmF1bHQ7CiAKICAgICAgICAgdGhpcy5fY29udGVudE5lZWRz VXBkYXRlID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2Rpc21pc3NpbmcgPSBmYWxzZTsKQEAgLTc0 LDE4ICs3Myw2IEBAIFdJLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgICAgIHRoaXMuX2ZyYW1lID0gZnJhbWU7CiAgICAgfQogCi0gICAgZ2V0IGJhY2tncm91 bmRTdHlsZSgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fYmFja2dyb3VuZFN0eWxlOwot ICAgIH0KLQotICAgIHNldCBiYWNrZ3JvdW5kU3R5bGUoc3R5bGUpCi0gICAgewotICAgICAgICBj b25zb2xlLmFzc2VydChPYmplY3QudmFsdWVzKFdJLlBvcG92ZXIuQmFja2dyb3VuZFN0eWxlKS5p bmNsdWRlcyhzdHlsZSkpOwotCi0gICAgICAgIHRoaXMuX2JhY2tncm91bmRTdHlsZSA9IHN0eWxl OwotICAgIH0KLQogICAgIHNldCBjb250ZW50KGNvbnRlbnQpCiAgICAgewogICAgICAgICBpZiAo Y29udGVudCA9PT0gdGhpcy5fY29udGVudCkKQEAgLTM5MSwyNiArMzc4LDI2IEBAIFdJLlBvcG92 ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfZHJhd0JhY2tncm91 bmQoKQogICAgIHsKLSAgICAgICAgdmFyIHNjYWxlRmFjdG9yID0gd2luZG93LmRldmljZVBpeGVs UmF0aW87CisgICAgICAgIGxldCBzY2FsZUZhY3RvciA9IHdpbmRvdy5kZXZpY2VQaXhlbFJhdGlv OwogCi0gICAgICAgIHZhciB3aWR0aCA9IHRoaXMuX2ZyYW1lLnNpemUud2lkdGg7Ci0gICAgICAg IHZhciBoZWlnaHQgPSB0aGlzLl9mcmFtZS5zaXplLmhlaWdodDsKLSAgICAgICAgdmFyIHNjYWxl ZFdpZHRoID0gd2lkdGggKiBzY2FsZUZhY3RvcjsKLSAgICAgICAgdmFyIHNjYWxlZEhlaWdodCA9 IGhlaWdodCAqIHNjYWxlRmFjdG9yOworICAgICAgICBsZXQgd2lkdGggPSB0aGlzLl9mcmFtZS5z aXplLndpZHRoOworICAgICAgICBsZXQgaGVpZ2h0ID0gdGhpcy5fZnJhbWUuc2l6ZS5oZWlnaHQ7 CisgICAgICAgIGxldCBzY2FsZWRXaWR0aCA9IHdpZHRoICogc2NhbGVGYWN0b3I7CisgICAgICAg IGxldCBzY2FsZWRIZWlnaHQgPSBoZWlnaHQgKiBzY2FsZUZhY3RvcjsKIAogICAgICAgICAvLyBD cmVhdGUgYSBzY3JhdGNoIGNhbnZhcyBzbyB3ZSBjYW4gZHJhdyB0aGUgcG9wb3ZlciB0aGF0IHdp bGwgbGF0ZXIgYmUgZHJhd24gaW50bwogICAgICAgICAvLyB0aGUgZmluYWwgY29udGV4dCB3aXRo IGEgc2hhZG93LgotICAgICAgICB2YXIgc2NyYXRjaENhbnZhcyA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImNhbnZhcyIpOworICAgICAgICBsZXQgc2NyYXRjaENhbnZhcyA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImNhbnZhcyIpOwogICAgICAgICBzY3JhdGNoQ2FudmFzLndpZHRoID0gc2Nh bGVkV2lkdGg7CiAgICAgICAgIHNjcmF0Y2hDYW52YXMuaGVpZ2h0ID0gc2NhbGVkSGVpZ2h0Owog Ci0gICAgICAgIHZhciBjdHggPSBzY3JhdGNoQ2FudmFzLmdldENvbnRleHQoIjJkIik7CisgICAg ICAgIGxldCBjdHggPSBzY3JhdGNoQ2FudmFzLmdldENvbnRleHQoIjJkIik7CiAgICAgICAgIGN0 eC5zY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IpOwogCiAgICAgICAgIC8vIEJvdW5kcyBv ZiB0aGUgcGF0aCBkb24ndCB0YWtlIGludG8gYWNjb3VudCB0aGUgYXJyb3csIGJ1dCByZWFsbHkg b25seSB0aGUgdGlnaHQgYm91bmRpbmcgYm94CiAgICAgICAgIC8vIG9mIHRoZSBjb250ZW50IGNv bnRhaW5lZCB3aXRoaW4gdGhlIGZyYW1lLgotICAgICAgICB2YXIgYm91bmRzOwotICAgICAgICB2 YXIgYXJyb3dIZWlnaHQgPSBXSS5Qb3BvdmVyLkFuY2hvclNpemUuaGVpZ2h0OworICAgICAgICBs ZXQgYm91bmRzOworICAgICAgICBsZXQgYXJyb3dIZWlnaHQgPSBXSS5Qb3BvdmVyLkFuY2hvclNp emUuaGVpZ2h0OwogICAgICAgICBzd2l0Y2ggKHRoaXMuX2VkZ2UpIHsKICAgICAgICAgY2FzZSBX SS5SZWN0RWRnZS5NSU5fWDogLy8gRGlzcGxheWVkIG9uIHRoZSBsZWZ0IG9mIHRoZSB0YXJnZXQs IGFycm93IHBvaW50cyByaWdodC4KICAgICAgICAgICAgIGJvdW5kcyA9IG5ldyBXSS5SZWN0KDAs IDAsIHdpZHRoIC0gYXJyb3dIZWlnaHQsIGhlaWdodCk7CkBAIC00MjcsMTggKzQxNCwyMCBAQCBX SS5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9CiAK ICAgICAgICAgYm91bmRzID0gYm91bmRzLmluc2V0KFdJLlBvcG92ZXIuU2hhZG93RWRnZUluc2V0 cyk7CisgICAgICAgIGxldCBjb21wdXRlZFN0eWxlID0gd2luZG93LmdldENvbXB1dGVkU3R5bGUo dGhpcy5fZWxlbWVudCwgbnVsbCk7CiAKICAgICAgICAgLy8gQ2xpcCB0aGUgZnJhbWUuCi0gICAg ICAgIGN0eC5maWxsU3R5bGUgPSAiYmxhY2siOworICAgICAgICBjdHguZmlsbFN0eWxlID0gY29t cHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCItLXBvcG92ZXItY29sb3IiKS50cmltKCk7CiAg ICAgICAgIHRoaXMuX2RyYXdGcmFtZShjdHgsIGJvdW5kcywgdGhpcy5fZWRnZSwgdGhpcy5fYW5j aG9yUG9pbnQpOwogICAgICAgICBjdHguY2xpcCgpOwogCiAgICAgICAgIC8vIFBhbmVsIGJhY2tn cm91bmQgY29sb3IgZmlsbC4KLSAgICAgICAgY3R4LmZpbGxTdHlsZSA9IHRoaXMuX2JhY2tncm91 bmRTdHlsZSA9PT0gV0kuUG9wb3Zlci5CYWNrZ3JvdW5kU3R5bGUuV2hpdGUgPyAid2hpdGUiIDog InJnYigyMzYsIDIzNiwgMjM2KSI7CisgICAgICAgIGN0eC5maWxsU3R5bGUgPSBjb21wdXRlZFN0 eWxlLmdldFByb3BlcnR5VmFsdWUoIi0tcG9wb3Zlci1iYWNrZ3JvdW5kLWNvbG9yIikudHJpbSgp OworCiAgICAgICAgIGN0eC5maWxsUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKIAogICAgICAg ICAvLyBTdHJva2UuCi0gICAgICAgIGN0eC5zdHJva2VTdHlsZSA9ICJyZ2JhKDAsIDAsIDAsIDAu MjUpIjsKKyAgICAgICAgY3R4LnN0cm9rZVN0eWxlID0gY29tcHV0ZWRTdHlsZS5nZXRQcm9wZXJ0 eVZhbHVlKCItLXBvcG92ZXItYm9yZGVyLWNvbG9yIikudHJpbSgpOwogICAgICAgICBjdHgubGlu ZVdpZHRoID0gMjsKICAgICAgICAgdGhpcy5fZHJhd0ZyYW1lKGN0eCwgYm91bmRzLCB0aGlzLl9l ZGdlLCB0aGlzLl9hbmNob3JQb2ludCk7CiAgICAgICAgIGN0eC5zdHJva2UoKTsKQEAgLTQ0OSw3 ICs0MzgsNyBAQCBXSS5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAog ICAgICAgICBmaW5hbENvbnRleHQuc2hhZG93T2Zmc2V0WCA9IDE7CiAgICAgICAgIGZpbmFsQ29u dGV4dC5zaGFkb3dPZmZzZXRZID0gMTsKICAgICAgICAgZmluYWxDb250ZXh0LnNoYWRvd0JsdXIg PSA1OwotICAgICAgICBmaW5hbENvbnRleHQuc2hhZG93Q29sb3IgPSAicmdiYSgwLCAwLCAwLCAw LjUpIjsKKyAgICAgICAgZmluYWxDb250ZXh0LnNoYWRvd0NvbG9yID0gY29tcHV0ZWRTdHlsZS5n ZXRQcm9wZXJ0eVZhbHVlKCItLXBvcG92ZXItc2hhZG93LWNvbG9yIikudHJpbSgpOwogICAgICAg ICBmaW5hbENvbnRleHQuZHJhd0ltYWdlKHNjcmF0Y2hDYW52YXMsIDAsIDAsIHNjYWxlZFdpZHRo LCBzY2FsZWRIZWlnaHQpOwogICAgIH0KIApAQCAtNTkyLDExICs1ODEsNiBAQCBXSS5Qb3BvdmVy ID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAogICAgIH0KIH07CiAKLVdJLlBvcG92 ZXIuQmFja2dyb3VuZFN0eWxlID0gewotICAgIERlZmF1bHQ6ICJwb3BvdmVyLWJhY2tncm91bmQt ZGVmYXVsdCIsCi0gICAgV2hpdGU6ICJwb3BvdmVyLWJhY2tncm91bmQtd2hpdGUiLAotfTsKLQog V0kuUG9wb3Zlci5GYWRlT3V0Q2xhc3NOYW1lID0gImZhZGUtb3V0IjsKIFdJLlBvcG92ZXIuQ29y bmVyUmFkaXVzID0gNTsKIFdJLlBvcG92ZXIuTWluV2lkdGggPSA0MDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltaW5nQnJl YWtkb3duVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcuY3NzCmluZGV4IGZlODg4ZTE0YTI0Li5lZGQy M2YyOGNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2VUaW1pbmdCcmVha2Rvd25WaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcu Y3NzCkBAIC0yMyw3ICsyMywxMSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICovCiAKLS53YXRlcmZhbGwtcG9wb3ZlciAucmVzb3VyY2UtdGltaW5nLWJyZWFrZG93biB7 CisucG9wb3Zlci53YXRlcmZhbGwtcG9wb3ZlciB7CisgICAgLS1wb3BvdmVyLWJhY2tncm91bmQt Y29sb3I6IHdoaXRlOworfQorCisud2F0ZXJmYWxsLXBvcG92ZXItY29udGVudCAucmVzb3VyY2Ut dGltaW5nLWJyZWFrZG93biB7CiAgICAgbWFyZ2luOiA1cHg7CiB9CiAK 337841 2018-04-12 15:22:44 -0700 2018-04-12 15:29:36 -0700 Patch patch.txt text/plain 9162 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI5MDVmZDFiY2Q3Li5lMWFmNGE3ZWFkYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTgtMDQtMTIgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVmYWN0b3Jpbmc6IG1vdmUgcG9wb3ZlciBzdHlsZXMgZnJvbSBKUyB0byBDU1MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDU1OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZSBzZXZl cmFsIENTUyB2YXJpYWJsZXMgdG8gY3VzdG9taXplIHBvcG92ZXIgYXBwZWFyYW5jZSBpbiBDU1MK KyAgICAgICAgYW5kIG5vdCBKYXZhU2NyaXB0LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fd2F0ZXJmYWxsUG9wb3ZlckNvbnRlbnRGb3JSZXNvdXJj ZSk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRs ZU1vdXNlZG93bldhdGVyZmFsbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qb3Bv dmVyLmNzczoKKyAgICAgICAgKC5wb3BvdmVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1BvcG92ZXIuanM6CisgICAgICAgIChXSS5Qb3BvdmVyKToKKyAgICAgICAgKFdJLlBvcG92 ZXIucHJvdG90eXBlLl9kcmF3QmFja2dyb3VuZCk6CisgICAgICAgIFJlcGxhY2UgYHZhcmAgd2l0 aCBgbGV0YC4KKworICAgICAgICAoV0kuUG9wb3Zlci5wcm90b3R5cGUuZ2V0IGJhY2tncm91bmRT dHlsZSk6IERlbGV0ZWQuCisgICAgICAgIChXSS5Qb3BvdmVyLnByb3RvdHlwZS5zZXQgYmFja2dy b3VuZFN0eWxlKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291 cmNlVGltaW5nQnJlYWtkb3duVmlldy5jc3M6CisgICAgICAgICgucG9wb3Zlci53YXRlcmZhbGwt cG9wb3Zlcik6CisgICAgICAgICgud2F0ZXJmYWxsLXBvcG92ZXItY29udGVudCAucmVzb3VyY2Ut dGltaW5nLWJyZWFrZG93bik6CisgICAgICAgICgud2F0ZXJmYWxsLXBvcG92ZXIgLnJlc291cmNl LXRpbWluZy1icmVha2Rvd24pOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fd2F0ZXJmYWxsUG9wb3ZlckNvbnRlbnRGb3JSZXNvdXJj ZSk6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRs ZU1vdXNlZG93bldhdGVyZmFsbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qb3Bv dmVyLmNzczoKKyAgICAgICAgKC5wb3BvdmVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1BvcG92ZXIuanM6CisgICAgICAgIChXSS5Qb3BvdmVyKToKKyAgICAgICAgKFdJLlBvcG92 ZXIucHJvdG90eXBlLl9kcmF3QmFja2dyb3VuZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcuY3NzOgorICAgICAgICAoLnBvcG92ZXIu d2F0ZXJmYWxsLXBvcG92ZXIpOgorICAgICAgICAoLndhdGVyZmFsbC1wb3BvdmVyLWNvbnRlbnQg LnJlc291cmNlLXRpbWluZy1icmVha2Rvd24pOgorCiAyMDE4LTA0LTA3ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVycm9y cyBnbHlwaCBkb2Vzbid0IGZ1bGx5IGNoYW5nZSB0byBibHVlIHdoZW4gYWN0aXZlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFi bGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCmluZGV4IGI3ZGU3YjczMThiLi5lYzUyYjI4 ZWE2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKQEAgLTE0MDQs NyArMTQwNCw3IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1Rh YmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgX3dhdGVyZmFsbFBvcG92 ZXJDb250ZW50Rm9yUmVzb3VyY2UocmVzb3VyY2UpCiAgICAgewogICAgICAgICBsZXQgY29udGVu dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgY29udGVu dEVsZW1lbnQuY2xhc3NOYW1lID0gIndhdGVyZmFsbC1wb3BvdmVyIjsKKyAgICAgICAgY29udGVu dEVsZW1lbnQuY2xhc3NOYW1lID0gIndhdGVyZmFsbC1wb3BvdmVyLWNvbnRlbnQiOwogCiAgICAg ICAgIGlmICghcmVzb3VyY2UuaGFzUmVzcG9uc2UoKSB8fCAhcmVzb3VyY2UudGltaW5nRGF0YS5z dGFydFRpbWUgfHwgIXJlc291cmNlLnRpbWluZ0RhdGEucmVzcG9uc2VFbmQpIHsKICAgICAgICAg ICAgIGNvbnRlbnRFbGVtZW50LnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIlJlc291cmNlIGhh cyBubyB0aW1pbmcgZGF0YSIpOwpAQCAtMTQyMiw3ICsxNDIyLDcgQEAgV0kuTmV0d29ya1RhYmxl Q29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bnRlbnRWaWUKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fd2F0ZXJmYWxsUG9wb3Zlcikgewog ICAgICAgICAgICAgdGhpcy5fd2F0ZXJmYWxsUG9wb3ZlciA9IG5ldyBXSS5Qb3BvdmVyOwotICAg ICAgICAgICAgdGhpcy5fd2F0ZXJmYWxsUG9wb3Zlci5iYWNrZ3JvdW5kU3R5bGUgPSBXSS5Qb3Bv dmVyLkJhY2tncm91bmRTdHlsZS5XaGl0ZTsKKyAgICAgICAgICAgIHRoaXMuX3dhdGVyZmFsbFBv cG92ZXIuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ3YXRlcmZhbGwtcG9wb3ZlciIpOwogICAgICAg ICB9CiAKICAgICAgICAgaWYgKHRoaXMuX3dhdGVyZmFsbFBvcG92ZXIudmlzaWJsZSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIu Y3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5j c3MKaW5kZXggNGQ1ZGI0Mzc2ZjMuLmRjMzM5N2ZmZDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmNzcwpAQCAtMjgsOSAr MjgsMTUgQEAKICAgICBtaW4td2lkdGg6IDIwcHg7CiAgICAgbWluLWhlaWdodDogMjBweDsKICAg ICBib3gtc2l6aW5nOiBib3JkZXItYm94OwotICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQt Y2FudmFzKHBvcG92ZXIpOwogICAgIHBvaW50ZXItZXZlbnRzOiBub25lOwogICAgIHotaW5kZXg6 IHZhcigtLXotaW5kZXgtcG9wb3Zlcik7CisKKyAgICAtLXBvcG92ZXItY29sb3I6IGJsYWNrOwor ICAgIC0tcG9wb3Zlci1iYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1wYW5lbC1iYWNrZ3JvdW5kLWNv bG9yKTsKKyAgICAtLXBvcG92ZXItYm9yZGVyLWNvbG9yOiBoc2xhKDAsIDAlLCAwJSwgMC4yNSk7 CisgICAgLS1wb3BvdmVyLXNoYWRvdy1jb2xvcjogaHNsYSgwLCAwJSwgMCUsIDAuNSk7CisKKyAg ICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWNhbnZhcyhwb3BvdmVyKTsKIH0KIAogLnBvcG92 ZXIuYXJyb3ctdXAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUG9wb3Zlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1BvcG92ZXIuanMKaW5kZXggZWJkMTAzNGVhMWMuLjJjN2RjYzRmYzU1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92 ZXIuanMKQEAgLTM3LDcgKzM3LDYgQEAgV0kuUG9wb3ZlciA9IGNsYXNzIFBvcG92ZXIgZXh0ZW5k cyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fYW5jaG9yUG9pbnQgPSBuZXcgV0kuUG9pbnQ7CiAg ICAgICAgIHRoaXMuX3ByZWZlcnJlZEVkZ2VzID0gbnVsbDsKICAgICAgICAgdGhpcy5fcmVzaXpl SGFuZGxlciA9IG51bGw7Ci0gICAgICAgIHRoaXMuX2JhY2tncm91bmRTdHlsZSA9IFdJLlBvcG92 ZXIuQmFja2dyb3VuZFN0eWxlLkRlZmF1bHQ7CiAKICAgICAgICAgdGhpcy5fY29udGVudE5lZWRz VXBkYXRlID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2Rpc21pc3NpbmcgPSBmYWxzZTsKQEAgLTc0 LDE4ICs3Myw2IEBAIFdJLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgICAgIHRoaXMuX2ZyYW1lID0gZnJhbWU7CiAgICAgfQogCi0gICAgZ2V0IGJhY2tncm91 bmRTdHlsZSgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fYmFja2dyb3VuZFN0eWxlOwot ICAgIH0KLQotICAgIHNldCBiYWNrZ3JvdW5kU3R5bGUoc3R5bGUpCi0gICAgewotICAgICAgICBj b25zb2xlLmFzc2VydChPYmplY3QudmFsdWVzKFdJLlBvcG92ZXIuQmFja2dyb3VuZFN0eWxlKS5p bmNsdWRlcyhzdHlsZSkpOwotCi0gICAgICAgIHRoaXMuX2JhY2tncm91bmRTdHlsZSA9IHN0eWxl OwotICAgIH0KLQogICAgIHNldCBjb250ZW50KGNvbnRlbnQpCiAgICAgewogICAgICAgICBpZiAo Y29udGVudCA9PT0gdGhpcy5fY29udGVudCkKQEAgLTM5MSwyNiArMzc4LDI2IEBAIFdJLlBvcG92 ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfZHJhd0JhY2tncm91 bmQoKQogICAgIHsKLSAgICAgICAgdmFyIHNjYWxlRmFjdG9yID0gd2luZG93LmRldmljZVBpeGVs UmF0aW87CisgICAgICAgIGxldCBzY2FsZUZhY3RvciA9IHdpbmRvdy5kZXZpY2VQaXhlbFJhdGlv OwogCi0gICAgICAgIHZhciB3aWR0aCA9IHRoaXMuX2ZyYW1lLnNpemUud2lkdGg7Ci0gICAgICAg IHZhciBoZWlnaHQgPSB0aGlzLl9mcmFtZS5zaXplLmhlaWdodDsKLSAgICAgICAgdmFyIHNjYWxl ZFdpZHRoID0gd2lkdGggKiBzY2FsZUZhY3RvcjsKLSAgICAgICAgdmFyIHNjYWxlZEhlaWdodCA9 IGhlaWdodCAqIHNjYWxlRmFjdG9yOworICAgICAgICBsZXQgd2lkdGggPSB0aGlzLl9mcmFtZS5z aXplLndpZHRoOworICAgICAgICBsZXQgaGVpZ2h0ID0gdGhpcy5fZnJhbWUuc2l6ZS5oZWlnaHQ7 CisgICAgICAgIGxldCBzY2FsZWRXaWR0aCA9IHdpZHRoICogc2NhbGVGYWN0b3I7CisgICAgICAg IGxldCBzY2FsZWRIZWlnaHQgPSBoZWlnaHQgKiBzY2FsZUZhY3RvcjsKIAogICAgICAgICAvLyBD cmVhdGUgYSBzY3JhdGNoIGNhbnZhcyBzbyB3ZSBjYW4gZHJhdyB0aGUgcG9wb3ZlciB0aGF0IHdp bGwgbGF0ZXIgYmUgZHJhd24gaW50bwogICAgICAgICAvLyB0aGUgZmluYWwgY29udGV4dCB3aXRo IGEgc2hhZG93LgotICAgICAgICB2YXIgc2NyYXRjaENhbnZhcyA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImNhbnZhcyIpOworICAgICAgICBsZXQgc2NyYXRjaENhbnZhcyA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImNhbnZhcyIpOwogICAgICAgICBzY3JhdGNoQ2FudmFzLndpZHRoID0gc2Nh bGVkV2lkdGg7CiAgICAgICAgIHNjcmF0Y2hDYW52YXMuaGVpZ2h0ID0gc2NhbGVkSGVpZ2h0Owog Ci0gICAgICAgIHZhciBjdHggPSBzY3JhdGNoQ2FudmFzLmdldENvbnRleHQoIjJkIik7CisgICAg ICAgIGxldCBjdHggPSBzY3JhdGNoQ2FudmFzLmdldENvbnRleHQoIjJkIik7CiAgICAgICAgIGN0 eC5zY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IpOwogCiAgICAgICAgIC8vIEJvdW5kcyBv ZiB0aGUgcGF0aCBkb24ndCB0YWtlIGludG8gYWNjb3VudCB0aGUgYXJyb3csIGJ1dCByZWFsbHkg b25seSB0aGUgdGlnaHQgYm91bmRpbmcgYm94CiAgICAgICAgIC8vIG9mIHRoZSBjb250ZW50IGNv bnRhaW5lZCB3aXRoaW4gdGhlIGZyYW1lLgotICAgICAgICB2YXIgYm91bmRzOwotICAgICAgICB2 YXIgYXJyb3dIZWlnaHQgPSBXSS5Qb3BvdmVyLkFuY2hvclNpemUuaGVpZ2h0OworICAgICAgICBs ZXQgYm91bmRzOworICAgICAgICBsZXQgYXJyb3dIZWlnaHQgPSBXSS5Qb3BvdmVyLkFuY2hvclNp emUuaGVpZ2h0OwogICAgICAgICBzd2l0Y2ggKHRoaXMuX2VkZ2UpIHsKICAgICAgICAgY2FzZSBX SS5SZWN0RWRnZS5NSU5fWDogLy8gRGlzcGxheWVkIG9uIHRoZSBsZWZ0IG9mIHRoZSB0YXJnZXQs IGFycm93IHBvaW50cyByaWdodC4KICAgICAgICAgICAgIGJvdW5kcyA9IG5ldyBXSS5SZWN0KDAs IDAsIHdpZHRoIC0gYXJyb3dIZWlnaHQsIGhlaWdodCk7CkBAIC00MjcsMTggKzQxNCwyMCBAQCBX SS5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB9CiAK ICAgICAgICAgYm91bmRzID0gYm91bmRzLmluc2V0KFdJLlBvcG92ZXIuU2hhZG93RWRnZUluc2V0 cyk7CisgICAgICAgIGxldCBjb21wdXRlZFN0eWxlID0gd2luZG93LmdldENvbXB1dGVkU3R5bGUo dGhpcy5fZWxlbWVudCwgbnVsbCk7CiAKICAgICAgICAgLy8gQ2xpcCB0aGUgZnJhbWUuCi0gICAg ICAgIGN0eC5maWxsU3R5bGUgPSAiYmxhY2siOworICAgICAgICBjdHguZmlsbFN0eWxlID0gY29t cHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCItLXBvcG92ZXItY29sb3IiKS50cmltKCk7CiAg ICAgICAgIHRoaXMuX2RyYXdGcmFtZShjdHgsIGJvdW5kcywgdGhpcy5fZWRnZSwgdGhpcy5fYW5j aG9yUG9pbnQpOwogICAgICAgICBjdHguY2xpcCgpOwogCiAgICAgICAgIC8vIFBhbmVsIGJhY2tn cm91bmQgY29sb3IgZmlsbC4KLSAgICAgICAgY3R4LmZpbGxTdHlsZSA9IHRoaXMuX2JhY2tncm91 bmRTdHlsZSA9PT0gV0kuUG9wb3Zlci5CYWNrZ3JvdW5kU3R5bGUuV2hpdGUgPyAid2hpdGUiIDog InJnYigyMzYsIDIzNiwgMjM2KSI7CisgICAgICAgIGN0eC5maWxsU3R5bGUgPSBjb21wdXRlZFN0 eWxlLmdldFByb3BlcnR5VmFsdWUoIi0tcG9wb3Zlci1iYWNrZ3JvdW5kLWNvbG9yIikudHJpbSgp OworCiAgICAgICAgIGN0eC5maWxsUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKIAogICAgICAg ICAvLyBTdHJva2UuCi0gICAgICAgIGN0eC5zdHJva2VTdHlsZSA9ICJyZ2JhKDAsIDAsIDAsIDAu MjUpIjsKKyAgICAgICAgY3R4LnN0cm9rZVN0eWxlID0gY29tcHV0ZWRTdHlsZS5nZXRQcm9wZXJ0 eVZhbHVlKCItLXBvcG92ZXItYm9yZGVyLWNvbG9yIikudHJpbSgpOwogICAgICAgICBjdHgubGlu ZVdpZHRoID0gMjsKICAgICAgICAgdGhpcy5fZHJhd0ZyYW1lKGN0eCwgYm91bmRzLCB0aGlzLl9l ZGdlLCB0aGlzLl9hbmNob3JQb2ludCk7CiAgICAgICAgIGN0eC5zdHJva2UoKTsKQEAgLTQ0OSw3 ICs0MzgsNyBAQCBXSS5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAog ICAgICAgICBmaW5hbENvbnRleHQuc2hhZG93T2Zmc2V0WCA9IDE7CiAgICAgICAgIGZpbmFsQ29u dGV4dC5zaGFkb3dPZmZzZXRZID0gMTsKICAgICAgICAgZmluYWxDb250ZXh0LnNoYWRvd0JsdXIg PSA1OwotICAgICAgICBmaW5hbENvbnRleHQuc2hhZG93Q29sb3IgPSAicmdiYSgwLCAwLCAwLCAw LjUpIjsKKyAgICAgICAgZmluYWxDb250ZXh0LnNoYWRvd0NvbG9yID0gY29tcHV0ZWRTdHlsZS5n ZXRQcm9wZXJ0eVZhbHVlKCItLXBvcG92ZXItc2hhZG93LWNvbG9yIikudHJpbSgpOwogICAgICAg ICBmaW5hbENvbnRleHQuZHJhd0ltYWdlKHNjcmF0Y2hDYW52YXMsIDAsIDAsIHNjYWxlZFdpZHRo LCBzY2FsZWRIZWlnaHQpOwogICAgIH0KIApAQCAtNTkyLDExICs1ODEsNiBAQCBXSS5Qb3BvdmVy ID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAogICAgIH0KIH07CiAKLVdJLlBvcG92 ZXIuQmFja2dyb3VuZFN0eWxlID0gewotICAgIERlZmF1bHQ6ICJwb3BvdmVyLWJhY2tncm91bmQt ZGVmYXVsdCIsCi0gICAgV2hpdGU6ICJwb3BvdmVyLWJhY2tncm91bmQtd2hpdGUiLAotfTsKLQog V0kuUG9wb3Zlci5GYWRlT3V0Q2xhc3NOYW1lID0gImZhZGUtb3V0IjsKIFdJLlBvcG92ZXIuQ29y bmVyUmFkaXVzID0gNTsKIFdJLlBvcG92ZXIuTWluV2lkdGggPSA0MDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltaW5nQnJl YWtkb3duVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcuY3NzCmluZGV4IGZlODg4ZTE0YTI0Li5lZGQy M2YyOGNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2VUaW1pbmdCcmVha2Rvd25WaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcu Y3NzCkBAIC0yMyw3ICsyMywxMSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICovCiAKLS53YXRlcmZhbGwtcG9wb3ZlciAucmVzb3VyY2UtdGltaW5nLWJyZWFrZG93biB7 CisucG9wb3Zlci53YXRlcmZhbGwtcG9wb3ZlciB7CisgICAgLS1wb3BvdmVyLWJhY2tncm91bmQt Y29sb3I6IHdoaXRlOworfQorCisud2F0ZXJmYWxsLXBvcG92ZXItY29udGVudCAucmVzb3VyY2Ut dGltaW5nLWJyZWFrZG93biB7CiAgICAgbWFyZ2luOiA1cHg7CiB9CiAK 337842 2018-04-12 15:29:36 -0700 2018-04-12 18:09:56 -0700 Patch patch.txt text/plain 9168 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI5MDVmZDFiY2Q3Li5mZWExZDAxMjQ2NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTgtMDQtMTIgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVmYWN0b3Jpbmc6IG1vdmUgcG9wb3ZlciBzdHlsZXMgZnJvbSBKUyB0byBDU1MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDU1OAorCisgICAg ICAgIFJldmlld2VkIGJ5IEJyaWFuIEJ1cmcuCisKKyAgICAgICAgSW50cm9kdWNlIHNldmVyYWwg Q1NTIHZhcmlhYmxlcyB0byBjdXN0b21pemUgcG9wb3ZlciBhcHBlYXJhbmNlIGluIENTUworICAg ICAgICBhbmQgbm90IEphdmFTY3JpcHQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29u dGVudFZpZXcucHJvdG90eXBlLl93YXRlcmZhbGxQb3BvdmVyQ29udGVudEZvclJlc291cmNlKToK KyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlTW91 c2Vkb3duV2F0ZXJmYWxsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIu Y3NzOgorICAgICAgICAoLnBvcG92ZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv UG9wb3Zlci5qczoKKyAgICAgICAgKFdJLlBvcG92ZXIpOgorICAgICAgICAoV0kuUG9wb3Zlci5w cm90b3R5cGUuX2RyYXdCYWNrZ3JvdW5kKToKKyAgICAgICAgUmVwbGFjZSBgdmFyYCB3aXRoIGBs ZXRgLgorCisgICAgICAgIChXSS5Qb3BvdmVyLnByb3RvdHlwZS5nZXQgYmFja2dyb3VuZFN0eWxl KTogRGVsZXRlZC4KKyAgICAgICAgKFdJLlBvcG92ZXIucHJvdG90eXBlLnNldCBiYWNrZ3JvdW5k U3R5bGUpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VU aW1pbmdCcmVha2Rvd25WaWV3LmNzczoKKyAgICAgICAgKC5wb3BvdmVyLndhdGVyZmFsbC1wb3Bv dmVyKToKKyAgICAgICAgKC53YXRlcmZhbGwtcG9wb3Zlci1jb250ZW50IC5yZXNvdXJjZS10aW1p bmctYnJlYWtkb3duKToKKyAgICAgICAgKC53YXRlcmZhbGwtcG9wb3ZlciAucmVzb3VyY2UtdGlt aW5nLWJyZWFrZG93bik6IERlbGV0ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29u dGVudFZpZXcucHJvdG90eXBlLl93YXRlcmZhbGxQb3BvdmVyQ29udGVudEZvclJlc291cmNlKToK KyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlTW91 c2Vkb3duV2F0ZXJmYWxsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIu Y3NzOgorICAgICAgICAoLnBvcG92ZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv UG9wb3Zlci5qczoKKyAgICAgICAgKFdJLlBvcG92ZXIpOgorICAgICAgICAoV0kuUG9wb3Zlci5w cm90b3R5cGUuX2RyYXdCYWNrZ3JvdW5kKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1Jlc291cmNlVGltaW5nQnJlYWtkb3duVmlldy5jc3M6CisgICAgICAgICgucG9wb3Zlci53YXRl cmZhbGwtcG9wb3Zlcik6CisgICAgICAgICgud2F0ZXJmYWxsLXBvcG92ZXItY29udGVudCAucmVz b3VyY2UtdGltaW5nLWJyZWFrZG93bik6CisKIDIwMTgtMDQtMDcgIE5pa2l0YSBWYXNpbHlldiAg PG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRXJyb3JzIGds eXBoIGRvZXNuJ3QgZnVsbHkgY2hhbmdlIHRvIGJsdWUgd2hlbiBhY3RpdmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKaW5kZXggYjdkZTdiNzMxOGIuLmVjNTJiMjhlYTYw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwpAQCAtMTQwNCw3ICsx NDA0LDcgQEAgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVD b250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWUKICAgICBfd2F0ZXJmYWxsUG9wb3ZlckNv bnRlbnRGb3JSZXNvdXJjZShyZXNvdXJjZSkKICAgICB7CiAgICAgICAgIGxldCBjb250ZW50RWxl bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICBjb250ZW50RWxl bWVudC5jbGFzc05hbWUgPSAid2F0ZXJmYWxsLXBvcG92ZXIiOworICAgICAgICBjb250ZW50RWxl bWVudC5jbGFzc05hbWUgPSAid2F0ZXJmYWxsLXBvcG92ZXItY29udGVudCI7CiAKICAgICAgICAg aWYgKCFyZXNvdXJjZS5oYXNSZXNwb25zZSgpIHx8ICFyZXNvdXJjZS50aW1pbmdEYXRhLnN0YXJ0 VGltZSB8fCAhcmVzb3VyY2UudGltaW5nRGF0YS5yZXNwb25zZUVuZCkgewogICAgICAgICAgICAg Y29udGVudEVsZW1lbnQudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiUmVzb3VyY2UgaGFzIG5v IHRpbWluZyBkYXRhIik7CkBAIC0xNDIyLDcgKzE0MjIsNyBAQCBXSS5OZXR3b3JrVGFibGVDb250 ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVu dFZpZQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl93YXRlcmZhbGxQb3BvdmVyKSB7CiAgICAg ICAgICAgICB0aGlzLl93YXRlcmZhbGxQb3BvdmVyID0gbmV3IFdJLlBvcG92ZXI7Ci0gICAgICAg ICAgICB0aGlzLl93YXRlcmZhbGxQb3BvdmVyLmJhY2tncm91bmRTdHlsZSA9IFdJLlBvcG92ZXIu QmFja2dyb3VuZFN0eWxlLldoaXRlOworICAgICAgICAgICAgdGhpcy5fd2F0ZXJmYWxsUG9wb3Zl ci5lbGVtZW50LmNsYXNzTGlzdC5hZGQoIndhdGVyZmFsbC1wb3BvdmVyIik7CiAgICAgICAgIH0K IAogICAgICAgICBpZiAodGhpcy5fd2F0ZXJmYWxsUG9wb3Zlci52aXNpYmxlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5jc3Mg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmNzcwpp bmRleCA0ZDVkYjQzNzZmMy4uMDQzMTgwMzM1NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuY3NzCkBAIC0yOCw5ICsyOCwx NSBAQAogICAgIG1pbi13aWR0aDogMjBweDsKICAgICBtaW4taGVpZ2h0OiAyMHB4OwogICAgIGJv eC1zaXppbmc6IGJvcmRlci1ib3g7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1jYW52 YXMocG9wb3Zlcik7CiAgICAgcG9pbnRlci1ldmVudHM6IG5vbmU7CiAgICAgei1pbmRleDogdmFy KC0tei1pbmRleC1wb3BvdmVyKTsKKworICAgIC0tcG9wb3Zlci10ZXh0LWNvbG9yOiBibGFjazsK KyAgICAtLXBvcG92ZXItYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tcGFuZWwtYmFja2dyb3VuZC1j b2xvcik7CisgICAgLS1wb3BvdmVyLWJvcmRlci1jb2xvcjogaHNsYSgwLCAwJSwgMCUsIDAuMjUp OworICAgIC0tcG9wb3Zlci1zaGFkb3ctY29sb3I6IGhzbGEoMCwgMCUsIDAlLCAwLjUpOworCisg ICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1jYW52YXMocG9wb3Zlcik7CiB9CiAKIC5wb3Bv dmVyLmFycm93LXVwIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCmluZGV4IGViZDEwMzRlYTFjLi43NjM5NjEwMDEzNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zl ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3Bv dmVyLmpzCkBAIC0zNyw3ICszNyw2IEBAIFdJLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVu ZHMgV0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX2FuY2hvclBvaW50ID0gbmV3IFdJLlBvaW50Owog ICAgICAgICB0aGlzLl9wcmVmZXJyZWRFZGdlcyA9IG51bGw7CiAgICAgICAgIHRoaXMuX3Jlc2l6 ZUhhbmRsZXIgPSBudWxsOwotICAgICAgICB0aGlzLl9iYWNrZ3JvdW5kU3R5bGUgPSBXSS5Qb3Bv dmVyLkJhY2tncm91bmRTdHlsZS5EZWZhdWx0OwogCiAgICAgICAgIHRoaXMuX2NvbnRlbnROZWVk c1VwZGF0ZSA9IGZhbHNlOwogICAgICAgICB0aGlzLl9kaXNtaXNzaW5nID0gZmFsc2U7CkBAIC03 NCwxOCArNzMsNiBAQCBXSS5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVj dAogICAgICAgICB0aGlzLl9mcmFtZSA9IGZyYW1lOwogICAgIH0KIAotICAgIGdldCBiYWNrZ3Jv dW5kU3R5bGUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2JhY2tncm91bmRTdHlsZTsK LSAgICB9Ci0KLSAgICBzZXQgYmFja2dyb3VuZFN0eWxlKHN0eWxlKQotICAgIHsKLSAgICAgICAg Y29uc29sZS5hc3NlcnQoT2JqZWN0LnZhbHVlcyhXSS5Qb3BvdmVyLkJhY2tncm91bmRTdHlsZSku aW5jbHVkZXMoc3R5bGUpKTsKLQotICAgICAgICB0aGlzLl9iYWNrZ3JvdW5kU3R5bGUgPSBzdHls ZTsKLSAgICB9Ci0KICAgICBzZXQgY29udGVudChjb250ZW50KQogICAgIHsKICAgICAgICAgaWYg KGNvbnRlbnQgPT09IHRoaXMuX2NvbnRlbnQpCkBAIC0zOTEsMjYgKzM3OCwyNiBAQCBXSS5Qb3Bv dmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgX2RyYXdCYWNrZ3Jv dW5kKCkKICAgICB7Ci0gICAgICAgIHZhciBzY2FsZUZhY3RvciA9IHdpbmRvdy5kZXZpY2VQaXhl bFJhdGlvOworICAgICAgICBsZXQgc2NhbGVGYWN0b3IgPSB3aW5kb3cuZGV2aWNlUGl4ZWxSYXRp bzsKIAotICAgICAgICB2YXIgd2lkdGggPSB0aGlzLl9mcmFtZS5zaXplLndpZHRoOwotICAgICAg ICB2YXIgaGVpZ2h0ID0gdGhpcy5fZnJhbWUuc2l6ZS5oZWlnaHQ7Ci0gICAgICAgIHZhciBzY2Fs ZWRXaWR0aCA9IHdpZHRoICogc2NhbGVGYWN0b3I7Ci0gICAgICAgIHZhciBzY2FsZWRIZWlnaHQg PSBoZWlnaHQgKiBzY2FsZUZhY3RvcjsKKyAgICAgICAgbGV0IHdpZHRoID0gdGhpcy5fZnJhbWUu c2l6ZS53aWR0aDsKKyAgICAgICAgbGV0IGhlaWdodCA9IHRoaXMuX2ZyYW1lLnNpemUuaGVpZ2h0 OworICAgICAgICBsZXQgc2NhbGVkV2lkdGggPSB3aWR0aCAqIHNjYWxlRmFjdG9yOworICAgICAg ICBsZXQgc2NhbGVkSGVpZ2h0ID0gaGVpZ2h0ICogc2NhbGVGYWN0b3I7CiAKICAgICAgICAgLy8g Q3JlYXRlIGEgc2NyYXRjaCBjYW52YXMgc28gd2UgY2FuIGRyYXcgdGhlIHBvcG92ZXIgdGhhdCB3 aWxsIGxhdGVyIGJlIGRyYXduIGludG8KICAgICAgICAgLy8gdGhlIGZpbmFsIGNvbnRleHQgd2l0 aCBhIHNoYWRvdy4KLSAgICAgICAgdmFyIHNjcmF0Y2hDYW52YXMgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJjYW52YXMiKTsKKyAgICAgICAgbGV0IHNjcmF0Y2hDYW52YXMgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJjYW52YXMiKTsKICAgICAgICAgc2NyYXRjaENhbnZhcy53aWR0aCA9IHNj YWxlZFdpZHRoOwogICAgICAgICBzY3JhdGNoQ2FudmFzLmhlaWdodCA9IHNjYWxlZEhlaWdodDsK IAotICAgICAgICB2YXIgY3R4ID0gc2NyYXRjaENhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworICAg ICAgICBsZXQgY3R4ID0gc2NyYXRjaENhbnZhcy5nZXRDb250ZXh0KCIyZCIpOwogICAgICAgICBj dHguc2NhbGUoc2NhbGVGYWN0b3IsIHNjYWxlRmFjdG9yKTsKIAogICAgICAgICAvLyBCb3VuZHMg b2YgdGhlIHBhdGggZG9uJ3QgdGFrZSBpbnRvIGFjY291bnQgdGhlIGFycm93LCBidXQgcmVhbGx5 IG9ubHkgdGhlIHRpZ2h0IGJvdW5kaW5nIGJveAogICAgICAgICAvLyBvZiB0aGUgY29udGVudCBj b250YWluZWQgd2l0aGluIHRoZSBmcmFtZS4KLSAgICAgICAgdmFyIGJvdW5kczsKLSAgICAgICAg dmFyIGFycm93SGVpZ2h0ID0gV0kuUG9wb3Zlci5BbmNob3JTaXplLmhlaWdodDsKKyAgICAgICAg bGV0IGJvdW5kczsKKyAgICAgICAgbGV0IGFycm93SGVpZ2h0ID0gV0kuUG9wb3Zlci5BbmNob3JT aXplLmhlaWdodDsKICAgICAgICAgc3dpdGNoICh0aGlzLl9lZGdlKSB7CiAgICAgICAgIGNhc2Ug V0kuUmVjdEVkZ2UuTUlOX1g6IC8vIERpc3BsYXllZCBvbiB0aGUgbGVmdCBvZiB0aGUgdGFyZ2V0 LCBhcnJvdyBwb2ludHMgcmlnaHQuCiAgICAgICAgICAgICBib3VuZHMgPSBuZXcgV0kuUmVjdCgw LCAwLCB3aWR0aCAtIGFycm93SGVpZ2h0LCBoZWlnaHQpOwpAQCAtNDI3LDE4ICs0MTQsMjAgQEAg V0kuUG9wb3ZlciA9IGNsYXNzIFBvcG92ZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgfQog CiAgICAgICAgIGJvdW5kcyA9IGJvdW5kcy5pbnNldChXSS5Qb3BvdmVyLlNoYWRvd0VkZ2VJbnNl dHMpOworICAgICAgICBsZXQgY29tcHV0ZWRTdHlsZSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxl KHRoaXMuX2VsZW1lbnQsIG51bGwpOwogCiAgICAgICAgIC8vIENsaXAgdGhlIGZyYW1lLgotICAg ICAgICBjdHguZmlsbFN0eWxlID0gImJsYWNrIjsKKyAgICAgICAgY3R4LmZpbGxTdHlsZSA9IGNv bXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgiLS1wb3BvdmVyLXRleHQtY29sb3IiKS50cmlt KCk7CiAgICAgICAgIHRoaXMuX2RyYXdGcmFtZShjdHgsIGJvdW5kcywgdGhpcy5fZWRnZSwgdGhp cy5fYW5jaG9yUG9pbnQpOwogICAgICAgICBjdHguY2xpcCgpOwogCiAgICAgICAgIC8vIFBhbmVs IGJhY2tncm91bmQgY29sb3IgZmlsbC4KLSAgICAgICAgY3R4LmZpbGxTdHlsZSA9IHRoaXMuX2Jh Y2tncm91bmRTdHlsZSA9PT0gV0kuUG9wb3Zlci5CYWNrZ3JvdW5kU3R5bGUuV2hpdGUgPyAid2hp dGUiIDogInJnYigyMzYsIDIzNiwgMjM2KSI7CisgICAgICAgIGN0eC5maWxsU3R5bGUgPSBjb21w dXRlZFN0eWxlLmdldFByb3BlcnR5VmFsdWUoIi0tcG9wb3Zlci1iYWNrZ3JvdW5kLWNvbG9yIiku dHJpbSgpOworCiAgICAgICAgIGN0eC5maWxsUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKIAog ICAgICAgICAvLyBTdHJva2UuCi0gICAgICAgIGN0eC5zdHJva2VTdHlsZSA9ICJyZ2JhKDAsIDAs IDAsIDAuMjUpIjsKKyAgICAgICAgY3R4LnN0cm9rZVN0eWxlID0gY29tcHV0ZWRTdHlsZS5nZXRQ cm9wZXJ0eVZhbHVlKCItLXBvcG92ZXItYm9yZGVyLWNvbG9yIikudHJpbSgpOwogICAgICAgICBj dHgubGluZVdpZHRoID0gMjsKICAgICAgICAgdGhpcy5fZHJhd0ZyYW1lKGN0eCwgYm91bmRzLCB0 aGlzLl9lZGdlLCB0aGlzLl9hbmNob3JQb2ludCk7CiAgICAgICAgIGN0eC5zdHJva2UoKTsKQEAg LTQ0OSw3ICs0MzgsNyBAQCBXSS5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9i amVjdAogICAgICAgICBmaW5hbENvbnRleHQuc2hhZG93T2Zmc2V0WCA9IDE7CiAgICAgICAgIGZp bmFsQ29udGV4dC5zaGFkb3dPZmZzZXRZID0gMTsKICAgICAgICAgZmluYWxDb250ZXh0LnNoYWRv d0JsdXIgPSA1OwotICAgICAgICBmaW5hbENvbnRleHQuc2hhZG93Q29sb3IgPSAicmdiYSgwLCAw LCAwLCAwLjUpIjsKKyAgICAgICAgZmluYWxDb250ZXh0LnNoYWRvd0NvbG9yID0gY29tcHV0ZWRT dHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCItLXBvcG92ZXItc2hhZG93LWNvbG9yIikudHJpbSgpOwog ICAgICAgICBmaW5hbENvbnRleHQuZHJhd0ltYWdlKHNjcmF0Y2hDYW52YXMsIDAsIDAsIHNjYWxl ZFdpZHRoLCBzY2FsZWRIZWlnaHQpOwogICAgIH0KIApAQCAtNTkyLDExICs1ODEsNiBAQCBXSS5Q b3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdJLk9iamVjdAogICAgIH0KIH07CiAKLVdJ LlBvcG92ZXIuQmFja2dyb3VuZFN0eWxlID0gewotICAgIERlZmF1bHQ6ICJwb3BvdmVyLWJhY2tn cm91bmQtZGVmYXVsdCIsCi0gICAgV2hpdGU6ICJwb3BvdmVyLWJhY2tncm91bmQtd2hpdGUiLAot fTsKLQogV0kuUG9wb3Zlci5GYWRlT3V0Q2xhc3NOYW1lID0gImZhZGUtb3V0IjsKIFdJLlBvcG92 ZXIuQ29ybmVyUmFkaXVzID0gNTsKIFdJLlBvcG92ZXIuTWluV2lkdGggPSA0MDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGlt aW5nQnJlYWtkb3duVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcuY3NzCmluZGV4IGZlODg4ZTE0YTI0 Li5lZGQyM2YyOGNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUmVzb3VyY2VUaW1pbmdCcmVha2Rvd25WaWV3LmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWluZ0JyZWFrZG93 blZpZXcuY3NzCkBAIC0yMyw3ICsyMywxMSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogICovCiAKLS53YXRlcmZhbGwtcG9wb3ZlciAucmVzb3VyY2UtdGltaW5nLWJyZWFr ZG93biB7CisucG9wb3Zlci53YXRlcmZhbGwtcG9wb3ZlciB7CisgICAgLS1wb3BvdmVyLWJhY2tn cm91bmQtY29sb3I6IHdoaXRlOworfQorCisud2F0ZXJmYWxsLXBvcG92ZXItY29udGVudCAucmVz b3VyY2UtdGltaW5nLWJyZWFrZG93biB7CiAgICAgbWFyZ2luOiA1cHg7CiB9CiAK