134099 2014-06-20 01:38:09 -0700 Make WebKit2 more accessible in MiniBrowser 2014-06-20 19:24:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca simon.fraser oldest_to_newest 1016887 0 thorton 2014-06-20 01:38:09 -0700 We should have a menu item to use WebKit2 by default, and maybe not hide the WebKit2 new-window menu item behind the option key. 1016888 1 233413 thorton 2014-06-20 01:38:56 -0700 Created attachment 233413 patch 1017169 2 thorton 2014-06-20 19:24:43 -0700 http://trac.webkit.org/changeset/170194 233413 2014-06-20 01:38:56 -0700 2014-06-20 06:20:35 -0700 patch mini-wk2.diff text/plain 11726 thorton ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MmYw NzFlLi4yMzkzYzE0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTQtMDYtMjAgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBXZWJLaXQyIG1vcmUgYWNjZXNzaWJs ZSBpbiBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM0MDk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaDoKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUubToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRl IG5ld1dpbmRvdzpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIGFwcGxpY2F0aW9u RGlkRmluaXNoTGF1bmNoaW5nOl0pOgorICAgICAgICAoLVtCcm93c2VyQXBwRGVsZWdhdGUgdG9n Z2xlVXNlV2ViS2l0MkJ5RGVmYXVsdDpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRl IF91c2VXZWJLaXQyQnlEZWZhdWx0XSk6CisgICAgICAgICgtW0Jyb3dzZXJBcHBEZWxlZ2F0ZSBf dXBkYXRlTmV3V2luZG93S2V5RXF1aXZhbGVudHNdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERl bGVnYXRlIHZhbGlkYXRlTWVudUl0ZW06XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL01h aW5NZW51LnhpYjoKKyAgICAgICAgQWRkIGEgIlVzZSBXZWJLaXQyIEJ5IERlZmF1bHQiIG1lbnUg aXRlbSB0byB0aGUgdG9wIG9mIHRoZSBEZWJ1ZyBtZW51LgorICAgICAgICBXaGVuIHN3aXRjaGVk IG9uLCBDbWQtTiB3aWxsIG1ha2UgV2ViS2l0MiB3aW5kb3dzIChhbmQgdGhlIGRlZmF1bHQgd2lu ZG93IHdpbGwgYmUgV2ViS2l0MikuCisgICAgICAgIE1ha2UgdGhlIG5vbi1kZWZhdWx0IG5ldy13 aW5kb3cgbWVudSBpdGVtIGFsd2F5cyBzaG93IHVwLCBiZWNhdXNlIHBlb3BsZSBvZnRlbiBkb24n dCBmaW5kIGl0CisgICAgICAgIHdoZW4geW91IGhhdmUgdG8gcHJlc3Mgb3B0aW9uIHRvIGhhdmUg aXQgc2hvdyB1cC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29u dHJvbGxlci5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJv bGxlci5tOgorICAgICAgICAoLVtCcm93c2VyV2luZG93Q29udHJvbGxlciBpbml0V2l0aFdpbmRv dzpdKToKKyAgICAgICAgCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5k b3dDb250cm9sbGVyLm06CisgICAgICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHZh bGlkYXRlTWVudUl0ZW06XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJX aW5kb3dDb250cm9sbGVyLm06CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVy IHZhbGlkYXRlTWVudUl0ZW06XSk6CisgICAgICAgIFVzZSB0aGUgY2FjaGVkIFttZW51SXRlbSBh Y3Rpb25dIGxpa2UgdGhlIGVhcmxpZXIgY2FzZXMgZG8uCisKIDIwMTQtMDYtMjAgIEV2YSBCYWxh enNmYWx2aSAgPGV2YWIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBb RUZMXSBBZGQgZ3N0cmVhbWVyIGFzIGRlcGVuZGVjeSBvZiBFRkwgYWZ0ZXIgcjE2OTc4NQpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLmggYi9Ub29scy9NaW5p QnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaAppbmRleCA0NmRmOWI1Li44ZWFkMGVmIDEwMDY0NAot LS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaApAQCAtMjUsOCArMjUsMTMgQEAKIAogQGludGVyZmFj ZSBCcm93c2VyQXBwRGVsZWdhdGUgOiBOU09iamVjdCA8TlNBcHBsaWNhdGlvbkRlbGVnYXRlPiB7 CiAgICAgTlNNdXRhYmxlU2V0ICpfYnJvd3NlcldpbmRvd0NvbnRyb2xsZXJzOworCisgICAgSUJP dXRsZXQgTlNNZW51SXRlbSAqX25ld1dlYktpdDFXaW5kb3dJdGVtOworICAgIElCT3V0bGV0IE5T TWVudUl0ZW0gKl9uZXdXZWJLaXQyV2luZG93SXRlbTsKIH0KIAogLSAodm9pZClicm93c2VyV2lu ZG93V2lsbENsb3NlOihOU1dpbmRvdyAqKXdpbmRvdzsKIAorLSAoSUJBY3Rpb24pdG9nZ2xlVXNl V2ViS2l0MkJ5RGVmYXVsdDooaWQpc2VuZGVyOworCiBAZW5kCmRpZmYgLS1naXQgYS9Ub29scy9N aW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBE ZWxlZ2F0ZS5tCmluZGV4IGEyNTM3NWIuLjUyNGEzY2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlC cm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBE ZWxlZ2F0ZS5tCkBAIC0zMSw2ICszMSw3IEBACiAjaW1wb3J0IDxXZWJLaXQvV2ViS2l0Mi5oPgog CiBzdGF0aWMgTlNTdHJpbmcgKmRlZmF1bHRVUkwgPSBAImh0dHA6Ly93d3cud2Via2l0Lm9yZy8i Oworc3RhdGljIE5TU3RyaW5nICp1c2VXZWJLaXQyQnlEZWZhdWx0UHJlZmVyZW5jZUtleSA9IEAi VXNlV2ViS2l0MkJ5RGVmYXVsdCI7CiAKIGVudW0gewogICAgIFdlYktpdDFOZXdXaW5kb3dUYWcg PSAxLApAQCAtNTIsMTEgKzUzLDE4IEBAIC0gKGlkKWluaXQKIC0gKElCQWN0aW9uKW5ld1dpbmRv dzooaWQpc2VuZGVyCiB7CiAgICAgQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgKmNvbnRyb2xsZXIg PSBuaWw7CisKKyAgICBCT09MIHVzZVdlYktpdDIgPSBOTzsKKworICAgIGlmICghW3NlbmRlciBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHRhZyldKQorICAgICAgICB1c2VXZWJLaXQyID0g W3NlbGYgX3VzZVdlYktpdDJCeURlZmF1bHRdOworICAgIGVsc2UKKyAgICAgICAgdXNlV2ViS2l0 MiA9IFtzZW5kZXIgdGFnXSA9PSBXZWJLaXQyTmV3V2luZG93VGFnOwogICAgIAotICAgIGlmICgh W3NlbmRlciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHRhZyldIHx8IFtzZW5kZXIgdGFn XSA9PSBXZWJLaXQxTmV3V2luZG93VGFnKQorICAgIGlmICghdXNlV2ViS2l0MikKICAgICAgICAg Y29udHJvbGxlciA9IFtbV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRo V2luZG93TmliTmFtZTpAIkJyb3dzZXJXaW5kb3ciXTsKICNpZiBXS19BUElfRU5BQkxFRAotICAg IGVsc2UgaWYgKFtzZW5kZXIgdGFnXSA9PSBXZWJLaXQyTmV3V2luZG93VGFnKQorICAgIGVsc2UK ICAgICAgICAgY29udHJvbGxlciA9IFtbV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgYWxsb2Nd IGluaXRXaXRoV2luZG93TmliTmFtZTpAIkJyb3dzZXJXaW5kb3ciXTsKICNlbmRpZgogICAgIGlm ICghY29udHJvbGxlcikKQEAgLTc5LDYgKzg3LDcgQEAgLSAodm9pZClhcHBsaWNhdGlvbkRpZEZp bmlzaExhdW5jaGluZzooTlNOb3RpZmljYXRpb24gKilhTm90aWZpY2F0aW9uCiAgICAgW1dlYkhp c3Rvcnkgc2V0T3B0aW9uYWxTaGFyZWRIaXN0b3J5OndlYkhpc3RvcnldOwogICAgIFt3ZWJIaXN0 b3J5IHJlbGVhc2VdOwogCisgICAgW3NlbGYgX3VwZGF0ZU5ld1dpbmRvd0tleUVxdWl2YWxlbnRz XTsKICAgICBbc2VsZiBuZXdXaW5kb3c6c2VsZl07CiB9CiAKQEAgLTEzMyw0ICsxNDIsMzggQEAg LSAoSUJBY3Rpb24pb3BlbkRvY3VtZW50OihpZClzZW5kZXIKICAgICB9XTsKIH0KIAorLSAoSUJB Y3Rpb24pdG9nZ2xlVXNlV2ViS2l0MkJ5RGVmYXVsdDooaWQpc2VuZGVyCit7CisgICAgQk9PTCBu ZXdVc2VXZWJLaXQyQnlEZWZhdWx0ID0gIVtzZWxmIF91c2VXZWJLaXQyQnlEZWZhdWx0XTsKKyAg ICBpZiAoIW5ld1VzZVdlYktpdDJCeURlZmF1bHQpCisgICAgICAgIFtbTlNVc2VyRGVmYXVsdHMg c3RhbmRhcmRVc2VyRGVmYXVsdHNdIHJlbW92ZU9iamVjdEZvcktleTp1c2VXZWJLaXQyQnlEZWZh dWx0UHJlZmVyZW5jZUtleV07CisgICAgZWxzZQorICAgICAgICBbW05TVXNlckRlZmF1bHRzIHN0 YW5kYXJkVXNlckRlZmF1bHRzXSBzZXRCb29sOm5ld1VzZVdlYktpdDJCeURlZmF1bHQgZm9yS2V5 OnVzZVdlYktpdDJCeURlZmF1bHRQcmVmZXJlbmNlS2V5XTsKKyAgICBbc2VsZiBfdXBkYXRlTmV3 V2luZG93S2V5RXF1aXZhbGVudHNdOworfQorCistIChCT09MKV91c2VXZWJLaXQyQnlEZWZhdWx0 Cit7CisgICAgcmV0dXJuIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJv b2xGb3JLZXk6dXNlV2ViS2l0MkJ5RGVmYXVsdFByZWZlcmVuY2VLZXldOworfQorCistICh2b2lk KV91cGRhdGVOZXdXaW5kb3dLZXlFcXVpdmFsZW50cworeworICAgIGlmIChbc2VsZiBfdXNlV2Vi S2l0MkJ5RGVmYXVsdF0pIHsKKyAgICAgICAgW19uZXdXZWJLaXQxV2luZG93SXRlbSBzZXRLZXlF cXVpdmFsZW50TW9kaWZpZXJNYXNrOk5TQ29tbWFuZEtleU1hc2sgfCBOU0FsdGVybmF0ZUtleU1h c2tdOworICAgICAgICBbX25ld1dlYktpdDJXaW5kb3dJdGVtIHNldEtleUVxdWl2YWxlbnRNb2Rp Zmllck1hc2s6TlNDb21tYW5kS2V5TWFza107CisgICAgfSBlbHNlIHsKKyAgICAgICAgW19uZXdX ZWJLaXQxV2luZG93SXRlbSBzZXRLZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrOk5TQ29tbWFuZEtl eU1hc2tdOworICAgICAgICBbX25ld1dlYktpdDJXaW5kb3dJdGVtIHNldEtleUVxdWl2YWxlbnRN b2RpZmllck1hc2s6TlNDb21tYW5kS2V5TWFzayB8IE5TQWx0ZXJuYXRlS2V5TWFza107CisgICAg fQorfQorCistIChCT09MKXZhbGlkYXRlTWVudUl0ZW06KE5TTWVudUl0ZW0gKiltZW51SXRlbQor eworICAgIGlmIChbbWVudUl0ZW0gYWN0aW9uXSA9PSBAc2VsZWN0b3IodG9nZ2xlVXNlV2ViS2l0 MkJ5RGVmYXVsdDopKQorICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6W3NlbGYgX3VzZVdlYktp dDJCeURlZmF1bHRdID8gTlNPblN0YXRlIDogTlNPZmZTdGF0ZV07CisKKyAgICByZXR1cm4gWUVT OworfQorCiBAZW5kCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIuaCBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29u dHJvbGxlci5oCmluZGV4IDdjOGFkMjEuLjRjOTM0NWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlC cm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5oCkBAIC02Niw3ICs2Niw3IEBACiAgICAg SUJPdXRsZXQgTlNWaWV3ICpjb250YWluZXJWaWV3OwogICAgIAogICAgIElCT3V0bGV0IE5TV2lu ZG93ICpmaW5kUGFuZWxXaW5kb3c7Ci0gICAgCisKICAgICBCT09MIF96b29tVGV4dE9ubHk7CiB9 CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJv bGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0K aW5kZXggYmEzOGQyNS4uNzk1ZjJhMiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFj L0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jy b3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAgLTM0LDkgKzM0LDYgQEAgQGltcGxlbWVudGF0aW9u IEJyb3dzZXJXaW5kb3dDb250cm9sbGVyCiAtIChpZClpbml0V2l0aFdpbmRvdzooTlNXaW5kb3cg Kil3aW5kb3cKIHsKICAgICBzZWxmID0gW3N1cGVyIGluaXRXaXRoV2luZG93OndpbmRvd107Ci0g ICAgaWYgKHNlbGYpIHsKLSAgICB9Ci0gICAgCiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKZGlmZiAt LWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIgYi9Ub29scy9NaW5pQnJv d3Nlci9tYWMvTWFpbk1lbnUueGliCmluZGV4IGRmY2U2ZWUuLjZiNTMzMjMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIKKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvbWFjL01haW5NZW51LnhpYgpAQCAtMSw3ICsxLDcgQEAKIDw/eG1sIHZlcnNpb249IjEuMCIg ZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJubyI/PgotPGRvY3VtZW50IHR5cGU9ImNvbS5h cHBsZS5JbnRlcmZhY2VCdWlsZGVyMy5Db2NvYS5YSUIiIHZlcnNpb249IjMuMCIgdG9vbHNWZXJz aW9uPSI2MTE5LjIiIHN5c3RlbVZlcnNpb249IjEzQzY0IiB0YXJnZXRSdW50aW1lPSJNYWNPU1gu Q29jb2EiIHByb3BlcnR5QWNjZXNzQ29udHJvbD0ibm9uZSI+Cis8ZG9jdW1lbnQgdHlwZT0iY29t LmFwcGxlLkludGVyZmFjZUJ1aWxkZXIzLkNvY29hLlhJQiIgdmVyc2lvbj0iMy4wIiB0b29sc1Zl cnNpb249IjUwNTYiIHN5c3RlbVZlcnNpb249IjEzRDY1IiB0YXJnZXRSdW50aW1lPSJNYWNPU1gu Q29jb2EiIHByb3BlcnR5QWNjZXNzQ29udHJvbD0ibm9uZSI+CiAgICAgPGRlcGVuZGVuY2llcz4K LSAgICAgICAgPHBsdWdJbiBpZGVudGlmaWVyPSJjb20uYXBwbGUuSW50ZXJmYWNlQnVpbGRlci5D b2NvYVBsdWdpbiIgdmVyc2lvbj0iNjExOS4yIi8+CisgICAgICAgIDxwbHVnSW4gaWRlbnRpZmll cj0iY29tLmFwcGxlLkludGVyZmFjZUJ1aWxkZXIuQ29jb2FQbHVnaW4iIHZlcnNpb249IjUwNTYi Lz4KICAgICA8L2RlcGVuZGVuY2llcz4KICAgICA8b2JqZWN0cz4KICAgICAgICAgPGN1c3RvbU9i amVjdCBpZD0iLTIiIHVzZXJMYWJlbD0iRmlsZSdzIE93bmVyIiBjdXN0b21DbGFzcz0iTlNBcHBs aWNhdGlvbiI+CkBAIC03NSw3ICs3NSw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8YWN0aW9uIHNlbGVjdG9yPSJuZXdXaW5kb3c6IiB0YXJnZXQ9Ii0xIiBpZD0iNTc0 Ii8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgPC9tZW51SXRlbT4KLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8bWVudUl0ZW0gdGl0bGU9Ik5ldyBXZWJLaXQyIFdpbmRvdyIgdGFnPSIyIiBhbHRl cm5hdGU9IllFUyIga2V5RXF1aXZhbGVudD0ibiIgaWQ9IjU3MSI+CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPG1lbnVJdGVtIHRpdGxlPSJOZXcgV2ViS2l0MiBXaW5kb3ciIHRhZz0iMiIg a2V5RXF1aXZhbGVudD0ibiIgaWQ9IjU3MSI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxtb2RpZmllck1hc2sga2V5PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIiBvcHRpb249 IllFUyIgY29tbWFuZD0iWUVTIi8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxj b25uZWN0aW9ucz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24g c2VsZWN0b3I9Im5ld1dpbmRvdzoiIHRhcmdldD0iLTEiIGlkPSI1NzIiLz4KQEAgLTQyNSw2ICs0 MjUsMTMgQEAKICAgICAgICAgICAgICAgICAgICAgPG1vZGlmaWVyTWFzayBrZXk9ImtleUVxdWl2 YWxlbnRNb2RpZmllck1hc2siLz4KICAgICAgICAgICAgICAgICAgICAgPG1lbnUga2V5PSJzdWJt ZW51IiB0aXRsZT0iRGVidWciIGlkPSI1MzUiPgogICAgICAgICAgICAgICAgICAgICAgICAgPGl0 ZW1zPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0aXRsZT0iVXNlIFdl YktpdDIgQnkgRGVmYXVsdCIgaWQ9IkdtSC0wOC1aWDkiPgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8bW9kaWZpZXJNYXNrIGtleT0ia2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzayIv PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y29ubmVjdGlvbnM+CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8YWN0aW9uIHNlbGVjdG9yPSJ0b2dnbGVVc2VX ZWJLaXQyQnlEZWZhdWx0OiIgdGFyZ2V0PSI0OTQiIGlkPSJ4Z0EtOVAtelk2Ii8+CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPC9tZW51SXRlbT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bWVu dUl0ZW0gaXNTZXBhcmF0b3JJdGVtPSJZRVMiIGlkPSJrZ2YtQnMtOFMxIi8+CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPG1lbnVJdGVtIHRpdGxlPSJGb3JjZSBSZXBhaW50IiBrZXlFcXVp dmFsZW50PSJyIiBpZD0iNTQ1Ij4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1v ZGlmaWVyTWFzayBrZXk9ImtleUVxdWl2YWxlbnRNb2RpZmllck1hc2siIG9wdGlvbj0iWUVTIiBj b21tYW5kPSJZRVMiLz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGNvbm5lY3Rp b25zPgpAQCAtNDgwLDcgKzQ4NywxMiBAQAogICAgICAgICAgICAgICAgIDwvbWVudUl0ZW0+CiAg ICAgICAgICAgICA8L2l0ZW1zPgogICAgICAgICA8L21lbnU+Ci0gICAgICAgIDxjdXN0b21PYmpl Y3QgaWQ9IjQ5NCIgY3VzdG9tQ2xhc3M9IkJyb3dzZXJBcHBEZWxlZ2F0ZSIvPgorICAgICAgICA8 Y3VzdG9tT2JqZWN0IGlkPSI0OTQiIGN1c3RvbUNsYXNzPSJCcm93c2VyQXBwRGVsZWdhdGUiPgor ICAgICAgICAgICAgPGNvbm5lY3Rpb25zPgorICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVy dHk9Il9uZXdXZWJLaXQxV2luZG93SXRlbSIgZGVzdGluYXRpb249IjU3MyIgaWQ9IlpDai11Mi1Q VTciLz4KKyAgICAgICAgICAgICAgICA8b3V0bGV0IHByb3BlcnR5PSJfbmV3V2ViS2l0MldpbmRv d0l0ZW0iIGRlc3RpbmF0aW9uPSI1NzEiIGlkPSIxR3YtbUstYXVsIi8+CisgICAgICAgICAgICA8 L2Nvbm5lY3Rpb25zPgorICAgICAgICA8L2N1c3RvbU9iamVjdD4KICAgICAgICAgPGN1c3RvbU9i amVjdCBpZD0iNDIwIiBjdXN0b21DbGFzcz0iTlNGb250TWFuYWdlciIvPgogICAgIDwvb2JqZWN0 cz4KIDwvZG9jdW1lbnQ+CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJv d3NlcldpbmRvd0NvbnRyb2xsZXIubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2Vy V2luZG93Q29udHJvbGxlci5tCmluZGV4IDIzY2IyN2IuLmUzOGYyMWEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rv b2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC0xMzAs MTEgKzEzMCwxMSBAQCAtIChCT09MKXZhbGlkYXRlTWVudUl0ZW06KE5TTWVudUl0ZW0gKiltZW51 SXRlbQogICAgICAgICBbbWVudUl0ZW0gc2V0VGl0bGU6W193ZWJWaWV3IHdpbmRvd10gPyBAIlJl bW92ZSBXZWIgVmlldyIgOiBAIkluc2VydCBXZWIgVmlldyJdOwogICAgIGVsc2UgaWYgKGFjdGlv biA9PSBAc2VsZWN0b3IodG9nZ2xlWm9vbU1vZGU6KSkKICAgICAgICAgW21lbnVJdGVtIHNldFN0 YXRlOl96b29tVGV4dE9ubHkgPyBOU09uU3RhdGUgOiBOU09mZlN0YXRlXTsKLSAgICBlbHNlIGlm IChbbWVudUl0ZW0gYWN0aW9uXSA9PSBAc2VsZWN0b3IodG9nZ2xlUGFnaW5hdGlvbk1vZGU6KSkK KyAgICBlbHNlIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHRvZ2dsZVBhZ2luYXRpb25Nb2RlOikp CiAgICAgICAgIFttZW51SXRlbSBzZXRTdGF0ZTpbc2VsZiBpc1BhZ2luYXRlZF0gPyBOU09uU3Rh dGUgOiBOU09mZlN0YXRlXTsKLSAgICBlbHNlIGlmIChbbWVudUl0ZW0gYWN0aW9uXSA9PSBAc2Vs ZWN0b3IodG9nZ2xlVHJhbnNwYXJlbnRXaW5kb3c6KSkKKyAgICBlbHNlIGlmIChhY3Rpb24gPT0g QHNlbGVjdG9yKHRvZ2dsZVRyYW5zcGFyZW50V2luZG93OikpCiAgICAgICAgIFttZW51SXRlbSBz ZXRTdGF0ZTpbW3NlbGYgd2luZG93XSBpc09wYXF1ZV0gPyBOU09mZlN0YXRlIDogTlNPblN0YXRl XTsKLSAgICBlbHNlIGlmIChbbWVudUl0ZW0gYWN0aW9uXSA9PSBAc2VsZWN0b3IodG9nZ2xlU3Vi cGl4ZWxDU1NPTUVsZW1lbnRNZXRyaWNzRW5hYmxlZDopKQorICAgIGVsc2UgaWYgKGFjdGlvbiA9 PSBAc2VsZWN0b3IodG9nZ2xlU3VicGl4ZWxDU1NPTUVsZW1lbnRNZXRyaWNzRW5hYmxlZDopKQog ICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6W3NlbGYgaXNTdWJwaXhlbENTU09NRWxlbWVudE1l dHJpY3NFbmFibGVkXSA/IE5TT25TdGF0ZSA6IE5TT2ZmU3RhdGVdOwogCiAgICAgcmV0dXJuIFlF UzsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29u dHJvbGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0KaW5kZXggZjcwZmQ5MC4uMTJjYTVmZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dz ZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAgLTEzMiwxMyArMTMyLDEzIEBA IC0gKEJPT0wpdmFsaWRhdGVNZW51SXRlbTooTlNNZW51SXRlbSAqKW1lbnVJdGVtCiAgICAgICAg IFttZW51SXRlbSBzZXRUaXRsZTpbX3dlYlZpZXcgd2luZG93XSA/IEAiUmVtb3ZlIFdlYiBWaWV3 IiA6IEAiSW5zZXJ0IFdlYiBWaWV3Il07CiAgICAgZWxzZSBpZiAoYWN0aW9uID09IEBzZWxlY3Rv cih0b2dnbGVab29tTW9kZTopKQogICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6X3pvb21UZXh0 T25seSA/IE5TT25TdGF0ZSA6IE5TT2ZmU3RhdGVdOwotICAgIGVsc2UgaWYgKFttZW51SXRlbSBh Y3Rpb25dID09IEBzZWxlY3Rvcih0b2dnbGVQYWdpbmF0aW9uTW9kZTopKQorICAgIGVsc2UgaWYg KGFjdGlvbiA9PSBAc2VsZWN0b3IodG9nZ2xlUGFnaW5hdGlvbk1vZGU6KSkKICAgICAgICAgW21l bnVJdGVtIHNldFN0YXRlOltzZWxmIGlzUGFnaW5hdGVkXSA/IE5TT25TdGF0ZSA6IE5TT2ZmU3Rh dGVdOwotICAgIGVsc2UgaWYgKFttZW51SXRlbSBhY3Rpb25dID09IEBzZWxlY3Rvcih0b2dnbGVU cmFuc3BhcmVudFdpbmRvdzopKQorICAgIGVsc2UgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IodG9n Z2xlVHJhbnNwYXJlbnRXaW5kb3c6KSkKICAgICAgICAgW21lbnVJdGVtIHNldFN0YXRlOltbc2Vs ZiB3aW5kb3ddIGlzT3BhcXVlXSA/IE5TT2ZmU3RhdGUgOiBOU09uU3RhdGVdOwotICAgIGVsc2Ug aWYgKFttZW51SXRlbSBhY3Rpb25dID09IEBzZWxlY3Rvcih0b2dnbGVVSVNpZGVDb21wb3NpdGlu ZzopKQorICAgIGVsc2UgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IodG9nZ2xlVUlTaWRlQ29tcG9z aXRpbmc6KSkKICAgICAgICAgW21lbnVJdGVtIHNldFN0YXRlOltzZWxmIGlzVUlTaWRlQ29tcG9z aXRpbmdFbmFibGVkXSA/IE5TT25TdGF0ZSA6IE5TT2ZmU3RhdGVdOwotICAgIGVsc2UgaWYgKFtt ZW51SXRlbSBhY3Rpb25dID09IEBzZWxlY3Rvcih0b2dnbGVTdWJwaXhlbENTU09NRWxlbWVudE1l dHJpY3NFbmFibGVkOikpCisgICAgZWxzZSBpZiAoYWN0aW9uID09IEBzZWxlY3Rvcih0b2dnbGVT dWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVkOikpCiAgICAgICAgIFttZW51SXRlbSBz ZXRTdGF0ZTpbc2VsZiBpc1N1YnBpeGVsQ1NTT01FbGVtZW50TWV0cmljc0VuYWJsZWRdID8gTlNP blN0YXRlIDogTlNPZmZTdGF0ZV07CiAKICAgICByZXR1cm4gWUVTOwo=