171623 2017-05-03 15:21:53 -0700 Maintain interaction information URL as a URL, not a string 2017-05-03 16:00:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin simon.fraser wenson_hsieh oldest_to_newest 1304301 0 thorton 2017-05-03 15:21:53 -0700 Maintain interaction information URL as a URL, not a string 1304306 1 308968 thorton 2017-05-03 15:25:59 -0700 Created attachment 308968 Patch 1304334 2 308968 simon.fraser 2017-05-03 15:42:13 -0700 Comment on attachment 308968 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308968&action=review > Source/WebKit2/Shared/ios/InteractionInformationAtPosition.h:61 > String imageURL; Why is this not a URL too? 1304335 3 thorton 2017-05-03 15:42:50 -0700 That one needs to change too! 1304342 4 thorton 2017-05-03 16:00:26 -0700 https://trac.webkit.org/changeset/216152/webkit 308968 2017-05-03 15:25:59 -0700 2017-05-03 15:42:13 -0700 Patch bug-171623-20170503152557.patch text/plain 11581 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTRhMTAxNzQ4Y2M5MDMy ZmNhZTYwNmU3OGI3YWVlNTNiMzI5N2MxOC4uM2E5M2M5NTE0YTE2MjQ1MGI5ZjUyYzA2YTQ1OGZi Nzc3ZTkxNWFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA1LTAzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIE1haW50YWluIGlu dGVyYWN0aW9uIGluZm9ybWF0aW9uIFVSTCBhcyBhIFVSTCwgbm90IGEgc3RyaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzE2MjMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5v dCBhIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL1VSTC5oOgorCiAyMDE3 LTA1LTAyICBHd2FuZyBZb29uIEh3YW5nICA8eW9vbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtH VEtdIFJlY3ljbGUgdGV4dHVyZXMgd2hpbGUgaGFuZGxpbmcgdGlsZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBi YmZmMzQ3YjIzYTQ1YmM1NTUzMTk1OTM4NzdiYjc5MWZmMjJkZGU5Li4yNmFjODZhZDdlM2Y4MWUw YjE5ZTRhMTFiMzYyMjdlZDVkYmZmNTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIw MTctMDUtMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFpbnRhaW4gaW50ZXJhY3Rpb24gaW5mb3JtYXRpb24gVVJMIGFzIGEgVVJMLCBub3QgYSBz dHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTYyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbi5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9zaG93QXR0YWNobWVudFNoZWV0XSk6CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgX2ludGVyYWN0aW9uU2hvdWxkQmVnaW5Gcm9tUHJldmlld0l0ZW1Db250cm9sbGVyOmZv clBvc2l0aW9uOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kYXRhRm9yUHJldmlld0l0 ZW1Db250cm9sbGVyOmF0UG9zaXRpb246dHlwZTpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9z L1dLUERGVmlldy5tbToKKyAgICAgICAgKC1bV0tQREZWaWV3IGFubm90YXRpb246aXNCZWluZ1By ZXNzZWRBdFBvaW50OmNvbnRyb2xsZXI6XSk6CisgICAgICAgICgtW1dLUERGVmlldyBhY3Rpb25T aGVldEFzc2lzdGFudDpwZXJmb3JtQWN0aW9uOl0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0UG9z aXRpb25JbmZvcm1hdGlvbik6CisKIDIwMTctMDUtMDIgIFRpbW90aHkgSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEluZm9ybSBjbGllbnRzIHdoZW4gdmlld3Bv cnQtZml0IHN0YXRlIGNoYW5nZXMsIHNvIHRoZXkgY2FuIHJlY29tcHV0ZSBpbnNldHMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vVVJMLmgKaW5kZXggODFiMzA5MzNjNmYxM2VlMDUxZGY2NWNiODAxOWM2NTUxN2M1ZTFm NS4uZGFjZDg0Yzg0ODM5MmM3MmQwMTdhMDA5Y2ZjZmMxN2MwZWVhZDA3ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vVVJMLmgKQEAgLTcyLDcgKzcyLDcgQEAgcHVibGljOgogICAgIFVSTChjb25zdCBVUkwmIGJh c2UsIGNvbnN0IFN0cmluZyYgcmVsYXRpdmUsIGNvbnN0IFRleHRFbmNvZGluZyYpOwogCiAgICAg c3RhdGljIFVSTCBmYWtlVVJMV2l0aFJlbGF0aXZlUGFydChjb25zdCBTdHJpbmcmKTsKLSAgICBz dGF0aWMgVVJMIGZpbGVVUkxXaXRoRmlsZVN5c3RlbVBhdGgoY29uc3QgU3RyaW5nJik7CisgICAg V0VCQ09SRV9FWFBPUlQgc3RhdGljIFVSTCBmaWxlVVJMV2l0aEZpbGVTeXN0ZW1QYXRoKGNvbnN0 IFN0cmluZyYpOwogCiAgICAgU3RyaW5nIHN0cmlwcGVkRm9yVXNlQXNSZWZlcnJlcigpIGNvbnN0 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5m b3JtYXRpb25BdFBvc2l0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvaW9zL0ludGVyYWN0 aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmgKaW5kZXggNzJhNDRiZmUzYzljOGFkNTI5MDc1ZDA0 MjE4OTEzNmNhOTg5YWIxZS4uNzQ3NTE0NjE0OWRmNjg3MmEzMTczNTg0ZDk0ODM1ZTE2MDI3NzNk OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9y bWF0aW9uQXRQb3NpdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9pb3MvSW50ZXJh Y3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24uaApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUg PFdlYkNvcmUvSW50UG9pbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NlbGVjdGlvblJlY3QuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL1RleHRJbmRpY2F0b3IuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1VS TC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKQEAgLTU2LDcgKzU3LDcgQEAgc3RydWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uIHsKICAgICBib29sIGlzRGF0YURldGVjdG9yTGluayB7IGZhbHNlIH07CiAjZW5kaWYKICAg ICBXZWJDb3JlOjpGbG9hdFBvaW50IGFkanVzdGVkUG9pbnRGb3JOb2RlUmVzcG9uZGluZ1RvQ2xp Y2tFdmVudHM7Ci0gICAgU3RyaW5nIHVybDsKKyAgICBXZWJDb3JlOjpVUkwgdXJsOwogICAgIFN0 cmluZyBpbWFnZVVSTDsKICAgICBTdHJpbmcgdGl0bGU7CiAgICAgU3RyaW5nIGlkQXR0cmlidXRl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQppbmRleCAxODRhOGY5OGFiZTM4Yzc2MjkyODVjNmM0MGU5ZjAzYTJh Njg5ZDU1Li5lZjcxZDM0M2M5YjM1NTAxMWRmNTk1MDlmNTQ3MTljMmQyZmY1NjE5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQpAQCAtMTI2Nyw3ICsxMjY3LDcgQEAgLSAodm9pZClfc2hvd0F0dGFjaG1lbnRT aGVldAogICAgIGlmICghW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihf d2ViVmlldzpzaG93Q3VzdG9tU2hlZXRGb3JFbGVtZW50OildKQogICAgICAgICByZXR1cm47CiAK LSAgICBhdXRvIGVsZW1lbnQgPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxs b2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVBdHRhY2htZW50IFVSTDpb TlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOl9wb3NpdGlvbkluZm9ybWF0aW9uLnVybF0gbG9j YXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpfcG9zaXRpb25J bmZvcm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJpYnV0ZSByZWN0 Ol9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpuaWxdKTsKKyAgICBhdXRvIGVsZW1l bnQgPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5 cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVBdHRhY2htZW50IFVSTDooTlNVUkwgKilfcG9zaXRp b25JbmZvcm1hdGlvbi51cmwgbG9jYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5w b2ludCB0aXRsZTpfcG9zaXRpb25JbmZvcm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1h dGlvbi5pZEF0dHJpYnV0ZSByZWN0Ol9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpu aWxdKTsKICAgICBbdWlEZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyBzaG93Q3VzdG9tU2hlZXRG b3JFbGVtZW50OmVsZW1lbnQuZ2V0KCldOwogfQogCkBAIC00MjI1LDE5ICs0MjI1LDE4IEBAIC0g KEJPT0wpX2ludGVyYWN0aW9uU2hvdWxkQmVnaW5Gcm9tUHJldmlld0l0ZW1Db250cm9sbGVyOihV SVByZXZpZXdJdGVtQ29udHJvbGxlCiAgICAgaWYgKCFfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0xp bmsgJiYgIV9wb3NpdGlvbkluZm9ybWF0aW9uLmlzSW1hZ2UgJiYgIV9wb3NpdGlvbkluZm9ybWF0 aW9uLmlzQXR0YWNobWVudCkKICAgICAgICAgcmV0dXJuIE5POwogCi0gICAgU3RyaW5nIGFic29s dXRlTGlua1VSTCA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLnVybDsKKyAgICBjb25zdCBVUkwmIGxp bmtVUkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi51cmw7CiAgICAgaWYgKF9wb3NpdGlvbkluZm9y bWF0aW9uLmlzTGluaykgewotICAgICAgICBOU1VSTCAqdGFyZ2V0VVJMID0gW05TVVJMIF93ZWJf VVJMV2l0aFdURlN0cmluZzpfcG9zaXRpb25JbmZvcm1hdGlvbi51cmxdOwogICAgICAgICBpZCA8 V0tVSURlbGVnYXRlUHJpdmF0ZT4gdWlEZWxlZ2F0ZSA9IHN0YXRpY19jYXN0PGlkIDxXS1VJRGVs ZWdhdGVQcml2YXRlPj4oW193ZWJWaWV3IFVJRGVsZWdhdGVdKTsKICAgICAgICAgaWYgKFt1aURl bGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlldzpzaG91bGRQcmV2aWV3 RWxlbWVudDopXSkgewotICAgICAgICAgICAgYXV0byBwcmV2aWV3RWxlbWVudEluZm8gPSBhZG9w dE5TKFtbV0tQcmV2aWV3RWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aExpbmtVUkw6dGFyZ2V0 VVJMXSk7CisgICAgICAgICAgICBhdXRvIHByZXZpZXdFbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tX S1ByZXZpZXdFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoTGlua1VSTDooTlNVUkwgKilsaW5r VVJMXSk7CiAgICAgICAgICAgICByZXR1cm4gW3VpRGVsZWdhdGUgd2ViVmlldzpfd2ViVmlldyBz aG91bGRQcmV2aWV3RWxlbWVudDpwcmV2aWV3RWxlbWVudEluZm8uZ2V0KCldOwogICAgICAgICB9 Ci0gICAgICAgIGlmIChhYnNvbHV0ZUxpbmtVUkwuaXNFbXB0eSgpKQorICAgICAgICBpZiAobGlu a1VSTC5pc0VtcHR5KCkpCiAgICAgICAgICAgICByZXR1cm4gTk87Ci0gICAgICAgIGlmIChXZWJD b3JlOjpwcm90b2NvbElzSW5IVFRQRmFtaWx5KGFic29sdXRlTGlua1VSTCkpCisgICAgICAgIGlm IChsaW5rVVJMLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgICAgIHJldHVybiBZ RVM7Ci0gICAgICAgIGlmIChbW2dldERERGV0ZWN0aW9uQ29udHJvbGxlckNsYXNzKCkgdGFwQW5k SG9sZFNjaGVtZXNdIGNvbnRhaW5zT2JqZWN0OnRhcmdldFVSTC5zY2hlbWUubG93ZXJjYXNlU3Ry aW5nXSkKKyAgICAgICAgaWYgKFtbZ2V0REREZXRlY3Rpb25Db250cm9sbGVyQ2xhc3MoKSB0YXBB bmRIb2xkU2NoZW1lc10gY29udGFpbnNPYmplY3Q6bGlua1VSTC5wcm90b2NvbCgpLnRvU3RyaW5n KCkuY29udmVydFRvQVNDSUlMb3dlcmNhc2UoKV0pCiAgICAgICAgICAgICByZXR1cm4gWUVTOwog ICAgICAgICByZXR1cm4gTk87CiAgICAgfQpAQCAtNDI2Nyw4ICs0MjY2LDggQEAgLSAoTlNEaWN0 aW9uYXJ5ICopX2RhdGFGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6KFVJUHJldmlld0l0ZW1Db250 cm9sbGVyICopY29udHIKICAgICBpZiAoIWNhblNob3dMaW5rUHJldmlldyAmJiAhY2FuU2hvd0lt YWdlUHJldmlldyAmJiAhY2FuU2hvd0F0dGFjaG1lbnRQcmV2aWV3KQogICAgICAgICByZXR1cm4g bmlsOwogCi0gICAgU3RyaW5nIGFic29sdXRlTGlua1VSTCA9IF9wb3NpdGlvbkluZm9ybWF0aW9u LnVybDsKLSAgICBpZiAoIXVzZUltYWdlVVJMRm9yTGluayAmJiAoYWJzb2x1dGVMaW5rVVJMLmlz RW1wdHkoKSB8fCAoIVdlYkNvcmU6OnByb3RvY29sSXNJbkhUVFBGYW1pbHkoYWJzb2x1dGVMaW5r VVJMKSAmJiAhX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNEYXRhRGV0ZWN0b3JMaW5rKSkpIHsKKyAg ICBjb25zdCBVUkwmIGxpbmtVUkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi51cmw7CisgICAgaWYg KCF1c2VJbWFnZVVSTEZvckxpbmsgJiYgKGxpbmtVUkwuaXNFbXB0eSgpIHx8ICghbGlua1VSTC5w cm90b2NvbElzSW5IVFRQRmFtaWx5KCkgJiYgIV9wb3NpdGlvbkluZm9ybWF0aW9uLmlzRGF0YURl dGVjdG9yTGluaykpKSB7CiAgICAgICAgIGlmIChjYW5TaG93TGlua1ByZXZpZXcgJiYgIWNhblNo b3dJbWFnZVByZXZpZXcpCiAgICAgICAgICAgICByZXR1cm4gbmlsOwogICAgICAgICBjYW5TaG93 TGlua1ByZXZpZXcgPSBOTzsKQEAgLTQyODAsNyArNDI3OSw3IEBAIC0gKE5TRGljdGlvbmFyeSAq KV9kYXRhRm9yUHJldmlld0l0ZW1Db250cm9sbGVyOihVSVByZXZpZXdJdGVtQ29udHJvbGxlciAq KWNvbnRyCiAgICAgICAgIGlmICh1c2VJbWFnZVVSTEZvckxpbmspCiAgICAgICAgICAgICBkYXRh Rm9yUHJldmlld1tVSVByZXZpZXdEYXRhTGlua10gPSBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3Ry aW5nOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlVVJMXTsKICAgICAgICAgZWxzZQotICAgICAg ICAgICAgZGF0YUZvclByZXZpZXdbVUlQcmV2aWV3RGF0YUxpbmtdID0gW05TVVJMIF93ZWJfVVJM V2l0aFdURlN0cmluZzpfcG9zaXRpb25JbmZvcm1hdGlvbi51cmxdOworICAgICAgICAgICAgZGF0 YUZvclByZXZpZXdbVUlQcmV2aWV3RGF0YUxpbmtdID0gKE5TVVJMICopbGlua1VSTDsKICAgICAg ICAgaWYgKF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzRGF0YURldGVjdG9yTGluaykgewogICAgICAg ICAgICAgTlNEaWN0aW9uYXJ5ICpjb250ZXh0ID0gbmlsOwogICAgICAgICAgICAgaWYgKFt1aURl bGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2RhdGFEZXRlY3Rpb25Db250ZXh0 Rm9yV2ViVmlldzopXSkKQEAgLTQzMTEsNyArNDMxMCw3IEBAIC0gKE5TRGljdGlvbmFyeSAqKV9k YXRhRm9yUHJldmlld0l0ZW1Db250cm9sbGVyOihVSVByZXZpZXdJdGVtQ29udHJvbGxlciAqKWNv bnRyCiAgICAgfSBlbHNlIGlmIChjYW5TaG93QXR0YWNobWVudFByZXZpZXcpIHsKICNpZiBfX0lQ SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDAwMDAKICAgICAgICAgKnR5cGUgPSBV SVByZXZpZXdJdGVtVHlwZUF0dGFjaG1lbnQ7Ci0gICAgICAgIGF1dG8gZWxlbWVudCA9IGFkb3B0 TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3Rp dmF0ZWRFbGVtZW50VHlwZUF0dGFjaG1lbnQgVVJMOltOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJp bmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24udXJsXSBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1hdGlv bi5yZXF1ZXN0LnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIElEOl9wb3Np dGlvbkluZm9ybWF0aW9uLmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91 bmRzIGltYWdlOm5pbF0pOworICAgICAgICBhdXRvIGVsZW1lbnQgPSBhZG9wdE5TKFtbX1dLQWN0 aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVu dFR5cGVBdHRhY2htZW50IFVSTDooTlNVUkwgKilsaW5rVVJMIGxvY2F0aW9uOl9wb3NpdGlvbklu Zm9ybWF0aW9uLnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUg SUQ6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaWRBdHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25JbmZvcm1h dGlvbi5ib3VuZHMgaW1hZ2U6bmlsXSk7CiAgICAgICAgIE5TVUludGVnZXIgaW5kZXggPSBbdWlE ZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyBpbmRleEludG9BdHRhY2htZW50TGlzdEZvckVsZW1l bnQ6ZWxlbWVudC5nZXQoKV07CiAgICAgICAgIGlmIChpbmRleCAhPSBOU05vdEZvdW5kKSB7CiAg ICAgICAgICAgICBCT09MIHNvdXJjZUlzTWFuYWdlZCA9IE5POwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1dLUERGVmlldy5tbQppbmRleCBlMjkyZGQ4MDQ2NWY0NGM1OWRlMTY4Y2QwZTNi MGE0ZjZlYThjZjRhLi43ZjY0NTVhMmUxZGFlODk2ODY2NWI1MDMwNjliMjE5ODg5ZmI3NDAxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQpAQCAtNjk1LDcgKzY5 NSw3IEBAIC0gKHZvaWQpYW5ub3RhdGlvbjooVUlQREZBbm5vdGF0aW9uICopYW5ub3RhdGlvbiBp c0JlaW5nUHJlc3NlZEF0UG9pbnQ6KENHUG9pbnQpCiAKICAgICBfcG9zaXRpb25JbmZvcm1hdGlv bi5yZXF1ZXN0LnBvaW50ID0gcm91bmRlZEludFBvaW50KFtjb250cm9sbGVyLnBhZ2VWaWV3IGNv bnZlcnRQb2ludDpwb2ludCB0b1ZpZXc6c2VsZl0pOwogCi0gICAgX3Bvc2l0aW9uSW5mb3JtYXRp b24udXJsID0gdXJsLmFic29sdXRlU3RyaW5nOworICAgIF9wb3NpdGlvbkluZm9ybWF0aW9uLnVy bCA9IHVybDsKICAgICBfcG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHMgPSByb3VuZGVkSW50UmVj dChbc2VsZiBjb252ZXJ0UmVjdDpbY29udHJvbGxlci5wYWdlVmlldyBjb252ZXJ0UmVjdEZyb21Q REZQYWdlU3BhY2U6YW5ub3RhdGlvbi5SZWN0XSBmcm9tVmlldzpjb250cm9sbGVyLnBhZ2VWaWV3 XSk7CiAKICAgICBbc2VsZiBfaGlnaGxpZ2h0TGlua0Fubm90YXRpb246bGlua0Fubm90YXRpb24g Zm9yRHVyYXRpb246Ljc1IGNvbXBsZXRpb25IYW5kbGVyOl57CkBAIC03MTYsOCArNzE2LDggQEAg LSAodm9pZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFz c2lzdGFudCBwZXJmb3JtQWN0aW9uOigKICAgICAgICAgcmV0dXJuOwogCiAgICAgTlNEaWN0aW9u YXJ5ICpyZXByZXNlbnRhdGlvbnMgPSBAewotICAgICAgICAoTlNTdHJpbmcgKilrVVRUeXBlVVRG OFBsYWluVGV4dCA6IF9wb3NpdGlvbkluZm9ybWF0aW9uLnVybCwKLSAgICAgICAgKE5TU3RyaW5n ICopa1VUVHlwZVVSTCA6IFtOU1VSTCBVUkxXaXRoU3RyaW5nOl9wb3NpdGlvbkluZm9ybWF0aW9u LnVybF0KKyAgICAgICAgKE5TU3RyaW5nICopa1VUVHlwZVVURjhQbGFpblRleHQgOiAoTlNTdHJp bmcgKilfcG9zaXRpb25JbmZvcm1hdGlvbi51cmwsCisgICAgICAgIChOU1N0cmluZyAqKWtVVFR5 cGVVUkwgOiAoTlNVUkwgKilfcG9zaXRpb25JbmZvcm1hdGlvbi51cmwKICAgICB9OwogCiAgICAg W1VJUGFzdGVib2FyZCBnZW5lcmFsUGFzdGVib2FyZF0uaXRlbXMgPSBAWyByZXByZXNlbnRhdGlv bnMgXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbQppbmRleCA2MGEzY2MzOGRhM2JiZDg3Mzg4MWU2ZWYyZTc1MzdjNTE0NDAzNjRl Li5lNjBlNjNmYWM0ODVhZTQ2YWVjYzIyOWFmZDNlNjRiYTRjYjQ3ODUzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0y NTI0LDcgKzI1MjQsNyBAQCB2b2lkIFdlYlBhZ2U6OmdldFBvc2l0aW9uSW5mb3JtYXRpb24oY29u c3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QmIHJlcXVlcwogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChsaW5rRWxlbWVudCkKLSAgICAgICAg ICAgICAgICBpbmZvLnVybCA9IFsoTlNVUkwgKilsaW5rRWxlbWVudC0+ZG9jdW1lbnQoKS5jb21w bGV0ZVVSTChzdHJpcExlYWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFjZXMobGlua0VsZW1lbnQtPmdl dEF0dHJpYnV0ZShIVE1MTmFtZXM6OmhyZWZBdHRyKSkpIGFic29sdXRlU3RyaW5nXTsKKyAgICAg ICAgICAgICAgICBpbmZvLnVybCA9IGxpbmtFbGVtZW50LT5kb2N1bWVudCgpLmNvbXBsZXRlVVJM KHN0cmlwTGVhZGluZ0FuZFRyYWlsaW5nSFRNTFNwYWNlcyhsaW5rRWxlbWVudC0+Z2V0QXR0cmli dXRlKEhUTUxOYW1lczo6aHJlZkF0dHIpKSk7CiAgICAgICAgICAgICBpbmZvLnRpdGxlID0gZWxl bWVudC0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OnRpdGxlQXR0 cikuc3RyaW5nKCk7CiAgICAgICAgICAgICBpZiAobGlua0VsZW1lbnQgJiYgaW5mby50aXRsZS5p c0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgaW5mby50aXRsZSA9IGVsZW1lbnQtPmlubmVyVGV4 dCgpOwpAQCAtMjU1OSw3ICsyNTU5LDcgQEAgdm9pZCBXZWJQYWdlOjpnZXRQb3NpdGlvbkluZm9y bWF0aW9uKGNvbnN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0JiByZXF1ZXMKICAgICAg ICAgICAgICAgICBjb25zdCBIVE1MQXR0YWNobWVudEVsZW1lbnQmIGF0dGFjaG1lbnQgPSBkb3du Y2FzdDxIVE1MQXR0YWNobWVudEVsZW1lbnQ+KCpoaXROb2RlKTsKICAgICAgICAgICAgICAgICBp bmZvLnRpdGxlID0gYXR0YWNobWVudC5hdHRhY2htZW50VGl0bGUoKTsKICAgICAgICAgICAgICAg ICBpZiAoYXR0YWNobWVudC5maWxlKCkpCi0gICAgICAgICAgICAgICAgICAgIGluZm8udXJsID0g ZG93bmNhc3Q8SFRNTEF0dGFjaG1lbnRFbGVtZW50PigqaGl0Tm9kZSkuZmlsZSgpLT5wYXRoKCk7 CisgICAgICAgICAgICAgICAgICAgIGluZm8udXJsID0gVVJMOjpmaWxlVVJMV2l0aEZpbGVTeXN0 ZW1QYXRoKGRvd25jYXN0PEhUTUxBdHRhY2htZW50RWxlbWVudD4oKmhpdE5vZGUpLmZpbGUoKS0+ cGF0aCgpKTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgaW5mby5pc1Nl bGVjdGFibGUgPSByZW5kZXJlci0+c3R5bGUoKS51c2VyU2VsZWN0KCkgIT0gU0VMRUNUX05PTkU7 CiAgICAgICAgICAgICAgICAgaWYgKGluZm8uaXNTZWxlY3RhYmxlICYmICFoaXROb2RlLT5pc1Rl eHROb2RlKCkpCg==