211216 2020-04-29 20:22:06 -0700 Add a MiniBrowser option to inset the web view so it doesn't fill the window 2020-04-29 21:17:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton webkit-bug-importer oldest_to_newest 1647267 0 simon.fraser 2020-04-29 20:22:06 -0700 Add a MiniBrowser option to inset the web view so it doesn't fill the window 1647268 1 398029 simon.fraser 2020-04-29 20:28:52 -0700 Created attachment 398029 Patch 1647269 2 simon.fraser 2020-04-29 20:34:45 -0700 This is for event debugging, where you want to be able to differentiate between "view" and "window" coordinates. 1647274 3 simon.fraser 2020-04-29 21:16:31 -0700 https://trac.webkit.org/changeset/260934/webkit 1647276 4 webkit-bug-importer 2020-04-29 21:17:25 -0700 <rdar://problem/62631537> 398029 2020-04-29 20:28:52 -0700 2020-04-29 20:55:37 -0700 Patch bug-211216-20200429202851.patch text/plain 11478 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwOTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTQ1ZWZjNThjOGMwN2IyNzQ5NzE3ZDU1YzI1YjJhM2Zh YjJkZGE1ZC4uZDFkNjQyMDhjZmVmMzYyMWUzZDQwMzE0ZDNkMDNjY2Q0OGZhY2JjOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1 IEBACisyMDIwLTA0LTI5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEFkZCBhIE1pbmlCcm93c2VyIG9wdGlvbiB0byBpbnNldCB0aGUgd2ViIHZpZXcg c28gaXQgZG9lc24ndCBmaWxsIHRoZSB3aW5kb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTIxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgQWRkIGEgbWVudSBpdGVtLCBEZWJ1ZyA+IElu c2V0IFdlYiBWaWV3IHRvIE1pbmlCcm93c2VyIHdoaWNoIGluc2V0cyB0aGUgdmlldyBmcm9tCisg ICAgICAgIHRoZSBlZGdlcyBvZiB0aGUgd2luZG93LCBtYWtpbmcgaXQgcG9zc2libGUgdG8gZGVi dWcgY29vcmRpbmF0ZSBjb252ZXJzaW9uIGlzc3Vlcy4KKworICAgICAgICBUaGUgc3RhdGUgaXMg c3RvcmUgaW4gU2V0dGluZ3MsIGJ1dCB1bmxpa2Ugb3RoZXIgU2V0dGluZ3MgdGhpcyBvbmUgZG9l c24ndAorICAgICAgICBnZXQgcG9wdWxhdGVkIGludG8gdGhlIFNldHRpbmdzIG1lbnUgYmVjYXVz ZSBpdCBtYWtlcyBtb3JlIGxvZ2ljYWwgc2Vuc2UgZ3JvdXBlZAorICAgICAgICB3aXRoIHRoZSBv cHRpb25zIHRvIEhpZGUgYW5kIFJlbW92ZSB0aGUgd2ViIHZpZXcuCisKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBNaW5pQnJv d3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIgdG9nZ2xlRnVsbFdpbmRvd1dlYlZpZXc6XSk6CisgICAgICAgICgtW0Jy b3dzZXJXaW5kb3dDb250cm9sbGVyIHdlYlZpZXdGaWxsc1dpbmRvd10pOgorICAgICAgICAoLVtC cm93c2VyV2luZG93Q29udHJvbGxlciBzZXRXZWJWaWV3RmlsbHNXaW5kb3c6XSk6CisgICAgICAg ICogTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYjoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9t YWMvU2V0dGluZ3NDb250cm9sbGVyLmg6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL1NldHRp bmdzQ29udHJvbGxlci5tOgorICAgICAgICAoLVtTZXR0aW5nc0NvbnRyb2xsZXIgaW5pdFdpdGhN ZW51Ol0pOgorICAgICAgICAoLVtTZXR0aW5nc0NvbnRyb2xsZXIgd2ViVmlld0ZpbGxzV2luZG93 XSk6CisgICAgICAgICgtW1NldHRpbmdzQ29udHJvbGxlciBzZXRXZWJWaWV3RmlsbHNXaW5kb3c6 XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVy Lm06CisgICAgICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHZhbGlkYXRlTWVudUl0 ZW06XSk6CisgICAgICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGRpZENoYW5nZVNl dHRpbmdzXSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250 cm9sbGVyLm06CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHZhbGlkYXRl TWVudUl0ZW06XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGRpZENo YW5nZVNldHRpbmdzXSk6CisKIDIwMjAtMDQtMjkgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2No ZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3IgbGF5b3V0IHRlc3RzIGFmdGVyIHVw ZGF0ZXMgdG8gSW4tQXBwIEJyb3dzZXIgUHJpdmFjeQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJy b3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLmggYi9Ub29scy9NaW5pQnJvd3Nlci9t YWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaAppbmRleCA0ZDA1ZjY4MzRjYWJhNGU1YjQwOWVm YzdiNzQ0MzZkMzk3MTZhNTY1Li45ZjMxNTYzMThmOGY1MDJmNzkyZGVmOWE0MzQ0NDI0MzUxOGU0 MDE1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRy b2xsZXIuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXIuaApAQCAtNTgsNiArNTgsNyBAQCBAaW50ZXJmYWNlIEJyb3dzZXJXaW5kb3dDb250cm9sbGVy IDogTlNXaW5kb3dDb250cm9sbGVyIHsKIAogLSAoSUJBY3Rpb24pc2hvd0hpZGVXZWJWaWV3Oihp ZClzZW5kZXI7CiAtIChJQkFjdGlvbilyZW1vdmVSZWluc2VydFdlYlZpZXc6KGlkKXNlbmRlcjsK Ky0gKElCQWN0aW9uKXRvZ2dsZUZ1bGxXaW5kb3dXZWJWaWV3OihpZClzZW5kZXI7CiAKIC0gKElC QWN0aW9uKXpvb21JbjooaWQpc2VuZGVyOwogLSAoSUJBY3Rpb24pem9vbU91dDooaWQpc2VuZGVy OwpAQCAtNzgsNiArNzksOCBAQCBAaW50ZXJmYWNlIEJyb3dzZXJXaW5kb3dDb250cm9sbGVyIDog TlNXaW5kb3dDb250cm9sbGVyIHsKIC0gKElCQWN0aW9uKXNob3dIaWRlV2ViSW5zcGVjdG9yOihp ZClzZW5kZXI7CiAKIC0gKHZvaWQpZGlkQ2hhbmdlU2V0dGluZ3M7CistIChCT09MKXdlYlZpZXdG aWxsc1dpbmRvdzsKKy0gKHZvaWQpc2V0V2ViVmlld0ZpbGxzV2luZG93OihCT09MKWZpbGxXaW5k b3c7CiAKIC0gKE5TVVJMICopY3VycmVudFVSTDsKIC0gKE5TVmlldyAqKW1haW5Db250ZW50Vmll dzsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJv bGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0K aW5kZXggMzk2YTYwZGRjNjZiNTBmYzgwOGFmNDIzNTQzYmNjM2RmNWFkMGIyZi4uMzAzMTdkZTY4 MGEzOTVkNzc3OTQ3ZTFmYTNjYThiMzNmNmUwMmFjYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJy b3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAgLTI1LDYgKzI1LDkgQEAKIAogI2lt cG9ydCAiQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaCIKIAorI2ltcG9ydCAiQXBwRGVsZWdhdGUu aCIKKyNpbXBvcnQgIlNldHRpbmdzQ29udHJvbGxlci5oIgorCiBAaW50ZXJmYWNlIEJyb3dzZXJX aW5kb3dDb250cm9sbGVyICgpIDxOU1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUsIE5TU2hh cmluZ1NlcnZpY2VEZWxlZ2F0ZT4KIEBlbmQKIApAQCAtMTI2LDYgKzEyOSwzMyBAQCAtIChJQkFj dGlvbilyZW1vdmVSZWluc2VydFdlYlZpZXc6KGlkKXNlbmRlcgogICAgICAgICBbY29udGFpbmVy VmlldyBhZGRTdWJ2aWV3OnNlbGYubWFpbkNvbnRlbnRWaWV3XTsKIH0KIAorLSAoSUJBY3Rpb24p dG9nZ2xlRnVsbFdpbmRvd1dlYlZpZXc6KGlkKXNlbmRlcgoreworICAgIEJPT0wgbmV3RmlsbFdp bmRvdyA9ICFbc2VsZiB3ZWJWaWV3RmlsbHNXaW5kb3ddOworICAgIFtzZWxmIHNldFdlYlZpZXdG aWxsc1dpbmRvdzpuZXdGaWxsV2luZG93XTsKKworICAgIFNldHRpbmdzQ29udHJvbGxlciAqc2V0 dGluZ3MgPSBbW05TQXBwbGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dIGJyb3dzZXJBcHBEZWxl Z2F0ZV0uc2V0dGluZ3NDb250cm9sbGVyOworICAgIHNldHRpbmdzLndlYlZpZXdGaWxsc1dpbmRv dyA9IG5ld0ZpbGxXaW5kb3c7Cit9CisKKy0gKEJPT0wpd2ViVmlld0ZpbGxzV2luZG93Cit7Cisg ICAgcmV0dXJuIE5TRXF1YWxSZWN0cyhjb250YWluZXJWaWV3LmJvdW5kcywgc2VsZi5tYWluQ29u dGVudFZpZXcuZnJhbWUpOworfQorCistICh2b2lkKXNldFdlYlZpZXdGaWxsc1dpbmRvdzooQk9P TClmaWxsV2luZG93Cit7CisgICAgaWYgKGZpbGxXaW5kb3cpCisgICAgICAgIFtzZWxmLm1haW5D b250ZW50VmlldyBzZXRGcmFtZTpjb250YWluZXJWaWV3LmJvdW5kc107CisgICAgZWxzZSB7Cisg ICAgICAgIGNvbnN0IENHRmxvYXQgdmlld0luc2V0ID0gMTAwLjBmOworICAgICAgICBOU1JlY3Qg dmlld1JlY3QgPSBOU0luc2V0UmVjdChjb250YWluZXJWaWV3LmJvdW5kcywgdmlld0luc2V0LCB2 aWV3SW5zZXQpOworICAgICAgICAvLyBNYWtlIGl0IG5vdCB2ZXJ0aWNhbGx5IGNlbnRlcmVkLCB0 byByZXZlYWwgeS1mbGlwcGluZyBidWdzLgorICAgICAgICB2aWV3UmVjdCA9IE5TT2Zmc2V0UmVj dCh2aWV3UmVjdCwgMCwgLTI1KTsKKyAgICAgICAgW3NlbGYubWFpbkNvbnRlbnRWaWV3IHNldEZy YW1lOnZpZXdSZWN0XTsKKyAgICB9Cit9CisKIC0gKElCQWN0aW9uKXpvb21JbjooaWQpc2VuZGVy CiB7CiAgICAgW3NlbGYgZG9lc05vdFJlY29nbml6ZVNlbGVjdG9yOl9jbWRdOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYiBiL1Rvb2xzL01pbmlCcm93c2Vy L21hYy9NYWluTWVudS54aWIKaW5kZXggMmI0ZDNhM2I4Y2I4YTIwMjU3ODY5NzEyYjE1YmM4NTU1 N2VkNjNjYi4uNjE4YWM1YmQ1OTgyZWYyMmU1Nzc0ZWRkNWQwOGI2ODNkOTc3YmYzNyAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYgorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9tYWMvTWFpbk1lbnUueGliCkBAIC0xLDcgKzEsNyBAQAogPD94bWwgdmVyc2lvbj0i MS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KLTxkb2N1bWVudCB0eXBlPSJjb20uYXBwbGUuSW50ZXJm YWNlQnVpbGRlcjMuQ29jb2EuWElCIiB2ZXJzaW9uPSIzLjAiIHRvb2xzVmVyc2lvbj0iMTU1MDUi IHRhcmdldFJ1bnRpbWU9Ik1hY09TWC5Db2NvYSIgcHJvcGVydHlBY2Nlc3NDb250cm9sPSJub25l IiB1c2VBdXRvbGF5b3V0PSJZRVMiPgorPGRvY3VtZW50IHR5cGU9ImNvbS5hcHBsZS5JbnRlcmZh Y2VCdWlsZGVyMy5Db2NvYS5YSUIiIHZlcnNpb249IjMuMCIgdG9vbHNWZXJzaW9uPSIxNjA4NSIg dGFyZ2V0UnVudGltZT0iTWFjT1NYLkNvY29hIiBwcm9wZXJ0eUFjY2Vzc0NvbnRyb2w9Im5vbmUi IHVzZUF1dG9sYXlvdXQ9IllFUyI+CiAgICAgPGRlcGVuZGVuY2llcz4KLSAgICAgICAgPHBsdWdJ biBpZGVudGlmaWVyPSJjb20uYXBwbGUuSW50ZXJmYWNlQnVpbGRlci5Db2NvYVBsdWdpbiIgdmVy c2lvbj0iMTU1MDUiLz4KKyAgICAgICAgPHBsdWdJbiBpZGVudGlmaWVyPSJjb20uYXBwbGUuSW50 ZXJmYWNlQnVpbGRlci5Db2NvYVBsdWdpbiIgdmVyc2lvbj0iMTYwODUiLz4KICAgICA8L2RlcGVu ZGVuY2llcz4KICAgICA8b2JqZWN0cz4KICAgICAgICAgPGN1c3RvbU9iamVjdCBpZD0iLTIiIHVz ZXJMYWJlbD0iRmlsZSdzIE93bmVyIiBjdXN0b21DbGFzcz0iTlNBcHBsaWNhdGlvbiI+CkBAIC03 OTksNiArNzk5LDEyIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8YWN0 aW9uIHNlbGVjdG9yPSJyZW1vdmVSZWluc2VydFdlYlZpZXc6IiB0YXJnZXQ9Ii0xIiBpZD0iNTUx Ii8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgPC9tZW51SXRlbT4KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8bWVudUl0ZW0gdGl0bGU9IkZ1bGwgV2luZG93IFdlYiBWaWV3IiBpZD0iVXpLLWhm LVNzMCI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtb2RpZmllck1hc2sga2V5 PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIi8+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDxjb25uZWN0aW9ucz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDxhY3Rpb24gc2VsZWN0b3I9InRvZ2dsZUZ1bGxXaW5kb3dXZWJWaWV3OiIgdGFyZ2V0PSItMSIg aWQ9Ilg2RS0xNS0wbHciLz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9jb25u ZWN0aW9ucz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L21lbnVJdGVtPgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSBpc1NlcGFyYXRvckl0ZW09IllFUyIgaWQ9 IjU1MyIvPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0aXRsZT0iRHVt cCBTb3VyY2UgVG8gQ29uc29sZSIgaWQ9IjU2NiI+CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDxtb2RpZmllck1hc2sga2V5PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIi8+CmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvU2V0dGluZ3NDb250cm9sbGVyLmggYi9U b29scy9NaW5pQnJvd3Nlci9tYWMvU2V0dGluZ3NDb250cm9sbGVyLmgKaW5kZXggYzY2NzZjMDhk ZDZhNDI1Y2JmYmRlNmMzYzc4MjIyODQ3MzdmYzc3ZC4uMDZhZmU1OTQyN2IyODQ2YTFjNDdlNDkx NzVlMGEyOTQ3YzRiNGQzMSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1NldHRp bmdzQ29udHJvbGxlci5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9TZXR0aW5nc0NvbnRy b2xsZXIuaApAQCAtNjQsNCArNjQsNiBAQCBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkp IEJPT0wgcHJvY2Vzc1N3YXBPbldpbmRvd09wZW5XaXRoT3BlbmVyRW5hYmxlZDsKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNTdHJpbmcgKmRlZmF1bHRVUkw7CiBAcHJvcGVydHkg KG5vbmF0b21pYywgcmVhZG9ubHkpIE5TU3RyaW5nICpjdXN0b21Vc2VyQWdlbnQ7CiAKK0Bwcm9w ZXJ0eSAobm9uYXRvbWljKSBCT09MIHdlYlZpZXdGaWxsc1dpbmRvdzsKKwogQGVuZApkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1NldHRpbmdzQ29udHJvbGxlci5tIGIvVG9vbHMv TWluaUJyb3dzZXIvbWFjL1NldHRpbmdzQ29udHJvbGxlci5tCmluZGV4IGQ2OGM4NTRhZDU4Mjcw MmM2YTZlYTYzODcwOGYxZDNmOGU0ZTFiMTguLmUxNjI3MmEzYWEwOTkyYzFiMjdkNTNmZGJhNzhh OTA5YzZjYjhiNWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9TZXR0aW5nc0Nv bnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvU2V0dGluZ3NDb250cm9sbGVy Lm0KQEAgLTQ1LDYgKzQ1LDcgQEAKIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IFNpbXBsZUxpbmVM YXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkUHJlZmVyZW5jZUtleSA9IEAiU2ltcGxlTGluZUxheW91 dERlYnVnQm9yZGVyc0VuYWJsZWQiOwogc3RhdGljIE5TU3RyaW5nICogY29uc3QgVGlsZWRTY3Jv bGxpbmdJbmRpY2F0b3JWaXNpYmxlUHJlZmVyZW5jZUtleSA9IEAiVGlsZWRTY3JvbGxpbmdJbmRp Y2F0b3JWaXNpYmxlIjsKIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IFJlc2VydmVTcGFjZUZvckJh bm5lcnNQcmVmZXJlbmNlS2V5ID0gQCJSZXNlcnZlU3BhY2VGb3JCYW5uZXJzIjsKK3N0YXRpYyBO U1N0cmluZyAqIGNvbnN0IFdlYlZpZXdGaWxsc1dpbmRvd0tleSA9IEAiV2ViVmlld0ZpbGxzV2lu ZG93IjsKIAogc3RhdGljIE5TU3RyaW5nICogY29uc3QgUmVzb3VyY2VVc2FnZU92ZXJsYXlWaXNp YmxlUHJlZmVyZW5jZUtleSA9IEAiUmVzb3VyY2VVc2FnZU92ZXJsYXlWaXNpYmxlIjsKIHN0YXRp YyBOU1N0cmluZyAqIGNvbnN0IExvYWRzQWxsU2l0ZUljb25zS2V5ID0gQCJMb2Fkc0FsbFNpdGVJ Y29ucyI7CkBAIC0xMDMsNiArMTA0LDcgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoTWVudToo TlNNZW51ICopbWVudQogICAgICAgICBTdWJwaXhlbEFudGlhbGlhc2VkTGF5ZXJUZXh0RW5hYmxl ZFByZWZlcmVuY2VLZXksCiAgICAgICAgIExhcmdlSW1hZ2VBc3luY0RlY29kaW5nRW5hYmxlZFBy ZWZlcmVuY2VLZXksCiAgICAgICAgIEFuaW1hdGVkSW1hZ2VBc3luY0RlY29kaW5nRW5hYmxlZFBy ZWZlcmVuY2VLZXksCisgICAgICAgIFdlYlZpZXdGaWxsc1dpbmRvd0tleSwKICAgICBdOwogICAg IAogICAgIE5TVXNlckRlZmF1bHRzICp1c2VyRGVmYXVsdHMgPSBbTlNVc2VyRGVmYXVsdHMgc3Rh bmRhcmRVc2VyRGVmYXVsdHNdOwpAQCAtNjI1LDYgKzYyNywxNiBAQCAtIChCT09MKWlzU3BhY2VS ZXNlcnZlZEZvckJhbm5lcnMKICAgICByZXR1cm4gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVz ZXJEZWZhdWx0c10gYm9vbEZvcktleTpSZXNlcnZlU3BhY2VGb3JCYW5uZXJzUHJlZmVyZW5jZUtl eV07CiB9CiAKKy0gKEJPT0wpd2ViVmlld0ZpbGxzV2luZG93Cit7CisgICAgcmV0dXJuIFtbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6V2ViVmlld0ZpbGxz V2luZG93S2V5XTsKK30KKworLSAodm9pZClzZXRXZWJWaWV3RmlsbHNXaW5kb3c6KEJPT0wpZmls bHNXaW5kb3cKK3sKKyAgICByZXR1cm4gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZh dWx0c10gc2V0Qm9vbDpmaWxsc1dpbmRvdyBmb3JLZXk6V2ViVmlld0ZpbGxzV2luZG93S2V5XTsK K30KKwogLSAoQk9PTCl0aWxlZFNjcm9sbGluZ0luZGljYXRvclZpc2libGUKIHsKICAgICByZXR1 cm4gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gYm9vbEZvcktleTpUaWxl ZFNjcm9sbGluZ0luZGljYXRvclZpc2libGVQcmVmZXJlbmNlS2V5XTsKZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tIGIvVG9vbHMv TWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KaW5kZXggMmFhNTM2 Njk5NWE0NjRmMjJiYTUwODViMDM5YTY3ZTc1YzI3NGQ4Ni4uY2Y0ODk2ODllZDcwN2QzMzg0YzJj OGM0NWNiYjJhNjBiYzJhMjVjOSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dL MUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dL MUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAgLTE2Niw2ICsxNjYsOCBAQCAtIChCT09MKXZh bGlkYXRlTWVudUl0ZW06KE5TTWVudUl0ZW0gKiltZW51SXRlbQogICAgICAgICBbbWVudUl0ZW0g c2V0VGl0bGU6W193ZWJWaWV3IGlzSGlkZGVuXSA/IEAiU2hvdyBXZWIgVmlldyIgOiBAIkhpZGUg V2ViIFZpZXciXTsKICAgICBlbHNlIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHJlbW92ZVJlaW5z ZXJ0V2ViVmlldzopKQogICAgICAgICBbbWVudUl0ZW0gc2V0VGl0bGU6W193ZWJWaWV3IHdpbmRv d10gPyBAIlJlbW92ZSBXZWIgVmlldyIgOiBAIkluc2VydCBXZWIgVmlldyJdOworICAgIGVsc2Ug aWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IodG9nZ2xlRnVsbFdpbmRvd1dlYlZpZXc6KSkKKyAgICAg ICAgW21lbnVJdGVtIHNldFRpdGxlOltzZWxmIHdlYlZpZXdGaWxsc1dpbmRvd10gPyBAIkluc2V0 IFdlYiBWaWV3IiA6IEAiRml0IFdlYiBWaWV3IHRvIFdpbmRvdyJdOwogICAgIGVsc2UgaWYgKGFj dGlvbiA9PSBAc2VsZWN0b3IodG9nZ2xlWm9vbU1vZGU6KSkKICAgICAgICAgW21lbnVJdGVtIHNl dFN0YXRlOl96b29tVGV4dE9ubHkgPyBOU0NvbnRyb2xTdGF0ZVZhbHVlT24gOiBOU0NvbnRyb2xT dGF0ZVZhbHVlT2ZmXTsKICAgICBlbHNlIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHRvZ2dsZUVk aXRhYmxlOikpCkBAIC0zMzUsNiArMzM3LDggQEAgLSAodm9pZClkaWRDaGFuZ2VTZXR0aW5ncwog CiAgICAgX3dlYlZpZXcuX3VzZVN5c3RlbUFwcGVhcmFuY2UgPSBzZXR0aW5ncy51c2VTeXN0ZW1B cHBlYXJhbmNlOwogCisgICAgW3NlbGYgc2V0V2ViVmlld0ZpbGxzV2luZG93OnNldHRpbmdzLndl YlZpZXdGaWxsc1dpbmRvd107CisKICAgICBCT09MIHVzZVRyYW5zcGFyZW50V2luZG93cyA9IHNl dHRpbmdzLnVzZVRyYW5zcGFyZW50V2luZG93czsKICAgICBpZiAodXNlVHJhbnNwYXJlbnRXaW5k b3dzICE9ICFzZWxmLndpbmRvdy5pc09wYXF1ZSkgewogICAgICAgICBbc2VsZi53aW5kb3cgc2V0 T3BhcXVlOiF1c2VUcmFuc3BhcmVudFdpbmRvd3NdOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJy b3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nl ci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQppbmRleCBmNTAzNzAyNGE5ZDU4MDA2 YzU3MmQ1ZGU0MDUwNmMxYzQ4MjIzNzFjLi4yMWJjMmUwMTY3ZTFlODc4MzIwYzJlYjM0N2JiYzQx NThiMGIyNTQwIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIubQpAQCAtMjUzLDYgKzI1Myw4IEBAIC0gKEJPT0wpdmFsaWRhdGVNZW51 SXRlbTooTlNNZW51SXRlbSAqKW1lbnVJdGVtCiAgICAgICAgIFttZW51SXRlbSBzZXRUaXRsZTpb X3dlYlZpZXcgaXNIaWRkZW5dID8gQCJTaG93IFdlYiBWaWV3IiA6IEAiSGlkZSBXZWIgVmlldyJd OwogICAgIGVsc2UgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IocmVtb3ZlUmVpbnNlcnRXZWJWaWV3 OikpCiAgICAgICAgIFttZW51SXRlbSBzZXRUaXRsZTpbX3dlYlZpZXcgd2luZG93XSA/IEAiUmVt b3ZlIFdlYiBWaWV3IiA6IEAiSW5zZXJ0IFdlYiBWaWV3Il07CisgICAgZWxzZSBpZiAoYWN0aW9u ID09IEBzZWxlY3Rvcih0b2dnbGVGdWxsV2luZG93V2ViVmlldzopKQorICAgICAgICBbbWVudUl0 ZW0gc2V0VGl0bGU6W3NlbGYgd2ViVmlld0ZpbGxzV2luZG93XSA/IEAiSW5zZXQgV2ViIFZpZXci IDogQCJGaXQgV2ViIFZpZXcgdG8gV2luZG93Il07CiAgICAgZWxzZSBpZiAoYWN0aW9uID09IEBz ZWxlY3Rvcih0b2dnbGVab29tTW9kZTopKQogICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6X3pv b21UZXh0T25seSA/IE5TQ29udHJvbFN0YXRlVmFsdWVPbiA6IE5TQ29udHJvbFN0YXRlVmFsdWVP ZmZdOwogICAgIGVsc2UgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IodG9nZ2xlRWRpdGFibGU6KSkK QEAgLTQ2Myw2ICs0NjUsOCBAQCAtICh2b2lkKWRpZENoYW5nZVNldHRpbmdzCiAKICAgICBfd2Vi Vmlldy5jb25maWd1cmF0aW9uLndlYnNpdGVEYXRhU3RvcmUuX3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NFbmFibGVkID0gc2V0dGluZ3MucmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQ7CiAKKyAg ICBbc2VsZiBzZXRXZWJWaWV3RmlsbHNXaW5kb3c6c2V0dGluZ3Mud2ViVmlld0ZpbGxzV2luZG93 XTsKKwogICAgIEJPT0wgdXNlVHJhbnNwYXJlbnRXaW5kb3dzID0gc2V0dGluZ3MudXNlVHJhbnNw YXJlbnRXaW5kb3dzOwogICAgIGlmICh1c2VUcmFuc3BhcmVudFdpbmRvd3MgIT0gIV93ZWJWaWV3 Ll9kcmF3c0JhY2tncm91bmQpIHsKICAgICAgICAgW3NlbGYud2luZG93IHNldE9wYXF1ZTohdXNl VHJhbnNwYXJlbnRXaW5kb3dzXTsK