209346 2020-03-20 10:19:58 -0700 Web Inspector: REGRESSION(r257835): close and undock buttons are shown in remote inspector 2020-03-20 12:27:30 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 208555 1 hi hi bburg hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1632149 0 hi 2020-03-20 10:19:58 -0700 # STEPS TO REPRODUCE: 1. connect an external device or open an iOS simulator 2. inspect anything 1632150 1 394097 hi 2020-03-20 10:20:32 -0700 Created attachment 394097 Patch 1632195 2 394097 bburg 2020-03-20 12:03:50 -0700 Comment on attachment 394097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394097&action=review r=me > Source/WebInspectorUI/UserInterface/Base/Main.js:900 > + WI.tabBar.resetCachedWidths(); How does the tabBar invalidate cached widths when the inspector window / view is resized? Surprised this is only called in one place. > Source/WebInspectorUI/UserInterface/Base/Main.js:2359 > + let closeHidden = WI._closeTabBarButton?.hidden; o_O I guess it's OK! 1632207 3 ews-feeder 2020-03-20 12:22:09 -0700 Committed r258778: <https://trac.webkit.org/changeset/258778> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394097. 1632209 4 webkit-bug-importer 2020-03-20 12:23:10 -0700 <rdar://problem/60698896> 1632210 5 394097 hi 2020-03-20 12:27:30 -0700 Comment on attachment 394097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394097&action=review >> Source/WebInspectorUI/UserInterface/Base/Main.js:900 >> + WI.tabBar.resetCachedWidths(); > > How does the tabBar invalidate cached widths when the inspector window / view is resized? Surprised this is only called in one place. When we're docked, the size of each `WI.TabBarItem` should never change, as we don't expand to fill available space. When undocked, however, `WI.TabBarItem` do expand to fill as much available space as possible. Along these lines, we have logic inside `WI.TabBar.prototype.layout` that handles this exact scenario :) <https://trac.webkit.org/browser/webkit/trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js?rev=258623#L469> 394097 2020-03-20 10:20:32 -0700 2020-03-20 12:22:09 -0700 Patch bug-209346-20200320112031.patch text/plain 13027 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDUzNzU1M2NkNzM4OWRkNDJlNjMwYzE5MDk0NmE5 OWE5YzBmYzdlM2IuLjRhMGI3OTBkMDBhNDkyNGI4MGIxN2JmN2JiNmJiOTA3NzcyNGJmZDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDIwLTAzLTIwICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OKHIyNTc4MzUpOiBjbG9zZSBhbmQgdW5kb2NrIGJ1dHRvbnMgYXJlIHNob3duIGlu IHJlbW90ZSBpbnNwZWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwOTM0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEluIHRoZSBjYXNlIG9mIHJlbW90ZSBpbnNwZWN0aW9uLCB0aGUgZnJvbnRlbmQg aXMgdG9sZCB0aGF0IGRvY2tpbmcgaXMgbm90IGF2YWlsYWJsZSBiZWZvcmUKKyAgICAgICAgaXQg aXMgZXZlbiBzaG93biAodmlhIGBJbnNwZWN0b3JGcm9udGVuZEFQSS5zZXREb2NraW5nVW5hdmFp bGFibGVgKS4gQWRkaXRpb25hbGx5LCB0aGUKKyAgICAgICAgYmFja2VuZCAoYFdlYktpdDo6UmVt b3RlV2ViSW5zcGVjdG9yVUlgKSBuZXZlciB0ZWxscyB0aGUgZnJvbnRlbmQgd2hhdCBkb2NrIHNp ZGUgaXQgYWN0dWFsbHkKKyAgICAgICAgaXMgKHZpYSBgSW5zcGVjdG9yRnJvbnRlbmRBUEkuc2V0 RG9ja1NpZGVgKSwgYXMgdGhlcmUgd291bGQgYmUgbm8gcG9pbnQsIGdpdmVuIHRoYXQgZG9ja2lu ZworICAgICAgICBpcyB1bmF2YWlsYWJsZSwgbWVhbmluZyB0aGF0IHRoZSBmcm9udGVuZCBtdXN0 IGJlIHVuZG9ja2VkLgorCisgICAgICAgIEJlZm9yZSByMjU3ODM1LCB0aGUgZG9ja2luZyBzdGF0 ZSBoZWxkIGJ5IGBXSS5fZG9ja0NvbmZpZ3VyYXRpb25gIGFuZCBgV0kuZG9ja2VkYCwgbmVpdGhl cgorICAgICAgICBvZiB3aGljaCB3b3VsZCBiZSBzZXQgYXMgZGVzY3JpYmVkIGFib3ZlLiBBcyBh IHJlc3VsdCwgaW4gYFdJLl91cGRhdGVEb2NrTmF2aWdhdGlvbkl0ZW1zYAorICAgICAgICBgV0ku ZG9ja2VkYCB3b3VsZCBiZSB1bmRlZmluZWQsIHdoaWNoIGlzIGZhbHN5LCB0aGVyZWJ5IGNhdXNp bmcgYWxsIGRvY2tpbmcgbmF2aWdhdGlvbiBpdGVtcworICAgICAgICB0byBiZSBoaWRkZW4uIEFm dGVyIHIyNTc4MzUsIHRoZXNlIHdlcmUgbWVyZ2VkIGludG8gb25lIGBXSS5kb2NrQ29uZmlndXJh dGlvbmAsIHdoaWNoIGlzCisgICAgICAgIGNvbXBhcmVkIGFnYWluc3QgYFdJLkRvY2tDb25maWd1 cmF0aW9uLlVuZG9ja2VkYCBpbnN0ZWFkIG9mIGp1c3QgYmVpbmcgZmFsc3kgY2hlY2tlZCwKKyAg ICAgICAgbWVhbmluZyBpdCB3b3VsZCByZXN1bHQgaW4gYHRydWVgIHdoaWNoIHdvdWxkIG5vdCBo aWRlIGFsbCBvZiB0aGUgZG9ja2luZyBuYXZpZ2F0aW9uIGl0ZW1zLgorCisgICAgICAgIENoYW5n ZSB0aGUgbG9naWMgb2YgYFdJLnVwZGF0ZURvY2tpbmdBdmFpbGFiaWxpdHlgIHN1Y2ggdGhhdCBp ZiB0aGUgZnJvbnRlbmQgaXMgdG9sZCB0aGF0CisgICAgICAgIGRvY2tpbmcgaXMgdW5hdmFpbGFi bGUsIG1hcmsgdGhlIGBXSS5kb2NrQ29uZmlndXJhdGlvbmAgYXMgYFdJLkRvY2tDb25maWd1cmF0 aW9uLlVuZG9ja2VkYC4KKyAgICAgICAgVGhpcyB3YXksIHRoZSBmcm9udGVuZCB3aWxsIGFsd2F5 cyBoYXZlIGEgdmFsaWQgdmFsdWUgZm9yIGBXSS5kb2NrQ29uZmlndXJhdGlvbmAuCisKKyAgICAg ICAgQWRkaXRpb25hbGx5LCBmdXJ0aGVyIGxldmVyYWdlIGBJbnNwZWN0b3JGcm9udGVuZEhvc3Qu c3VwcG9ydHNEb2NrU2lkZWAgdG8gb25seSBjcmVhdGUgdGhlCisgICAgICAgIGRvY2tpbmcgbmF2 aWdhdGlvbiBpdGVtcyB0aGF0IGFyZSBhY3R1YWxseSBzdXBwb3J0ZWQgYnkgdGhlIGhvc3QuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdJLmNvbnRl bnRMb2FkZWQpOgorICAgICAgICAoV0kudXBkYXRlRG9ja2luZ0F2YWlsYWJpbGl0eSk6CisgICAg ICAgIChXSS5yZXNpemVEb2NrZWRGcmFtZU1vdXNlRG93bik6CisgICAgICAgIChXSS5kb2NrZWRD b25maWd1cmF0aW9uU3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyKToKKyAgICAgICAgKFdJLl91 cGRhdGVEb2NrTmF2aWdhdGlvbkl0ZW1zKToKKyAgICAgICAgKFdJLl91cGRhdGVUYWJCYXJEaXZp ZGVycyk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qczoKKyAgICAg ICAgKFdJLlRhYkJhci5nZXQgaG9yaXpvbnRhbFBhZGRpbmcpOgorICAgICAgICAoV0kuVGFiQmFy LnByb3RvdHlwZS5yZXNldENhY2hlZFdpZHRocyk6IEFkZGVkLgorICAgICAgICBXaGVuIHN3aXRj aGluZyBkb2NrIGNvbmZpZ3VyYXRpb25zLCB3ZSBuZWVkIHRvIHJlc2V0IHRoZSBjYWNoZWQgd2lk dGggb2YgZWFjaCB0YWIgYmFyIGl0ZW0sCisgICAgICAgIGFzIG90aGVyd2lzZSwgYSBsYXJnZSB3 aWR0aCBjYWNoZWQgd2hlbiB1bmRvY2tlZCBjYW4gaW5jb3JyZWN0bHkgYmUgdXNlZCB3aGVuIGRv Y2tlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFySXRlbS5qczoKKyAg ICAgICAgKFdJLlRhYkJhckl0ZW0uZ2V0IGhvcml6b250YWxNYXJnaW4pOgorICAgICAgICBSZXBs YWNlIG5lZ2F0aXZlIGNoZWNrcyBvZiBgV0kuZG9ja0NvbmZpZ3VyYXRpb25gIHdpdGggcG9zaXRp dmUgb25lcyB0aGF0IGNhbid0IGJlIGZvb2xlZCBieQorICAgICAgICBhIGZhbHN5IHZhbHVlLgor CiAyMDIwLTAzLTE5ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IEFYSTogZGlzYWJsZWQgYnV0dG9ucyBzaG91bGRuJ3QgYmUg Zm9jdXNhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L01haW4uanMKaW5kZXggNGIzYzdmNjRiZTI4NTU4NGQyY2ZiMTk1NGM0ODYyZmY5MDBmY2Y2NC4u YzhmNWVlNDc0MjhjYjE5NjA5ODM0M2E5YTlkZGM3NjBmYTI4ZWRmZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMzY2LDI2ICsz NjYsMzQgQEAgV0kuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKIAogICAgIFdJLl90b2dnbGVQ cmV2aW91c0RvY2tDb25maWd1cmF0aW9uS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2Fy ZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCB8 IFdJLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsICJEIiwgV0kuX3RvZ2dsZVByZXZp b3VzRG9ja0NvbmZpZ3VyYXRpb24pOwogCi0gICAgV0kuX2Nsb3NlVGFiQmFyQnV0dG9uID0gbmV3 IFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJkb2NrLWNsb3NlIiwgV0kuVUlTdHJpbmcoIkNsb3Nl IiksICJJbWFnZXMvQ2xvc2VMYXJnZS5zdmciKTsKLSAgICBXSS5fY2xvc2VUYWJCYXJCdXR0b24u YWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCBX SS5jbG9zZSk7Ci0KICAgICBsZXQgZG9ja2luZ0NvbmZpZ3VyYXRpb25OYXZpZ2F0aW9uSXRlbXMg PSBbXTsKIAotICAgIGlmIChJbnNwZWN0b3JGcm9udGVuZEhvc3Quc3VwcG9ydHNEb2NrU2lkZShX SS5Eb2NrQ29uZmlndXJhdGlvbi5SaWdodCkgJiYgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnN1cHBv cnRzRG9ja1NpZGUoV0kuRG9ja0NvbmZpZ3VyYXRpb24uTGVmdCkpIHsKKyAgICBsZXQgc3VwcG9y dHNEb2NrUmlnaHQgPSBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc3VwcG9ydHNEb2NrU2lkZShXSS5E b2NrQ29uZmlndXJhdGlvbi5SaWdodCk7CisgICAgbGV0IHN1cHBvcnRzRG9ja0xlZnQgPSBJbnNw ZWN0b3JGcm9udGVuZEhvc3Quc3VwcG9ydHNEb2NrU2lkZShXSS5Eb2NrQ29uZmlndXJhdGlvbi5M ZWZ0KTsKKyAgICBsZXQgc3VwcG9ydHNEb2NrQm90dG9tID0gSW5zcGVjdG9yRnJvbnRlbmRIb3N0 LnN1cHBvcnRzRG9ja1NpZGUoV0kuRG9ja0NvbmZpZ3VyYXRpb24uQm90dG9tKTsKKyAgICBsZXQg c3VwcG9ydHNVbmRvY2tlZCA9IEluc3BlY3RvckZyb250ZW5kSG9zdC5zdXBwb3J0c0RvY2tTaWRl KFdJLkRvY2tDb25maWd1cmF0aW9uLlVuZG9ja2VkKTsKKworICAgIGlmIChzdXBwb3J0c0RvY2tS aWdodCB8fCBzdXBwb3J0c0RvY2tMZWZ0IHx8IHN1cHBvcnRzRG9ja0JvdHRvbSkgeworICAgICAg ICBXSS5fY2xvc2VUYWJCYXJCdXR0b24gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImRv Y2stY2xvc2UiLCBXSS5VSVN0cmluZygiQ2xvc2UiKSwgIkltYWdlcy9DbG9zZUxhcmdlLnN2ZyIp OworICAgICAgICBXSS5fY2xvc2VUYWJCYXJCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0 b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCBXSS5jbG9zZSk7CisgICAgICAgIGRvY2tp bmdDb25maWd1cmF0aW9uTmF2aWdhdGlvbkl0ZW1zLnB1c2goV0kuX2Nsb3NlVGFiQmFyQnV0dG9u KTsKKyAgICB9CisKKyAgICBpZiAoKHN1cHBvcnRzRG9ja1JpZ2h0IHx8IHN1cHBvcnRzRG9ja0xl ZnQpICYmIChzdXBwb3J0c0RvY2tCb3R0b20gfHwgc3VwcG9ydHNVbmRvY2tlZCkpIHsKICAgICAg ICAgV0kuX2RvY2tUb1NpZGVUYWJCYXJCdXR0b24gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0 ZW0oImRvY2stcmlnaHQiLCBXSS5VSVN0cmluZygiRG9jayB0byBzaWRlIG9mIHdpbmRvdyIpLCBX SS5yZXNvbHZlZExheW91dERpcmVjdGlvbigpID09PSBXSS5MYXlvdXREaXJlY3Rpb24uUlRMID8g IkltYWdlcy9Eb2NrTGVmdC5zdmciIDogIkltYWdlcy9Eb2NrUmlnaHQuc3ZnIiwgMTYsIDE2KTsK ICAgICAgICAgV0kuX2RvY2tUb1NpZGVUYWJCYXJCdXR0b24uZWxlbWVudC5jbGFzc0xpc3QuYWRk KFdJLlBvcG92ZXIuSWdub3JlQXV0b0Rpc21pc3NDbGFzc05hbWUpOwogICAgICAgICBXSS5fZG9j a1RvU2lkZVRhYkJhckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25J dGVtLkV2ZW50LkNsaWNrZWQsIFdJLnJlc29sdmVkTGF5b3V0RGlyZWN0aW9uKCkgPT09IFdJLkxh eW91dERpcmVjdGlvbi5SVEwgPyBXSS5fZG9ja0xlZnQgOiBXSS5fZG9ja1JpZ2h0KTsKICAgICAg ICAgZG9ja2luZ0NvbmZpZ3VyYXRpb25OYXZpZ2F0aW9uSXRlbXMucHVzaChXSS5fZG9ja1RvU2lk ZVRhYkJhckJ1dHRvbik7CiAgICAgfQogCi0gICAgaWYgKEluc3BlY3RvckZyb250ZW5kSG9zdC5z dXBwb3J0c0RvY2tTaWRlKFdJLkRvY2tDb25maWd1cmF0aW9uLkJvdHRvbSkpIHsKKyAgICBpZiAo c3VwcG9ydHNEb2NrQm90dG9tICYmIChzdXBwb3J0c0RvY2tSaWdodCB8fCBzdXBwb3J0c0RvY2tM ZWZ0IHx8IHN1cHBvcnRzVW5kb2NrZWQpKSB7CiAgICAgICAgIFdJLl9kb2NrQm90dG9tVGFiQmFy QnV0dG9uID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJkb2NrLWJvdHRvbSIsIFdJLlVJ U3RyaW5nKCJEb2NrIHRvIGJvdHRvbSBvZiB3aW5kb3ciKSwgIkltYWdlcy9Eb2NrQm90dG9tLnN2 ZyIsIDE2LCAxNik7CiAgICAgICAgIFdJLl9kb2NrQm90dG9tVGFiQmFyQnV0dG9uLmVsZW1lbnQu Y2xhc3NMaXN0LmFkZChXSS5Qb3BvdmVyLklnbm9yZUF1dG9EaXNtaXNzQ2xhc3NOYW1lKTsKICAg ICAgICAgV0kuX2RvY2tCb3R0b21UYWJCYXJCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0 b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCBXSS5fZG9ja0JvdHRvbSk7CiAgICAgICAg IGRvY2tpbmdDb25maWd1cmF0aW9uTmF2aWdhdGlvbkl0ZW1zLnB1c2goV0kuX2RvY2tCb3R0b21U YWJCYXJCdXR0b24pOwogICAgIH0KIAotICAgIGlmIChJbnNwZWN0b3JGcm9udGVuZEhvc3Quc3Vw cG9ydHNEb2NrU2lkZShXSS5Eb2NrQ29uZmlndXJhdGlvbi5VbmRvY2tlZCkpIHsKKyAgICBpZiAo c3VwcG9ydHNVbmRvY2tlZCAmJiAoc3VwcG9ydHNEb2NrUmlnaHQgfHwgc3VwcG9ydHNEb2NrTGVm dCB8fCBzdXBwb3J0c0RvY2tCb3R0b20pKSB7CiAgICAgICAgIFdJLl91bmRvY2tUYWJCYXJCdXR0 b24gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInVuZG9jayIsIFdJLlVJU3RyaW5nKCJE ZXRhY2ggaW50byBzZXBhcmF0ZSB3aW5kb3ciKSwgIkltYWdlcy9VbmRvY2suc3ZnIiwgMTYsIDE2 KTsKICAgICAgICAgV0kuX3VuZG9ja1RhYkJhckJ1dHRvbi5lbGVtZW50LmNsYXNzTGlzdC5hZGQo V0kuUG9wb3Zlci5JZ25vcmVBdXRvRGlzbWlzc0NsYXNzTmFtZSk7CiAgICAgICAgIFdJLl91bmRv Y2tUYWJCYXJCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5F dmVudC5DbGlja2VkLCBXSS5fdW5kb2NrKTsKQEAgLTQyNiw3ICs0MzQsNiBAQCBXSS5jb250ZW50 TG9hZGVkID0gZnVuY3Rpb24oKQogICAgIH0KIAogICAgIFdJLnRhYkJhci5hZGROYXZpZ2F0aW9u SXRlbUJlZm9yZShuZXcgV0kuR3JvdXBOYXZpZ2F0aW9uSXRlbShbCi0gICAgICAgIFdJLl9jbG9z ZVRhYkJhckJ1dHRvbiwKICAgICAgICAgLi4uZG9ja2luZ0NvbmZpZ3VyYXRpb25OYXZpZ2F0aW9u SXRlbXMsCiAgICAgICAgIC4uLmluc3BlY3RlZFBhZ2VDb250cm9sTmF2aWdhdGlvbkl0ZW1zLAog ICAgIF0pKTsKQEAgLTQ2NiwxMiArNDczLDE2IEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlv bigpCiAgICAgV0kuY29uc29sZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5Db25zb2xlTWFu YWdlci5FdmVudC5DbGVhcmVkLCBXSS5fdXBkYXRlQ29uc29sZVRhYkJhckJ1dHRvbnMsIFdJKTsK ICAgICBXSS5fdXBkYXRlQ29uc29sZVRhYkJhckJ1dHRvbnMoKTsKIAotICAgIFdJLl9kb2NrZWRS ZXNpemVyRWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJkb2NrZWQtcmVzaXplciIp OwotICAgIFdJLl9kb2NrZWRSZXNpemVyRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdJLlBvcG92ZXIu SWdub3JlQXV0b0Rpc21pc3NDbGFzc05hbWUpOwotICAgIFdJLl9kb2NrZWRSZXNpemVyRWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCBXSS5faGFuZGxlRG9ja2VkUmVzaXplck1v dXNlRG93bik7CisgICAgaWYgKHN1cHBvcnRzRG9ja1JpZ2h0IHx8IHN1cHBvcnRzRG9ja0xlZnQg fHwgc3VwcG9ydHNEb2NrQm90dG9tKSB7CisgICAgICAgIFdJLl9kb2NrZWRSZXNpemVyRWxlbWVu dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJkb2NrZWQtcmVzaXplciIpOworICAgICAgICBX SS5fZG9ja2VkUmVzaXplckVsZW1lbnQuY2xhc3NMaXN0LmFkZChXSS5Qb3BvdmVyLklnbm9yZUF1 dG9EaXNtaXNzQ2xhc3NOYW1lKTsKKyAgICAgICAgV0kuX2RvY2tlZFJlc2l6ZXJFbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIFdJLl9oYW5kbGVEb2NrZWRSZXNpemVyTW91c2VE b3duKTsKKyAgICB9CiAKLSAgICBsZXQgdW5kb2NrZWRUaXRsZUFyZWFFbGVtZW50ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInVuZG9ja2VkLXRpdGxlLWFyZWEiKTsKLSAgICB1bmRvY2tlZFRp dGxlQXJlYUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgV0kuX2hhbmRsZVVu ZG9ja2VkVGl0bGVBcmVhTW91c2VEb3duKTsKKyAgICBpZiAoc3VwcG9ydHNVbmRvY2tlZCkgewor ICAgICAgICBsZXQgdW5kb2NrZWRUaXRsZUFyZWFFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoInVuZG9ja2VkLXRpdGxlLWFyZWEiKTsKKyAgICAgICAgdW5kb2NrZWRUaXRsZUFyZWFF bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIFdJLl9oYW5kbGVVbmRvY2tlZFRp dGxlQXJlYU1vdXNlRG93bik7CisgICAgfQogCiAgICAgV0kuX2RvY2tpbmdBdmFpbGFibGUgPSBm YWxzZTsKIApAQCAtODM5LDYgKzg1MCwxMSBAQCBXSS51cGRhdGVEb2NraW5nQXZhaWxhYmlsaXR5 ID0gZnVuY3Rpb24oYXZhaWxhYmxlKQogewogICAgIFdJLl9kb2NraW5nQXZhaWxhYmxlID0gYXZh aWxhYmxlOwogCisgICAgaWYgKCFXSS5fZG9ja2luZ0F2YWlsYWJsZSkgeworICAgICAgICBXSS51 cGRhdGVEb2NrZWRTdGF0ZShXSS5Eb2NrQ29uZmlndXJhdGlvbi5VbmRvY2tlZCk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKICAgICBXSS5fdXBkYXRlRG9ja05hdmlnYXRpb25JdGVtcygpOwog fTsKIApAQCAtODgxLDEzICs4OTcsMTUgQEAgV0kudXBkYXRlRG9ja2VkU3RhdGUgPSBmdW5jdGlv bihzaWRlKQogCiAgICAgV0kuX3VwZGF0ZURvY2tOYXZpZ2F0aW9uSXRlbXMoKTsKIAorICAgIFdJ LnRhYkJhci5yZXNldENhY2hlZFdpZHRocygpOworCiAgICAgaWYgKCFXSS5kb2NrZWRDb25maWd1 cmF0aW9uU3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyKCkgJiYgIVdJLmRvZXNDdXJyZW50VGFi U3VwcG9ydFNwbGl0Q29udGVudEJyb3dzZXIoKSkKICAgICAgICAgV0kuaGlkZVNwbGl0Q29uc29s ZSgpOwogfTsKIAogV0kucmVzaXplRG9ja2VkRnJhbWVNb3VzZURvd24gPSBmdW5jdGlvbihldmVu dCkKIHsKLSAgICBjb25zb2xlLmFzc2VydChXSS5kb2NrQ29uZmlndXJhdGlvbiAhPT0gV0kuRG9j a0NvbmZpZ3VyYXRpb24uVW5kb2NrZWQpOworICAgIGNvbnNvbGUuYXNzZXJ0KFdJLmRvY2tDb25m aWd1cmF0aW9uICYmIFdJLmRvY2tDb25maWd1cmF0aW9uICE9PSBXSS5Eb2NrQ29uZmlndXJhdGlv bi5VbmRvY2tlZCk7CiAKICAgICBpZiAoZXZlbnQuYnV0dG9uICE9PSAwIHx8IGV2ZW50LmN0cmxL ZXkpCiAgICAgICAgIHJldHVybjsKQEAgLTExMDIsNyArMTEyMCw3IEBAIFdJLmlzU2hvd2luZ1Nw bGl0Q29uc29sZSA9IGZ1bmN0aW9uKCkKIAogV0kuZG9ja2VkQ29uZmlndXJhdGlvblN1cHBvcnRz U3BsaXRDb250ZW50QnJvd3NlciA9IGZ1bmN0aW9uKCkKIHsKLSAgICByZXR1cm4gV0kuZG9ja0Nv bmZpZ3VyYXRpb24gIT09IFdJLkRvY2tDb25maWd1cmF0aW9uLkJvdHRvbTsKKyAgICByZXR1cm4g IVdJLmRvY2tDb25maWd1cmF0aW9uIHx8IFdJLmRvY2tDb25maWd1cmF0aW9uICE9PSBXSS5Eb2Nr Q29uZmlndXJhdGlvbi5Cb3R0b207CiB9OwogCiBXSS5kb2VzQ3VycmVudFRhYlN1cHBvcnRTcGxp dENvbnRlbnRCcm93c2VyID0gZnVuY3Rpb24oKQpAQCAtMTg2MywxMCArMTg4MSwxMSBAQCBXSS5f dG9nZ2xlUHJldmlvdXNEb2NrQ29uZmlndXJhdGlvbiA9IGZ1bmN0aW9uKGV2ZW50KQogCiBXSS5f dXBkYXRlRG9ja05hdmlnYXRpb25JdGVtcyA9IGZ1bmN0aW9uKCkKIHsKLSAgICBsZXQgZG9ja2Vk ID0gV0kuZG9ja0NvbmZpZ3VyYXRpb24gIT09IFdJLkRvY2tDb25maWd1cmF0aW9uLlVuZG9ja2Vk OworICAgIGxldCBkb2NrZWQgPSBXSS5kb2NrZWRDb25maWd1cmF0aW9uU3VwcG9ydHNTcGxpdENv bnRlbnRCcm93c2VyICYmIFdJLmRvY2tDb25maWd1cmF0aW9uICE9PSBXSS5Eb2NrQ29uZmlndXJh dGlvbi5VbmRvY2tlZDsKIAogICAgIGlmIChXSS5fZG9ja2luZ0F2YWlsYWJsZSB8fCBkb2NrZWQp IHsKLSAgICAgICAgV0kuX2Nsb3NlVGFiQmFyQnV0dG9uLmhpZGRlbiA9ICFkb2NrZWQ7CisgICAg ICAgIGlmIChXSS5fY2xvc2VUYWJCYXJCdXR0b24pCisgICAgICAgICAgICBXSS5fY2xvc2VUYWJC YXJCdXR0b24uaGlkZGVuID0gIWRvY2tlZDsKICAgICAgICAgaWYgKFdJLl9kb2NrVG9TaWRlVGFi QmFyQnV0dG9uKQogICAgICAgICAgICAgV0kuX2RvY2tUb1NpZGVUYWJCYXJCdXR0b24uaGlkZGVu ID0gV0kuZG9ja0NvbmZpZ3VyYXRpb24gPT09IFdJLkRvY2tDb25maWd1cmF0aW9uLlJpZ2h0IHx8 IFdJLmRvY2tDb25maWd1cmF0aW9uID09PSBXSS5Eb2NrQ29uZmlndXJhdGlvbi5MZWZ0OwogICAg ICAgICBpZiAoV0kuX2RvY2tCb3R0b21UYWJCYXJCdXR0b24pCkBAIC0xODc0LDcgKzE4OTMsOCBA QCBXSS5fdXBkYXRlRG9ja05hdmlnYXRpb25JdGVtcyA9IGZ1bmN0aW9uKCkKICAgICAgICAgaWYg KFdJLl91bmRvY2tUYWJCYXJCdXR0b24pCiAgICAgICAgICAgICBXSS5fdW5kb2NrVGFiQmFyQnV0 dG9uLmhpZGRlbiA9IFdJLmRvY2tDb25maWd1cmF0aW9uID09PSBXSS5Eb2NrQ29uZmlndXJhdGlv bi5VbmRvY2tlZDsKICAgICB9IGVsc2UgewotICAgICAgICBXSS5fY2xvc2VUYWJCYXJCdXR0b24u aGlkZGVuID0gdHJ1ZTsKKyAgICAgICAgaWYgKFdJLl9jbG9zZVRhYkJhckJ1dHRvbikKKyAgICAg ICAgICAgIFdJLl9jbG9zZVRhYkJhckJ1dHRvbi5oaWRkZW4gPSB0cnVlOwogICAgICAgICBpZiAo V0kuX2RvY2tUb1NpZGVUYWJCYXJCdXR0b24pCiAgICAgICAgICAgICBXSS5fZG9ja1RvU2lkZVRh YkJhckJ1dHRvbi5oaWRkZW4gPSB0cnVlOwogICAgICAgICBpZiAoV0kuX2RvY2tCb3R0b21UYWJC YXJCdXR0b24pCkBAIC0yMzM2LDcgKzIzNTYsNyBAQCBXSS5fdXBkYXRlSW5zcGVjdE1vZGVUYWJC YXJCdXR0b24gPSBmdW5jdGlvbigpCiAKIFdJLl91cGRhdGVUYWJCYXJEaXZpZGVycyA9IGZ1bmN0 aW9uKCkKIHsKLSAgICBsZXQgY2xvc2VIaWRkZW4gPSBXSS5fY2xvc2VUYWJCYXJCdXR0b24uaGlk ZGVuOworICAgIGxldCBjbG9zZUhpZGRlbiA9IFdJLl9jbG9zZVRhYkJhckJ1dHRvbj8uaGlkZGVu OwogICAgIGxldCBkb2NrVG9TaWRlSGlkZGVuID0gV0kuX2RvY2tUb1NpZGVUYWJCYXJCdXR0b24/ LmhpZGRlbjsKICAgICBsZXQgZG9ja0JvdHRvbUhpZGRlbiA9IFdJLl9kb2NrQm90dG9tVGFiQmFy QnV0dG9uPy5oaWRkZW47CiAgICAgbGV0IHVuZG9ja0hpZGRlbiA9IFdJLl91bmRvY2tUYWJCYXJC dXR0b24/LmhpZGRlbjsKQEAgLTMzNTQsMyArMzM3NCw1IEBAIFdJLkRvY2tDb25maWd1cmF0aW9u ID0gewogICAgIEJvdHRvbTogImJvdHRvbSIsCiAgICAgVW5kb2NrZWQ6ICJ1bmRvY2tlZCIsCiB9 OworCitXSS5Eb2NrQ29uZmlndXJhdGlvbkNoYW5nZWRMYXlvdXRSZWFzb24gPSBTeW1ib2woImRv Y2stY29uZmlndXJhdGlvbi1jaGFuZ2VkIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMKaW5kZXggNDBlMmY1NDIxNDU3MTZkNjBi NGNmODFhMzM0NzdhYjE5MDYxYzJkYS4uMmU1MThkZmM1ZDIzMGE5NWZjYjgzYmQwYTYwYjFjZmRi ZTIyNDljNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGFiQmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RhYkJhci5qcwpAQCAtNzIsNyArNzIsNyBAQCBXSS5UYWJCYXIgPSBjbGFzcyBUYWJC YXIgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICBzdGF0aWMgZ2V0IGhvcml6b250YWxQYWRkaW5nKCkK ICAgICB7Ci0gICAgICAgIHJldHVybiAoV0kuZG9ja0NvbmZpZ3VyYXRpb24gIT09IFdJLkRvY2tD b25maWd1cmF0aW9uLlVuZG9ja2VkKSA/IDggOiAwOyAvLyBLZWVwIGluIHN5bmMgd2l0aCBgYm9k eS5kb2NrZWQgLnRhYi1iYXIgLnRhYnNgCisgICAgICAgIHJldHVybiAoV0kuZG9ja0NvbmZpZ3Vy YXRpb24gPT09IFdJLkRvY2tDb25maWd1cmF0aW9uLlVuZG9ja2VkKSA/IDAgOiA4OyAvLyBLZWVw IGluIHN5bmMgd2l0aCBgYm9keS5kb2NrZWQgLnRhYi1iYXIgLnRhYnNgCiAgICAgfQogCiAgICAg Ly8gUHVibGljCkBAIC00MjUsNiArNDI1LDEyIEBAIFdJLlRhYkJhciA9IGNsYXNzIFRhYkJhciBl eHRlbmRzIFdJLlZpZXcKICAgICAgICAgcmV0dXJuIHRoaXMuX3RhYkJhckl0ZW1zLmZpbHRlcigo aXRlbSkgPT4gIShpdGVtIGluc3RhbmNlb2YgV0kuUGlubmVkVGFiQmFySXRlbSkpLmxlbmd0aDsK ICAgICB9CiAKKyAgICByZXNldENhY2hlZFdpZHRocygpCisgICAgeworICAgICAgICBmb3IgKGxl dCB0YWJCYXJJdGVtIG9mIHRoaXMuX3RhYkJhckl0ZW1zKQorICAgICAgICAgICAgdGFiQmFySXRl bVtXSS5UYWJCYXIuQ2FjaGVkV2lkdGhTeW1ib2xdID0gMDsKKyAgICB9CisKICAgICAvLyBQcm90 ZWN0ZWQKIAogICAgIGxheW91dCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXJJdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFySXRlbS5qcwppbmRleCBkY2NiMjZmODIyMjM2ZDE2 YzkwNTYzZjcxYjUzZmE1MzM5MTdlMWRiLi45NTY3NjZmYzZkYWI3NmJjYWY2MWQxYzgxMTlhOWI5 Nzc4MDcxNmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UYWJCYXJJdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RhYkJhckl0ZW0uanMKQEAgLTUzLDcgKzUzLDcgQEAgV0kuVGFiQmFySXRl bSA9IGNsYXNzIFRhYkJhckl0ZW0KIAogICAgIHN0YXRpYyBnZXQgaG9yaXpvbnRhbE1hcmdpbigp CiAgICAgewotICAgICAgICByZXR1cm4gKFdJLmRvY2tDb25maWd1cmF0aW9uICE9PSBXSS5Eb2Nr Q29uZmlndXJhdGlvbi5VbmRvY2tlZCkgPyA0IDogMDsgLy8gS2VlcCBpbiBzeW5jIHdpdGggYGJv ZHkuZG9ja2VkIC50YWItYmFyID4gLnRhYnMgPiAuaXRlbWAKKyAgICAgICAgcmV0dXJuIChXSS5k b2NrQ29uZmlndXJhdGlvbiA9PT0gV0kuRG9ja0NvbmZpZ3VyYXRpb24uVW5kb2NrZWQpID8gMCA6 IDQ7IC8vIEtlZXAgaW4gc3luYyB3aXRoIGBib2R5LmRvY2tlZCAudGFiLWJhciA+IC50YWJzID4g Lml0ZW1gCiAgICAgfQogCiAgICAgLy8gUHVibGljCg==