184654 2018-04-16 09:16:35 -0700 [iOS] Implement find-in-page in the new WKPDFView 2018-04-19 12:34:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes bdakin commit-queue dino mitz thorton timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1414795 0 aestes 2018-04-16 09:16:35 -0700 [iOS] Implement find-in-page in the new WKPDFView 1414796 1 338006 aestes 2018-04-16 09:17:04 -0700 Created attachment 338006 Patch 1414962 2 338058 aestes 2018-04-16 17:09:08 -0700 Created attachment 338058 Patch 1415796 3 aestes 2018-04-18 17:05:29 -0700 rdar://problem/39331654 1415818 4 338291 aestes 2018-04-18 18:28:47 -0700 Created attachment 338291 Patch 1416022 5 338291 commit-queue 2018-04-19 12:34:04 -0700 Comment on attachment 338291 Patch Clearing flags on attachment: 338291 Committed r230814: <https://trac.webkit.org/changeset/230814> 1416023 6 commit-queue 2018-04-19 12:34:06 -0700 All reviewed patches have been landed. Closing bug. 338006 2018-04-16 09:17:04 -0700 2018-04-16 17:09:07 -0700 Patch bug-184654-20180416091704.patch text/plain 8254 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM4YjkxZTk2MGY5MzQ4ZWZj OGE1MDE3Mzg1ZWU2MmIxNDIwMzIzMWEuLjlhNjlkMmY1ZDAxNzI2MTVjNjlmOGRkNjAxNmNkYmY0 MjhjNzc3MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTgtMDQtMTYgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEltcGxlbWVudCBmaW5kLWlu LXBhZ2UgaW4gdGhlIG5ldyBXS1BERlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NDY1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dLV2ViVmlld0NvbnRlbnRQcm92 aWRlclJlZ2lzdHJ5Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXdDb250ZW50UHJvdmlkZXJSZWdp c3RyeSBpbml0XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisgICAg ICAgIChzdHJpbmdDb21wYXJlT3B0aW9ucyk6CisgICAgICAgICgtW1dLUERGVmlldyBfcmVzZXRG aW5kXSk6CisgICAgICAgICgtW1dLUERGVmlldyBfZmluZFN0cmluZzp3aXRoT3B0aW9uczptYXhD b3VudDpjb21wbGV0aW9uOl0pOgorICAgICAgICAoLVtXS1BERlZpZXcgd2ViX2NvdW50U3RyaW5n TWF0Y2hlczpvcHRpb25zOm1heENvdW50Ol0pOgorICAgICAgICAoLVtXS1BERlZpZXcgX2NvbXB1 dGVGb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXhXaXRoT3B0aW9uczpkaWRXcmFwQXJvdW5kOl0pOgor ICAgICAgICAoLVtXS1BERlZpZXcgX2ZvY3VzT25TZWFyY2hSZXN1bHRXaXRoT3B0aW9uczpdKToK KyAgICAgICAgKC1bV0tQREZWaWV3IHdlYl9maW5kU3RyaW5nOm9wdGlvbnM6bWF4Q291bnQ6XSk6 CisgICAgICAgICgtW1dLUERGVmlldyB3ZWJfaGlkZUZpbmRVSV0pOgorICAgICAgICAoLVtXS1BE RlZpZXcgcGRmSG9zdFZpZXdDb250cm9sbGVyOmZpbmRTdHJpbmdVcGRhdGU6ZG9uZTpdKToKKwog MjAxOC0wNC0xNSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW1dQRV0gSW5zdGFsbCBmaWxlcyBuZWVkZWQgZm9yIFdlYktpdFdlYkV4dGVuc2lv bnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLV2ViVmlld0Nv bnRlbnRQcm92aWRlclJlZ2lzdHJ5Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev V0tXZWJWaWV3Q29udGVudFByb3ZpZGVyUmVnaXN0cnkubW0KaW5kZXggZWZiNGViOThmM2NmYzZj MGZmZDc2ODNmM2I4OTJhZGE4Yzk2NTM0Ni4uMWY5MjUwZGVkOGZjYWU0Y2Q2Nzk1MzkwMTE4OGRi NzRjZmU4MDAzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV0tX ZWJWaWV3Q29udGVudFByb3ZpZGVyUmVnaXN0cnkubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV0tXZWJWaWV3Q29udGVudFByb3ZpZGVyUmVnaXN0cnkubW0KQEAgLTMxLDYg KzMxLDcgQEAKICNpZiBQTEFURk9STShJT1MpCiAKICNpbXBvcnQgIldLTGVnYWN5UERGVmlldy5o IgorI2ltcG9ydCAiV0tQREZWaWV3LmgiCiAjaW1wb3J0ICJXS1N5c3RlbVByZXZpZXdWaWV3Lmgi CiAjaW1wb3J0ICJXS1dlYlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViUGFnZVByb3h5Lmgi CkBAIC01OCw3ICs1OSw3IEBAIC0gKGluc3RhbmNldHlwZSlpbml0CiAKICNpZiBFTkFCTEUoV0tM RUdBQ1lQREZWSUVXKQogICAgIGZvciAoYXV0byYgbWltZVR5cGUgOiBXZWJDb3JlOjpNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXRQREZNSU1FVHlwZXMoKSkKLSAgICAgICAgW3NlbGYgcmVnaXN0ZXJQcm92 aWRlcjpbV0tMZWdhY3lQREZWaWV3IGNsYXNzXSBmb3JNSU1FVHlwZTptaW1lVHlwZV07CisgICAg ICAgIFtzZWxmIHJlZ2lzdGVyUHJvdmlkZXI6W1dLUERGVmlldyBjbGFzc10gZm9yTUlNRVR5cGU6 bWltZVR5cGVdOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpICYmIFVTRShRVUlDS19MT09L KSAmJiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S1BERlZpZXcubW0KaW5kZXggNzBmYTE2YTlhOGVhZDVjZDA4NmJlOGJmZGNhYTYyY2RlYzMxMDg3 Yy4uMmQ1OGJhZDRkZDhmNmY5OWYxZWJmNzg4YzVmZTIxYjQ1MmVkM2I2ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCkBAIC0yOCwxMSArMjgsMTMgQEAKIAogI2lm IEVOQUJMRShXS1BERlZJRVcpCiAKKyNpbXBvcnQgIkZpbmRDbGllbnQuaCIKICNpbXBvcnQgIldL V2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0ICJXZWFrT2JqQ1B0ci5oIgogI2ltcG9ydCAiV2Vi UGFnZVByb3h5LmgiCiAjaW1wb3J0ICJfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5o IgogI2ltcG9ydCA8UERGS2l0L1BERkhvc3RWaWV3Q29udHJvbGxlci5oPgorI2ltcG9ydCA8d3Rm L0Jsb2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogI2ltcG9ydCA8d3RmL1Jl dGFpblB0ci5oPgogCkBAIC00MCwxMiArNDIsMTggQEAgQGludGVyZmFjZSBXS1BERlZpZXcgKCkg PFBERkhvc3RWaWV3Q29udHJvbGxlckRlbGVnYXRlPgogQGVuZAogCiBAaW1wbGVtZW50YXRpb24g V0tQREZWaWV3IHsKLSAgICBDR1NpemUgX292ZXJsYWlkQWNjZXNzb3J5Vmlld3NJbnNldDsKICAg ICBSZXRhaW5QdHI8TlNEYXRhPiBfZGF0YTsKLSAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9zdWdn ZXN0ZWRGaWxlbmFtZTsKLSAgICBSZXRhaW5QdHI8UERGSG9zdFZpZXdDb250cm9sbGVyPiBfaG9z dFZpZXdDb250cm9sbGVyOworICAgIEJsb2NrUHRyPHZvaWQoKT4gX2ZpbmRDb21wbGV0aW9uOwor ICAgIFJldGFpblB0cjxOU1N0cmluZz4gX2ZpbmRTdHJpbmc7CisgICAgTlNVSW50ZWdlciBfZmlu ZFN0cmluZ01heENvdW50OworICAgIE5TVUludGVnZXIgX2ZpbmRTdHJpbmdDb3VudDsKICAgICBS ZXRhaW5QdHI8VUlWaWV3PiBfZml4ZWRPdmVybGF5VmlldzsKKyAgICBzdGQ6Om9wdGlvbmFsPE5T VUludGVnZXI+IF9mb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXg7CisgICAgUmV0YWluUHRyPFBERkhv c3RWaWV3Q29udHJvbGxlcj4gX2hvc3RWaWV3Q29udHJvbGxlcjsKKyAgICBDR1NpemUgX292ZXJs YWlkQWNjZXNzb3J5Vmlld3NJbnNldDsKICAgICBSZXRhaW5QdHI8VUlWaWV3PiBfcGFnZU51bWJl ckluZGljYXRvcjsKKyAgICBCbG9ja1B0cjx2b2lkKCk+IF9wZW5kaW5nRmluZDsKKyAgICBSZXRh aW5QdHI8TlNTdHJpbmc+IF9zdWdnZXN0ZWRGaWxlbmFtZTsKICAgICBXZWJLaXQ6OldlYWtPYmpD UHRyPFdLV2ViVmlldz4gX3dlYlZpZXc7CiB9CiAKQEAgLTE3OCwxOSArMTg2LDExNSBAQCAtICh2 b2lkKXdlYl9kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uOihXS1NhbWVEb2N1bWVudE5hdmlnYXRp b25UeXBlKW5hdmlnYXRpb25UeQogICAgICAgICBbc2VsZiBfc2Nyb2xsVG9VUkxGcmFnbWVudDpb X3dlYlZpZXcgVVJMXS5mcmFnbWVudF07CiB9CiAKK3N0YXRpYyBOU1N0cmluZ0NvbXBhcmVPcHRp b25zIHN0cmluZ0NvbXBhcmVPcHRpb25zKF9XS0ZpbmRPcHRpb25zIGZpbmRPcHRpb25zKQorewor ICAgIE5TU3RyaW5nQ29tcGFyZU9wdGlvbnMgY29tcGFyZU9wdGlvbnMgPSAwOworICAgIGlmIChm aW5kT3B0aW9ucyAmIF9XS0ZpbmRPcHRpb25zQmFja3dhcmRzKQorICAgICAgICBjb21wYXJlT3B0 aW9ucyB8PSBOU0JhY2t3YXJkc1NlYXJjaDsKKyAgICBpZiAoZmluZE9wdGlvbnMgJiBfV0tGaW5k T3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZSkKKyAgICAgICAgY29tcGFyZU9wdGlvbnMgfD0gTlNDYXNl SW5zZW5zaXRpdmVTZWFyY2g7CisgICAgcmV0dXJuIGNvbXBhcmVPcHRpb25zOworfQorCistICh2 b2lkKV9yZXNldEZpbmQKK3sKKyAgICBfZmluZENvbXBsZXRpb24gPSBuaWw7CisgICAgX2ZpbmRT dHJpbmcgPSBuaWw7CisgICAgX2ZpbmRTdHJpbmdDb3VudCA9IDA7CisgICAgX2ZpbmRTdHJpbmdN YXhDb3VudCA9IDA7CisgICAgX2ZvY3VzZWRTZWFyY2hSZXN1bHRJbmRleCA9IHN0ZDo6bnVsbG9w dDsKKyAgICBfcGVuZGluZ0ZpbmQgPSBuaWw7CisKKyAgICBbX2hvc3RWaWV3Q29udHJvbGxlciBj YW5jZWxGaW5kU3RyaW5nXTsKK30KKworLSAodm9pZClfZmluZFN0cmluZzooTlNTdHJpbmcgKilz dHJpbmcgd2l0aE9wdGlvbnM6KF9XS0ZpbmRPcHRpb25zKW9wdGlvbnMgbWF4Q291bnQ6KE5TVUlu dGVnZXIpbWF4Q291bnQgY29tcGxldGlvbjoodm9pZCheKSgpKWNvbXBsZXRpb24KK3sKKyAgICBb c2VsZiBfcmVzZXRGaW5kXTsKKworICAgIF9maW5kQ29tcGxldGlvbiA9IGNvbXBsZXRpb247Cisg ICAgX2ZpbmRTdHJpbmcgPSBhZG9wdE5TKFtzdHJpbmcgY29weV0pOworICAgIF9maW5kU3RyaW5n TWF4Q291bnQgPSBtYXhDb3VudDsKKyAgICBbX2hvc3RWaWV3Q29udHJvbGxlciBmaW5kU3RyaW5n Ol9maW5kU3RyaW5nLmdldCgpIHdpdGhPcHRpb25zOnN0cmluZ0NvbXBhcmVPcHRpb25zKG9wdGlv bnMpXTsKK30KKwogLSAodm9pZCl3ZWJfY291bnRTdHJpbmdNYXRjaGVzOihOU1N0cmluZyAqKXN0 cmluZyBvcHRpb25zOihfV0tGaW5kT3B0aW9ucylvcHRpb25zIG1heENvdW50OihOU1VJbnRlZ2Vy KW1heENvdW50CiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudCBmaW5kLWluLXBhZ2UuCisgICAg W3NlbGYgX2ZpbmRTdHJpbmc6c3RyaW5nIHdpdGhPcHRpb25zOm9wdGlvbnMgbWF4Q291bnQ6bWF4 Q291bnQgY29tcGxldGlvbjpeeworICAgICAgICBpZiAoYXV0byBwYWdlID0gW193ZWJWaWV3IF9w YWdlXSkKKyAgICAgICAgICAgIHBhZ2UtPmZpbmRDbGllbnQoKS5kaWRDb3VudFN0cmluZ01hdGNo ZXMocGFnZSwgX2ZpbmRTdHJpbmcuZ2V0KCksIF9maW5kU3RyaW5nQ291bnQpOworICAgIH1dOwor fQorCistIChCT09MKV9jb21wdXRlRm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4V2l0aE9wdGlvbnM6 KF9XS0ZpbmRPcHRpb25zKW9wdGlvbnMgZGlkV3JhcEFyb3VuZDooQk9PTCAqKWRpZFdyYXBBcm91 bmQKK3sKKyAgICBpZiAoIV9maW5kU3RyaW5nQ291bnQpCisgICAgICAgIHJldHVybiBOTzsKKwor ICAgIEJPT0wgaXNCYWNrd2FyZHMgPSBvcHRpb25zICYgX1dLRmluZE9wdGlvbnNCYWNrd2FyZHM7 CisgICAgTlNVSW50ZWdlciBmaXJzdEluZGV4ID0gaXNCYWNrd2FyZHMgPyBfZmluZFN0cmluZ0Nv dW50IC0gMSA6IDA7CisgICAgaWYgKCFfZm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4KSB7CisgICAg ICAgIF9mb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXggPSBmaXJzdEluZGV4OworICAgICAgICByZXR1 cm4gWUVTOworICAgIH0KKworICAgIE5TVUludGVnZXIgZm9jdXNlZEluZGV4ID0gKl9mb2N1c2Vk U2VhcmNoUmVzdWx0SW5kZXg7CisgICAgaWYgKGlzQmFja3dhcmRzID8gIWZvY3VzZWRJbmRleCA6 IGZvY3VzZWRJbmRleCArIDEgPT0gX2ZpbmRTdHJpbmdDb3VudCkgeworICAgICAgICBpZiAoIShv cHRpb25zICYgX1dLRmluZE9wdGlvbnNXcmFwQXJvdW5kKSkKKyAgICAgICAgICAgIHJldHVybiBO TzsKKworICAgICAgICAqZGlkV3JhcEFyb3VuZCA9IFlFUzsKKyAgICAgICAgX2ZvY3VzZWRTZWFy Y2hSZXN1bHRJbmRleCA9IGZpcnN0SW5kZXg7CisgICAgICAgIHJldHVybiBZRVM7CisgICAgfQor CisgICAgX2ZvY3VzZWRTZWFyY2hSZXN1bHRJbmRleCA9IGlzQmFja3dhcmRzID8gZm9jdXNlZElu ZGV4IC0gMSA6IGZvY3VzZWRJbmRleCArIDE7CisgICAgQVNTRVJUKCpfZm9jdXNlZFNlYXJjaFJl c3VsdEluZGV4IDwgX2ZpbmRTdHJpbmdDb3VudCk7CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAo dm9pZClfZm9jdXNPblNlYXJjaFJlc3VsdFdpdGhPcHRpb25zOihfV0tGaW5kT3B0aW9ucylvcHRp b25zCit7CisgICAgYXV0byBwYWdlID0gW193ZWJWaWV3IF9wYWdlXTsKKyAgICBpZiAoIXBhZ2Up CisgICAgICAgIHJldHVybjsKKworICAgIEJPT0wgZGlkV3JhcEFyb3VuZCA9IE5POworICAgIGlm ICghW3NlbGYgX2NvbXB1dGVGb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXhXaXRoT3B0aW9uczpvcHRp b25zIGRpZFdyYXBBcm91bmQ6JmRpZFdyYXBBcm91bmRdKSB7CisgICAgICAgIHBhZ2UtPmZpbmRD bGllbnQoKS5kaWRGYWlsVG9GaW5kU3RyaW5nKHBhZ2UsIF9maW5kU3RyaW5nLmdldCgpKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGF1dG8gZm9jdXNlZEluZGV4ID0gKl9mb2N1c2Vk U2VhcmNoUmVzdWx0SW5kZXg7CisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgZm9jdXNPblNlYXJj aFJlc3VsdEF0SW5kZXg6Zm9jdXNlZEluZGV4XTsKKyAgICBwYWdlLT5maW5kQ2xpZW50KCkuZGlk RmluZFN0cmluZyhwYWdlLCBfZmluZFN0cmluZy5nZXQoKSwgeyB9LCBfZmluZFN0cmluZ0NvdW50 LCBmb2N1c2VkSW5kZXgsIGRpZFdyYXBBcm91bmQpOwogfQogCiAtICh2b2lkKXdlYl9maW5kU3Ry aW5nOihOU1N0cmluZyAqKXN0cmluZyBvcHRpb25zOihfV0tGaW5kT3B0aW9ucylvcHRpb25zIG1h eENvdW50OihOU1VJbnRlZ2VyKW1heENvdW50CiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudCBm aW5kLWluLXBhZ2UuCisgICAgaWYgKFtfZmluZFN0cmluZyBpc0VxdWFsVG9TdHJpbmc6c3RyaW5n XSkgeworICAgICAgICBbc2VsZiBfZm9jdXNPblNlYXJjaFJlc3VsdFdpdGhPcHRpb25zOm9wdGlv bnNdOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgW3NlbGYgX2ZpbmRTdHJpbmc6c3Ry aW5nIHdpdGhPcHRpb25zOm9wdGlvbnMgbWF4Q291bnQ6bWF4Q291bnQgY29tcGxldGlvbjpeewor ICAgICAgICBBU1NFUlQoW19maW5kU3RyaW5nIGlzRXF1YWxUb1N0cmluZzpzdHJpbmddKTsKKyAg ICAgICAgW3NlbGYgX2ZvY3VzT25TZWFyY2hSZXN1bHRXaXRoT3B0aW9uczpvcHRpb25zXTsKKyAg ICB9XTsKKyAgICAKKworLy8gICAgaWYgKF9maW5kQ29tcGxldGlvbikgeworLy8gICAgICAgIF9w ZW5kaW5nRmluZCA9IGZpbmRPcGVyYXRpb247CisvLyAgICAgICAgcmV0dXJuOworLy8gICAgfQor Ly8KKy8vICAgIEFTU0VSVCghX3BlbmRpbmdGaW5kKTsKKy8vICAgIGZpbmRPcGVyYXRpb24oKTsK IH0KIAogLSAodm9pZCl3ZWJfaGlkZUZpbmRVSQogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQg ZmluZC1pbi1wYWdlLgorICAgIFtzZWxmIF9yZXNldEZpbmRdOwogfQogCiAtIChVSVZpZXcgKil3 ZWJfY29udGVudFZpZXcKQEAgLTI0MCw2ICszNDQsMjEgQEAgLSAodm9pZClwZGZIb3N0Vmlld0Nv bnRyb2xsZXI6KFBERkhvc3RWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgdXBkYXRlUGFnZUNv dW4KICAgICBbc2VsZiBfc2Nyb2xsVG9VUkxGcmFnbWVudDpbX3dlYlZpZXcgVVJMXS5mcmFnbWVu dF07CiB9CiAKKy0gKHZvaWQpcGRmSG9zdFZpZXdDb250cm9sbGVyOihQREZIb3N0Vmlld0NvbnRy b2xsZXIgKiljb250cm9sbGVyIGZpbmRTdHJpbmdVcGRhdGU6KE5TVUludGVnZXIpbnVtRm91bmQg ZG9uZTooQk9PTClkb25lCit7CisgICAgaWYgKCFkb25lICYmIG51bUZvdW5kIDwgX2ZpbmRTdHJp bmdNYXhDb3VudCkKKyAgICAgICAgcmV0dXJuOworCisgICAgX2ZpbmRTdHJpbmdDb3VudCA9IG51 bUZvdW5kOworICAgIFtfaG9zdFZpZXdDb250cm9sbGVyIGNhbmNlbEZpbmRTdHJpbmddOworCisg ICAgaWYgKGF1dG8gZmluZENvbXBsZXRpb24gPSBzdGQ6OmV4Y2hhbmdlKF9maW5kQ29tcGxldGlv biwgbmlsKSkKKyAgICAgICAgZmluZENvbXBsZXRpb24oKTsKKworICAgIGlmIChhdXRvIHBlbmRp bmdGaW5kID0gc3RkOjpleGNoYW5nZShfcGVuZGluZ0ZpbmQsIG5pbCkpCisgICAgICAgIHBlbmRp bmdGaW5kKCk7Cit9CisKIC0gKHZvaWQpcGRmSG9zdFZpZXdDb250cm9sbGVyOihQREZIb3N0Vmll d0NvbnRyb2xsZXIgKiljb250cm9sbGVyIGdvVG9VUkw6KE5TVVJMICopdXJsCiB7CiAgICAgV0tX ZWJWaWV3ICp3ZWJWaWV3ID0gX3dlYlZpZXcuZ2V0QXV0b3JlbGVhc2VkKCk7Cg== 338058 2018-04-16 17:09:08 -0700 2018-04-18 17:02:36 -0700 Patch bug-184654-20180416170908.patch text/plain 8262 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM4YjkxZTk2MGY5MzQ4ZWZj OGE1MDE3Mzg1ZWU2MmIxNDIwMzIzMWEuLjlhNjlkMmY1ZDAxNzI2MTVjNjlmOGRkNjAxNmNkYmY0 MjhjNzc3MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTgtMDQtMTYgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEltcGxlbWVudCBmaW5kLWlu LXBhZ2UgaW4gdGhlIG5ldyBXS1BERlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NDY1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dLV2ViVmlld0NvbnRlbnRQcm92 aWRlclJlZ2lzdHJ5Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXdDb250ZW50UHJvdmlkZXJSZWdp c3RyeSBpbml0XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisgICAg ICAgIChzdHJpbmdDb21wYXJlT3B0aW9ucyk6CisgICAgICAgICgtW1dLUERGVmlldyBfcmVzZXRG aW5kXSk6CisgICAgICAgICgtW1dLUERGVmlldyBfZmluZFN0cmluZzp3aXRoT3B0aW9uczptYXhD b3VudDpjb21wbGV0aW9uOl0pOgorICAgICAgICAoLVtXS1BERlZpZXcgd2ViX2NvdW50U3RyaW5n TWF0Y2hlczpvcHRpb25zOm1heENvdW50Ol0pOgorICAgICAgICAoLVtXS1BERlZpZXcgX2NvbXB1 dGVGb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXhXaXRoT3B0aW9uczpkaWRXcmFwQXJvdW5kOl0pOgor ICAgICAgICAoLVtXS1BERlZpZXcgX2ZvY3VzT25TZWFyY2hSZXN1bHRXaXRoT3B0aW9uczpdKToK KyAgICAgICAgKC1bV0tQREZWaWV3IHdlYl9maW5kU3RyaW5nOm9wdGlvbnM6bWF4Q291bnQ6XSk6 CisgICAgICAgICgtW1dLUERGVmlldyB3ZWJfaGlkZUZpbmRVSV0pOgorICAgICAgICAoLVtXS1BE RlZpZXcgcGRmSG9zdFZpZXdDb250cm9sbGVyOmZpbmRTdHJpbmdVcGRhdGU6ZG9uZTpdKToKKwog MjAxOC0wNC0xNSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW1dQRV0gSW5zdGFsbCBmaWxlcyBuZWVkZWQgZm9yIFdlYktpdFdlYkV4dGVuc2lv bnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLV2ViVmlld0Nv bnRlbnRQcm92aWRlclJlZ2lzdHJ5Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev V0tXZWJWaWV3Q29udGVudFByb3ZpZGVyUmVnaXN0cnkubW0KaW5kZXggZWZiNGViOThmM2NmYzZj MGZmZDc2ODNmM2I4OTJhZGE4Yzk2NTM0Ni4uMWY5MjUwZGVkOGZjYWU0Y2Q2Nzk1MzkwMTE4OGRi NzRjZmU4MDAzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV0tX ZWJWaWV3Q29udGVudFByb3ZpZGVyUmVnaXN0cnkubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV0tXZWJWaWV3Q29udGVudFByb3ZpZGVyUmVnaXN0cnkubW0KQEAgLTMxLDYg KzMxLDcgQEAKICNpZiBQTEFURk9STShJT1MpCiAKICNpbXBvcnQgIldLTGVnYWN5UERGVmlldy5o IgorI2ltcG9ydCAiV0tQREZWaWV3LmgiCiAjaW1wb3J0ICJXS1N5c3RlbVByZXZpZXdWaWV3Lmgi CiAjaW1wb3J0ICJXS1dlYlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViUGFnZVByb3h5Lmgi CkBAIC01OCw3ICs1OSw3IEBAIC0gKGluc3RhbmNldHlwZSlpbml0CiAKICNpZiBFTkFCTEUoV0tM RUdBQ1lQREZWSUVXKQogICAgIGZvciAoYXV0byYgbWltZVR5cGUgOiBXZWJDb3JlOjpNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXRQREZNSU1FVHlwZXMoKSkKLSAgICAgICAgW3NlbGYgcmVnaXN0ZXJQcm92 aWRlcjpbV0tMZWdhY3lQREZWaWV3IGNsYXNzXSBmb3JNSU1FVHlwZTptaW1lVHlwZV07CisgICAg ICAgIFtzZWxmIHJlZ2lzdGVyUHJvdmlkZXI6W1dLUERGVmlldyBjbGFzc10gZm9yTUlNRVR5cGU6 bWltZVR5cGVdOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpICYmIFVTRShRVUlDS19MT09L KSAmJiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S1BERlZpZXcubW0KaW5kZXggNzBmYTE2YTlhOGVhZDVjZDA4NmJlOGJmZGNhYTYyY2RlYzMxMDg3 Yy4uNzMxZTc2YTdhZjU5ZmU4M2Y0YTEwYjIzMjM0MjE5ZTdmNGYwMjYwOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCkBAIC0yOCwxMSArMjgsMTMgQEAKIAogI2lm IEVOQUJMRShXS1BERlZJRVcpCiAKKyNpbXBvcnQgIkZpbmRDbGllbnQuaCIKICNpbXBvcnQgIldL V2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0ICJXZWFrT2JqQ1B0ci5oIgogI2ltcG9ydCAiV2Vi UGFnZVByb3h5LmgiCiAjaW1wb3J0ICJfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5o IgogI2ltcG9ydCA8UERGS2l0L1BERkhvc3RWaWV3Q29udHJvbGxlci5oPgorI2ltcG9ydCA8d3Rm L0Jsb2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogI2ltcG9ydCA8d3RmL1Jl dGFpblB0ci5oPgogCkBAIC00MCwxMiArNDIsMTggQEAgQGludGVyZmFjZSBXS1BERlZpZXcgKCkg PFBERkhvc3RWaWV3Q29udHJvbGxlckRlbGVnYXRlPgogQGVuZAogCiBAaW1wbGVtZW50YXRpb24g V0tQREZWaWV3IHsKLSAgICBDR1NpemUgX292ZXJsYWlkQWNjZXNzb3J5Vmlld3NJbnNldDsKICAg ICBSZXRhaW5QdHI8TlNEYXRhPiBfZGF0YTsKLSAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9zdWdn ZXN0ZWRGaWxlbmFtZTsKLSAgICBSZXRhaW5QdHI8UERGSG9zdFZpZXdDb250cm9sbGVyPiBfaG9z dFZpZXdDb250cm9sbGVyOworICAgIEJsb2NrUHRyPHZvaWQoKT4gX2ZpbmRDb21wbGV0aW9uOwor ICAgIFJldGFpblB0cjxOU1N0cmluZz4gX2ZpbmRTdHJpbmc7CisgICAgTlNVSW50ZWdlciBfZmlu ZFN0cmluZ01heENvdW50OworICAgIE5TSW50ZWdlciBfZmluZFN0cmluZ1BlbmRpbmdPZmZzZXQ7 CisgICAgTlNVSW50ZWdlciBfZmluZFN0cmluZ0NvdW50OwogICAgIFJldGFpblB0cjxVSVZpZXc+ IF9maXhlZE92ZXJsYXlWaWV3OworICAgIHN0ZDo6b3B0aW9uYWw8TlNVSW50ZWdlcj4gX2ZvY3Vz ZWRTZWFyY2hSZXN1bHRJbmRleDsKKyAgICBSZXRhaW5QdHI8UERGSG9zdFZpZXdDb250cm9sbGVy PiBfaG9zdFZpZXdDb250cm9sbGVyOworICAgIENHU2l6ZSBfb3ZlcmxhaWRBY2Nlc3NvcnlWaWV3 c0luc2V0OwogICAgIFJldGFpblB0cjxVSVZpZXc+IF9wYWdlTnVtYmVySW5kaWNhdG9yOworICAg IFJldGFpblB0cjxOU1N0cmluZz4gX3N1Z2dlc3RlZEZpbGVuYW1lOwogICAgIFdlYktpdDo6V2Vh a09iakNQdHI8V0tXZWJWaWV3PiBfd2ViVmlldzsKIH0KIApAQCAtMTc4LDE5ICsxODYsMTExIEBA IC0gKHZvaWQpd2ViX2RpZFNhbWVEb2N1bWVudE5hdmlnYXRpb246KFdLU2FtZURvY3VtZW50TmF2 aWdhdGlvblR5cGUpbmF2aWdhdGlvblR5CiAgICAgICAgIFtzZWxmIF9zY3JvbGxUb1VSTEZyYWdt ZW50Oltfd2ViVmlldyBVUkxdLmZyYWdtZW50XTsKIH0KIAorc3RhdGljIE5TU3RyaW5nQ29tcGFy ZU9wdGlvbnMgc3RyaW5nQ29tcGFyZU9wdGlvbnMoX1dLRmluZE9wdGlvbnMgZmluZE9wdGlvbnMp Cit7CisgICAgTlNTdHJpbmdDb21wYXJlT3B0aW9ucyBjb21wYXJlT3B0aW9ucyA9IDA7CisgICAg aWYgKGZpbmRPcHRpb25zICYgX1dLRmluZE9wdGlvbnNCYWNrd2FyZHMpCisgICAgICAgIGNvbXBh cmVPcHRpb25zIHw9IE5TQmFja3dhcmRzU2VhcmNoOworICAgIGlmIChmaW5kT3B0aW9ucyAmIF9X S0ZpbmRPcHRpb25zQ2FzZUluc2Vuc2l0aXZlKQorICAgICAgICBjb21wYXJlT3B0aW9ucyB8PSBO U0Nhc2VJbnNlbnNpdGl2ZVNlYXJjaDsKKyAgICByZXR1cm4gY29tcGFyZU9wdGlvbnM7Cit9CisK Ky0gKHZvaWQpX3Jlc2V0RmluZAoreworICAgIF9maW5kQ29tcGxldGlvbiA9IG5pbDsKKyAgICBf ZmluZFN0cmluZyA9IG5pbDsKKyAgICBfZmluZFN0cmluZ0NvdW50ID0gMDsKKyAgICBfZmluZFN0 cmluZ01heENvdW50ID0gMDsKKyAgICBfZm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4ID0gc3RkOjpu dWxsb3B0OworCisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgY2FuY2VsRmluZFN0cmluZ107Cit9 CisKKy0gKHZvaWQpX2ZpbmRTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIHdpdGhPcHRpb25zOihf V0tGaW5kT3B0aW9ucylvcHRpb25zIG1heENvdW50OihOU1VJbnRlZ2VyKW1heENvdW50IGNvbXBs ZXRpb246KHZvaWQoXikoKSljb21wbGV0aW9uCit7CisgICAgW3NlbGYgX3Jlc2V0RmluZF07CisK KyAgICBfZmluZENvbXBsZXRpb24gPSBjb21wbGV0aW9uOworICAgIF9maW5kU3RyaW5nID0gYWRv cHROUyhbc3RyaW5nIGNvcHldKTsKKyAgICBfZmluZFN0cmluZ01heENvdW50ID0gbWF4Q291bnQ7 CisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgZmluZFN0cmluZzpfZmluZFN0cmluZy5nZXQoKSB3 aXRoT3B0aW9uczpzdHJpbmdDb21wYXJlT3B0aW9ucyhvcHRpb25zKV07Cit9CisKIC0gKHZvaWQp d2ViX2NvdW50U3RyaW5nTWF0Y2hlczooTlNTdHJpbmcgKilzdHJpbmcgb3B0aW9uczooX1dLRmlu ZE9wdGlvbnMpb3B0aW9ucyBtYXhDb3VudDooTlNVSW50ZWdlciltYXhDb3VudAogewotICAgIC8v IEZJWE1FOiBJbXBsZW1lbnQgZmluZC1pbi1wYWdlLgorICAgIFtzZWxmIF9maW5kU3RyaW5nOnN0 cmluZyB3aXRoT3B0aW9uczpvcHRpb25zIG1heENvdW50Om1heENvdW50IGNvbXBsZXRpb246XnsK KyAgICAgICAgaWYgKGF1dG8gcGFnZSA9IFtfd2ViVmlldyBfcGFnZV0pCisgICAgICAgICAgICBw YWdlLT5maW5kQ2xpZW50KCkuZGlkQ291bnRTdHJpbmdNYXRjaGVzKHBhZ2UsIF9maW5kU3RyaW5n LmdldCgpLCBfZmluZFN0cmluZ0NvdW50KTsKKyAgICB9XTsKK30KKworLSAoQk9PTClfY29tcHV0 ZUZvY3VzZWRTZWFyY2hSZXN1bHRJbmRleFdpdGhPcHRpb25zOihfV0tGaW5kT3B0aW9ucylvcHRp b25zIGRpZFdyYXBBcm91bmQ6KEJPT0wgKilkaWRXcmFwQXJvdW5kCit7CisgICAgaWYgKCFfZmlu ZFN0cmluZ0NvdW50KQorICAgICAgICByZXR1cm4gTk87CisKKyAgICBCT09MIGlzQmFja3dhcmRz ID0gb3B0aW9ucyAmIF9XS0ZpbmRPcHRpb25zQmFja3dhcmRzOworICAgIE5TSW50ZWdlciBzaW5n bGVPZmZzZXQgPSBpc0JhY2t3YXJkcyA/IC0xIDogMTsKKyAgICBpZiAoX2ZpbmRDb21wbGV0aW9u KSB7CisgICAgICAgIF9maW5kU3RyaW5nUGVuZGluZ09mZnNldCArPSBzaW5nbGVPZmZzZXQ7Cisg ICAgICAgIHJldHVybiBOTzsKKyAgICB9CisKKyAgICBOU0ludGVnZXIgbmV3SW5kZXggPSBfZm9j dXNlZFNlYXJjaFJlc3VsdEluZGV4LnZhbHVlX29yKGlzQmFja3dhcmRzID8gX2ZpbmRTdHJpbmdN YXhDb3VudCAtIDEgOiAwKSArIHN0ZDo6ZXhjaGFuZ2UoX2ZpbmRTdHJpbmdQZW5kaW5nT2Zmc2V0 LCAwKTsKKyAgICBpZiAoX2ZvY3VzZWRTZWFyY2hSZXN1bHRJbmRleCkKKyAgICAgICAgbmV3SW5k ZXggKz0gc2luZ2xlT2Zmc2V0OworCisgICAgaWYgKG5ld0luZGV4IDwgMCB8fCBzdGF0aWNfY2Fz dDxOU1VJbnRlZ2VyPihuZXdJbmRleCkgPj0gX2ZpbmRTdHJpbmdNYXhDb3VudCkgeworICAgICAg ICAqZGlkV3JhcEFyb3VuZCA9IFlFUzsKKyAgICAgICAgaWYgKCEob3B0aW9ucyAmIF9XS0ZpbmRP cHRpb25zV3JhcEFyb3VuZCkpCisgICAgICAgICAgICByZXR1cm4gTk87CisKKyAgICAgICAgTlNV SW50ZWdlciBub3JtYWxpemVkSW5kZXggPSBzdGQ6OmFicyhuZXdJbmRleCkgJSBfZmluZFN0cmlu Z01heENvdW50OworICAgICAgICBpZiAobmV3SW5kZXggPCAwKQorICAgICAgICAgICAgbm9ybWFs aXplZEluZGV4ID0gX2ZpbmRTdHJpbmdNYXhDb3VudCAtIG5vcm1hbGl6ZWRJbmRleDsKKyAgICAg ICAgbmV3SW5kZXggPSBub3JtYWxpemVkSW5kZXg7CisgICAgfQorCisgICAgX2ZvY3VzZWRTZWFy Y2hSZXN1bHRJbmRleCA9IG5ld0luZGV4OworICAgIEFTU0VSVCgqX2ZvY3VzZWRTZWFyY2hSZXN1 bHRJbmRleCA8IF9maW5kU3RyaW5nQ291bnQpOworICAgIHJldHVybiBZRVM7Cit9CisKKy0gKHZv aWQpX2ZvY3VzT25TZWFyY2hSZXN1bHRXaXRoT3B0aW9uczooX1dLRmluZE9wdGlvbnMpb3B0aW9u cworeworICAgIGF1dG8gcGFnZSA9IFtfd2ViVmlldyBfcGFnZV07CisgICAgaWYgKCFwYWdlKQor ICAgICAgICByZXR1cm47CisKKyAgICBCT09MIGRpZFdyYXBBcm91bmQgPSBOTzsKKyAgICBpZiAo IVtzZWxmIF9jb21wdXRlRm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4V2l0aE9wdGlvbnM6b3B0aW9u cyBkaWRXcmFwQXJvdW5kOiZkaWRXcmFwQXJvdW5kXSkgeworICAgICAgICBpZiAoIV9maW5kQ29t cGxldGlvbikKKyAgICAgICAgICAgIHBhZ2UtPmZpbmRDbGllbnQoKS5kaWRGYWlsVG9GaW5kU3Ry aW5nKHBhZ2UsIF9maW5kU3RyaW5nLmdldCgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIGF1dG8gZm9jdXNlZEluZGV4ID0gKl9mb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXg7CisgICAg W19ob3N0Vmlld0NvbnRyb2xsZXIgZm9jdXNPblNlYXJjaFJlc3VsdEF0SW5kZXg6Zm9jdXNlZElu ZGV4XTsKKyAgICBwYWdlLT5maW5kQ2xpZW50KCkuZGlkRmluZFN0cmluZyhwYWdlLCBfZmluZFN0 cmluZy5nZXQoKSwgeyB9LCBfZmluZFN0cmluZ0NvdW50LCBmb2N1c2VkSW5kZXgsIGRpZFdyYXBB cm91bmQpOwogfQogCiAtICh2b2lkKXdlYl9maW5kU3RyaW5nOihOU1N0cmluZyAqKXN0cmluZyBv cHRpb25zOihfV0tGaW5kT3B0aW9ucylvcHRpb25zIG1heENvdW50OihOU1VJbnRlZ2VyKW1heENv dW50CiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudCBmaW5kLWluLXBhZ2UuCisgICAgaWYgKFtf ZmluZFN0cmluZyBpc0VxdWFsVG9TdHJpbmc6c3RyaW5nXSkgeworICAgICAgICBbc2VsZiBfZm9j dXNPblNlYXJjaFJlc3VsdFdpdGhPcHRpb25zOm9wdGlvbnNdOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgW3NlbGYgX2ZpbmRTdHJpbmc6c3RyaW5nIHdpdGhPcHRpb25zOm9wdGlvbnMg bWF4Q291bnQ6bWF4Q291bnQgY29tcGxldGlvbjpeeworICAgICAgICBBU1NFUlQoW19maW5kU3Ry aW5nIGlzRXF1YWxUb1N0cmluZzpzdHJpbmddKTsKKyAgICAgICAgW3NlbGYgX2ZvY3VzT25TZWFy Y2hSZXN1bHRXaXRoT3B0aW9uczpvcHRpb25zXTsKKyAgICB9XTsKIH0KIAogLSAodm9pZCl3ZWJf aGlkZUZpbmRVSQogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgZmluZC1pbi1wYWdlLgorICAg IFtzZWxmIF9yZXNldEZpbmRdOwogfQogCiAtIChVSVZpZXcgKil3ZWJfY29udGVudFZpZXcKQEAg LTI0MCw2ICszNDAsMTggQEAgLSAodm9pZClwZGZIb3N0Vmlld0NvbnRyb2xsZXI6KFBERkhvc3RW aWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgdXBkYXRlUGFnZUNvdW4KICAgICBbc2VsZiBfc2Ny b2xsVG9VUkxGcmFnbWVudDpbX3dlYlZpZXcgVVJMXS5mcmFnbWVudF07CiB9CiAKKy0gKHZvaWQp cGRmSG9zdFZpZXdDb250cm9sbGVyOihQREZIb3N0Vmlld0NvbnRyb2xsZXIgKiljb250cm9sbGVy IGZpbmRTdHJpbmdVcGRhdGU6KE5TVUludGVnZXIpbnVtRm91bmQgZG9uZTooQk9PTClkb25lCit7 CisgICAgaWYgKCFkb25lICYmIG51bUZvdW5kIDwgX2ZpbmRTdHJpbmdNYXhDb3VudCkKKyAgICAg ICAgcmV0dXJuOworCisgICAgX2ZpbmRTdHJpbmdDb3VudCA9IG51bUZvdW5kOworICAgIGlmIChh dXRvIGZpbmRDb21wbGV0aW9uID0gc3RkOjpleGNoYW5nZShfZmluZENvbXBsZXRpb24sIG5pbCkp CisgICAgICAgIGZpbmRDb21wbGV0aW9uKCk7CisKKyAgICBbX2hvc3RWaWV3Q29udHJvbGxlciBj YW5jZWxGaW5kU3RyaW5nXTsKK30KKwogLSAodm9pZClwZGZIb3N0Vmlld0NvbnRyb2xsZXI6KFBE Rkhvc3RWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgZ29Ub1VSTDooTlNVUkwgKil1cmwKIHsK ICAgICBXS1dlYlZpZXcgKndlYlZpZXcgPSBfd2ViVmlldy5nZXRBdXRvcmVsZWFzZWQoKTsK 338291 2018-04-18 18:28:47 -0700 2018-04-19 12:34:04 -0700 Patch bug-184654-20180419092846.patch text/plain 9639 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYzOWExYzAwMWIyODVkY2Qw NWViMTFlYjE1Y2ZmZGJhMDQyNTNmNTMuLjRhMjJiNjRmNDg5YzU3ZWM5ZGU1ZGYzMDMwZGUxNTEy Zjg4N2M0YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjcgQEAKKzIwMTgtMDQtMTYgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEltcGxlbWVudCBmaW5kLWlu LXBhZ2UgaW4gdGhlIG5ldyBXS1BERlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NDY1NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzkzMzE2 NTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBpcyB0aGVvcmV0aWNhbGx5IGNvdmVyZWQgYnkgZXhpc3RpbmcgV0tQREZWaWV3IEFQSSB0ZXN0 cywgYnV0IHRoYXQncyBjdXJyZW50bHkgYmxvY2tlZAorICAgICAgICBieSA8cmRhcjovL3Byb2Js ZW0vMzk0NzU1NDI+LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06Cisg ICAgICAgIChzdHJpbmdDb21wYXJlT3B0aW9ucyk6CisKKyAgICAgICAgTWFwcGVkIF9XS0ZpbmRP cHRpb25zIHRvIE5TU3RyaW5nQ29tcGFyZU9wdGlvbnMuCisKKyAgICAgICAgKC1bV0tQREZWaWV3 IF9yZXNldEZpbmRdKToKKworICAgICAgICBDYW5jZWxsZWQgYW4gaW4tcHJvZ3Jlc3Mgc2VhcmNo IGFuZCByZXNldCB0aGUgc2VhcmNoIHN0YXRlLgorCisgICAgICAgICgtW1dLUERGVmlldyBfZmlu ZFN0cmluZzp3aXRoT3B0aW9uczptYXhDb3VudDpjb21wbGV0aW9uOl0pOgorCisgICAgICAgIFN0 b3JlZCB0aGUgY29tcGxldGlvbiBibG9jaywgZmluZCBzdHJpbmcsIGFuZCBtYXggY291bnQsIHRo ZW4gY2FsbGVkCisgICAgICAgIC1bUERGSG9zdFZpZXdDb250cm9sbGVyIGZpbmRTdHJpbmc6d2l0 aE9wdGlvbnM6XS4KKworICAgICAgICAoLVtXS1BERlZpZXcgd2ViX2NvdW50U3RyaW5nTWF0Y2hl czpvcHRpb25zOm1heENvdW50Ol0pOgorCisgICAgICAgIENhbGxlZCAtX2ZpbmRTdHJpbmc6d2l0 aE9wdGlvbnM6bWF4Q291bnQ6Y29tcGxldGlvbjogd2l0aCBhIGNvbXBsZXRpb24gYmxvY2sgdGhh dCBjYWxscworICAgICAgICBGaW5kQ2xpZW50OjpkaWRDb3VudFN0cmluZ01hdGNoZXMoKSB3aXRo IF9maW5kU3RyaW5nQ291bnQuCisKKyAgICAgICAgKC1bV0tQREZWaWV3IF9jb21wdXRlRm9jdXNl ZFNlYXJjaFJlc3VsdEluZGV4V2l0aE9wdGlvbnM6ZGlkV3JhcEFyb3VuZDpdKToKKworICAgICAg ICBDb21wdXRlZCB0aGUgZm9jdXNlZCBzZWFyY2ggcmVzdWx0IGluZGV4LCB0YWtpbmcgX2ZpbmRT dHJpbmdDb3VudCBhbmQgd3JhcC1hcm91bmQgaW50bworICAgICAgICBhY2NvdW50LiBUaGVyZSBh cmUgdHdvIGludGVyZXN0aW5nIGNhc2VzIHRvIG1lbnRpb24gaGVyZToKKworICAgICAgICAxLiBX ZSBjYW4ndCBjaGFuZ2UgZm9jdXMgd2hpbGUgYSBzZWFyY2ggaXMgaW4gcHJvZ3Jlc3MsIGJlY2F1 c2Ugd2UgY2FuJ3QgcHJvcGVybHkgaGFuZGxlCisgICAgICAgIHdyYXAtYXJvdW5kIHdpdGhvdXQg YSBfZmluZFN0cmluZ0NvdW50LiBJZiBhIHNlYXJjaCBpcyBpbiBwcm9ncmVzcywgc3RvcmUgdGhl IHJlcXVlc3RlZAorICAgICAgICBmb2N1cyBjaGFuZ2UgaW4gX2ZvY3VzZWRTZWFyY2hSZXN1bHRQ ZW5kaW5nT2Zmc2V0LCB3aGljaCB3aWxsIGJlIGFwcGxpZWQgb25jZSB0aGUgc2VhcmNoCisgICAg ICAgIGZpbmlzaGVzLgorCisgICAgICAgIDIuIElmIHdyYXAtYXJvdW5kIGlzIGFib3V0IHRvIGhh cHBlbiBidXQgdGhlIGZpbmQgb3B0aW9ucyBkbyBub3QgYWxsb3cgaXQsIHdlIG5lZWQgdG8gY2Fs bAorICAgICAgICBGaW5kQ2xpZW50OjpkaWRGYWlsVG9GaW5kU3RyaW5nKCkuIEhhbmRsZSB0aGlz IGJ5IHJldHVybmluZyBOTywgd2hpY2ggd2lsbCB0ZWxsCisgICAgICAgIC1fZm9jdXNPblNlYXJj aFJlc3VsdFdpdGhPcHRpb25zOiB0byBjYWxsIGRpZEZhaWxUb0ZpbmRTdHJpbmcoKSBpZiBhIHNl YXJjaCBpcyBub3QgaW4KKyAgICAgICAgcHJvZ3Jlc3MuCisKKyAgICAgICAgKC1bV0tQREZWaWV3 IF9mb2N1c09uU2VhcmNoUmVzdWx0V2l0aE9wdGlvbnM6XSk6CisKKyAgICAgICAgSWYgLV9jb21w dXRlRm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4V2l0aE9wdGlvbnM6ZGlkV3JhcEFyb3VuZDogZmFp bGVkIHdoaWxlIGEgc2VhcmNoIGlzIGluCisgICAgICAgIHByb2dyZXNzLCBqdXN0IHJldHVybiBl YXJseS4gT3RoZXJ3aXNlLCBjYWxsIEZpbmRDbGllbnQ6OmRpZEZhaWxUb0ZpbmRTdHJpbmcoKS4g SWYKKyAgICAgICAgY29tcHV0aW5nIHRoZSBpbmRleCBkaWQgbm90IGZhaWwsIGNhbGwgLVtQREZI b3N0Vmlld0NvbnRyb2xsZXIgZm9jdXNPblNlYXJjaFJlc3VsdEF0SW5kZXg6XQorICAgICAgICB0 byBjaGFuZ2UgZm9jdXMgYW5kIHRoZW4gY2FsbCBGaW5kQ2xpZW50OjpkaWRGaW5kU3RyaW5nKCkg dG8gaW5mb3JtIHRoZSBjbGllbnQuCisKKyAgICAgICAgKC1bV0tQREZWaWV3IHdlYl9maW5kU3Ry aW5nOm9wdGlvbnM6bWF4Q291bnQ6XSk6CisKKyAgICAgICAgSWYgdGhlIGZpbmQgc3RyaW5nIGlz IGVxdWFsIHRvIF9maW5kU3RyaW5nLCBjaGFuZ2UgZm9jdXMuIE90aGVyd2lzZSwgc3RhcnQgYSBu ZXcgc2VhcmNoLgorCisgICAgICAgICgtW1dLUERGVmlldyB3ZWJfaGlkZUZpbmRVSV0pOgorCisg ICAgICAgIENhbGxlZCAtX3Jlc2V0RmluZC4KKworICAgICAgICAoLVtXS1BERlZpZXcgcGRmSG9z dFZpZXdDb250cm9sbGVyOmZpbmRTdHJpbmdVcGRhdGU6ZG9uZTpdKToKKworICAgICAgICBTdG9y ZWQgdGhlIGNvdW50IGluIF9maW5kU3RyaW5nQ291bnQgYW5kIGNhbGxlZCBfZmluZENvbXBsZXRp b24gb25jZSB0aGUgc2VhcmNoIGlzIGRvbmUuCisKIDIwMTgtMDQtMTYgIFRpbW90aHkgSGF0Y2hl ciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgMzItYml0IGJ1aWxk IGZpeCBmb3IgcjIzMDY3My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS1BERlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1t CmluZGV4IDcwZmExNmE5YThlYWQ1Y2QwODZiZThiZmRjYWE2MmNkZWMzMTA4N2MuLjBkNjA3NTBi ZjFhZjQ4YTViMGNkZjg5MjNhMzc3Yjg0NTM5YzkwMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLUERGVmlldy5tbQpAQCAtMjgsMTEgKzI4LDEzIEBACiAKICNpZiBFTkFCTEUoV0tQ REZWSUVXKQogCisjaW1wb3J0ICJGaW5kQ2xpZW50LmgiCiAjaW1wb3J0ICJXS1dlYlZpZXdJbnRl cm5hbC5oIgogI2ltcG9ydCAiV2Vha09iakNQdHIuaCIKICNpbXBvcnQgIldlYlBhZ2VQcm94eS5o IgogI2ltcG9ydCAiX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaCIKICNpbXBvcnQg PFBERktpdC9QREZIb3N0Vmlld0NvbnRyb2xsZXIuaD4KKyNpbXBvcnQgPHd0Zi9CbG9ja1B0ci5o PgogI2ltcG9ydCA8d3RmL01haW5UaHJlYWQuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4K IApAQCAtNDAsMTIgKzQyLDE4IEBAIEBpbnRlcmZhY2UgV0tQREZWaWV3ICgpIDxQREZIb3N0Vmll d0NvbnRyb2xsZXJEZWxlZ2F0ZT4KIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLUERGVmlldyB7 Ci0gICAgQ0dTaXplIF9vdmVybGFpZEFjY2Vzc29yeVZpZXdzSW5zZXQ7CiAgICAgUmV0YWluUHRy PE5TRGF0YT4gX2RhdGE7Ci0gICAgUmV0YWluUHRyPE5TU3RyaW5nPiBfc3VnZ2VzdGVkRmlsZW5h bWU7Ci0gICAgUmV0YWluUHRyPFBERkhvc3RWaWV3Q29udHJvbGxlcj4gX2hvc3RWaWV3Q29udHJv bGxlcjsKKyAgICBCbG9ja1B0cjx2b2lkKCk+IF9maW5kQ29tcGxldGlvbjsKKyAgICBSZXRhaW5Q dHI8TlNTdHJpbmc+IF9maW5kU3RyaW5nOworICAgIE5TVUludGVnZXIgX2ZpbmRTdHJpbmdDb3Vu dDsKKyAgICBOU1VJbnRlZ2VyIF9maW5kU3RyaW5nTWF4Q291bnQ7CiAgICAgUmV0YWluUHRyPFVJ Vmlldz4gX2ZpeGVkT3ZlcmxheVZpZXc7CisgICAgc3RkOjpvcHRpb25hbDxOU1VJbnRlZ2VyPiBf Zm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4OworICAgIE5TSW50ZWdlciBfZm9jdXNlZFNlYXJjaFJl c3VsdFBlbmRpbmdPZmZzZXQ7CisgICAgUmV0YWluUHRyPFBERkhvc3RWaWV3Q29udHJvbGxlcj4g X2hvc3RWaWV3Q29udHJvbGxlcjsKKyAgICBDR1NpemUgX292ZXJsYWlkQWNjZXNzb3J5Vmlld3NJ bnNldDsKICAgICBSZXRhaW5QdHI8VUlWaWV3PiBfcGFnZU51bWJlckluZGljYXRvcjsKKyAgICBS ZXRhaW5QdHI8TlNTdHJpbmc+IF9zdWdnZXN0ZWRGaWxlbmFtZTsKICAgICBXZWJLaXQ6OldlYWtP YmpDUHRyPFdLV2ViVmlldz4gX3dlYlZpZXc7CiB9CiAKQEAgLTE3OCwxOSArMTg2LDEyMSBAQCAt ICh2b2lkKXdlYl9kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uOihXS1NhbWVEb2N1bWVudE5hdmln YXRpb25UeXBlKW5hdmlnYXRpb25UeQogICAgICAgICBbc2VsZiBfc2Nyb2xsVG9VUkxGcmFnbWVu dDpbX3dlYlZpZXcgVVJMXS5mcmFnbWVudF07CiB9CiAKK3N0YXRpYyBOU1N0cmluZ0NvbXBhcmVP cHRpb25zIHN0cmluZ0NvbXBhcmVPcHRpb25zKF9XS0ZpbmRPcHRpb25zIGZpbmRPcHRpb25zKQor eworICAgIE5TU3RyaW5nQ29tcGFyZU9wdGlvbnMgY29tcGFyZU9wdGlvbnMgPSAwOworICAgIGlm IChmaW5kT3B0aW9ucyAmIF9XS0ZpbmRPcHRpb25zQmFja3dhcmRzKQorICAgICAgICBjb21wYXJl T3B0aW9ucyB8PSBOU0JhY2t3YXJkc1NlYXJjaDsKKyAgICBpZiAoZmluZE9wdGlvbnMgJiBfV0tG aW5kT3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZSkKKyAgICAgICAgY29tcGFyZU9wdGlvbnMgfD0gTlND YXNlSW5zZW5zaXRpdmVTZWFyY2g7CisgICAgcmV0dXJuIGNvbXBhcmVPcHRpb25zOworfQorCist ICh2b2lkKV9yZXNldEZpbmQKK3sKKyAgICBpZiAoX2ZpbmRDb21wbGV0aW9uKQorICAgICAgICBb X2hvc3RWaWV3Q29udHJvbGxlciBjYW5jZWxGaW5kU3RyaW5nXTsKKworICAgIF9maW5kQ29tcGxl dGlvbiA9IG5pbDsKKyAgICBfZmluZFN0cmluZyA9IG5pbDsKKyAgICBfZmluZFN0cmluZ0NvdW50 ID0gMDsKKyAgICBfZmluZFN0cmluZ01heENvdW50ID0gMDsKKyAgICBfZm9jdXNlZFNlYXJjaFJl c3VsdEluZGV4ID0gc3RkOjpudWxsb3B0OworICAgIF9mb2N1c2VkU2VhcmNoUmVzdWx0UGVuZGlu Z09mZnNldCA9IDA7Cit9CisKKy0gKHZvaWQpX2ZpbmRTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5n IHdpdGhPcHRpb25zOihfV0tGaW5kT3B0aW9ucylvcHRpb25zIG1heENvdW50OihOU1VJbnRlZ2Vy KW1heENvdW50IGNvbXBsZXRpb246KHZvaWQoXikoKSljb21wbGV0aW9uCit7CisgICAgW3NlbGYg X3Jlc2V0RmluZF07CisKKyAgICBfZmluZENvbXBsZXRpb24gPSBjb21wbGV0aW9uOworICAgIF9m aW5kU3RyaW5nID0gYWRvcHROUyhbc3RyaW5nIGNvcHldKTsKKyAgICBfZmluZFN0cmluZ01heENv dW50ID0gbWF4Q291bnQ7CisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgZmluZFN0cmluZzpfZmlu ZFN0cmluZy5nZXQoKSB3aXRoT3B0aW9uczpzdHJpbmdDb21wYXJlT3B0aW9ucyhvcHRpb25zKV07 Cit9CisKIC0gKHZvaWQpd2ViX2NvdW50U3RyaW5nTWF0Y2hlczooTlNTdHJpbmcgKilzdHJpbmcg b3B0aW9uczooX1dLRmluZE9wdGlvbnMpb3B0aW9ucyBtYXhDb3VudDooTlNVSW50ZWdlciltYXhD b3VudAogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgZmluZC1pbi1wYWdlLgorICAgIFtzZWxm IF9maW5kU3RyaW5nOnN0cmluZyB3aXRoT3B0aW9uczpvcHRpb25zIG1heENvdW50Om1heENvdW50 IGNvbXBsZXRpb246XnsKKyAgICAgICAgQVNTRVJUKFtfZmluZFN0cmluZyBpc0VxdWFsVG9TdHJp bmc6c3RyaW5nXSk7CisgICAgICAgIGlmIChhdXRvIHBhZ2UgPSBbX3dlYlZpZXcgX3BhZ2VdKQor ICAgICAgICAgICAgcGFnZS0+ZmluZENsaWVudCgpLmRpZENvdW50U3RyaW5nTWF0Y2hlcyhwYWdl LCBfZmluZFN0cmluZy5nZXQoKSwgX2ZpbmRTdHJpbmdDb3VudCk7CisgICAgfV07Cit9CisKKy0g KEJPT0wpX2NvbXB1dGVGb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXhXaXRoT3B0aW9uczooX1dLRmlu ZE9wdGlvbnMpb3B0aW9ucyBkaWRXcmFwQXJvdW5kOihCT09MICopZGlkV3JhcEFyb3VuZAorewor ICAgIEJPT0wgaXNCYWNrd2FyZHMgPSBvcHRpb25zICYgX1dLRmluZE9wdGlvbnNCYWNrd2FyZHM7 CisgICAgTlNJbnRlZ2VyIHNpbmdsZU9mZnNldCA9IGlzQmFja3dhcmRzID8gLTEgOiAxOworCisg ICAgaWYgKF9maW5kQ29tcGxldGlvbikgeworICAgICAgICBBU1NFUlQoIV9mb2N1c2VkU2VhcmNo UmVzdWx0SW5kZXgpOworICAgICAgICBfZm9jdXNlZFNlYXJjaFJlc3VsdFBlbmRpbmdPZmZzZXQg Kz0gc2luZ2xlT2Zmc2V0OworICAgICAgICByZXR1cm4gTk87CisgICAgfQorCisgICAgaWYgKCFf ZmluZFN0cmluZ0NvdW50KQorICAgICAgICByZXR1cm4gTk87CisKKyAgICBOU0ludGVnZXIgbmV3 SW5kZXg7CisgICAgaWYgKF9mb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXgpIHsKKyAgICAgICAgQVNT RVJUKCFfZm9jdXNlZFNlYXJjaFJlc3VsdFBlbmRpbmdPZmZzZXQpOworICAgICAgICBuZXdJbmRl eCA9ICpfZm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4ICsgc2luZ2xlT2Zmc2V0OworICAgIH0gZWxz ZSB7CisgICAgICAgIG5ld0luZGV4ID0gaXNCYWNrd2FyZHMgPyBfZmluZFN0cmluZ0NvdW50IC0g MSA6IDA7CisgICAgICAgIG5ld0luZGV4ICs9IHN0ZDo6ZXhjaGFuZ2UoX2ZvY3VzZWRTZWFyY2hS ZXN1bHRQZW5kaW5nT2Zmc2V0LCAwKTsKKyAgICB9CisKKyAgICBpZiAobmV3SW5kZXggPCAwIHx8 IHN0YXRpY19jYXN0PE5TVUludGVnZXI+KG5ld0luZGV4KSA+PSBfZmluZFN0cmluZ0NvdW50KSB7 CisgICAgICAgIGlmICghKG9wdGlvbnMgJiBfV0tGaW5kT3B0aW9uc1dyYXBBcm91bmQpKQorICAg ICAgICAgICAgcmV0dXJuIE5POworCisgICAgICAgIE5TVUludGVnZXIgd3JhcHBlZEluZGV4ID0g c3RkOjphYnMobmV3SW5kZXgpICUgX2ZpbmRTdHJpbmdDb3VudDsKKyAgICAgICAgaWYgKG5ld0lu ZGV4IDwgMCkKKyAgICAgICAgICAgIHdyYXBwZWRJbmRleCA9IF9maW5kU3RyaW5nQ291bnQgLSB3 cmFwcGVkSW5kZXg7CisgICAgICAgIG5ld0luZGV4ID0gd3JhcHBlZEluZGV4OworICAgICAgICAq ZGlkV3JhcEFyb3VuZCA9IFlFUzsKKyAgICB9CisKKyAgICBfZm9jdXNlZFNlYXJjaFJlc3VsdElu ZGV4ID0gbmV3SW5kZXg7CisgICAgQVNTRVJUKCpfZm9jdXNlZFNlYXJjaFJlc3VsdEluZGV4IDwg X2ZpbmRTdHJpbmdDb3VudCk7CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAodm9pZClfZm9jdXNP blNlYXJjaFJlc3VsdFdpdGhPcHRpb25zOihfV0tGaW5kT3B0aW9ucylvcHRpb25zCit7CisgICAg YXV0byBwYWdlID0gW193ZWJWaWV3IF9wYWdlXTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJl dHVybjsKKworICAgIEJPT0wgZGlkV3JhcEFyb3VuZCA9IE5POworICAgIGlmICghW3NlbGYgX2Nv bXB1dGVGb2N1c2VkU2VhcmNoUmVzdWx0SW5kZXhXaXRoT3B0aW9uczpvcHRpb25zIGRpZFdyYXBB cm91bmQ6JmRpZFdyYXBBcm91bmRdKSB7CisgICAgICAgIGlmICghX2ZpbmRDb21wbGV0aW9uKQor ICAgICAgICAgICAgcGFnZS0+ZmluZENsaWVudCgpLmRpZEZhaWxUb0ZpbmRTdHJpbmcocGFnZSwg X2ZpbmRTdHJpbmcuZ2V0KCkpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgYXV0byBm b2N1c2VkSW5kZXggPSAqX2ZvY3VzZWRTZWFyY2hSZXN1bHRJbmRleDsKKyAgICBbX2hvc3RWaWV3 Q29udHJvbGxlciBmb2N1c09uU2VhcmNoUmVzdWx0QXRJbmRleDpmb2N1c2VkSW5kZXhdOworICAg IHBhZ2UtPmZpbmRDbGllbnQoKS5kaWRGaW5kU3RyaW5nKHBhZ2UsIF9maW5kU3RyaW5nLmdldCgp LCB7IH0sIF9maW5kU3RyaW5nQ291bnQsIGZvY3VzZWRJbmRleCwgZGlkV3JhcEFyb3VuZCk7CiB9 CiAKIC0gKHZvaWQpd2ViX2ZpbmRTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIG9wdGlvbnM6KF9X S0ZpbmRPcHRpb25zKW9wdGlvbnMgbWF4Q291bnQ6KE5TVUludGVnZXIpbWF4Q291bnQKIHsKLSAg ICAvLyBGSVhNRTogSW1wbGVtZW50IGZpbmQtaW4tcGFnZS4KKyAgICBpZiAoW19maW5kU3RyaW5n IGlzRXF1YWxUb1N0cmluZzpzdHJpbmddKSB7CisgICAgICAgIFtzZWxmIF9mb2N1c09uU2VhcmNo UmVzdWx0V2l0aE9wdGlvbnM6b3B0aW9uc107CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAg ICBbc2VsZiBfZmluZFN0cmluZzpzdHJpbmcgd2l0aE9wdGlvbnM6b3B0aW9ucyBtYXhDb3VudDpt YXhDb3VudCBjb21wbGV0aW9uOl57CisgICAgICAgIEFTU0VSVChbX2ZpbmRTdHJpbmcgaXNFcXVh bFRvU3RyaW5nOnN0cmluZ10pOworICAgICAgICBbc2VsZiBfZm9jdXNPblNlYXJjaFJlc3VsdFdp dGhPcHRpb25zOm9wdGlvbnNdOworICAgIH1dOwogfQogCiAtICh2b2lkKXdlYl9oaWRlRmluZFVJ CiB7Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudCBmaW5kLWluLXBhZ2UuCisgICAgW3NlbGYgX3Jl c2V0RmluZF07CiB9CiAKIC0gKFVJVmlldyAqKXdlYl9jb250ZW50VmlldwpAQCAtMjQwLDYgKzM1 MCwxOCBAQCAtICh2b2lkKXBkZkhvc3RWaWV3Q29udHJvbGxlcjooUERGSG9zdFZpZXdDb250cm9s bGVyICopY29udHJvbGxlciB1cGRhdGVQYWdlQ291bgogICAgIFtzZWxmIF9zY3JvbGxUb1VSTEZy YWdtZW50Oltfd2ViVmlldyBVUkxdLmZyYWdtZW50XTsKIH0KIAorLSAodm9pZClwZGZIb3N0Vmll d0NvbnRyb2xsZXI6KFBERkhvc3RWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgZmluZFN0cmlu Z1VwZGF0ZTooTlNVSW50ZWdlciludW1Gb3VuZCBkb25lOihCT09MKWRvbmUKK3sKKyAgICAvLyBG SVhNRTogV2Ugc2hvdWxkIHN0b3Agc2VhcmNoaW5nIG9uY2UgbnVtRm91bmQgZXhjZWVkcyBfZmlu ZFN0cmluZ01heENvdW50LCBidXQgUERGS2l0IGRvZXNuJ3QKKyAgICAvLyBhbGxvdyB1cyB0byBz dG9wIHRoZSBzZWFyY2ggd2l0aG91dCBhbHNvIGNsZWFyaW5nIHRoZSBzZWFyY2ggaGlnaGxpZ2h0 cy4gU2VlIDxyZGFyOi8vcHJvYmxlbS8zOTU0Njk3Mz4uCisgICAgaWYgKCFkb25lKQorICAgICAg ICByZXR1cm47CisKKyAgICBfZmluZFN0cmluZ0NvdW50ID0gbnVtRm91bmQ7CisgICAgaWYgKGF1 dG8gZmluZENvbXBsZXRpb24gPSBzdGQ6OmV4Y2hhbmdlKF9maW5kQ29tcGxldGlvbiwgbmlsKSkK KyAgICAgICAgZmluZENvbXBsZXRpb24oKTsKK30KKwogLSAodm9pZClwZGZIb3N0Vmlld0NvbnRy b2xsZXI6KFBERkhvc3RWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgZ29Ub1VSTDooTlNVUkwg Kil1cmwKIHsKICAgICBXS1dlYlZpZXcgKndlYlZpZXcgPSBfd2ViVmlldy5nZXRBdXRvcmVsZWFz ZWQoKTsK