190939 2018-10-25 19:47:30 -0700 Remove Unused WebSelectionAssistant 2018-10-26 15:03:44 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin commit-queue thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1472301 0 megan_gardner 2018-10-25 19:47:30 -0700 Remove Unused WebSelectionAssistant 1472304 1 353148 megan_gardner 2018-10-25 19:49:59 -0700 Created attachment 353148 Patch 1472590 2 webkit-bug-importer 2018-10-26 14:38:53 -0700 <rdar://problem/45599953> 1472593 3 353148 commit-queue 2018-10-26 15:03:42 -0700 Comment on attachment 353148 Patch Clearing flags on attachment: 353148 Committed r237485: <https://trac.webkit.org/changeset/237485> 1472594 4 commit-queue 2018-10-26 15:03:44 -0700 All reviewed patches have been landed. Closing bug. 353148 2018-10-25 19:49:59 -0700 2018-10-26 15:03:42 -0700 Patch bug-190939-20181025194959.patch text/plain 15532 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NDI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVlODYzOWJmNDY1Mzk3YjZi YTI3OTJiNmZmMTg1ZGU1Zjk4YTUzMDUuLmQ2ZDk5NmQ1OWYwMmM4NDQwZTM0N2EwZWVjYjA3ZDM3 M2U4YTNmOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMTgtMTAtMjUgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgVW51c2Vk IFdlYlNlbGVjdGlvbkFzc2lzdGFudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkwOTM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2UgbWFkZSB3ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgYWx3YXN5cyBuaWwg bGFzdCB5ZWFyIHdoZW4gd2UgbW92ZWQgdG8gdXNpbmcKKyAgICAgICAgdGhlIHRleHRTZWxlY3Rp b25Bc3Npc3RhbnQgZm9yIGFsbCB0ZXh0IHNlbGVjdGlvbiBvbiB0aGUgd2ViLiBUaGlzIHBhdGNo IG1lcmVseSAKKyAgICAgICAgZ29lcyB0aHJvdWdoIGFuZCBjbGVhbnMgb3V0IGFsbCB0aGUgcmVm ZXJlbmNlcyB0byB0aGlzIG9iamVjdCB0aGF0IGlzIGFsd2F5cyBuaWwuCisgICAgICAgIE5vIGZ1 bmN0aW9uYWxpdHkgc2hvdWxkIGNoYW5nZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlldy5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlkRXhpdFN0YWJsZVN0 YXRlXSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjbGVhbnVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyByZXNpZ25GaXJzdFJlc3BvbmRlckZvcldlYlZpZXddKToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBfc2Nyb2xsaW5nTm9kZVNjcm9sbGluZ1dpbGxCZWdpbl0pOgor ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9zY3JvbGxpbmdOb2RlU2Nyb2xsaW5nRGlkRW5kXSk6 CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZ2VzdHVyZVJlY29nbml6ZXI6Y2FuQmVQcmV2ZW50 ZWRCeUdlc3R1cmVSZWNvZ25pemVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGdlc3R1 cmVSZWNvZ25pemVyOnNob3VsZFJlY29nbml6ZVNpbXVsdGFuZW91c2x5V2l0aEdlc3R1cmVSZWNv Z25pemVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF91aVRleHRTZWxlY3Rpb25SZWN0 c10pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9zaW5nbGVUYXBDb21taXRlZDpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBfd2lsbFN0YXJ0U2Nyb2xsaW5nT3Jab29taW5nXSk6Cisg ICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZEVuZFNjcm9sbGluZ09yWm9vbWluZ10pOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IF9sb29rdXBGb3JXZWJWaWV3Ol0pOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9zaGFyZUZvcldlYlZpZXc6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgX2FkZFNob3J0Y3V0Rm9yV2ViVmlldzpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBf c2hvd0RpY3Rpb25hcnk6XSk6CisgICAgICAgIChzZWxlY3Rpb25DaGFuZ2VkV2l0aEdlc3R1cmUp OgorICAgICAgICAoc2VsZWN0aW9uQ2hhbmdlZFdpdGhUb3VjaCk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgc2VsZWN0aW9uSW50ZXJhY3Rpb25Bc3Npc3RhbnRdKToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBfc3RvcEFzc2lzdGluZ05vZGVdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfdXBkYXRlQ2hhbmdlZFNlbGVjdGlvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBh Y3Rpb25TaGVldEFzc2lzdGFudDpzaGFyZUVsZW1lbnRXaXRoVVJMOnJlY3Q6XSk6CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgX3Jlc3RvcmVDYWxsb3V0QmFySWZOZWVkZWRdKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBkcmFnSW50ZXJhY3Rpb246d2lsbEFuaW1hdGVMaWZ0V2l0aEFuaW1h dG9yOnNlc3Npb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgd2ViU2VsZWN0aW9uQXNz aXN0YW50XSk6IERlbGV0ZWQuCisKIDIwMTgtMTAtMjUgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNh dGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGFub3RoZXIgdHJ5IGF0 IGZpeGluZyB0aGUgR1RLIGJ1aWxkIHdpdGggc2FuZGJveCBlbmFibGVkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IGQ0ZGNmN2FiMGJhZjVmZTc0 NzVlZDYyZDVmZDVjZjk1Y2JiMTRhMTMuLjNlN2NjY2Y3ZDIwZmZlZDA5MjU0YzkxMDlhYzMzYzAz NTA1YzIwYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 Lm1tCkBAIC0zNTksOSArMzU5LDYgQEAgLSAodm9pZClfZGlkRXhpdFN0YWJsZVN0YXRlCiAgICAg ICAgIHJldHVybjsKIAogICAgIFtfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCBkZWFjdGl2YXRlU2Vs ZWN0aW9uXTsKLSNpZiAhUExBVEZPUk0oSU9TTUFDKQotICAgIFtbX3dlYlNlbGVjdGlvbkFzc2lz dGFudCBzZWxlY3Rpb25WaWV3XSBzZXRIaWRkZW46WUVTXTsKLSNlbmRpZgogfQogCiAtIChDR1Jl Y3QpX2NvbXB1dGVVbm9ic2N1cmVkQ29udGVudFJlY3RSZXNwZWN0aW5nSW5wdXRWaWV3Qm91bmRz OihDR1JlY3QpdW5vYnNjdXJlZENvbnRlbnRSZWN0IGlucHV0Vmlld0JvdW5kczooQ0dSZWN0KWlu cHV0Vmlld0JvdW5kcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5oCmluZGV4IDg5NjUxNGJlZmJkNjEwZWZkMDFjMjUyMzFi MzkyYmZkNjlmNjUzYjAuLjBhM2Y5YzhlYWY1MDQ1MDA3MzNkMTdiYTJlNmE4OGFhODUyMjc5MDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLmgKQEAgLTE4OCw3ICsxODgsNiBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlv bkRhdGEgewogI2VuZGlmCiAKICAgICBSZXRhaW5QdHI8VUlXS1RleHRJbnRlcmFjdGlvbkFzc2lz dGFudD4gX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQ7Ci0gICAgUmV0YWluUHRyPFVJV0tTZWxlY3Rp b25Bc3Npc3RhbnQ+IF93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQ7CiAgICAgQk9PTCBfc3VwcHJlc3NB c3Npc3RhbnRTZWxlY3Rpb25WaWV3OwogCiAgICAgUmV0YWluUHRyPFVJVGV4dElucHV0VHJhaXRz PiBfdHJhaXRzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggMTZmZGRhYmVhOGIwZDlmMDM1YTFhNmY4NTdm NzA4N2IyNjI5Y2RmMC4uNzNmNzI3NjFhZDBhZjlmM2YyNmVmNDJiMTljOTcxMWQ0OGZmZTJkMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCkBAIC03MjUsNyArNzI1LDYgQEAgLSAodm9pZCljbGVhbnVwSW50ZXJh Y3Rpb24KICAgICBpZiAoIV9oYXNTZXRVcEludGVyYWN0aW9ucykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgX3dlYlNlbGVjdGlvbkFzc2lzdGFudCA9IG5pbDsKICAgICBfdGV4dFNlbGVjdGlvbkFz c2lzdGFudCA9IG5pbDsKICAgICAKICAgICBbX2FjdGlvblNoZWV0QXNzaXN0YW50IGNsZWFudXBT aGVldF07CkBAIC0xMDQ3LDcgKzEwNDYsNiBAQCAtIChCT09MKXJlc2lnbkZpcnN0UmVzcG9uZGVy Rm9yV2ViVmlldwogICAgIH0KIAogICAgIFtzZWxmIF9jYW5jZWxJbnRlcmFjdGlvbl07Ci0gICAg W193ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgcmVzaWduZWRGaXJzdFJlc3BvbmRlcl07CiAgICAgW190 ZXh0U2VsZWN0aW9uQXNzaXN0YW50IGRlYWN0aXZhdGVTZWxlY3Rpb25dOwogICAgIAogICAgIF9p bnB1dFZpZXdVcGRhdGVEZWZlcnJlciA9IG51bGxwdHI7CkBAIC0xMjk4LDcgKzEyOTYsNiBAQCAt ICh2b2lkKV9kaWRTY3JvbGwKIAogLSAodm9pZClfc2Nyb2xsaW5nTm9kZVNjcm9sbGluZ1dpbGxC ZWdpbgogewotICAgIFtfd2ViU2VsZWN0aW9uQXNzaXN0YW50IHdpbGxTdGFydFNjcm9sbGluZ092 ZXJmbG93XTsKICAgICBbX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQgd2lsbFN0YXJ0U2Nyb2xsaW5n T3ZlcmZsb3ddOyAgICAKIH0KIApAQCAtMTMxMSw3ICsxMzA4LDYgQEAgLSAodm9pZClfc2Nyb2xs aW5nTm9kZVNjcm9sbGluZ0RpZEVuZAogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIFtzZWxm IF91cGRhdGVDaGFuZ2VkU2VsZWN0aW9uXTsKLSAgICBbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCBk aWRFbmRTY3JvbGxpbmdPdmVyZmxvd107CiAgICAgW190ZXh0U2VsZWN0aW9uQXNzaXN0YW50IGRp ZEVuZFNjcm9sbGluZ092ZXJmbG93XTsKIH0KIApAQCAtMTQyMyw3ICsxNDE5LDcgQEAgLSAoQk9P TClnZXN0dXJlUmVjb2duaXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKXByZXZlbnRlZEdlc3R1 cmVSZWNvZ25pemVyIGNhbkIKICAgICAgICAgcmV0dXJuIFlFUzsKICNlbmRpZgogICAgIAotICAg IGlmICgocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0 YW50LmdldCgpLmxvdXBlR2VzdHVyZSB8fCBpc0ZvcmNlUHJlc3NHZXN0dXJlIHx8IFtfd2ViU2Vs ZWN0aW9uQXNzaXN0YW50IGlzU2VsZWN0aW9uR2VzdHVyZVJlY29nbml6ZXI6cHJldmVudGluZ0dl c3R1cmVSZWNvZ25pemVyXSkgJiYgKHByZXZlbnRlZEdlc3R1cmVSZWNvZ25pemVyID09IF9oaWdo bGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplciB8fCBwcmV2ZW50ZWRHZXN0dXJlUmVjb2du aXplciA9PSBfbG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIpKQorICAgIGlmICgocHJldmVudGlu Z0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50LmdldCgpLmxvdXBl R2VzdHVyZSB8fCBpc0ZvcmNlUHJlc3NHZXN0dXJlKSAmJiAocHJldmVudGVkR2VzdHVyZVJlY29n bml6ZXIgPT0gX2hpZ2hsaWdodExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyIHx8IHByZXZlbnRl ZEdlc3R1cmVSZWNvZ25pemVyID09IF9sb25nUHJlc3NHZXN0dXJlUmVjb2duaXplcikpCiAgICAg ICAgIHJldHVybiBOTzsKIAogICAgIHJldHVybiBZRVM7CkBAIC0xNDM5LDggKzE0MzUsNiBAQCAt IChCT09MKWdlc3R1cmVSZWNvZ25pemVyOihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJl Y29nbml6ZXIgc2hvdWxkUmVjb2duaQogICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25p emVyLCBvdGhlckdlc3R1cmVSZWNvZ25pemVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJl Y29nbml6ZXIuZ2V0KCksIF9sb25nUHJlc3NHZXN0dXJlUmVjb2duaXplci5nZXQoKSkpCiAgICAg ICAgIHJldHVybiBZRVM7CiAKLSAgICBpZiAoaXNTYW1lUGFpcihnZXN0dXJlUmVjb2duaXplciwg b3RoZXJHZXN0dXJlUmVjb2duaXplciwgX2hpZ2hsaWdodExvbmdQcmVzc0dlc3R1cmVSZWNvZ25p emVyLmdldCgpLCBfd2ViU2VsZWN0aW9uQXNzaXN0YW50LmdldCgpLnNlbGVjdGlvbkxvbmdQcmVz c1JlY29nbml6ZXIpKQotICAgICAgICByZXR1cm4gWUVTOwogI2lmIF9fSVBIT05FX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEyMDAwMAogI2lmIFBMQVRGT1JNKElPU01BQykKICAgICBpZiAo aXNTYW1lUGFpcihnZXN0dXJlUmVjb2duaXplciwgb3RoZXJHZXN0dXJlUmVjb2duaXplciwgX3Rl eHRTZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCkubG91cGVHZXN0dXJlLCBfdGV4dFNlbGVjdGlvbkFz c2lzdGFudC5nZXQoKS5mb3JjZVByZXNzR2VzdHVyZSkpCkBAIC0xNjQ0LDkgKzE2MzgsNiBAQCAt IChOU0FycmF5PE5TVmFsdWUgKj4gKilfdWlUZXh0U2VsZWN0aW9uUmVjdHMKICAgICBpZiAoX3Rl eHRTZWxlY3Rpb25Bc3Npc3RhbnQpIHsKICAgICAgICAgZm9yIChXS1RleHRTZWxlY3Rpb25SZWN0 ICpzZWxlY3Rpb25SZWN0IGluIFtfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCB2YWx1ZUZvcktleVBh dGg6QCJzZWxlY3Rpb25WaWV3LnNlbGVjdGlvbi5zZWxlY3Rpb25SZWN0cyJdKQogICAgICAgICAg ICAgW3RleHRTZWxlY3Rpb25SZWN0cyBhZGRPYmplY3Q6W05TVmFsdWUgdmFsdWVXaXRoQ0dSZWN0 OnNlbGVjdGlvblJlY3Qud2ViUmVjdC5yZWN0XV07Ci0gICAgfSBlbHNlIGlmIChfd2ViU2VsZWN0 aW9uQXNzaXN0YW50KSB7Ci0gICAgICAgIGZvciAoV2ViU2VsZWN0aW9uUmVjdCAqc2VsZWN0aW9u UmVjdCBpbiBbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCB2YWx1ZUZvcktleVBhdGg6QCJzZWxlY3Rp b25WaWV3LnNlbGVjdGlvblJlY3RzIl0pCi0gICAgICAgICAgICBbdGV4dFNlbGVjdGlvblJlY3Rz IGFkZE9iamVjdDpbTlNWYWx1ZSB2YWx1ZVdpdGhDR1JlY3Q6c2VsZWN0aW9uUmVjdC5yZWN0XV07 CiAgICAgfQogCiAgICAgcmV0dXJuIHRleHRTZWxlY3Rpb25SZWN0czsKQEAgLTE5ODQsMTEgKzE5 NzUsNiBAQCAtICh2b2lkKV9zaW5nbGVUYXBDb21taXRlZDooVUlUYXBHZXN0dXJlUmVjb2duaXpl ciAqKWdlc3R1cmVSZWNvZ25pemVyCiAgICAgICAgIFtzZWxmIGJlY29tZUZpcnN0UmVzcG9uZGVy XTsKICAgICB9CiAKLSAgICBpZiAoX3dlYlNlbGVjdGlvbkFzc2lzdGFudCAmJiAhW193ZWJTZWxl Y3Rpb25Bc3Npc3RhbnQgc2hvdWxkSGFuZGxlU2luZ2xlVGFwQXRQb2ludDpnZXN0dXJlUmVjb2du aXplci5sb2NhdGlvbl0pIHsKLSAgICAgICAgW3NlbGYgX3NpbmdsZVRhcERpZFJlc2V0Omdlc3R1 cmVSZWNvZ25pemVyXTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIEFTU0VSVChfcG90 ZW50aWFsVGFwSW5Qcm9ncmVzcyk7CiAKICAgICAvLyBXZSBkb24ndCB3YW50IHRvIGNsZWFyIHRo ZSBzZWxlY3Rpb24gaWYgaXQgaXMgaW4gZWRpdGFibGUgY29udGVudC4KQEAgLTIwODQsNyArMjA3 MCw2IEBAIC0gKHZvaWQpX3Bvc2l0aW9uSW5mb3JtYXRpb25EaWRDaGFuZ2U6KGNvbnN0IEludGVy YWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJilpCiAKIC0gKHZvaWQpX3dpbGxTdGFydFNjcm9s bGluZ09yWm9vbWluZwogewotICAgIFtfd2ViU2VsZWN0aW9uQXNzaXN0YW50IHdpbGxTdGFydFNj cm9sbGluZ09yWm9vbWluZ1BhZ2VdOwogICAgIFtfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCB3aWxs U3RhcnRTY3JvbGxpbmdPdmVyZmxvd107CiAgICAgX3BhZ2UtPnNldElzU2Nyb2xsaW5nT3Jab29t aW5nKHRydWUpOwogCkBAIC0yMTA1LDcgKzIwOTAsNiBAQCAtICh2b2lkKXNjcm9sbFZpZXdXaWxs U3RhcnRQYW5PclBpbmNoR2VzdHVyZQogLSAodm9pZClfZGlkRW5kU2Nyb2xsaW5nT3Jab29taW5n CiB7CiAgICAgaWYgKCFfbmVlZHNEZWZlcnJlZEVuZFNjcm9sbGluZ1NlbGVjdGlvblVwZGF0ZSkg ewotICAgICAgICBbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCBkaWRFbmRTY3JvbGxpbmdPclpvb21p bmdQYWdlXTsKICAgICAgICAgW190ZXh0U2VsZWN0aW9uQXNzaXN0YW50IGRpZEVuZFNjcm9sbGlu Z092ZXJmbG93XTsKICAgICB9CiAgICAgX3BhZ2UtPnNldElzU2Nyb2xsaW5nT3Jab29taW5nKGZh bHNlKTsKQEAgLTIyMjUsOCArMjIwOSw2IEBAIC0gKHZvaWQpX2xvb2t1cEZvcldlYlZpZXc6KGlk KXNlbmRlcgogCiAgICAgICAgIGlmIChhdXRvIHRleHRTZWxlY3Rpb25Bc3Npc3RhbnQgPSB2aWV3 LT5fdGV4dFNlbGVjdGlvbkFzc2lzdGFudCkKICAgICAgICAgICAgIFt0ZXh0U2VsZWN0aW9uQXNz aXN0YW50IGxvb2t1cDpzZWxlY3Rpb25Db250ZXh0IHdpdGhSYW5nZTpzZWxlY3RlZFJhbmdlSW5D b250ZXh0IGZyb21SZWN0OnByZXNlbnRhdGlvblJlY3RdOwotICAgICAgICBlbHNlCi0gICAgICAg ICAgICBbdmlldy0+X3dlYlNlbGVjdGlvbkFzc2lzdGFudCBsb29rdXA6c2VsZWN0aW9uQ29udGV4 dCB3aXRoUmFuZ2U6c2VsZWN0ZWRSYW5nZUluQ29udGV4dCBmcm9tUmVjdDpwcmVzZW50YXRpb25S ZWN0XTsKICAgICB9KTsKIH0KIApAQCAtMjI0Myw4ICsyMjI1LDYgQEAgLSAodm9pZClfc2hhcmVG b3JXZWJWaWV3OihpZClzZW5kZXIKIAogICAgICAgICBpZiAodmlldy0+X3RleHRTZWxlY3Rpb25B c3Npc3RhbnQpCiAgICAgICAgICAgICBbdmlldy0+X3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQgc2hv d1NoYXJlU2hlZXRGb3I6c3RyaW5nIGZyb21SZWN0OnByZXNlbnRhdGlvblJlY3RdOwotICAgICAg ICBlbHNlIGlmICh2aWV3LT5fd2ViU2VsZWN0aW9uQXNzaXN0YW50KQotICAgICAgICAgICAgW3Zp ZXctPl93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgc2hvd1NoYXJlU2hlZXRGb3I6c3RyaW5nIGZyb21S ZWN0OnByZXNlbnRhdGlvblJlY3RdOwogICAgIH0pOwogfQogCkBAIC0yMjUyLDggKzIyMzIsNiBA QCAtICh2b2lkKV9hZGRTaG9ydGN1dEZvcldlYlZpZXc6KGlkKXNlbmRlcgogewogICAgIGlmIChf dGV4dFNlbGVjdGlvbkFzc2lzdGFudCkKICAgICAgICAgW190ZXh0U2VsZWN0aW9uQXNzaXN0YW50 IHNob3dUZXh0U2VydmljZUZvcjpbc2VsZiBzZWxlY3RlZFRleHRdIGZyb21SZWN0Ol9wYWdlLT5l ZGl0b3JTdGF0ZSgpLnBvc3RMYXlvdXREYXRhKCkuc2VsZWN0aW9uUmVjdHNbMF0ucmVjdCgpXTsK LSAgICBlbHNlIGlmIChfd2ViU2VsZWN0aW9uQXNzaXN0YW50KQotICAgICAgICBbX3dlYlNlbGVj dGlvbkFzc2lzdGFudCBzaG93VGV4dFNlcnZpY2VGb3I6W3NlbGYgc2VsZWN0ZWRUZXh0XSBmcm9t UmVjdDpfcGFnZS0+ZWRpdG9yU3RhdGUoKS5wb3N0TGF5b3V0RGF0YSgpLnNlbGVjdGlvblJlY3Rz WzBdLnJlY3QoKV07CiB9CiAKIC0gKE5TU3RyaW5nICopc2VsZWN0ZWRUZXh0CkBAIC0yNjEwLDgg KzI1ODgsNiBAQCAtICh2b2lkKV9zaG93RGljdGlvbmFyeTooTlNTdHJpbmcgKil0ZXh0CiAgICAg Q0dSZWN0IHByZXNlbnRhdGlvblJlY3QgPSBfcGFnZS0+ZWRpdG9yU3RhdGUoKS5wb3N0TGF5b3V0 RGF0YSgpLnNlbGVjdGlvblJlY3RzWzBdLnJlY3QoKTsKICAgICBpZiAoX3RleHRTZWxlY3Rpb25B c3Npc3RhbnQpCiAgICAgICAgIFtfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCBzaG93RGljdGlvbmFy eUZvcjp0ZXh0IGZyb21SZWN0OnByZXNlbnRhdGlvblJlY3RdOwotICAgIGVsc2UKLSAgICAgICAg W193ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgc2hvd0RpY3Rpb25hcnlGb3I6dGV4dCBmcm9tUmVjdDpw cmVzZW50YXRpb25SZWN0XTsKIH0KIAogLSAodm9pZClfZGVmaW5lRm9yV2ViVmlldzooaWQpc2Vu ZGVyCkBAIC0yODg2LDEwICsyODYyLDcgQEAgc3RhdGljIHZvaWQgc2VsZWN0aW9uQ2hhbmdlZFdp dGhHZXN0dXJlKFdLQ29udGVudFZpZXcgKnZpZXcsIGNvbnN0IFdlYkNvcmU6OkludFAKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgaWYg KFt2aWV3IHdlYlNlbGVjdGlvbkFzc2lzdGFudF0pCi0gICAgICAgIFsoVUlXS1NlbGVjdGlvbkFz c2lzdGFudCAqKVt2aWV3IHdlYlNlbGVjdGlvbkFzc2lzdGFudF0gc2VsZWN0aW9uQ2hhbmdlZFdp dGhHZXN0dXJlQXQ6KENHUG9pbnQpcG9pbnQgd2l0aEdlc3R1cmU6dG9VSVdLR2VzdHVyZVR5cGUo KEdlc3R1cmVUeXBlKWdlc3R1cmVUeXBlKSB3aXRoU3RhdGU6dG9VSUdlc3R1cmVSZWNvZ25pemVy U3RhdGUoc3RhdGljX2Nhc3Q8R2VzdHVyZVJlY29nbml6ZXJTdGF0ZT4oZ2VzdHVyZVN0YXRlKSkg d2l0aEZsYWdzOih0b1VJV0tTZWxlY3Rpb25GbGFncygoU2VsZWN0aW9uRmxhZ3MpZmxhZ3MpKV07 Ci0gICAgZWxzZQotICAgICAgICBbKFVJV0tUZXh0SW50ZXJhY3Rpb25Bc3Npc3RhbnQgKilbdmll dyBpbnRlcmFjdGlvbkFzc2lzdGFudF0gc2VsZWN0aW9uQ2hhbmdlZFdpdGhHZXN0dXJlQXQ6KENH UG9pbnQpcG9pbnQgd2l0aEdlc3R1cmU6dG9VSVdLR2VzdHVyZVR5cGUoKEdlc3R1cmVUeXBlKWdl c3R1cmVUeXBlKSB3aXRoU3RhdGU6dG9VSUdlc3R1cmVSZWNvZ25pemVyU3RhdGUoc3RhdGljX2Nh c3Q8R2VzdHVyZVJlY29nbml6ZXJTdGF0ZT4oZ2VzdHVyZVN0YXRlKSkgd2l0aEZsYWdzOih0b1VJ V0tTZWxlY3Rpb25GbGFncygoU2VsZWN0aW9uRmxhZ3MpZmxhZ3MpKV07CisgICAgWyhVSVdLVGV4 dEludGVyYWN0aW9uQXNzaXN0YW50ICopW3ZpZXcgaW50ZXJhY3Rpb25Bc3Npc3RhbnRdIHNlbGVj dGlvbkNoYW5nZWRXaXRoR2VzdHVyZUF0OihDR1BvaW50KXBvaW50IHdpdGhHZXN0dXJlOnRvVUlX S0dlc3R1cmVUeXBlKChHZXN0dXJlVHlwZSlnZXN0dXJlVHlwZSkgd2l0aFN0YXRlOnRvVUlHZXN0 dXJlUmVjb2duaXplclN0YXRlKHN0YXRpY19jYXN0PEdlc3R1cmVSZWNvZ25pemVyU3RhdGU+KGdl c3R1cmVTdGF0ZSkpIHdpdGhGbGFnczoodG9VSVdLU2VsZWN0aW9uRmxhZ3MoKFNlbGVjdGlvbkZs YWdzKWZsYWdzKSldOwogfQogCiBzdGF0aWMgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkV2l0aFRvdWNo KFdLQ29udGVudFZpZXcgKnZpZXcsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb2ludCwgdWlu dDMyX3QgdG91Y2gsIHVpbnQzMl90IGZsYWdzLCBXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3Ig ZXJyb3IpCkBAIC0yODk4LDEwICsyODcxLDcgQEAgc3RhdGljIHZvaWQgc2VsZWN0aW9uQ2hhbmdl ZFdpdGhUb3VjaChXS0NvbnRlbnRWaWV3ICp2aWV3LCBjb25zdCBXZWJDb3JlOjpJbnRQb2kKICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAg aWYgKFt2aWV3IHdlYlNlbGVjdGlvbkFzc2lzdGFudF0pCi0gICAgICAgIFsoVUlXS1NlbGVjdGlv bkFzc2lzdGFudCAqKVt2aWV3IHdlYlNlbGVjdGlvbkFzc2lzdGFudF0gc2VsZWN0aW9uQ2hhbmdl ZFdpdGhUb3VjaEF0OihDR1BvaW50KXBvaW50IHdpdGhTZWxlY3Rpb25Ub3VjaDp0b1VJV0tTZWxl Y3Rpb25Ub3VjaCgoU2VsZWN0aW9uVG91Y2gpdG91Y2gpIHdpdGhGbGFnczpzdGF0aWNfY2FzdDxV SVdLU2VsZWN0aW9uRmxhZ3M+KGZsYWdzKV07Ci0gICAgZWxzZQotICAgICAgICBbKFVJV0tUZXh0 SW50ZXJhY3Rpb25Bc3Npc3RhbnQgKilbdmlldyBpbnRlcmFjdGlvbkFzc2lzdGFudF0gc2VsZWN0 aW9uQ2hhbmdlZFdpdGhUb3VjaEF0OihDR1BvaW50KXBvaW50IHdpdGhTZWxlY3Rpb25Ub3VjaDp0 b1VJV0tTZWxlY3Rpb25Ub3VjaCgoU2VsZWN0aW9uVG91Y2gpdG91Y2gpIHdpdGhGbGFnczpzdGF0 aWNfY2FzdDxVSVdLU2VsZWN0aW9uRmxhZ3M+KGZsYWdzKV07CisgICAgWyhVSVdLVGV4dEludGVy YWN0aW9uQXNzaXN0YW50ICopW3ZpZXcgaW50ZXJhY3Rpb25Bc3Npc3RhbnRdIHNlbGVjdGlvbkNo YW5nZWRXaXRoVG91Y2hBdDooQ0dQb2ludClwb2ludCB3aXRoU2VsZWN0aW9uVG91Y2g6dG9VSVdL U2VsZWN0aW9uVG91Y2goKFNlbGVjdGlvblRvdWNoKXRvdWNoKSB3aXRoRmxhZ3M6c3RhdGljX2Nh c3Q8VUlXS1NlbGVjdGlvbkZsYWdzPihmbGFncyldOwogfQogCiAtIChCT09MKV9pc0ludGVyYWN0 aW5nV2l0aEFzc2lzdGVkTm9kZQpAQCAtMzcyOSwxNSArMzY5OSw4IEBAIC0gKFVJVGV4dEludGVy YWN0aW9uQXNzaXN0YW50ICopaW50ZXJhY3Rpb25Bc3Npc3RhbnQKICAgICByZXR1cm4gX3RleHRT ZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCk7CiB9CiAKLS0gKFVJV2ViU2VsZWN0aW9uQXNzaXN0YW50 ICopd2ViU2VsZWN0aW9uQXNzaXN0YW50Ci17Ci0gICAgcmV0dXJuIF93ZWJTZWxlY3Rpb25Bc3Np c3RhbnQuZ2V0KCk7Ci19Ci0KIC0gKGlkPFVJU2VsZWN0aW9uSW50ZXJhY3Rpb25Bc3Npc3RhbnQ+ KXNlbGVjdGlvbkludGVyYWN0aW9uQXNzaXN0YW50CiB7Ci0gICAgaWYgKFtfd2ViU2VsZWN0aW9u QXNzaXN0YW50IGNvbmZvcm1zVG9Qcm90b2NvbDpAcHJvdG9jb2woVUlTZWxlY3Rpb25JbnRlcmFj dGlvbkFzc2lzdGFudCldKQotICAgICAgICByZXR1cm4gKGlkPFVJU2VsZWN0aW9uSW50ZXJhY3Rp b25Bc3Npc3RhbnQ+KV93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCk7CiAgICAgcmV0dXJuIG5p bDsKIH0KIApAQCAtNDM2Niw4ICs0MzI5LDYgQEAgLSAodm9pZClfc3RvcEFzc2lzdGluZ05vZGUK ICAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IGhpZGVBdXRvRmlsbEJ1dHRvbl07CiAgICAgW3NlbGYg cmVsb2FkSW5wdXRWaWV3c107CiAgICAgW3NlbGYgX3VwZGF0ZUFjY2Vzc29yeV07Ci0gICAgLy8g VGhlIG5hbWUgaXMgbWlzbGVhZGluZywgYnV0IHRoaXMgYWN0dWFsbHkgY2xlYXJzIHRoZSBzZWxl Y3Rpb24gdmlld3MgYW5kIHJlbW92ZXMgYW55IHNlbGVjdGlvbi4KLSAgICBbX3dlYlNlbGVjdGlv bkFzc2lzdGFudCByZXNpZ25lZEZpcnN0UmVzcG9uZGVyXTsKIAogI2lmIFBMQVRGT1JNKFdBVENI T1MpCiAgICAgW3NlbGYgZGlzbWlzc0FsbElucHV0Vmlld0NvbnRyb2xsZXJzOllFU107CkBAIC00 NzI2LDEyICs0Njg3LDEwIEBAIC0gKHZvaWQpX3VwZGF0ZUNoYW5nZWRTZWxlY3Rpb246KEJPT0wp Zm9yY2UKICAgICAgICAgICAgIF9tYXJrZWRUZXh0ID0gKF9wYWdlLT5lZGl0b3JTdGF0ZSgpLmhh c0NvbXBvc2l0aW9uKSA/IF9wYWdlLT5lZGl0b3JTdGF0ZSgpLm1hcmtlZFRleHQgOiBTdHJpbmco KTsKICAgICAgICAgICAgIGlmICghX3Nob3dpbmdUZXh0U3R5bGVPcHRpb25zKQogICAgICAgICAg ICAgICAgIFtfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCBzZWxlY3Rpb25DaGFuZ2VkXTsKLSAgICAg ICAgfSBlbHNlIGlmICghX3BhZ2UtPmVkaXRvclN0YXRlKCkuaXNDb250ZW50RWRpdGFibGUpCi0g ICAgICAgICAgICBbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCBzZWxlY3Rpb25DaGFuZ2VkXTsKKyAg ICAgICAgfQogCiAgICAgICAgIF9zZWxlY3Rpb25OZWVkc1VwZGF0ZSA9IE5POwogICAgICAgICBp ZiAoX3Nob3VsZFJlc3RvcmVTZWxlY3Rpb24pIHsKLSAgICAgICAgICAgIFtfd2ViU2VsZWN0aW9u QXNzaXN0YW50IGRpZEVuZFNjcm9sbGluZ092ZXJmbG93XTsKICAgICAgICAgICAgIFtfdGV4dFNl bGVjdGlvbkFzc2lzdGFudCBkaWRFbmRTY3JvbGxpbmdPdmVyZmxvd107CiAgICAgICAgICAgICBf c2hvdWxkUmVzdG9yZVNlbGVjdGlvbiA9IE5POwogICAgICAgICB9CkBAIC00NzQwLDEwICs0Njk5 LDYgQEAgLSAodm9pZClfdXBkYXRlQ2hhbmdlZFNlbGVjdGlvbjooQk9PTClmb3JjZQogICAgIGF1 dG8mIHN0YXRlID0gX3BhZ2UtPmVkaXRvclN0YXRlKCk7CiAgICAgaWYgKCFzdGF0ZS5pc01pc3Np bmdQb3N0TGF5b3V0RGF0YSAmJiBzdGF0ZS5wb3N0TGF5b3V0RGF0YSgpLmlzU3RhYmxlU3RhdGVV cGRhdGUgJiYgX25lZWRzRGVmZXJyZWRFbmRTY3JvbGxpbmdTZWxlY3Rpb25VcGRhdGUgJiYgX3Bh Z2UtPmluU3RhYmxlU3RhdGUoKSkgewogICAgICAgICBbW3NlbGYgc2VsZWN0aW9uSW50ZXJhY3Rp b25Bc3Npc3RhbnRdIHNob3dTZWxlY3Rpb25Db21tYW5kc107Ci0gICAgICAgIFtfd2ViU2VsZWN0 aW9uQXNzaXN0YW50IGRpZEVuZFNjcm9sbGluZ09yWm9vbWluZ1BhZ2VdOwotI2lmICFQTEFURk9S TShJT1NNQUMpCi0gICAgICAgIFtbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCBzZWxlY3Rpb25WaWV3 XSBzZXRIaWRkZW46Tk9dOwotI2VuZGlmCiAKICAgICAgICAgaWYgKCFzZWxmLnN1cHByZXNzQXNz aXN0YW50U2VsZWN0aW9uVmlldykKICAgICAgICAgICAgIFtfdGV4dFNlbGVjdGlvbkFzc2lzdGFu dCBhY3RpdmF0ZVNlbGVjdGlvbl07CkBAIC00OTgzLDggKzQ5MzgsNiBAQCAtICh2b2lkKWFjdGlv blNoZWV0QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50IHNoYXJl RWxlbWVudFdpdAogewogICAgIGlmIChfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCkKICAgICAgICAg W190ZXh0U2VsZWN0aW9uQXNzaXN0YW50IHNob3dTaGFyZVNoZWV0Rm9yOnVzZXJWaXNpYmxlU3Ry aW5nKHVybCkgZnJvbVJlY3Q6Ym91bmRpbmdSZWN0XTsKLSAgICBlbHNlIGlmIChfd2ViU2VsZWN0 aW9uQXNzaXN0YW50KQotICAgICAgICBbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCBzaG93U2hhcmVT aGVldEZvcjp1c2VyVmlzaWJsZVN0cmluZyh1cmwpIGZyb21SZWN0OmJvdW5kaW5nUmVjdF07CiB9 CiAKICNpZiBIQVZFKEFQUF9MSU5LUykKQEAgLTU0MjIsNyArNTM3NSw2IEBAIC0gKHZvaWQpX3Jl c3RvcmVDYWxsb3V0QmFySWZOZWVkZWQKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6 IFRoaXMgU1BJIHNob3VsZCBiZSByZW5hbWVkIGluIFVJS2l0IHRvIHJlZmxlY3QgYSBtb3JlIGdl bmVyYWwgcHVycG9zZSBvZiByZXZlYWxpbmcgaGlkZGVuIGludGVyYWN0aW9uIGFzc2lzdGFudCBj b250cm9scy4KLSAgICBbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCBkaWRFbmRTY3JvbGxpbmdPdmVy Zmxvd107CiAgICAgW190ZXh0U2VsZWN0aW9uQXNzaXN0YW50IGRpZEVuZFNjcm9sbGluZ092ZXJm bG93XTsKICAgICBfc2hvdWxkUmVzdG9yZUNhbGxvdXRCYXJBZnRlckRyb3AgPSBOTzsKIH0KQEAg LTU1NzEsNyArNTUyMyw2IEBAIC0gKHZvaWQpZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFj dGlvbiAqKWludGVyYWN0aW9uIHdpbGxBbmltYXRlTGlmdFdpdGhBbmltCiB7CiAgICAgaWYgKCFf c2hvdWxkUmVzdG9yZUNhbGxvdXRCYXJBZnRlckRyb3AgJiYgX2RyYWdEcm9wSW50ZXJhY3Rpb25T dGF0ZS5hbnlBY3RpdmVEcmFnU291cmNlSXMoRHJhZ1NvdXJjZUFjdGlvblNlbGVjdGlvbikpIHsK ICAgICAgICAgLy8gRklYTUU6IFRoaXMgU1BJIHNob3VsZCBiZSByZW5hbWVkIGluIFVJS2l0IHRv IHJlZmxlY3QgYSBtb3JlIGdlbmVyYWwgcHVycG9zZSBvZiBoaWRpbmcgaW50ZXJhY3Rpb24gYXNz aXN0YW50IGNvbnRyb2xzLgotICAgICAgICBbX3dlYlNlbGVjdGlvbkFzc2lzdGFudCB3aWxsU3Rh cnRTY3JvbGxpbmdPdmVyZmxvd107CiAgICAgICAgIFtfdGV4dFNlbGVjdGlvbkFzc2lzdGFudCB3 aWxsU3RhcnRTY3JvbGxpbmdPdmVyZmxvd107CiAgICAgICAgIF9zaG91bGRSZXN0b3JlQ2FsbG91 dEJhckFmdGVyRHJvcCA9IFlFUzsKICAgICB9Cg==