141828 2015-02-20 02:02:48 -0800 [WebEditingTester] Hook up key equivalents for new window action 2015-02-20 11:18:37 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca commit-queue enrica sam simon.fraser oldest_to_newest 1070638 0 thorton 2015-02-20 02:02:48 -0800 [WebEditingTester] Hook up key equivalents for new window action 1070639 1 246949 thorton 2015-02-20 02:03:00 -0800 Created attachment 246949 Patch 1070645 2 commit-queue 2015-02-20 02:05:54 -0800 Attachment 246949 did not pass style-queue: ERROR: Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1070732 3 246949 enrica 2015-02-20 11:15:51 -0800 Comment on attachment 246949 Patch Looks good to me. Add the bug url to the ChangeLog. 1070734 4 thorton 2015-02-20 11:18:37 -0800 http://trac.webkit.org/changeset/180429 246949 2015-02-20 02:03:00 -0800 2015-02-20 11:15:51 -0800 Patch bug-141828-20150220020252.patch text/plain 13638 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMzc5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDhjMjA0ZGJkNjlkZWRmMGMxZGE0MTczM2RkYzRiMjhh ZWI2NTQ2MC4uNWZmMGZmMjZiNDY0OTU0NzZkZTc1ODYyNDRkMmEzMjkzMzExYmIxMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1 IEBACisyMDE1LTAyLTIwICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKworICAgICAgICBbV2ViRWRpdGluZ1Rlc3Rlcl0gSG9vayB1cCBrZXkgZXF1aXZhbGVudHMg Zm9yIG5ldyB3aW5kb3cgYWN0aW9uCisgICAgICAgIE5lZWQgdGhlIGJ1ZyBVUkwgKE9PUFMhKS4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkVk aXRpbmdUZXN0ZXIvQXBwRGVsZWdhdGUuaDoKKyAgICAgICAgKiBXZWJFZGl0aW5nVGVzdGVyL0Fw cERlbGVnYXRlLm06CisgICAgICAgICgtW1dlYkVkaXRpbmdBcHBEZWxlZ2F0ZSBhcHBsaWNhdGlv bkRpZEZpbmlzaExhdW5jaGluZzpdKToKKyAgICAgICAgKC1bV2ViRWRpdGluZ0FwcERlbGVnYXRl IG5ld0VkaXRvcjpdKToKKyAgICAgICAgKC1bV2ViRWRpdGluZ0FwcERlbGVnYXRlIF9kZWZhdWx0 V2ViRG9jdW1lbnRDb250cm9sbGVyQ2xhc3NdKToKKyAgICAgICAgKC1bV2ViRWRpdGluZ0FwcERl bGVnYXRlIHRvZ2dsZVVzZVdLMkJ5RGVmYXVsdDpdKToKKyAgICAgICAgKC1bV2ViRWRpdGluZ0Fw cERlbGVnYXRlIF91cGRhdGVOZXdXaW5kb3dLZXlFcXVpdmFsZW50c10pOgorICAgICAgICAoZGVm YXVsdENvbmZpZ3VyYXRpb24pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJFZGl0aW5nQXBwRGVs ZWdhdGUgYXBwbGljYXRpb25XaWxsVGVybWluYXRlOl0pOiBEZWxldGVkLgorICAgICAgICBNb3Zl IFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0dXAgaW50byBXSzJXZWJEb2N1bWVudENvbnRyb2xs ZXIuCisgICAgICAgIFJlbW92ZSB1bnVzZWQgYXBwbGljYXRpb24gdGVybWluYXRpb24gY29kZS4K KyAgICAgICAgVXBkYXRlIG5ldy13aW5kb3cgbWVudSBpdGVtIGtleSBlcXVpdmFsZW50cyB3aGVu IGxhdW5jaGluZyBhbmQgd2hlbgorICAgICAgICBjaGFuZ2luZyB0aGUgdXNlLVdlYktpdDItYnkt ZGVmYXVsdCBzZXR0aW5nLgorICAgICAgICBNYWtlIFdlYkRvY3VtZW50Q29udHJvbGxlciBzdWJj bGFzc2VzIGFsbCBpbml0aWFsaXplZCB0aGUgc2FtZSB3YXksCisgICAgICAgIGFuZCB1c2UgdGhh dCB0byBmYWN0b3Igb3V0IGFsbG9jL2luaXQuCisgICAgICAgIFJlbmFtZSBsb2FkQ29udGVudCB0 byBsb2FkSFRNTFN0cmluZyBmb3IgZnV0dXJlIHVzZS4KKworICAgICAgICAqIFdlYkVkaXRpbmdU ZXN0ZXIvTWFpbk1lbnUueGliOgorICAgICAgICBBZGQgZGVmYXVsdCBrZXkgZXF1aXZhbGVudHMu CisgICAgICAgIENtZC1OIHdpbGwgYWx3YXlzIG1ha2UgdGhlIGRlZmF1bHQga2luZCBvZiB3aW5k b3cgKGNvbnRyb2xsZWQgYnkgdGhlIHByZWYpLgorICAgICAgICBDbWQtT3B0LU4gd2lsbCBhbHdh eXMgbWFrZSB0aGUgb3RoZXIga2luZC4KKyAgICAgICAgVGhlIG1lbnUgaXRlbXMgYXJlIGNvbmZp Z3VyZWQgYXMgYWx0ZXJuYXRlcyBzbyB0aGV5IG9ubHkgc2hvdyB1cCBpZiB5b3UKKyAgICAgICAg cHJlc3MgYWx0IChqdXN0IGxpa2UgaW4gTWluaUJyb3dzZXIpLgorCisgICAgICAgICogV2ViRWRp dGluZ1Rlc3Rlci9XSzFXZWJEb2N1bWVudENvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV0sxV2Vi RG9jdW1lbnRDb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOl0pOgorICAgICAgICAoLVtXSzFXZWJE b2N1bWVudENvbnRyb2xsZXIgbG9hZENvbnRlbnRdKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJF ZGl0aW5nVGVzdGVyL1dLMldlYkRvY3VtZW50Q29udHJvbGxlci5oOgorICAgICAgICAqIFdlYkVk aXRpbmdUZXN0ZXIvV0syV2ViRG9jdW1lbnRDb250cm9sbGVyLm06CisgICAgICAgIChkZWZhdWx0 Q29uZmlndXJhdGlvbik6CisgICAgICAgICgtW1dLMldlYkRvY3VtZW50Q29udHJvbGxlciBhd2Fr ZUZyb21OaWJdKToKKyAgICAgICAgKC1bV0syV2ViRG9jdW1lbnRDb250cm9sbGVyIGxvYWRIVE1M U3RyaW5nOl0pOgorICAgICAgICAoLVtXSzJXZWJEb2N1bWVudENvbnRyb2xsZXIgaW5pdFdpdGhD b25maWd1cmF0aW9uOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXSzJXZWJEb2N1bWVudENvbnRy b2xsZXIgZGVhbGxvY10pOiBEZWxldGVkLgorICAgICAgICAqIFdlYkVkaXRpbmdUZXN0ZXIvV2Vi RG9jdW1lbnRDb250cm9sbGVyLmg6CisgICAgICAgICogV2ViRWRpdGluZ1Rlc3Rlci9XZWJEb2N1 bWVudENvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV2ViRG9jdW1lbnRDb250cm9sbGVyIGluaXRd KToKKyAgICAgICAgKC1bV2ViRG9jdW1lbnRDb250cm9sbGVyIGluaXRXaXRoV2luZG93Ol0pOgor ICAgICAgICAoK1tXZWJEb2N1bWVudENvbnRyb2xsZXIgZGVmYXVsdEVkaXRpbmdTb3VyY2VdKToK KyAgICAgICAgKC1bV2ViRG9jdW1lbnRDb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOl0pOgorICAg ICAgICAoLVtXZWJEb2N1bWVudENvbnRyb2xsZXIgd2luZG93RGlkTG9hZF0pOiBEZWxldGVkLgor ICAgICAgICAoLVtXZWJEb2N1bWVudENvbnRyb2xsZXIgZGVmYXVsdEVkaXRpbmdTb3VyY2VdKTog RGVsZXRlZC4KKyAgICAgICAgKC1bV2ViRG9jdW1lbnRDb250cm9sbGVyIGFwcGxpY2F0aW9uVGVy bWluYXRpbmddKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViRG9jdW1lbnRDb250cm9sbGVyIGxv YWRDb250ZW50XSk6IERlbGV0ZWQuCisKIDIwMTUtMDItMTkgIFRpbW90aHkgSG9ydG9uICA8dGlt b3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJFZGl0aW5nVGVzdGVyXSBBUkMt aWZ5IFdlYkVkaXRpbmdUZXN0ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIv QXBwRGVsZWdhdGUuaCBiL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvQXBwRGVsZWdhdGUuaAppbmRl eCAzOGU5ZTIwNmIyMzc0MWI5YjQyMWE2M2RhNjRhNDg4ZjA0YWI5ZTBlLi4xOTM4MTg0YTg5MDM3 MDYwZmQ4ODZiNzhjODA2YTRmMzkxODY3MmQzIDEwMDY0NAotLS0gYS9Ub29scy9XZWJFZGl0aW5n VGVzdGVyL0FwcERlbGVnYXRlLmgKKysrIGIvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9BcHBEZWxl Z2F0ZS5oCkBAIC0zMSw2ICszMSw3IEBACiAgICAgSUJPdXRsZXQgTlNNZW51SXRlbSAqX25ld1dL MkVkaXRvckl0ZW07CiAgICAgSUJPdXRsZXQgTlNQYW5lbCAqX29wZXJhdGlvbnNQYW5lbDsKIH0K KwogLSAoSUJBY3Rpb24pbmV3RWRpdG9yOihpZClzZW5kZXI7CiAtIChJQkFjdGlvbilzaG93T3Bl cmF0aW9uczooaWQpc2VuZGVyOwogLSAoSUJBY3Rpb24pdG9nZ2xlVXNlV0syQnlEZWZhdWx0Oihp ZClzZW5kZXI7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJFZGl0aW5nVGVzdGVyL0FwcERlbGVnYXRl Lm0gYi9Ub29scy9XZWJFZGl0aW5nVGVzdGVyL0FwcERlbGVnYXRlLm0KaW5kZXggNTI5NWI5M2Yy NjdiYTQxZDY1YmQzNjdlYmVkNzYzN2M5Mzk2OWJkMS4uNDFlMjE2YzI0MWRiZDQ3YjZmNmEwOTE3 Yjg3MmFmYzE4NmMzOWE3MSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9BcHBE ZWxlZ2F0ZS5tCisrKyBiL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvQXBwRGVsZWdhdGUubQpAQCAt MjgsMTAgKzI4LDYgQEAKICNpbXBvcnQgIkVkaXRpbmdPcGVyYXRpb25zLmgiCiAjaW1wb3J0ICJX SzFXZWJEb2N1bWVudENvbnRyb2xsZXIuaCIKICNpbXBvcnQgIldLMldlYkRvY3VtZW50Q29udHJv bGxlci5oIgotI2ltcG9ydCA8V2ViS2l0L1dLUHJlZmVyZW5jZXNQcml2YXRlLmg+Ci0jaW1wb3J0 IDxXZWJLaXQvV0tXZWJWaWV3Q29uZmlndXJhdGlvblByaXZhdGUuaD4KLSNpbXBvcnQgPFdlYktp dC9XZWJLaXQuaD4KLSNpbXBvcnQgPFdlYktpdC9fV0tXZWJzaXRlRGF0YVN0b3JlLmg+CiAKIHN0 YXRpYyBOU1N0cmluZyAqIGNvbnN0IFVzZVdlYktpdDJCeURlZmF1bHRQcmVmZXJlbmNlS2V5ID0g QCJVc2VXZWJLaXQyQnlEZWZhdWx0IjsKIApAQCAtNDUsNDkgKzQxLDI3IEBAIC0gKGlkKWluaXQK ICAgICByZXR1cm4gc2VsZjsKIH0KIAotc3RhdGljIFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKmRl ZmF1bHRDb25maWd1cmF0aW9uKCkKLXsKLSAgICBzdGF0aWMgV0tXZWJWaWV3Q29uZmlndXJhdGlv biAqY29uZmlndXJhdGlvbjsKLSAgICAKLSAgICBpZiAoIWNvbmZpZ3VyYXRpb24pIHsKLSAgICAg ICAgY29uZmlndXJhdGlvbiA9IFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF07 Ci0gICAgICAgIGNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZXMuX2Z1bGxTY3JlZW5FbmFibGVkID0g WUVTOwotICAgICAgICBjb25maWd1cmF0aW9uLnByZWZlcmVuY2VzLl9kZXZlbG9wZXJFeHRyYXNF bmFibGVkID0gWUVTOwotICAgIH0KLSAgICAKLSAgICByZXR1cm4gY29uZmlndXJhdGlvbjsKLX0K LQotCiAtICh2b2lkKWFwcGxpY2F0aW9uRGlkRmluaXNoTGF1bmNoaW5nOihOU05vdGlmaWNhdGlv biAqKWFOb3RpZmljYXRpb24KIHsKICAgICBbc2VsZiBuZXdFZGl0b3I6c2VsZl07Ci19Ci0KLS0g KHZvaWQpYXBwbGljYXRpb25XaWxsVGVybWluYXRlOihOU05vdGlmaWNhdGlvbiAqKWFOb3RpZmlj YXRpb24KLXsKLSAgICBmb3IgKFdlYkRvY3VtZW50Q29udHJvbGxlciAqZG9jdW1lbnRzIGluIF93 ZWJEb2N1bWVudHMpCi0gICAgICAgIFtkb2N1bWVudHMgYXBwbGljYXRpb25UZXJtaW5hdGluZ107 CisgICAgW3NlbGYgX3VwZGF0ZU5ld1dpbmRvd0tleUVxdWl2YWxlbnRzXTsKIH0KIAogLSAoSUJB Y3Rpb24pbmV3RWRpdG9yOihpZClzZW5kZXIKIHsKLSAgICBCT09MIHVzZVdlYktpdDIgPSBOTzsK KyAgICBDbGFzcyBjb250cm9sbGVyQ2xhc3M7CiAKICAgICBpZiAoc2VuZGVyID09IHNlbGYpCi0g ICAgICAgIHVzZVdlYktpdDIgPSBbc2VsZiB1c2VXZWJLaXQyQnlEZWZhdWx0XTsKKyAgICAgICAg Y29udHJvbGxlckNsYXNzID0gc2VsZi5fZGVmYXVsdFdlYkRvY3VtZW50Q29udHJvbGxlckNsYXNz OwogICAgIGVsc2UgaWYgKHNlbmRlciA9PSBfbmV3V0syRWRpdG9ySXRlbSkKLSAgICAgICAgdXNl V2ViS2l0MiA9IFlFUzsKLSAgICAKLSAgICBXZWJEb2N1bWVudENvbnRyb2xsZXIgKmNvbnRyb2xs ZXIgPSBuaWw7Ci0gICAgaWYgKHVzZVdlYktpdDIpCi0gICAgICAgIGNvbnRyb2xsZXIgPSBbW1dL MldlYkRvY3VtZW50Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhDb25maWd1cmF0aW9uOmRlZmF1 bHRDb25maWd1cmF0aW9uKCldOwotICAgIGVsc2UKLSAgICAgICAgY29udHJvbGxlciA9IFtbV0sx V2ViRG9jdW1lbnRDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFdpbmRvd05pYk5hbWU6QCJXZWJE b2N1bWVudCJdOworICAgICAgICBjb250cm9sbGVyQ2xhc3MgPSBbV0syV2ViRG9jdW1lbnRDb250 cm9sbGVyIGNsYXNzXTsKKyAgICBlbHNlIGlmIChzZW5kZXIgPT0gX25ld1dLMUVkaXRvckl0ZW0p CisgICAgICAgIGNvbnRyb2xsZXJDbGFzcyA9IFtXSzFXZWJEb2N1bWVudENvbnRyb2xsZXIgY2xh c3NdOwogICAgIAorICAgIFdlYkRvY3VtZW50Q29udHJvbGxlciAqY29udHJvbGxlciA9IFtbY29u dHJvbGxlckNsYXNzIGFsbG9jXSBpbml0XTsKICAgICBbW2NvbnRyb2xsZXIgd2luZG93XSBtYWtl S2V5QW5kT3JkZXJGcm9udDpzZW5kZXJdOwogICAgIFtfd2ViRG9jdW1lbnRzIGFkZE9iamVjdDpj b250cm9sbGVyXTsKLSAgICBbY29udHJvbGxlciBsb2FkQ29udGVudF07CisgICAgW2NvbnRyb2xs ZXIgbG9hZEhUTUxTdHJpbmc6W1dlYkRvY3VtZW50Q29udHJvbGxlciBkZWZhdWx0RWRpdGluZ1Nv dXJjZV1dOwogfQogCiAtIChJQkFjdGlvbilzaG93T3BlcmF0aW9uczooaWQpc2VuZGVyCkBAIC0x MzgsNiArMTEyLDExIEBAIC0gKElCQWN0aW9uKXNob3dPcGVyYXRpb25zOihpZClzZW5kZXIKICAg ICBbX29wZXJhdGlvbnNQYW5lbCBvcmRlckZyb250Om5pbF07CiB9CiAKKy0gKENsYXNzKV9kZWZh dWx0V2ViRG9jdW1lbnRDb250cm9sbGVyQ2xhc3MKK3sKKyAgICByZXR1cm4gc2VsZi51c2VXZWJL aXQyQnlEZWZhdWx0ID8gW1dLMldlYkRvY3VtZW50Q29udHJvbGxlciBjbGFzc10gOiBbV0sxV2Vi RG9jdW1lbnRDb250cm9sbGVyIGNsYXNzXTsKK30KKwogLSAoQk9PTCl1c2VXZWJLaXQyQnlEZWZh dWx0CiB7CiAgICAgcmV0dXJuIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNd IGJvb2xGb3JLZXk6VXNlV2ViS2l0MkJ5RGVmYXVsdFByZWZlcmVuY2VLZXldOwpAQCAtMTQ3LDYg KzEyNiw3IEBAIC0gKElCQWN0aW9uKXRvZ2dsZVVzZVdLMkJ5RGVmYXVsdDooaWQpc2VuZGVyCiB7 CiAgICAgTlNVc2VyRGVmYXVsdHMgKmRlZmF1bHRzID0gW05TVXNlckRlZmF1bHRzIHN0YW5kYXJk VXNlckRlZmF1bHRzXTsKICAgICBbZGVmYXVsdHMgc2V0Qm9vbDohW2RlZmF1bHRzIGJvb2xGb3JL ZXk6VXNlV2ViS2l0MkJ5RGVmYXVsdFByZWZlcmVuY2VLZXldIGZvcktleTpVc2VXZWJLaXQyQnlE ZWZhdWx0UHJlZmVyZW5jZUtleV07CisgICAgW3NlbGYgX3VwZGF0ZU5ld1dpbmRvd0tleUVxdWl2 YWxlbnRzXTsKIH0KIAogLSAoQk9PTCl2YWxpZGF0ZU1lbnVJdGVtOihOU01lbnVJdGVtICopbWVu dUl0ZW0KQEAgLTE1OSw0ICsxMzksMTUgQEAgLSAoQk9PTCl2YWxpZGF0ZU1lbnVJdGVtOihOU01l bnVJdGVtICopbWVudUl0ZW0KICAgICByZXR1cm4gWUVTOwogfQogCistICh2b2lkKV91cGRhdGVO ZXdXaW5kb3dLZXlFcXVpdmFsZW50cworeworICAgIGlmIChzZWxmLnVzZVdlYktpdDJCeURlZmF1 bHQpIHsKKyAgICAgICAgW19uZXdXSzFFZGl0b3JJdGVtIHNldEtleUVxdWl2YWxlbnRNb2RpZmll ck1hc2s6TlNDb21tYW5kS2V5TWFzayB8IE5TQWx0ZXJuYXRlS2V5TWFza107CisgICAgICAgIFtf bmV3V0syRWRpdG9ySXRlbSBzZXRLZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrOk5TQ29tbWFuZEtl eU1hc2tdOworICAgIH0gZWxzZSB7CisgICAgICAgIFtfbmV3V0sxRWRpdG9ySXRlbSBzZXRLZXlF cXVpdmFsZW50TW9kaWZpZXJNYXNrOk5TQ29tbWFuZEtleU1hc2tdOworICAgICAgICBbX25ld1dL MkVkaXRvckl0ZW0gc2V0S2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzazpOU0NvbW1hbmRLZXlNYXNr IHwgTlNBbHRlcm5hdGVLZXlNYXNrXTsKKyAgICB9Cit9CisKIEBlbmQKZGlmZiAtLWdpdCBhL1Rv b2xzL1dlYkVkaXRpbmdUZXN0ZXIvTWFpbk1lbnUueGliIGIvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rl ci9NYWluTWVudS54aWIKaW5kZXggMzNhMjI2Mjg3ZjIxNTE4ZDdkZjY2MjNmMzY0YmEwNDAwN2Vi NjRkZC4uZTIxYjJhOWFhZGQ4OWJlNzYwOWRmNDA0MjZhMjA5YjJlNThiODk5ZSAxMDA2NDQKLS0t IGEvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9NYWluTWVudS54aWIKKysrIGIvVG9vbHMvV2ViRWRp dGluZ1Rlc3Rlci9NYWluTWVudS54aWIKQEAgLTY5LDE0ICs2OSwxMyBAQAogICAgICAgICAgICAg ICAgICAgICA8bW9kaWZpZXJNYXNrIGtleT0ia2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzayIvPgog ICAgICAgICAgICAgICAgICAgICA8bWVudSBrZXk9InN1Ym1lbnUiIHRpdGxlPSJGaWxlIiBpZD0i YmliLVVqLXZ6dSI+CiAgICAgICAgICAgICAgICAgICAgICAgICA8aXRlbXM+Ci0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgPG1lbnVJdGVtIHRpdGxlPSJOZXcgV0sxIEVkaXRvciIgaWQ9IjJQ ZC0zWC1UdmYiIHVzZXJMYWJlbD0iTmV3IFdLMSBFZGl0b3IiPgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8bW9kaWZpZXJNYXNrIGtleT0ia2V5RXF1aXZhbGVudE1vZGlmaWVyTWFz ayIvPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0aXRsZT0iTmV3IFdL MSBFZGl0b3IiIGtleUVxdWl2YWxlbnQ9Im4iIGlkPSIyUGQtM1gtVHZmIiB1c2VyTGFiZWw9Ik5l dyBXSzEgRWRpdG9yIj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGNvbm5lY3Rp b25zPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGFjdGlvbiBzZWxlY3Rv cj0ibmV3RWRpdG9yOiIgdGFyZ2V0PSJWb2UtVHgtckxDIiBpZD0iMjFtLTNCLW9YWSIvPgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2Nvbm5lY3Rpb25zPgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDwvbWVudUl0ZW0+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg PG1lbnVJdGVtIHRpdGxlPSJOZXcgV0syIEVkaXRvciIgaWQ9Imt6ci0wbS1jQXUiIHVzZXJMYWJl bD0iTmV3IFdLMiBFZGl0b3IiPgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bW9k aWZpZXJNYXNrIGtleT0ia2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzayIvPgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0aXRsZT0iTmV3IFdLMiBFZGl0b3IiIGFsdGVybmF0 ZT0iWUVTIiBrZXlFcXVpdmFsZW50PSJuIiBpZD0ia3pyLTBtLWNBdSIgdXNlckxhYmVsPSJOZXcg V0syIEVkaXRvciI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtb2RpZmllck1h c2sga2V5PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIiBvcHRpb249IllFUyIgY29tbWFuZD0i WUVTIi8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjb25uZWN0aW9ucz4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24gc2VsZWN0b3I9Im5ld0Vk aXRvcjoiIHRhcmdldD0iVm9lLVR4LXJMQyIgaWQ9IlphMy1nTS0zUjciLz4KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPC9jb25uZWN0aW9ucz4KZGlmZiAtLWdpdCBhL1Rvb2xzL1dl YkVkaXRpbmdUZXN0ZXIvV0sxV2ViRG9jdW1lbnRDb250cm9sbGVyLm0gYi9Ub29scy9XZWJFZGl0 aW5nVGVzdGVyL1dLMVdlYkRvY3VtZW50Q29udHJvbGxlci5tCmluZGV4IGFmOWVkNjZhMDAyZWY1 NmJiMjUyYTBkMDQ2NTBjNmRkMWJhZDFkODIuLjg5MDYwNzVlMjI2YmI1MmEzZTFjMjQyOWQyZDAx NjY4YTZkYWUyNDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvV0sxV2ViRG9j dW1lbnRDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9XSzFXZWJEb2N1 bWVudENvbnRyb2xsZXIubQpAQCAtNTIsOSArNTIsOSBAQCAtICh2b2lkKWF3YWtlRnJvbU5pYgog ICAgIFtjb250YWluZXJWaWV3IGFkZFN1YnZpZXc6X3dlYlZpZXddOwogfQogCi0tICh2b2lkKWxv YWRDb250ZW50CistICh2b2lkKWxvYWRIVE1MU3RyaW5nOihOU1N0cmluZyAqKWNvbnRlbnQKIHsK LSAgICBbW193ZWJWaWV3IG1haW5GcmFtZV0gbG9hZEhUTUxTdHJpbmc6W3NlbGYgZGVmYXVsdEVk aXRpbmdTb3VyY2VdIGJhc2VVUkw6bmlsXTsgICAgCisgICAgW1tfd2ViVmlldyBtYWluRnJhbWVd IGxvYWRIVE1MU3RyaW5nOmNvbnRlbnQgYmFzZVVSTDpuaWxdOwogfQogCiAtIChJQkFjdGlvbilw YXN0ZUFzTWFya3VwOihpZClzZW5kZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYkVkaXRpbmdUZXN0 ZXIvV0syV2ViRG9jdW1lbnRDb250cm9sbGVyLmggYi9Ub29scy9XZWJFZGl0aW5nVGVzdGVyL1dL MldlYkRvY3VtZW50Q29udHJvbGxlci5oCmluZGV4IDUyYWRmMGYxZWM3NGM0MDMxMDkxYjRlYTc1 MzgwMDllZDc0MzNkZTYuLmI5ZGRiYzNkYTI1ZDUwYTA4OWM2YmEwZDZmZjhhZDFkZDcyYTA5N2Qg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvV0syV2ViRG9jdW1lbnRDb250cm9s bGVyLmgKKysrIGIvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9XSzJXZWJEb2N1bWVudENvbnRyb2xs ZXIuaApAQCAtMjksNyArMjksNSBAQAogCiBAaW50ZXJmYWNlIFdLMldlYkRvY3VtZW50Q29udHJv bGxlciA6IFdlYkRvY3VtZW50Q29udHJvbGxlcjxXZWJEb2N1bWVudD4KIAotLSAoaW5zdGFuY2V0 eXBlKWluaXRXaXRoQ29uZmlndXJhdGlvbjooV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqKWNvbmZp Z3VyYXRpb247Ci0KIEBlbmQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9X SzJXZWJEb2N1bWVudENvbnRyb2xsZXIubSBiL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvV0syV2Vi RG9jdW1lbnRDb250cm9sbGVyLm0KaW5kZXggNTZmMWJiZWVkOWE4NzYxOTI2MWUwY2QxZDAwOGNl MGE0NjNiMDg1ZC4uOWFiZmYyMDY4NWQ1ZTRkOGY0NTE2ZDc0NGNmZmI5MjhkZWIyMDA2MiAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9XSzJXZWJEb2N1bWVudENvbnRyb2xsZXIu bQorKysgYi9Ub29scy9XZWJFZGl0aW5nVGVzdGVyL1dLMldlYkRvY3VtZW50Q29udHJvbGxlci5t CkBAIC0zOCwxOCArMzgsMjAgQEAgQGludGVyZmFjZSBXSzJXZWJEb2N1bWVudENvbnRyb2xsZXIg KCkgPFdLVUlEZWxlZ2F0ZT4KIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLMldlYkRvY3VtZW50 Q29udHJvbGxlciB7Ci0gICAgV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqX2NvbmZpZ3VyYXRpb247 CiAgICAgV0tXZWJWaWV3ICpfd2ViVmlldzsKIH0KIAotLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRo Q29uZmlndXJhdGlvbjooV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KK3N0 YXRpYyBXS1dlYlZpZXdDb25maWd1cmF0aW9uICpkZWZhdWx0Q29uZmlndXJhdGlvbigpCiB7Ci0g ICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0V2l0aFdpbmRvd05pYk5hbWU6QCJXZWJEb2N1bWVu dCJdKSkKLSAgICAgICAgcmV0dXJuIG5pbDsKLSAgICBfY29uZmlndXJhdGlvbiA9IFtjb25maWd1 cmF0aW9uIGNvcHldOwotICAgIAotICAgIHJldHVybiBzZWxmOwotICAgIAorICAgIHN0YXRpYyBX S1dlYlZpZXdDb25maWd1cmF0aW9uICpjb25maWd1cmF0aW9uOworCisgICAgaWYgKCFjb25maWd1 cmF0aW9uKSB7CisgICAgICAgIGNvbmZpZ3VyYXRpb24gPSBbW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gYWxsb2NdIGluaXRdOworICAgICAgICBjb25maWd1cmF0aW9uLnByZWZlcmVuY2VzLl9mdWxs U2NyZWVuRW5hYmxlZCA9IFlFUzsKKyAgICAgICAgY29uZmlndXJhdGlvbi5wcmVmZXJlbmNlcy5f ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCA9IFlFUzsKKyAgICB9CisKKyAgICByZXR1cm4gY29uZmln dXJhdGlvbjsKIH0KIAogLSAoSUJBY3Rpb24pcGFzdGVBc01hcmt1cDooaWQpc2VuZGVyCkBAIC01 OSw3ICs2MSw3IEBAIC0gKElCQWN0aW9uKXBhc3RlQXNNYXJrdXA6KGlkKXNlbmRlcgogCiAtICh2 b2lkKWF3YWtlRnJvbU5pYgogewotICAgIF93ZWJWaWV3ID0gW1tXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6W2NvbnRhaW5lclZpZXcgYm91bmRzXSBjb25maWd1cmF0aW9uOl9jb25maWd1 cmF0aW9uXTsKKyAgICBfd2ViVmlldyA9IFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1l Oltjb250YWluZXJWaWV3IGJvdW5kc10gY29uZmlndXJhdGlvbjpkZWZhdWx0Q29uZmlndXJhdGlv bigpXTsKICAgICBbX3dlYlZpZXcgc2V0QXV0b3Jlc2l6aW5nTWFzazooTlNWaWV3V2lkdGhTaXph YmxlIHwgTlNWaWV3SGVpZ2h0U2l6YWJsZSldOwogICAgIFtfd2ViVmlldyBfc2V0RWRpdGFibGU6 WUVTXTsKICAgICBbX3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpzZWxmXTsKQEAgLTY4LDkgKzcwLDkg QEAgLSAodm9pZClhd2FrZUZyb21OaWIKICAgICBbc2VsZi53aW5kb3cgc2V0VGl0bGU6QCJXZWJF ZGl0b3IgW1dLMl0iXTsKIH0KIAotLSAodm9pZClsb2FkQ29udGVudAorLSAodm9pZClsb2FkSFRN TFN0cmluZzooTlNTdHJpbmcgKiljb250ZW50CiB7Ci0gICAgW193ZWJWaWV3IGxvYWRIVE1MU3Ry aW5nOltzZWxmIGRlZmF1bHRFZGl0aW5nU291cmNlXSBiYXNlVVJMOm5pbF07CisgICAgW193ZWJW aWV3IGxvYWRIVE1MU3RyaW5nOmNvbnRlbnQgYmFzZVVSTDpuaWxdOwogfQogCiBAZW5kCmRpZmYg LS1naXQgYS9Ub29scy9XZWJFZGl0aW5nVGVzdGVyL1dlYkRvY3VtZW50Q29udHJvbGxlci5oIGIv VG9vbHMvV2ViRWRpdGluZ1Rlc3Rlci9XZWJEb2N1bWVudENvbnRyb2xsZXIuaAppbmRleCBkN2Zi Zjk2NTc3OWJjMjA4NjI0MGM0NGUyMWY4MTNlMzkwNWMzODE0Li4xYjkzMWI3YzgxZDg4ZjE4MWFm ODViZjE1MmYyZTIwYTAwYmQ3MzE5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJFZGl0aW5nVGVzdGVy L1dlYkRvY3VtZW50Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvV2Vi RG9jdW1lbnRDb250cm9sbGVyLmgKQEAgLTMzLDkgKzMzLDEwIEBACiB7CiAgICAgSUJPdXRsZXQg TlNWaWV3ICpjb250YWluZXJWaWV3OwogfQotLSAoTlNTdHJpbmcgKilkZWZhdWx0RWRpdGluZ1Nv dXJjZTsKLS0gKHZvaWQpYXBwbGljYXRpb25UZXJtaW5hdGluZzsKLS0gKHZvaWQpbG9hZENvbnRl bnQ7CisKKysgKE5TU3RyaW5nICopZGVmYXVsdEVkaXRpbmdTb3VyY2U7CisKKy0gKHZvaWQpbG9h ZEhUTUxTdHJpbmc6KE5TU3RyaW5nICopY29udGVudDsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9U b29scy9XZWJFZGl0aW5nVGVzdGVyL1dlYkRvY3VtZW50Q29udHJvbGxlci5tIGIvVG9vbHMvV2Vi RWRpdGluZ1Rlc3Rlci9XZWJEb2N1bWVudENvbnRyb2xsZXIubQppbmRleCBmNTRjYTc4NmViOTg3 MWMzMzFlOTQ0MWEzOTM5NThmZWQ0ODMwZGVlLi42MzE0ZWZkMGVkNjNkYjE3YzJmNjM5YzExZGNj MGQ3NzA0ZGVjOTlhIDEwMDY0NAotLS0gYS9Ub29scy9XZWJFZGl0aW5nVGVzdGVyL1dlYkRvY3Vt ZW50Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL1dlYkVkaXRpbmdUZXN0ZXIvV2ViRG9jdW1lbnRD b250cm9sbGVyLm0KQEAgLTI3LDI4ICsyNywyNyBAQAogCiBAaW1wbGVtZW50YXRpb24gV2ViRG9j dW1lbnRDb250cm9sbGVyCiAKLS0gKGlkKWluaXRXaXRoV2luZG93OihOU1dpbmRvdyAqKXdpbmRv dworLSAoaW5zdGFuY2V0eXBlKWluaXQKIHsKLSAgICBzZWxmID0gW3N1cGVyIGluaXRXaXRoV2lu ZG93OndpbmRvd107CisgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0V2l0aFdpbmRvd05pYk5h bWU6QCJXZWJEb2N1bWVudCJdKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKwogICAgIHJldHVybiBz ZWxmOwogfQogCi0tICh2b2lkKXdpbmRvd0RpZExvYWQKLXsgICAgCi0gICAgW3N1cGVyIHdpbmRv d0RpZExvYWRdOworLSAoaWQpaW5pdFdpdGhXaW5kb3c6KE5TV2luZG93ICopd2luZG93Cit7Cisg ICAgc2VsZiA9IFtzdXBlciBpbml0V2l0aFdpbmRvdzp3aW5kb3ddOworICAgIHJldHVybiBzZWxm OwogfQogCi0tIChjb25zdCBOU1N0cmluZyAqKWRlZmF1bHRFZGl0aW5nU291cmNlCisrIChjb25z dCBOU1N0cmluZyAqKWRlZmF1bHRFZGl0aW5nU291cmNlCiB7CiAgICAgY29uc3Qgc3RhdGljIE5T U3RyaW5nICpzb3VyY2UgPSBAIjxodG1sPjxib2R5PjwvYm9keT48L2h0bWw+IjsKICAgICByZXR1 cm4gc291cmNlOwogfQogCi0tICh2b2lkKWFwcGxpY2F0aW9uVGVybWluYXRpbmcKLXsKLX0KLQot LSAodm9pZClsb2FkQ29udGVudAorLSAodm9pZClsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilj b250ZW50CiB7CiB9CiAK