182667 2018-02-09 17:50:35 -0800 Web Inspector: Canvas tab: tree selection abruptly changes when selecting a recording frame 2018-02-21 13:24:04 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 175485 183015 1 mattbaker mattbaker commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1398186 0 mattbaker 2018-02-09 17:50:35 -0800 Summary: Tree selection abruptly changes when selecting a recording frame. Steps to Reproduce: 1. Goto https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API/Tutorial/Basic_animations 2. Record any canvas 3. In the sidebar, select 'Frame 1' => Tree selection jumps to the last action in the frame 1398187 1 webkit-bug-importer 2018-02-09 17:51:06 -0800 <rdar://problem/37412639> 1398189 2 333545 mattbaker 2018-02-09 18:14:44 -0800 Created attachment 333545 Patch 1398192 3 333548 mattbaker 2018-02-09 18:34:07 -0800 Created attachment 333548 Patch 1398194 4 333548 hi 2018-02-09 19:10:26 -0800 Comment on attachment 333548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333548&action=review r=me. This feels much more smooth. I still think that we shouldn't auto-select a recording when viewing a Canvas, but we can discuss that before doing anything. > Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css:71 > +.sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline .item.folder-icon > .status { > + line-height: 16px; > +} This rule already exists below. > Source/WebInspectorUI/UserInterface/Views/TreeOutline.css:247 > +.tree-outline:not(.large):matches(:focus, .force-focus) .item.selected .status .indeterminate-progress-spinner { > + filter: invert(); > +} Nice! 1398205 5 333552 mattbaker 2018-02-09 21:32:57 -0800 Created attachment 333552 Patch for landing 1398209 6 333552 commit-queue 2018-02-09 22:15:51 -0800 Comment on attachment 333552 Patch for landing Clearing flags on attachment: 333552 Committed r228362: <https://trac.webkit.org/changeset/228362> 1398210 7 commit-queue 2018-02-09 22:15:52 -0800 All reviewed patches have been landed. Closing bug. 333545 2018-02-09 18:14:44 -0800 2018-02-09 18:34:06 -0800 Patch bug-182667-20180209181444.patch text/plain 12012 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz ZGI2YzIzNzhlYTdjZjI5MGFkNDJiMDBmMmI3ZmE5MjViY2NkNzY1Li5iN2Y4ZDNjOTkwNGY4MTli MDg2YTJiOTY5NzZlZjg5OGU4MTJkODhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw1MCBAQAogMjAxOC0wMi0wOSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FudmFzIHRhYjogdHJlZSBzZWxlY3Rpb24gYWJy dXB0bHkgY2hhbmdlcyB3aGVuIHNlbGVjdGluZyBhIHJlY29yZGluZyBmcmFtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNjY3CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zNzQxMjYzOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVs LmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNv bnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIpOgorICAgICAgICAo LnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6bm90KC5oYXMtcmVjb3JkaW5ncykg PiAuZmlsdGVyLWJhciwpOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5j YW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC50cmVlLW91dGxpbmUgLml0 ZW0ucmVjb3JkaW5nID4gLmljb24pOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC50cmVlLW91dGxp bmUgLml0ZW0uZm9sZGVyLWljb24gPiAuaWNvbik6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5l bC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLnJlY29yZGluZy1jb250ZW50ID4gLnRy ZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5zdGF0dXMpOgorICAgICAgICAoLnNpZGVi YXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5uYXZpZ2F0aW9uLWJh cik6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZh cyA+IC5jb250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5yZWNvcmRpbmcgPiAuaWNvbik6IERl bGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5j b250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5pY29uKTogRGVsZXRl ZC4KKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRl bnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLmZvbGRlci1pY29uID4gLnN0YXR1cyk6IERlbGV0ZWQu CisgICAgICAgIFN0eWxlIGNoYW5nZXMgZm9yIHRoZSBhZGRpdGlvbmFsIERPTSBlbGVtZW50IHJl cXVpcmVkIHRvIHZpcnR1YWxpemUgdGhlIHJlY29yZGluZyB0cmVlIG91dGxpbmUuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAg KFdJLkNhbnZhc1NpZGViYXJQYW5lbCk6CisgICAgICAgIEluIG9yZGVyIHRvIGJlIHZpcnR1YWxp emVkLCB0aGUgdHJlZSBtdXN0IGJlIHRoZSBvbmx5IGNoaWxkIG9mIGl0cyBwYXJlbnQuCisgICAg ICAgIChXSS5DYW52YXNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNldCBhY3Rpb24pOgorICAgICAg ICBFbnN1cmUgdGhhdCBhIGZyYW1lIHRyZWUgZWxlbWVudCBpc24ndCBkZXNlbGVjdGVkIHdoZW4g dGhlIGxhc3QgYWN0aW9uCisgICAgICAgIGluIHRoZSBmcmFtZSBiZWNvbWVzIHNlbGVjdGVkIGlu IHRoZSBSZWNvcmRpbmdDb250ZW50Vmlldy4KKyAgICAgICAgKFdJLkNhbnZhc1NpZGViYXJQYW5l bC5wcm90b3R5cGUuc2hvd24pOgorICAgICAgICBSZWZyZXNoIHRoZSBzaWRlYmFyLCBhcyByZXBy ZXNlbnRlZCBvYmplY3RzIG1heSBoYXZlIGNoYW5nZWQgd2hpbGUgaGlkZGVuLgorICAgICAgICAo V0kuQ2FudmFzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY3VycmVudFJlcHJlc2VudGVkT2JqZWN0 c0RpZENoYW5nZSk6CisgICAgICAgIFVuc2V0IHRoZSByZWNvcmRpbmcsIHNvIHRoZSB0cmVlIGlz IGNsZWFyZWQgd2hlbiB2aWV3aW5nIHRoZSBvdmVydmlldy4KKyAgICAgICAgKFdJLkNhbnZhc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUuX2NhbnZhc0NoYW5nZWQpOgorICAgICAgICAoV0kuQ2FudmFz U2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVjb3JkaW5nQ2hhbmdlZCk6CisgICAgICAgIChXSS5D YW52YXNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl91cGRhdGVSZWNvcmRpbmdTY29wZUJhcik6Cisg ICAgICAgIE1vdmVkIHRvZ2dsaW5nIG9mIHRoZSAiaGFzLXJlY29yZGluZ3MiIHN0eWxlIHRvIF9j YW52YXNDaGFuZ2VkLCBzaW5jZQorICAgICAgICB0aGUgbmF2aWdhdGlvbiBiYXIgc2hvdWxkIGJl IGhpZGRlbiB3aGVuIG5vIGNhbnZhcyBleGlzdHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0NvbGxlY3Rpb25Db250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkNvbGxlY3Rpb25D b250ZW50Vmlldy5wcm90b3R5cGUuYWRkQ29udGVudFZpZXdGb3JJdGVtKToKKyAgICAgICAgKFdJ LkNvbGxlY3Rpb25Db250ZW50Vmlldy5wcm90b3R5cGUucmVtb3ZlQ29udGVudFZpZXdGb3JJdGVt KToKKyAgICAgICAgRHJpdmUgYnkgZml4ZXMgZm9yIGNoaWxkIHZpZXcgdmlzaWJsZSBzdGF0ZS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuY3NzOgorICAgICAg ICAoLnRyZWUtb3V0bGluZTpub3QoLmxhcmdlKTptYXRjaGVzKDpmb2N1cywgLmZvcmNlLWZvY3Vz KSAuaXRlbS5zZWxlY3RlZCAuc3RhdHVzIC5pbmRldGVybWluYXRlLXByb2dyZXNzLXNwaW5uZXIp OgorICAgICAgICBNYWtlIHNwaW5uZXIgZWFzaWVyIHRvIHNlZSBhZ2FpbnN0IHRoZSBzZWxlY3Rp b24gYmFja2dyb3VuZCBjb2xvci4KKworMjAxOC0wMi0wOSAgTWF0dCBCYWtlciAgPG1hdHRiYWtl ckBhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogT2JqZWN0LnNoYWxsb3dFcXVh bCBhbHdheXMgZmFpbHMgd2hlbiBjb21wYXJpbmcgYXJyYXkgcHJvcGVydHkgdmFsdWVzCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI2MzQKICAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzM3Mzc0NjM5PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmNzcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5j c3MKaW5kZXggZGI1YjA2ODRlZjgxYmJiOTlhNzFmYmUxOTU2ZTllNzJhNjViZTA2NS4uOGU5ZjVl MjAxNzAxZmE3MTliYjM1NThkZDhlMDk4YWEwMDI5MWFmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmNzcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRl YmFyUGFuZWwuY3NzCkBAIC00MCw3ICs0MCw3IEBACiAgICAgY29udGVudDogdXJsKC4uL0ltYWdl cy9DYW52YXMzRC5zdmcpOwogfQogCi0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZh cyA+IC5jb250ZW50ID4gLm5hdmlnYXRpb24tYmFyIHsKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmln YXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAubmF2aWdhdGlv bi1iYXIgewogICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOwog fQogCkBAIC01MCwyMiArNTAsMjYgQEAKIH0KIAogLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlv bi5jYW52YXM6bm90KC5oYXMtcmVjb3JkaW5ncykgPiAuZmlsdGVyLWJhciwKLS5zaWRlYmFyID4g LnBhbmVsLm5hdmlnYXRpb24uY2FudmFzOm5vdCguaGFzLXJlY29yZGluZ3MpID4gLmNvbnRlbnQg PiAubmF2aWdhdGlvbi1iYXIgeworLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6 bm90KC5oYXMtcmVjb3JkaW5ncykgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCB7CiAg ICAgZGlzcGxheTogbm9uZTsKIH0KIAotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52 YXMgPiAuY29udGVudCA+IC50cmVlLW91dGxpbmUgLml0ZW0ucmVjb3JkaW5nID4gLmljb24gewot ICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUmVjb3JkaW5nLnN2Zyk7Ci19Ci0KIC5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5p dGVtLnNoYWRlci1wcm9ncmFtID4gLmljb24gewogICAgIGNvbnRlbnQ6IGltYWdlLXNldCh1cmwo Li4vSW1hZ2VzL0RvY3VtZW50R0wucG5nKSAxeCwgdXJsKC4uL0ltYWdlcy9Eb2N1bWVudEdMQDJ4 LnBuZykgMngpOwogfQogCi0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5j b250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5pY29uIHsKKy5zaWRl YmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNv bnRlbnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLnJlY29yZGluZyA+IC5pY29uIHsKKyAgICBjb250 ZW50OiB1cmwoLi4vSW1hZ2VzL1JlY29yZGluZy5zdmcpOworfQorCisuc2lkZWJhciA+IC5wYW5l bC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLnJlY29yZGluZy1jb250ZW50ID4gLnRy ZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5pY29uIHsKICAgICBjb250ZW50OiB1cmwo Li4vSW1hZ2VzL1JlbmRlcmluZ0ZyYW1lLnN2Zyk7CiB9CiAKLS5zaWRlYmFyID4gLnBhbmVsLm5h dmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLmZvbGRlci1p Y29uID4gLnN0YXR1cyB7Cisuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5j b250ZW50ID4gLnJlY29yZGluZy1jb250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXIt aWNvbiA+IC5zdGF0dXMgeworICAgIGxpbmUtaGVpZ2h0OiAxNnB4OworfQorCisuc2lkZWJhciA+ IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLnJlY29yZGluZy1jb250ZW50 ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5zdGF0dXMgewogICAgIGxpbmUt aGVpZ2h0OiAxNnB4OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzCmluZGV4IGUxOTRl OTA2NjczNzZkM2FkYTdiYjFhYzk2MzcxMGI5YzNiMWI1YWMuLjQxNmE2YzBjMTI3N2FmYTFkZmM4 MTVhZTU2MGNmNzdiMzQ2Y2E1YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMKQEAg LTQ4LDExICs0OCwxOCBAQCBXSS5DYW52YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52YXNTaWRl YmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAgICB0aGlzLl9j YW52YXNUcmVlT3V0bGluZSA9IHRoaXMuY3JlYXRlQ29udGVudFRyZWVPdXRsaW5lKHN1cHByZXNz RmlsdGVyaW5nKTsKICAgICAgICAgdGhpcy5fY2FudmFzVHJlZU91dGxpbmUuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJjYW52YXMiKTsKIAorICAgICAgICBsZXQgcmVjb3JkaW5nQ29udGVudCA9IHRo aXMuY29udGVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKSk7CisgICAgICAgIHJlY29yZGluZ0NvbnRlbnQuY2xhc3NOYW1lID0gInJlY29yZGlu Zy1jb250ZW50IjsKKwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyID0gbmV3 IFdJLk5hdmlnYXRpb25CYXI7Ci0gICAgICAgIHRoaXMuY29udGVudFZpZXcuYWRkU3Vidmlldyh0 aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyKTsKKyAgICAgICAgdGhpcy5fcmVjb3JkaW5nTmF2 aWdhdGlvbkJhci5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImhpZGRlbiIpOworICAgICAgICByZWNv cmRpbmdDb250ZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZGluZ05hdmlnYXRpb25CYXIuZWxl bWVudCk7CiAKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nVHJlZU91dGxpbmUgPSB0aGlzLmNvbnRl bnRUcmVlT3V0bGluZTsKLSAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENo aWxkKHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmVsZW1lbnQpOworICAgICAgICByZWNvcmRp bmdDb250ZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmVsZW1lbnQp OworCisgICAgICAgIHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmN1c3RvbUluZGVudCA9IHRy dWU7CisgICAgICAgIHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLnJlZ2lzdGVyU2Nyb2xsVmly dHVhbGl6ZXIocmVjb3JkaW5nQ29udGVudCwgMjApOwogCiAgICAgICAgIHRoaXMuX2NhbnZhc1Ry ZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJlZU91dGxpbmUuRXZlbnQuU2VsZWN0aW9u RGlkQ2hhbmdlLCB0aGlzLl90cmVlT3V0bGluZVNlbGVjdGlvbkRpZENoYW5nZSwgdGhpcyk7CiAg ICAgICAgIHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJl ZU91dGxpbmUuRXZlbnQuU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzLl90cmVlT3V0bGluZVNlbGVj dGlvbkRpZENoYW5nZSwgdGhpcyk7CkBAIC0xMDQsNiArMTExLDE5IEBAIFdJLkNhbnZhc1NpZGVi YXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25T aWRlYmFyUGFuCiAgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nKQogICAgICAgICAgICAgcmV0 dXJuOwogCisgICAgICAgIGxldCBzZWxlY3RlZFRyZWVFbGVtZW50ID0gdGhpcy5fcmVjb3JkaW5n VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudDsKKyAgICAgICAgaWYgKCFhY3Rpb24pIHsK KyAgICAgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50KQorICAgICAgICAgICAgICAgIHNl bGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorCisgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50ICYmIHNlbGVjdGVkVHJlZUVs ZW1lbnQgaW5zdGFuY2VvZiBXSS5Gb2xkZXJUcmVlRWxlbWVudCkgeworICAgICAgICAgICAgbGV0 IGxhc3RBY3Rpb25UcmVlRWxlbWVudCA9IHNlbGVjdGVkVHJlZUVsZW1lbnQuY2hpbGRyZW4ubGFz dFZhbHVlOworICAgICAgICAgICAgaWYgKGFjdGlvbiA9PT0gbGFzdEFjdGlvblRyZWVFbGVtZW50 LnJlcHJlc2VudGVkT2JqZWN0KQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor CiAgICAgICAgIGxldCB0cmVlRWxlbWVudCA9IHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmZp bmRUcmVlRWxlbWVudChhY3Rpb24pOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0cmVlRWxlbWVu dCwgIk1pc3NpbmcgdHJlZSBlbGVtZW50IGZvciByZWNvcmRpbmcgYWN0aW9uLiIsIGFjdGlvbik7 CiAgICAgICAgIGlmICghdHJlZUVsZW1lbnQpCkBAIC0xMjEsNiArMTQxLDcgQEAgV0kuQ2FudmFz U2lkZWJhclBhbmVsID0gY2xhc3MgQ2FudmFzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdh dGlvblNpZGViYXJQYW4KICAgICAgICAgc3VwZXIuc2hvd24oKTsKIAogICAgICAgICB0aGlzLmNv bnRlbnRCcm93c2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ29udGVudEJyb3dzZXIuRXZlbnQuQ3Vy cmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZSwgdGhpcy5fY3VycmVudFJlcHJlc2VudGVk T2JqZWN0c0RpZENoYW5nZSwgdGhpcyk7CisgICAgICAgIHRoaXMuX2N1cnJlbnRSZXByZXNlbnRl ZE9iamVjdHNEaWRDaGFuZ2UoKTsKICAgICB9CiAKICAgICBoaWRkZW4oKQpAQCAtMjM0LDYgKzI1 NSw3IEBAIFdJLkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBl eHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAgICAgIH0KIAogICAgICAgICB0aGlz LmNhbnZhcyA9IG51bGw7CisgICAgICAgIHRoaXMucmVjb3JkaW5nID0gbnVsbDsKICAgICB9CiAK ICAgICBfdHJlZU91dGxpbmVTZWxlY3Rpb25EaWRDaGFuZ2UoZXZlbnQpCkBAIC0yNjQsNiArMjg2 LDcgQEAgV0kuQ2FudmFzU2lkZWJhclBhbmVsID0gY2xhc3MgQ2FudmFzU2lkZWJhclBhbmVsIGV4 dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYXJQYW4KICAgICBfY2FudmFzQ2hhbmdlZCgpCiAgICAg ewogICAgICAgICB0aGlzLl9jYW52YXNUcmVlT3V0bGluZS5yZW1vdmVDaGlsZHJlbigpOworICAg ICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyLmVsZW1lbnQuY2xhc3NMaXN0LnRvZ2ds ZSgiaGlkZGVuIiwgISF0aGlzLl9jYW52YXMpOwogCiAgICAgICAgIGlmICghdGhpcy5fY2FudmFz KQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjkwLDYgKzMxMyw3IEBAIFdJLkNhbnZhc1NpZGVi YXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25T aWRlYmFyUGFuCiAgICAgX3JlY29yZGluZ0NoYW5nZWQoKQogICAgIHsKICAgICAgICAgdGhpcy5f cmVjb3JkaW5nVHJlZU91dGxpbmUucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgdGhpcy5lbGVt ZW50LmNsYXNzTGlzdC50b2dnbGUoImhhcy1yZWNvcmRpbmdzIiwgISF0aGlzLl9yZWNvcmRpbmcp OwogCiAgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nKQogICAgICAgICAgICAgcmV0dXJuOwpA QCAtMzU2LDEwICszODAsOCBAQCBXSS5DYW52YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52YXNT aWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAgICAgICAg dGhpcy5fc2NvcGVCYXIgPSBudWxsOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCF0aGlzLl9j YW52YXMgfHwgIXRoaXMuX2NhbnZhcy5yZWNvcmRpbmdDb2xsZWN0aW9uLml0ZW1zLnNpemUpIHsK LSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKCJoYXMtcmVjb3JkaW5n cyIpOworICAgICAgICBpZiAoIXRoaXMuX3JlY29yZGluZykKICAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgfQogCiAgICAgICAgIGxldCBzY29wZUJhckl0ZW1zID0gW107CiAgICAgICAgIGxl dCBzZWxlY3RlZFNjb3BlQmFySXRlbSA9IG51bGw7CkBAIC0zNzcsOCArMzk5LDYgQEAgV0kuQ2Fu dmFzU2lkZWJhclBhbmVsID0gY2xhc3MgQ2FudmFzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2 aWdhdGlvblNpZGViYXJQYW4KICAgICAgICAgdGhpcy5fc2NvcGVCYXIgPSBuZXcgV0kuU2NvcGVC YXIoImNhbnZhcy1yZWNvcmRpbmdhLXNjb3BlLWJhciIsIHNjb3BlQmFySXRlbXMsIHNlbGVjdGVk U2NvcGVCYXJJdGVtLCB0cnVlKTsKICAgICAgICAgdGhpcy5fc2NvcGVCYXIuYWRkRXZlbnRMaXN0 ZW5lcihXSS5TY29wZUJhci5FdmVudC5TZWxlY3Rpb25DaGFuZ2VkLCB0aGlzLl9zY29wZUJhclNl bGVjdGlvbkNoYW5nZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9u QmFyLmluc2VydE5hdmlnYXRpb25JdGVtKHRoaXMuX3Njb3BlQmFyLCAwKTsKLQotICAgICAgICB0 aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaGFzLXJlY29yZGluZ3MiKTsKICAgICB9CiB9Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b2xsZWN0aW9uQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db2xsZWN0aW9uQ29udGVudFZpZXcuanMKaW5kZXggZTQ4MTdiOTFjMjczMTE2 YzY3ODA5MTg5MmQ4YTYyOTAxMWM3MWQ3Ni4uMmY0ZDEyNzdkNmVkYTEzZGZlMWE5NDNjYThlNzk1 ZGVlNDNjNDM5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29sbGVjdGlvbkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbGxlY3Rpb25Db250ZW50Vmlldy5qcwpAQCAtMTMx LDYgKzEzMSwxMCBAQCBXSS5Db2xsZWN0aW9uQ29udGVudFZpZXcgPSBjbGFzcyBDb2xsZWN0aW9u Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLmFkZFN1YnZp ZXcoY29udGVudFZpZXcpOwogICAgICAgICB0aGlzLmNvbnRlbnRWaWV3QWRkZWQoY29udGVudFZp ZXcpOwogCisgICAgICAgIGlmICghdGhpcy52aXNpYmxlKQorICAgICAgICAgICAgcmV0dXJuOwor CisgICAgICAgIGNvbnRlbnRWaWV3LnZpc2libGUgPSB0cnVlOwogICAgICAgICBjb250ZW50Vmll dy5zaG93bigpOwogICAgIH0KIApAQCAtMTUxLDcgKzE1NSwxMCBAQCBXSS5Db2xsZWN0aW9uQ29u dGVudFZpZXcgPSBjbGFzcyBDb2xsZWN0aW9uQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmlldwogICAgICAgICB0aGlzLl9jb250ZW50Vmlld01hcC5kZWxldGUoaXRlbSk7CiAgICAgICAg IHRoaXMuY29udGVudFZpZXdSZW1vdmVkKGNvbnRlbnRWaWV3KTsKIAotICAgICAgICBjb250ZW50 Vmlldy5oaWRkZW4oKTsKKyAgICAgICAgaWYgKHRoaXMudmlzaWJsZSkgeworICAgICAgICAgICAg Y29udGVudFZpZXcudmlzaWJsZSA9IGZhbHNlOworICAgICAgICAgICAgY29udGVudFZpZXcuaGlk ZGVuKCk7CisgICAgICAgIH0KIAogICAgICAgICBjb250ZW50Vmlldy5yZW1vdmVFdmVudExpc3Rl bmVyKG51bGwsIG51bGwsIHRoaXMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5jc3MKaW5kZXggZjNiYzA0NzQz MTJmZDcxYjRlYTU4OTIzMzUzMzg4NWRmZjI1MGExYy4uYjA1YWM0NzdhZGUwODM3Mjk4NGRkYTVh OTAyN2VmOWE3ZGJkODk3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmNzcwpAQCAtMjQyLDYgKzI0MiwxMCBA QCBib2R5W2Rpcj1ydGxdIC50cmVlLW91dGxpbmUgLml0ZW0gLnN0YXR1cyB7CiAgICAgaGVpZ2h0 OiAxNHB4OwogfQogCisudHJlZS1vdXRsaW5lOm5vdCgubGFyZ2UpOm1hdGNoZXMoOmZvY3VzLCAu Zm9yY2UtZm9jdXMpIC5pdGVtLnNlbGVjdGVkIC5zdGF0dXMgLmluZGV0ZXJtaW5hdGUtcHJvZ3Jl c3Mtc3Bpbm5lciB7CisgICAgZmlsdGVyOiBpbnZlcnQoKTsKK30KKwogLnRyZWUtb3V0bGluZSAu aXRlbSAudGl0bGU6OmFmdGVyIHsKICAgICBjb250ZW50OiAiIjsKIH0K 333548 2018-02-09 18:34:07 -0800 2018-02-09 21:32:55 -0800 Patch bug-182667-20180209183406.patch text/plain 12362 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz ZGI2YzIzNzhlYTdjZjI5MGFkNDJiMDBmMmI3ZmE5MjViY2NkNzY1Li41YmIwZDMyNWY1NWM0MmJi MTY2YzRjNjk0MTBmN2M4ZmE0ODFjNWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw1NSBAQAogMjAxOC0wMi0wOSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FudmFzIHRhYjogdHJlZSBzZWxlY3Rpb24gYWJy dXB0bHkgY2hhbmdlcyB3aGVuIHNlbGVjdGluZyBhIHJlY29yZGluZyBmcmFtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNjY3CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zNzQxMjYzOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVs LmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNv bnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIpOgorICAgICAgICAo LnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6bm90KC5oYXMtcmVjb3JkaW5ncykg PiAuZmlsdGVyLWJhciwpOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5j YW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC50cmVlLW91dGxpbmUgLml0 ZW0ucmVjb3JkaW5nID4gLmljb24pOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC50cmVlLW91dGxp bmUgLml0ZW0uZm9sZGVyLWljb24gPiAuaWNvbik6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5l bC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLnJlY29yZGluZy1jb250ZW50ID4gLnRy ZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5zdGF0dXMpOgorICAgICAgICAoLnNpZGVi YXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5uYXZpZ2F0aW9uLWJh cik6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZh cyA+IC5jb250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5yZWNvcmRpbmcgPiAuaWNvbik6IERl bGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5j b250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5pY29uKTogRGVsZXRl ZC4KKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRl bnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLmZvbGRlci1pY29uID4gLnN0YXR1cyk6IERlbGV0ZWQu CisgICAgICAgIFN0eWxlIGNoYW5nZXMgZm9yIHRoZSBhZGRpdGlvbmFsIERPTSBlbGVtZW50IHJl cXVpcmVkIHRvIHZpcnR1YWxpemUgdGhlIHJlY29yZGluZyB0cmVlIG91dGxpbmUuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAg KFdJLkNhbnZhc1NpZGViYXJQYW5lbCk6CisgICAgICAgIEluIG9yZGVyIHRvIGJlIHZpcnR1YWxp emVkLCB0aGUgdHJlZSBtdXN0IGJlIHRoZSBvbmx5IGNoaWxkIG9mIGl0cyBwYXJlbnQuCisKKyAg ICAgICAgKFdJLkNhbnZhc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuc2V0IGFjdGlvbik6CisgICAg ICAgIEVuc3VyZSB0aGF0IGEgZnJhbWUgdHJlZSBlbGVtZW50IGlzbid0IGRlc2VsZWN0ZWQgd2hl biB0aGUgbGFzdCBhY3Rpb24KKyAgICAgICAgaW4gdGhlIGZyYW1lIGJlY29tZXMgc2VsZWN0ZWQg aW4gdGhlIFJlY29yZGluZ0NvbnRlbnRWaWV3LgorCisgICAgICAgIChXSS5DYW52YXNTaWRlYmFy UGFuZWwucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgUmVmcmVzaCB0aGUgc2lkZWJhciwgYXMg cmVwcmVzZW50ZWQgb2JqZWN0cyBtYXkgaGF2ZSBjaGFuZ2VkIHdoaWxlIGhpZGRlbi4KKworICAg ICAgICAoV0kuQ2FudmFzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY3VycmVudFJlcHJlc2VudGVk T2JqZWN0c0RpZENoYW5nZSk6CisgICAgICAgIFVuc2V0IHRoZSByZWNvcmRpbmcgd2hlbiBubyB2 YWxpZCByZXByZXNlbnRlZCBvYmplY3RzIGFyZSBmb3VuZCwgdG8KKyAgICAgICAgcHJldmVudCBh IHN0YWxlIHJlY29yZGluZyB0cmVlIGZyb20gYmVpbmcgc2hvd24gd2hlbiB2aWV3aW5nIHRoZSBv dmVydmlldy4KKworICAgICAgICAoV0kuQ2FudmFzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY2Fu dmFzQ2hhbmdlZCk6CisgICAgICAgIChXSS5DYW52YXNTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9y ZWNvcmRpbmdDaGFuZ2VkKToKKyAgICAgICAgKFdJLkNhbnZhc1NpZGViYXJQYW5lbC5wcm90b3R5 cGUuX3VwZGF0ZVJlY29yZGluZ1Njb3BlQmFyKToKKyAgICAgICAgTW92ZWQgdG9nZ2xpbmcgb2Yg dGhlICJoYXMtcmVjb3JkaW5ncyIgc3R5bGUgdG8gX2NhbnZhc0NoYW5nZWQsIHNpbmNlCisgICAg ICAgIHRoZSBuYXZpZ2F0aW9uIGJhciBzaG91bGQgYmUgaGlkZGVuIHdoZW4gbm8gY2FudmFzIGV4 aXN0cy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29sbGVjdGlvbkNvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV0kuQ29sbGVjdGlvbkNvbnRlbnRWaWV3LnByb3RvdHlwZS5hZGRD b250ZW50Vmlld0Zvckl0ZW0pOgorICAgICAgICAoV0kuQ29sbGVjdGlvbkNvbnRlbnRWaWV3LnBy b3RvdHlwZS5yZW1vdmVDb250ZW50Vmlld0Zvckl0ZW0pOgorICAgICAgICBEcml2ZSBieSBmaXhl cyBmb3IgY2hpbGQgdmlldyB2aXNpYmxlIHN0YXRlLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9UcmVlT3V0bGluZS5jc3M6CisgICAgICAgICgudHJlZS1vdXRsaW5lOm5vdCgubGFy Z2UpOm1hdGNoZXMoOmZvY3VzLCAuZm9yY2UtZm9jdXMpIC5pdGVtLnNlbGVjdGVkIC5zdGF0dXMg LmluZGV0ZXJtaW5hdGUtcHJvZ3Jlc3Mtc3Bpbm5lcik6CisgICAgICAgIE1ha2Ugc3Bpbm5lciBl YXNpZXIgdG8gc2VlIGFnYWluc3QgdGhlIHNlbGVjdGlvbiBiYWNrZ3JvdW5kIGNvbG9yLgorCisy MDE4LTAyLTA5ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBPYmplY3Quc2hhbGxvd0VxdWFsIGFsd2F5cyBmYWlscyB3aGVuIGNvbXBh cmluZyBhcnJheSBwcm9wZXJ0eSB2YWx1ZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4MjYzNAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzczNzQ2 Mzk+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DYW52YXNTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmNzcwppbmRleCBkYjViMDY4NGVmODFiYmI5 OWE3MWZiZTE5NTZlOWU3MmE2NWJlMDY1Li44ZTlmNWUyMDE3MDFmYTcxOWJiMzU1OGRkOGUwOThh YTAwMjkxYWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5jc3MKQEAgLTQwLDcgKzQw LDcgQEAKICAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL0NhbnZhczNELnN2Zyk7CiB9CiAKLS5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAubmF2aWdhdGlv bi1iYXIgeworLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+ IC5yZWNvcmRpbmctY29udGVudCA+IC5uYXZpZ2F0aW9uLWJhciB7CiAgICAgYm9yZGVyLXRvcDog MXB4IHNvbGlkIHZhcigtLWJvcmRlci1jb2xvcik7CiB9CiAKQEAgLTUwLDIyICs1MCwyNiBAQAog fQogCiAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhczpub3QoLmhhcy1yZWNvcmRp bmdzKSA+IC5maWx0ZXItYmFyLAotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6 bm90KC5oYXMtcmVjb3JkaW5ncykgPiAuY29udGVudCA+IC5uYXZpZ2F0aW9uLWJhciB7Cisuc2lk ZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhczpub3QoLmhhcy1yZWNvcmRpbmdzKSA+IC5j b250ZW50ID4gLnJlY29yZGluZy1jb250ZW50IHsKICAgICBkaXNwbGF5OiBub25lOwogfQogCi0u c2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLnRyZWUtb3V0 bGluZSAuaXRlbS5yZWNvcmRpbmcgPiAuaWNvbiB7Ci0gICAgY29udGVudDogdXJsKC4uL0ltYWdl cy9SZWNvcmRpbmcuc3ZnKTsKLX0KLQogLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52 YXMgPiAuY29udGVudCA+IC50cmVlLW91dGxpbmUgLml0ZW0uc2hhZGVyLXByb2dyYW0gPiAuaWNv biB7CiAgICAgY29udGVudDogaW1hZ2Utc2V0KHVybCguLi9JbWFnZXMvRG9jdW1lbnRHTC5wbmcp IDF4LCB1cmwoLi4vSW1hZ2VzL0RvY3VtZW50R0xAMngucG5nKSAyeCk7CiB9CiAKLS5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5p dGVtLmZvbGRlci1pY29uID4gLmljb24geworLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5j YW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC50cmVlLW91dGxpbmUgLml0 ZW0ucmVjb3JkaW5nID4gLmljb24geworICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUmVjb3Jk aW5nLnN2Zyk7Cit9CisKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNv bnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLmZvbGRlci1p Y29uID4gLmljb24gewogICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUmVuZGVyaW5nRnJhbWUu c3ZnKTsKIH0KIAotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVu dCA+IC50cmVlLW91dGxpbmUgLml0ZW0uZm9sZGVyLWljb24gPiAuc3RhdHVzIHsKKy5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRl bnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLmZvbGRlci1pY29uID4gLnN0YXR1cyB7CisgICAgbGlu ZS1oZWlnaHQ6IDE2cHg7Cit9CisKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFz ID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLmZv bGRlci1pY29uID4gLnN0YXR1cyB7CiAgICAgbGluZS1oZWlnaHQ6IDE2cHg7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRl YmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D YW52YXNTaWRlYmFyUGFuZWwuanMKaW5kZXggZTE5NGU5MDY2NzM3NmQzYWRhN2JiMWFjOTYzNzEw YjljM2IxYjVhYy4uZGRhMmQ5MDJlNzgyNDQ0NmEwYjI1YmZiMTI0ODQ1NDc5NWM2Nzc0MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFz U2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qcwpAQCAtNDgsMTEgKzQ4LDE4IEBAIFdJLkNhbnZh c1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmln YXRpb25TaWRlYmFyUGFuCiAgICAgICAgIHRoaXMuX2NhbnZhc1RyZWVPdXRsaW5lID0gdGhpcy5j cmVhdGVDb250ZW50VHJlZU91dGxpbmUoc3VwcHJlc3NGaWx0ZXJpbmcpOwogICAgICAgICB0aGlz Ll9jYW52YXNUcmVlT3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImNhbnZhcyIpOwogCisg ICAgICAgIGxldCByZWNvcmRpbmdDb250ZW50ID0gdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICAgICAgcmVjb3Jk aW5nQ29udGVudC5jbGFzc05hbWUgPSAicmVjb3JkaW5nLWNvbnRlbnQiOworCiAgICAgICAgIHRo aXMuX3JlY29yZGluZ05hdmlnYXRpb25CYXIgPSBuZXcgV0kuTmF2aWdhdGlvbkJhcjsKLSAgICAg ICAgdGhpcy5jb250ZW50Vmlldy5hZGRTdWJ2aWV3KHRoaXMuX3JlY29yZGluZ05hdmlnYXRpb25C YXIpOworICAgICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyLmVsZW1lbnQuY2xhc3NM aXN0LmFkZCgiaGlkZGVuIik7CisgICAgICAgIHJlY29yZGluZ0NvbnRlbnQuYXBwZW5kQ2hpbGQo dGhpcy5fcmVjb3JkaW5nTmF2aWdhdGlvbkJhci5lbGVtZW50KTsKIAogICAgICAgICB0aGlzLl9y ZWNvcmRpbmdUcmVlT3V0bGluZSA9IHRoaXMuY29udGVudFRyZWVPdXRsaW5lOwotICAgICAgICB0 aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fcmVjb3JkaW5nVHJlZU91 dGxpbmUuZWxlbWVudCk7CisgICAgICAgIHJlY29yZGluZ0NvbnRlbnQuYXBwZW5kQ2hpbGQodGhp cy5fcmVjb3JkaW5nVHJlZU91dGxpbmUuZWxlbWVudCk7CisKKyAgICAgICAgdGhpcy5fcmVjb3Jk aW5nVHJlZU91dGxpbmUuY3VzdG9tSW5kZW50ID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fcmVjb3Jk aW5nVHJlZU91dGxpbmUucmVnaXN0ZXJTY3JvbGxWaXJ0dWFsaXplcihyZWNvcmRpbmdDb250ZW50 LCAyMCk7CiAKICAgICAgICAgdGhpcy5fY2FudmFzVHJlZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5l cihXSS5UcmVlT3V0bGluZS5FdmVudC5TZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMuX3RyZWVPdXRs aW5lU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nVHJl ZU91dGxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXSS5UcmVlT3V0bGluZS5FdmVudC5TZWxlY3Rpb25E aWRDaGFuZ2UsIHRoaXMuX3RyZWVPdXRsaW5lU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKQEAg LTEwNCw2ICsxMTEsMTkgQEAgV0kuQ2FudmFzU2lkZWJhclBhbmVsID0gY2xhc3MgQ2FudmFzU2lk ZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYXJQYW4KICAgICAgICAgaWYgKCF0 aGlzLl9yZWNvcmRpbmcpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgbGV0IHNlbGVj dGVkVHJlZUVsZW1lbnQgPSB0aGlzLl9yZWNvcmRpbmdUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVF bGVtZW50OworICAgICAgICBpZiAoIWFjdGlvbikgeworICAgICAgICAgICAgaWYgKHNlbGVjdGVk VHJlZUVsZW1lbnQpCisgICAgICAgICAgICAgICAgc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVj dCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHNlbGVj dGVkVHJlZUVsZW1lbnQgJiYgc2VsZWN0ZWRUcmVlRWxlbWVudCBpbnN0YW5jZW9mIFdJLkZvbGRl clRyZWVFbGVtZW50KSB7CisgICAgICAgICAgICBsZXQgbGFzdEFjdGlvblRyZWVFbGVtZW50ID0g c2VsZWN0ZWRUcmVlRWxlbWVudC5jaGlsZHJlbi5sYXN0VmFsdWU7CisgICAgICAgICAgICBpZiAo YWN0aW9uID09PSBsYXN0QWN0aW9uVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QpCisgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgbGV0IHRyZWVFbGVtZW50 ID0gdGhpcy5fcmVjb3JkaW5nVHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KGFjdGlvbik7CiAg ICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRyZWVFbGVtZW50LCAiTWlzc2luZyB0cmVlIGVsZW1lbnQg Zm9yIHJlY29yZGluZyBhY3Rpb24uIiwgYWN0aW9uKTsKICAgICAgICAgaWYgKCF0cmVlRWxlbWVu dCkKQEAgLTEyMSw2ICsxNDEsNyBAQCBXSS5DYW52YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52 YXNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAgICBz dXBlci5zaG93bigpOwogCiAgICAgICAgIHRoaXMuY29udGVudEJyb3dzZXIuYWRkRXZlbnRMaXN0 ZW5lcihXSS5Db250ZW50QnJvd3Nlci5FdmVudC5DdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlk Q2hhbmdlLCB0aGlzLl9jdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlLCB0aGlzKTsK KyAgICAgICAgdGhpcy5fY3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZSgpOwogICAg IH0KIAogICAgIGhpZGRlbigpCkBAIC0yMzQsNiArMjU1LDcgQEAgV0kuQ2FudmFzU2lkZWJhclBh bmVsID0gY2xhc3MgQ2FudmFzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGVi YXJQYW4KICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuY2FudmFzID0gbnVsbDsKKyAgICAgICAg dGhpcy5yZWNvcmRpbmcgPSBudWxsOwogICAgIH0KIAogICAgIF90cmVlT3V0bGluZVNlbGVjdGlv bkRpZENoYW5nZShldmVudCkKQEAgLTI2NSw4ICsyODcsMTAgQEAgV0kuQ2FudmFzU2lkZWJhclBh bmVsID0gY2xhc3MgQ2FudmFzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGVi YXJQYW4KICAgICB7CiAgICAgICAgIHRoaXMuX2NhbnZhc1RyZWVPdXRsaW5lLnJlbW92ZUNoaWxk cmVuKCk7CiAKLSAgICAgICAgaWYgKCF0aGlzLl9jYW52YXMpCisgICAgICAgIGlmICghdGhpcy5f Y2FudmFzKSB7CisgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyLmVsZW1l bnQuY2xhc3NMaXN0LmFkZCgiaGlkZGVuIik7CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KIAogICAgICAgICBjb25zdCBzaG93UmVjb3JkaW5ncyA9IGZhbHNlOwogICAgICAgICBsZXQg Y2FudmFzVHJlZUVsZW1lbnQgPSBuZXcgV0kuQ2FudmFzVHJlZUVsZW1lbnQodGhpcy5fY2FudmFz LCBzaG93UmVjb3JkaW5ncyk7CkBAIC0yOTAsNiArMzE0LDcgQEAgV0kuQ2FudmFzU2lkZWJhclBh bmVsID0gY2xhc3MgQ2FudmFzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGVi YXJQYW4KICAgICBfcmVjb3JkaW5nQ2hhbmdlZCgpCiAgICAgewogICAgICAgICB0aGlzLl9yZWNv cmRpbmdUcmVlT3V0bGluZS5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLmVsZW1lbnQu Y2xhc3NMaXN0LnRvZ2dsZSgiaGFzLXJlY29yZGluZ3MiLCAhIXRoaXMuX3JlY29yZGluZyk7CiAK ICAgICAgICAgaWYgKCF0aGlzLl9yZWNvcmRpbmcpCiAgICAgICAgICAgICByZXR1cm47CkBAIC0z NTYsMTAgKzM4MSw5IEBAIFdJLkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGVi YXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAgICAgICAgICB0aGlz Ll9zY29wZUJhciA9IG51bGw7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXRoaXMuX2NhbnZh cyB8fCAhdGhpcy5fY2FudmFzLnJlY29yZGluZ0NvbGxlY3Rpb24uaXRlbXMuc2l6ZSkgewotICAg ICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoImhhcy1yZWNvcmRpbmdzIik7 CisgICAgICAgIHRoaXMuX3JlY29yZGluZ05hdmlnYXRpb25CYXIuZWxlbWVudC5jbGFzc0xpc3Qu dG9nZ2xlKCJoaWRkZW4iLCAhdGhpcy5fY2FudmFzIHx8ICF0aGlzLl9yZWNvcmRpbmcpOworICAg ICAgICBpZiAoIXRoaXMuX3JlY29yZGluZyB8fCAhdGhpcy5fY2FudmFzKQogICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9CiAKICAgICAgICAgbGV0IHNjb3BlQmFySXRlbXMgPSBbXTsKICAg ICAgICAgbGV0IHNlbGVjdGVkU2NvcGVCYXJJdGVtID0gbnVsbDsKQEAgLTM3Nyw4ICs0MDEsNiBA QCBXSS5DYW52YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52YXNTaWRlYmFyUGFuZWwgZXh0ZW5k cyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAgICB0aGlzLl9zY29wZUJhciA9IG5ldyBX SS5TY29wZUJhcigiY2FudmFzLXJlY29yZGluZ2Etc2NvcGUtYmFyIiwgc2NvcGVCYXJJdGVtcywg c2VsZWN0ZWRTY29wZUJhckl0ZW0sIHRydWUpOwogICAgICAgICB0aGlzLl9zY29wZUJhci5hZGRF dmVudExpc3RlbmVyKFdJLlNjb3BlQmFyLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHRoaXMuX3Nj b3BlQmFyU2VsZWN0aW9uQ2hhbmdlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3JlY29yZGluZ05h dmlnYXRpb25CYXIuaW5zZXJ0TmF2aWdhdGlvbkl0ZW0odGhpcy5fc2NvcGVCYXIsIDApOwotCi0g ICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJoYXMtcmVjb3JkaW5ncyIpOwogICAg IH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvbGxlY3Rpb25Db250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvbGxlY3Rpb25Db250ZW50Vmlldy5qcwppbmRleCBlNDgxN2I5 MWMyNzMxMTZjNjc4MDkxODkyZDhhNjI5MDExYzcxZDc2Li4yZjRkMTI3N2Q2ZWRhMTNkZmUxYTk0 M2NhOGU3OTVkZWU0M2M0MzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db2xsZWN0aW9uQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29sbGVjdGlvbkNvbnRlbnRWaWV3Lmpz CkBAIC0xMzEsNiArMTMxLDEwIEBAIFdJLkNvbGxlY3Rpb25Db250ZW50VmlldyA9IGNsYXNzIENv bGxlY3Rpb25Db250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMu YWRkU3Vidmlldyhjb250ZW50Vmlldyk7CiAgICAgICAgIHRoaXMuY29udGVudFZpZXdBZGRlZChj b250ZW50Vmlldyk7CiAKKyAgICAgICAgaWYgKCF0aGlzLnZpc2libGUpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgY29udGVudFZpZXcudmlzaWJsZSA9IHRydWU7CiAgICAgICAgIGNv bnRlbnRWaWV3LnNob3duKCk7CiAgICAgfQogCkBAIC0xNTEsNyArMTU1LDEwIEBAIFdJLkNvbGxl Y3Rpb25Db250ZW50VmlldyA9IGNsYXNzIENvbGxlY3Rpb25Db250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3TWFwLmRlbGV0ZShpdGVtKTsK ICAgICAgICAgdGhpcy5jb250ZW50Vmlld1JlbW92ZWQoY29udGVudFZpZXcpOwogCi0gICAgICAg IGNvbnRlbnRWaWV3LmhpZGRlbigpOworICAgICAgICBpZiAodGhpcy52aXNpYmxlKSB7CisgICAg ICAgICAgICBjb250ZW50Vmlldy52aXNpYmxlID0gZmFsc2U7CisgICAgICAgICAgICBjb250ZW50 Vmlldy5oaWRkZW4oKTsKKyAgICAgICAgfQogCiAgICAgICAgIGNvbnRlbnRWaWV3LnJlbW92ZUV2 ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmNzcwppbmRleCBm M2JjMDQ3NDMxMmZkNzFiNGVhNTg5MjMzNTMzODg1ZGZmMjUwYTFjLi5iMDVhYzQ3N2FkZTA4Mzcy OTg0ZGRhNWE5MDI3ZWY5YTdkYmQ4OTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5jc3MKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuY3NzCkBAIC0yNDIsNiAr MjQyLDEwIEBAIGJvZHlbZGlyPXJ0bF0gLnRyZWUtb3V0bGluZSAuaXRlbSAuc3RhdHVzIHsKICAg ICBoZWlnaHQ6IDE0cHg7CiB9CiAKKy50cmVlLW91dGxpbmU6bm90KC5sYXJnZSk6bWF0Y2hlcyg6 Zm9jdXMsIC5mb3JjZS1mb2N1cykgLml0ZW0uc2VsZWN0ZWQgLnN0YXR1cyAuaW5kZXRlcm1pbmF0 ZS1wcm9ncmVzcy1zcGlubmVyIHsKKyAgICBmaWx0ZXI6IGludmVydCgpOworfQorCiAudHJlZS1v dXRsaW5lIC5pdGVtIC50aXRsZTo6YWZ0ZXIgewogICAgIGNvbnRlbnQ6ICIiOwogfQo= 333552 2018-02-09 21:32:57 -0800 2018-02-09 22:15:51 -0800 Patch for landing bug-182667-20180209213256.patch text/plain 12216 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz ZGI2YzIzNzhlYTdjZjI5MGFkNDJiMDBmMmI3ZmE5MjViY2NkNzY1Li4yNzdiYzU0ZDdiNmNlMDU3 MmE2YmY2ZGEyZjY3YzM5Yzc4YTMxYTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw1NSBAQAogMjAxOC0wMi0wOSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FudmFzIHRhYjogdHJlZSBzZWxlY3Rpb24gYWJy dXB0bHkgY2hhbmdlcyB3aGVuIHNlbGVjdGluZyBhIHJlY29yZGluZyBmcmFtZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNjY3CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zNzQxMjYzOT4KKworICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vz c28uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5j c3M6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250 ZW50ID4gLnJlY29yZGluZy1jb250ZW50ID4gLm5hdmlnYXRpb24tYmFyKToKKyAgICAgICAgKC5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzOm5vdCguaGFzLXJlY29yZGluZ3MpID4g LmZpbHRlci1iYXIsKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2Fu dmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5pdGVt LnJlY29yZGluZyA+IC5pY29uKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRp b24uY2FudmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAudHJlZS1vdXRsaW5l IC5pdGVtLmZvbGRlci1pY29uID4gLmljb24pOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwu bmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+IC5yZWNvcmRpbmctY29udGVudCA+IC50cmVl LW91dGxpbmUgLml0ZW0uZm9sZGVyLWljb24gPiAuc3RhdHVzKToKKyAgICAgICAgKC5zaWRlYmFy ID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIp OiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMg PiAuY29udGVudCA+IC50cmVlLW91dGxpbmUgLml0ZW0ucmVjb3JkaW5nID4gLmljb24pOiBEZWxl dGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29u dGVudCA+IC50cmVlLW91dGxpbmUgLml0ZW0uZm9sZGVyLWljb24gPiAuaWNvbik6IERlbGV0ZWQu CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50 ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5zdGF0dXMpOiBEZWxldGVkLgor ICAgICAgICBTdHlsZSBjaGFuZ2VzIGZvciB0aGUgYWRkaXRpb25hbCBET00gZWxlbWVudCByZXF1 aXJlZCB0byB2aXJ0dWFsaXplIHRoZSByZWNvcmRpbmcgdHJlZSBvdXRsaW5lLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChX SS5DYW52YXNTaWRlYmFyUGFuZWwpOgorICAgICAgICBJbiBvcmRlciB0byBiZSB2aXJ0dWFsaXpl ZCwgdGhlIHRyZWUgbXVzdCBiZSB0aGUgb25seSBjaGlsZCBvZiBpdHMgcGFyZW50LgorCisgICAg ICAgIChXSS5DYW52YXNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNldCBhY3Rpb24pOgorICAgICAg ICBFbnN1cmUgdGhhdCBhIGZyYW1lIHRyZWUgZWxlbWVudCBpc24ndCBkZXNlbGVjdGVkIHdoZW4g dGhlIGxhc3QgYWN0aW9uCisgICAgICAgIGluIHRoZSBmcmFtZSBiZWNvbWVzIHNlbGVjdGVkIGlu IHRoZSBSZWNvcmRpbmdDb250ZW50Vmlldy4KKworICAgICAgICAoV0kuQ2FudmFzU2lkZWJhclBh bmVsLnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIFJlZnJlc2ggdGhlIHNpZGViYXIsIGFzIHJl cHJlc2VudGVkIG9iamVjdHMgbWF5IGhhdmUgY2hhbmdlZCB3aGlsZSBoaWRkZW4uCisKKyAgICAg ICAgKFdJLkNhbnZhc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX2N1cnJlbnRSZXByZXNlbnRlZE9i amVjdHNEaWRDaGFuZ2UpOgorICAgICAgICBVbnNldCB0aGUgcmVjb3JkaW5nIHdoZW4gbm8gdmFs aWQgcmVwcmVzZW50ZWQgb2JqZWN0cyBhcmUgZm91bmQsIHRvCisgICAgICAgIHByZXZlbnQgYSBz dGFsZSByZWNvcmRpbmcgdHJlZSBmcm9tIGJlaW5nIHNob3duIHdoZW4gdmlld2luZyB0aGUgb3Zl cnZpZXcuCisKKyAgICAgICAgKFdJLkNhbnZhc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX2NhbnZh c0NoYW5nZWQpOgorICAgICAgICAoV0kuQ2FudmFzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVj b3JkaW5nQ2hhbmdlZCk6CisgICAgICAgIChXSS5DYW52YXNTaWRlYmFyUGFuZWwucHJvdG90eXBl Ll91cGRhdGVSZWNvcmRpbmdTY29wZUJhcik6CisgICAgICAgIE1vdmVkIHRvZ2dsaW5nIG9mIHRo ZSAiaGFzLXJlY29yZGluZ3MiIHN0eWxlIHRvIF9jYW52YXNDaGFuZ2VkLCBzaW5jZQorICAgICAg ICB0aGUgbmF2aWdhdGlvbiBiYXIgc2hvdWxkIGJlIGhpZGRlbiB3aGVuIG5vIGNhbnZhcyBleGlz dHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbGxlY3Rpb25Db250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkNvbGxlY3Rpb25Db250ZW50Vmlldy5wcm90b3R5cGUuYWRkQ29u dGVudFZpZXdGb3JJdGVtKToKKyAgICAgICAgKFdJLkNvbGxlY3Rpb25Db250ZW50Vmlldy5wcm90 b3R5cGUucmVtb3ZlQ29udGVudFZpZXdGb3JJdGVtKToKKyAgICAgICAgRHJpdmUgYnkgZml4ZXMg Zm9yIGNoaWxkIHZpZXcgdmlzaWJsZSBzdGF0ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVHJlZU91dGxpbmUuY3NzOgorICAgICAgICAoLnRyZWUtb3V0bGluZTpub3QoLmxhcmdl KTptYXRjaGVzKDpmb2N1cywgLmZvcmNlLWZvY3VzKSAuaXRlbS5zZWxlY3RlZCAuc3RhdHVzIC5p bmRldGVybWluYXRlLXByb2dyZXNzLXNwaW5uZXIpOgorICAgICAgICBNYWtlIHNwaW5uZXIgZWFz aWVyIHRvIHNlZSBhZ2FpbnN0IHRoZSBzZWxlY3Rpb24gYmFja2dyb3VuZCBjb2xvci4KKworMjAx OC0wMi0wOSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogT2JqZWN0LnNoYWxsb3dFcXVhbCBhbHdheXMgZmFpbHMgd2hlbiBjb21wYXJp bmcgYXJyYXkgcHJvcGVydHkgdmFsdWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODI2MzQKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3Mzc0NjM5 PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q2FudmFzU2lkZWJhclBhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5jc3MKaW5kZXggZGI1YjA2ODRlZjgxYmJiOTlh NzFmYmUxOTU2ZTllNzJhNjViZTA2NS4uNmRmY2U5MTZiOTU0YWJiY2YzZTNjODIzNTUwYWFkMzli ZjY5YjJlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuY3NzCkBAIC00MCw3ICs0MCw3 IEBACiAgICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9DYW52YXMzRC5zdmcpOwogfQogCi0uc2lk ZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLm5hdmlnYXRpb24t YmFyIHsKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQgPiAu cmVjb3JkaW5nLWNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIgewogICAgIGJvcmRlci10b3A6IDFw eCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOwogfQogCkBAIC01MCwyMiArNTAsMjIgQEAKIH0K IAogLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6bm90KC5oYXMtcmVjb3JkaW5n cykgPiAuZmlsdGVyLWJhciwKLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzOm5v dCguaGFzLXJlY29yZGluZ3MpID4gLmNvbnRlbnQgPiAubmF2aWdhdGlvbi1iYXIgeworLnNpZGVi YXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXM6bm90KC5oYXMtcmVjb3JkaW5ncykgPiAuY29u dGVudCA+IC5yZWNvcmRpbmctY29udGVudCB7CiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotLnNp ZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5jYW52YXMgPiAuY29udGVudCA+IC50cmVlLW91dGxp bmUgLml0ZW0ucmVjb3JkaW5nID4gLmljb24gewotICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMv UmVjb3JkaW5nLnN2Zyk7Ci19Ci0KIC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFz ID4gLmNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5pdGVtLnNoYWRlci1wcm9ncmFtID4gLmljb24g ewogICAgIGNvbnRlbnQ6IGltYWdlLXNldCh1cmwoLi4vSW1hZ2VzL0RvY3VtZW50R0wucG5nKSAx eCwgdXJsKC4uL0ltYWdlcy9Eb2N1bWVudEdMQDJ4LnBuZykgMngpOwogfQogCi0uc2lkZWJhciA+ IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRl bS5mb2xkZXItaWNvbiA+IC5pY29uIHsKKy5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2Fu dmFzID4gLmNvbnRlbnQgPiAucmVjb3JkaW5nLWNvbnRlbnQgPiAudHJlZS1vdXRsaW5lIC5pdGVt LnJlY29yZGluZyA+IC5pY29uIHsKKyAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL1JlY29yZGlu Zy5zdmcpOworfQorCisuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250 ZW50ID4gLnJlY29yZGluZy1jb250ZW50ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNv biA+IC5pY29uIHsKICAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL1JlbmRlcmluZ0ZyYW1lLnN2 Zyk7CiB9CiAKLS5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uY2FudmFzID4gLmNvbnRlbnQg PiAudHJlZS1vdXRsaW5lIC5pdGVtLmZvbGRlci1pY29uID4gLnN0YXR1cyB7Cisuc2lkZWJhciA+ IC5wYW5lbC5uYXZpZ2F0aW9uLmNhbnZhcyA+IC5jb250ZW50ID4gLnJlY29yZGluZy1jb250ZW50 ID4gLnRyZWUtb3V0bGluZSAuaXRlbS5mb2xkZXItaWNvbiA+IC5zdGF0dXMgewogICAgIGxpbmUt aGVpZ2h0OiAxNnB4OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzU2lkZWJhclBhbmVsLmpzCmluZGV4IGUxOTRl OTA2NjczNzZkM2FkYTdiYjFhYzk2MzcxMGI5YzNiMWI1YWMuLmRkYTJkOTAyZTc4MjQ0NDZhMGIy NWJmYjEyNDg0NTQ3OTVjNjc3NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNTaWRlYmFyUGFuZWwuanMKQEAg LTQ4LDExICs0OCwxOCBAQCBXSS5DYW52YXNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDYW52YXNTaWRl YmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclBhbgogICAgICAgICB0aGlzLl9j YW52YXNUcmVlT3V0bGluZSA9IHRoaXMuY3JlYXRlQ29udGVudFRyZWVPdXRsaW5lKHN1cHByZXNz RmlsdGVyaW5nKTsKICAgICAgICAgdGhpcy5fY2FudmFzVHJlZU91dGxpbmUuZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJjYW52YXMiKTsKIAorICAgICAgICBsZXQgcmVjb3JkaW5nQ29udGVudCA9IHRo aXMuY29udGVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKSk7CisgICAgICAgIHJlY29yZGluZ0NvbnRlbnQuY2xhc3NOYW1lID0gInJlY29yZGlu Zy1jb250ZW50IjsKKwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyID0gbmV3 IFdJLk5hdmlnYXRpb25CYXI7Ci0gICAgICAgIHRoaXMuY29udGVudFZpZXcuYWRkU3Vidmlldyh0 aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyKTsKKyAgICAgICAgdGhpcy5fcmVjb3JkaW5nTmF2 aWdhdGlvbkJhci5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImhpZGRlbiIpOworICAgICAgICByZWNv cmRpbmdDb250ZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZGluZ05hdmlnYXRpb25CYXIuZWxl bWVudCk7CiAKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nVHJlZU91dGxpbmUgPSB0aGlzLmNvbnRl bnRUcmVlT3V0bGluZTsKLSAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENo aWxkKHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmVsZW1lbnQpOworICAgICAgICByZWNvcmRp bmdDb250ZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmVsZW1lbnQp OworCisgICAgICAgIHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmN1c3RvbUluZGVudCA9IHRy dWU7CisgICAgICAgIHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLnJlZ2lzdGVyU2Nyb2xsVmly dHVhbGl6ZXIocmVjb3JkaW5nQ29udGVudCwgMjApOwogCiAgICAgICAgIHRoaXMuX2NhbnZhc1Ry ZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJlZU91dGxpbmUuRXZlbnQuU2VsZWN0aW9u RGlkQ2hhbmdlLCB0aGlzLl90cmVlT3V0bGluZVNlbGVjdGlvbkRpZENoYW5nZSwgdGhpcyk7CiAg ICAgICAgIHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJl ZU91dGxpbmUuRXZlbnQuU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzLl90cmVlT3V0bGluZVNlbGVj dGlvbkRpZENoYW5nZSwgdGhpcyk7CkBAIC0xMDQsNiArMTExLDE5IEBAIFdJLkNhbnZhc1NpZGVi YXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25T aWRlYmFyUGFuCiAgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nKQogICAgICAgICAgICAgcmV0 dXJuOwogCisgICAgICAgIGxldCBzZWxlY3RlZFRyZWVFbGVtZW50ID0gdGhpcy5fcmVjb3JkaW5n VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudDsKKyAgICAgICAgaWYgKCFhY3Rpb24pIHsK KyAgICAgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50KQorICAgICAgICAgICAgICAgIHNl bGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorCisgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50ICYmIHNlbGVjdGVkVHJlZUVs ZW1lbnQgaW5zdGFuY2VvZiBXSS5Gb2xkZXJUcmVlRWxlbWVudCkgeworICAgICAgICAgICAgbGV0 IGxhc3RBY3Rpb25UcmVlRWxlbWVudCA9IHNlbGVjdGVkVHJlZUVsZW1lbnQuY2hpbGRyZW4ubGFz dFZhbHVlOworICAgICAgICAgICAgaWYgKGFjdGlvbiA9PT0gbGFzdEFjdGlvblRyZWVFbGVtZW50 LnJlcHJlc2VudGVkT2JqZWN0KQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor CiAgICAgICAgIGxldCB0cmVlRWxlbWVudCA9IHRoaXMuX3JlY29yZGluZ1RyZWVPdXRsaW5lLmZp bmRUcmVlRWxlbWVudChhY3Rpb24pOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0cmVlRWxlbWVu dCwgIk1pc3NpbmcgdHJlZSBlbGVtZW50IGZvciByZWNvcmRpbmcgYWN0aW9uLiIsIGFjdGlvbik7 CiAgICAgICAgIGlmICghdHJlZUVsZW1lbnQpCkBAIC0xMjEsNiArMTQxLDcgQEAgV0kuQ2FudmFz U2lkZWJhclBhbmVsID0gY2xhc3MgQ2FudmFzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdh dGlvblNpZGViYXJQYW4KICAgICAgICAgc3VwZXIuc2hvd24oKTsKIAogICAgICAgICB0aGlzLmNv bnRlbnRCcm93c2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ29udGVudEJyb3dzZXIuRXZlbnQuQ3Vy cmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZSwgdGhpcy5fY3VycmVudFJlcHJlc2VudGVk T2JqZWN0c0RpZENoYW5nZSwgdGhpcyk7CisgICAgICAgIHRoaXMuX2N1cnJlbnRSZXByZXNlbnRl ZE9iamVjdHNEaWRDaGFuZ2UoKTsKICAgICB9CiAKICAgICBoaWRkZW4oKQpAQCAtMjM0LDYgKzI1 NSw3IEBAIFdJLkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBl eHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAgICAgIH0KIAogICAgICAgICB0aGlz LmNhbnZhcyA9IG51bGw7CisgICAgICAgIHRoaXMucmVjb3JkaW5nID0gbnVsbDsKICAgICB9CiAK ICAgICBfdHJlZU91dGxpbmVTZWxlY3Rpb25EaWRDaGFuZ2UoZXZlbnQpCkBAIC0yNjUsOCArMjg3 LDEwIEBAIFdJLkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBl eHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAgewogICAgICAgICB0aGlzLl9jYW52 YXNUcmVlT3V0bGluZS5yZW1vdmVDaGlsZHJlbigpOwogCi0gICAgICAgIGlmICghdGhpcy5fY2Fu dmFzKQorICAgICAgICBpZiAoIXRoaXMuX2NhbnZhcykgeworICAgICAgICAgICAgdGhpcy5fcmVj b3JkaW5nTmF2aWdhdGlvbkJhci5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImhpZGRlbiIpOwogICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAKICAgICAgICAgY29uc3Qgc2hvd1JlY29yZGlu Z3MgPSBmYWxzZTsKICAgICAgICAgbGV0IGNhbnZhc1RyZWVFbGVtZW50ID0gbmV3IFdJLkNhbnZh c1RyZWVFbGVtZW50KHRoaXMuX2NhbnZhcywgc2hvd1JlY29yZGluZ3MpOwpAQCAtMjkwLDYgKzMx NCw3IEBAIFdJLkNhbnZhc1NpZGViYXJQYW5lbCA9IGNsYXNzIENhbnZhc1NpZGViYXJQYW5lbCBl eHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUGFuCiAgICAgX3JlY29yZGluZ0NoYW5nZWQoKQog ICAgIHsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nVHJlZU91dGxpbmUucmVtb3ZlQ2hpbGRyZW4o KTsKKyAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImhhcy1yZWNvcmRpbmdz IiwgISF0aGlzLl9yZWNvcmRpbmcpOwogCiAgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nKQog ICAgICAgICAgICAgcmV0dXJuOwpAQCAtMzU2LDEwICszODEsOSBAQCBXSS5DYW52YXNTaWRlYmFy UGFuZWwgPSBjbGFzcyBDYW52YXNTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lk ZWJhclBhbgogICAgICAgICAgICAgdGhpcy5fc2NvcGVCYXIgPSBudWxsOwogICAgICAgICB9CiAK LSAgICAgICAgaWYgKCF0aGlzLl9jYW52YXMgfHwgIXRoaXMuX2NhbnZhcy5yZWNvcmRpbmdDb2xs ZWN0aW9uLml0ZW1zLnNpemUpIHsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3Qu cmVtb3ZlKCJoYXMtcmVjb3JkaW5ncyIpOworICAgICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0 aW9uQmFyLmVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgiaGlkZGVuIiwgIXRoaXMuX2NhbnZhcyB8 fCAhdGhpcy5fcmVjb3JkaW5nKTsKKyAgICAgICAgaWYgKCF0aGlzLl9yZWNvcmRpbmcgfHwgIXRo aXMuX2NhbnZhcykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQogCiAgICAgICAgIGxl dCBzY29wZUJhckl0ZW1zID0gW107CiAgICAgICAgIGxldCBzZWxlY3RlZFNjb3BlQmFySXRlbSA9 IG51bGw7CkBAIC0zNzcsOCArNDAxLDYgQEAgV0kuQ2FudmFzU2lkZWJhclBhbmVsID0gY2xhc3Mg Q2FudmFzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYXJQYW4KICAgICAg ICAgdGhpcy5fc2NvcGVCYXIgPSBuZXcgV0kuU2NvcGVCYXIoImNhbnZhcy1yZWNvcmRpbmdhLXNj b3BlLWJhciIsIHNjb3BlQmFySXRlbXMsIHNlbGVjdGVkU2NvcGVCYXJJdGVtLCB0cnVlKTsKICAg ICAgICAgdGhpcy5fc2NvcGVCYXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5TY29wZUJhci5FdmVudC5T ZWxlY3Rpb25DaGFuZ2VkLCB0aGlzLl9zY29wZUJhclNlbGVjdGlvbkNoYW5nZWQsIHRoaXMpOwog ICAgICAgICB0aGlzLl9yZWNvcmRpbmdOYXZpZ2F0aW9uQmFyLmluc2VydE5hdmlnYXRpb25JdGVt KHRoaXMuX3Njb3BlQmFyLCAwKTsKLQotICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFk ZCgiaGFzLXJlY29yZGluZ3MiKTsKICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2xsZWN0aW9uQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2xsZWN0aW9uQ29u dGVudFZpZXcuanMKaW5kZXggZTQ4MTdiOTFjMjczMTE2YzY3ODA5MTg5MmQ4YTYyOTAxMWM3MWQ3 Ni4uMmY0ZDEyNzdkNmVkYTEzZGZlMWE5NDNjYThlNzk1ZGVlNDNjNDM5ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29sbGVjdGlvbkNvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbGxlY3Rpb25Db250ZW50Vmlldy5qcwpAQCAtMTMxLDYgKzEzMSwxMCBAQCBXSS5Db2xsZWN0 aW9uQ29udGVudFZpZXcgPSBjbGFzcyBDb2xsZWN0aW9uQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5D b250ZW50VmlldwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcoY29udGVudFZpZXcpOwogICAgICAg ICB0aGlzLmNvbnRlbnRWaWV3QWRkZWQoY29udGVudFZpZXcpOwogCisgICAgICAgIGlmICghdGhp cy52aXNpYmxlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGNvbnRlbnRWaWV3LnZp c2libGUgPSB0cnVlOwogICAgICAgICBjb250ZW50Vmlldy5zaG93bigpOwogICAgIH0KIApAQCAt MTUxLDcgKzE1NSwxMCBAQCBXSS5Db2xsZWN0aW9uQ29udGVudFZpZXcgPSBjbGFzcyBDb2xsZWN0 aW9uQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9jb250 ZW50Vmlld01hcC5kZWxldGUoaXRlbSk7CiAgICAgICAgIHRoaXMuY29udGVudFZpZXdSZW1vdmVk KGNvbnRlbnRWaWV3KTsKIAotICAgICAgICBjb250ZW50Vmlldy5oaWRkZW4oKTsKKyAgICAgICAg aWYgKHRoaXMudmlzaWJsZSkgeworICAgICAgICAgICAgY29udGVudFZpZXcudmlzaWJsZSA9IGZh bHNlOworICAgICAgICAgICAgY29udGVudFZpZXcuaGlkZGVuKCk7CisgICAgICAgIH0KIAogICAg ICAgICBjb250ZW50Vmlldy5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U cmVlT3V0bGluZS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UcmVlT3V0bGluZS5jc3MKaW5kZXggZjNiYzA0NzQzMTJmZDcxYjRlYTU4OTIzMzUzMzg4NWRm ZjI1MGExYy4uYjA1YWM0NzdhZGUwODM3Mjk4NGRkYTVhOTAyN2VmOWE3ZGJkODk3MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxp bmUuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Ry ZWVPdXRsaW5lLmNzcwpAQCAtMjQyLDYgKzI0MiwxMCBAQCBib2R5W2Rpcj1ydGxdIC50cmVlLW91 dGxpbmUgLml0ZW0gLnN0YXR1cyB7CiAgICAgaGVpZ2h0OiAxNHB4OwogfQogCisudHJlZS1vdXRs aW5lOm5vdCgubGFyZ2UpOm1hdGNoZXMoOmZvY3VzLCAuZm9yY2UtZm9jdXMpIC5pdGVtLnNlbGVj dGVkIC5zdGF0dXMgLmluZGV0ZXJtaW5hdGUtcHJvZ3Jlc3Mtc3Bpbm5lciB7CisgICAgZmlsdGVy OiBpbnZlcnQoKTsKK30KKwogLnRyZWUtb3V0bGluZSAuaXRlbSAudGl0bGU6OmFmdGVyIHsKICAg ICBjb250ZW50OiAiIjsKIH0K