208113 2020-02-23 14:40:05 -0800 REGRESSION (r248481): drag animation of a link starts from the incorrect location 2020-02-24 10:05:27 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue dino megan_gardner simon.fraser thorton webkit-bug-importer oldest_to_newest 1622030 0 wenson_hsieh 2020-02-23 14:40:05 -0800 <rdar://problem/59448696> 1622035 1 391502 wenson_hsieh 2020-02-23 15:44:15 -0800 Created attachment 391502 Patch 1622215 2 391502 commit-queue 2020-02-24 10:05:25 -0800 Comment on attachment 391502 Patch Clearing flags on attachment: 391502 Committed r257214: <https://trac.webkit.org/changeset/257214> 1622216 3 commit-queue 2020-02-24 10:05:27 -0800 All reviewed patches have been landed. Closing bug. 391502 2020-02-23 15:44:15 -0800 2020-02-24 10:05:25 -0800 Patch bug-208113-20200223154414.patch text/plain 12855 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjOTQ1NDU4NGVmMDgxZTYy YmNlYjg1MWVkODU0ZTYzZDg0NTE2ODMuLjczMDlmYzJiMTZjZWViZDBjYTBiOWU0OTQ2ZmI5ZjRj OTgzZDJkNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjUgQEAKKzIwMjAtMDItMjMgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI0 ODQ4MSk6IGRyYWcgYW5pbWF0aW9uIG9mIGEgbGluayBzdGFydHMgZnJvbSB0aGUgaW5jb3JyZWN0 IGxvY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDgxMTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5NDQ4Njk2PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBib3RoIGRyYWdnaW5nIGFu ZCBjb250ZXh0IG1lbnUgaW50ZXJhY3Rpb25zLCBVSUtpdCBhc2tzIHVzIGZvciB0YXJnZXRlZCBw cmV2aWV3cywgd2hpY2ggYXJlIGhvc3RlZCB1bmRlcgorICAgICAgICBjb250YWluZXIgdmlld3Mg cHJvdmlkZWQgYnkgV2ViS2l0LiBUaGVzZSBjb250YWluZXIgdmlld3MgbXVzdCBiZSBpbiB0aGUg aGllcmFyY2h5IChpLmUuIHRoZXkgbXVzdCBoYXZlIGEKKyAgICAgICAgVUlXaW5kb3cpOyBvdGhl cndpc2UsIFVJS2l0IGluY29ycmVjdGx5IGNvbXB1dGVzIHNvbWUgZ2VvbWV0cnkgd2hlbiBhbmlt YXRpbmcgdGhlIHByZXZpZXdzLiBQcmlvciB0byB0aGUgZml4IGZvcgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNTcxNzI1MTQ+LCB0aGlzIGNhdXNlZCB0YXJnZXRlZCBkcmFnIHByZXZpZXdzIHRv IGFuaW1hdGUgaW4gZnJvbSBhIHNlZW1pbmdseSByYW5kb20gbG9jYXRpb247CisgICAgICAgIGhv d2V2ZXIsIFVJS2l0IHdvcmtlZCBhcm91bmQgdGhpcyBieSBmYWxsaW5nIGJhY2sgdG8gdGhlIHNh bWUgY29kZXBhdGggdXNlZCBmb3IgcmVtb3RlbHkgaG9zdGVkIHZpZXdzLCB3aGljaAorICAgICAg ICB1c2VzIHRoZSBsYXN0IGtub3duIHRvdWNoIGxvY2F0aW9uIGFzIGFuIGFwcHJveGltYXRpb24g b2Ygd2hlcmUgdG8gc3RhcnQgdGhlIGRyYWcgcHJldmlldyBhbmltYXRpb24uIFRoaXMgbW9zdGx5 CisgICAgICAgIG1ha2VzIHRoZSBidWcgZ28gYXdheSwgYnV0IHRoZSBkZWx0YSBiZXR3ZWVuIHRo ZSB0b3VjaCBsb2NhdGlvbiBhbmQgdGhlIGFjdHVhbCBsb2NhdGlvbiBvZiB0aGUgZHJhZ2dlZCBl bGVtZW50CisgICAgICAgIGluIHRoZSBwYWdlIHN0aWxsIGNhdXNlcyBzb21lIHZlcnkgbWlub3Ig dmlzdWFsIGRpZmZlcmVuY2VzLgorCisgICAgICAgIER1ZSB0byByMjQ4NDgxLCBhIHNlcGFyYXRl IFVJVmlldyAoX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcpIHVuZGVyIHRoZSBjb250ZW50 IHZpZXcgaXMgdXNlZCB3aGVuIGdlbmVyYXRpbmcKKyAgICAgICAgdGFyZ2V0ZWQgcHJldmlld3Mg Zm9yIGJvdGggZHJhZyBhbmQgZHJvcCBhbmQgY29udGV4dCBtZW51IGhpbnRzLiBUaGlzIHZpZXcg aXMgcmVtb3ZlZCB3aGVuIHRoZSBjb250ZXh0IG1lbnUKKyAgICAgICAgaW50ZXJhY3Rpb24gZW5k czsgaG93ZXZlciwgd2hlbiBzdGFydGluZyBhIGRyYWcsIHRoZSBjb250ZXh0IG1lbnUgaW50ZXJh Y3Rpb24gZW5kcyByaWdodCBiZWZvcmUgdGhlIGRyYWcgc2Vzc2lvbgorICAgICAgICBhY3R1YWxs eSBiZWdpbnMsIHdoaWNoIG1lYW5zIHRoYXQgd2hlbiBVSUtpdCBhY3R1YWxseSBzdGFydHMgdG8g YW5pbWF0ZSB0aGUgZHJhZyBwcmV2aWV3LCB0aGUgY29udGFpbmVyIHZpZXcgaGFzCisgICAgICAg IGFscmVhZHkgYmVlbiB1bnBhcmVudGVkLgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhpcywgaW50 cm9kdWNlIGEgc2VwYXJhdGUgX2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyBhbG9uZ3NpZGUgX2Nv bnRleHRNZW51SGludENvbnRhaW5lclZpZXcsIGFuZCB1c2UKKyAgICAgICAgdGhpcyBuZXcgdmll dyB3aGVuIGdlbmVyYXRpbmcgdGFyZ2V0ZWQgcHJldmlld3MgZm9yIGRyYWdnaW5nLiBUaGlzIHZp ZXcgaXMgZ2VuZXJhdGVkIGxhemlseSBhbmQgY2xlYW5lZCB1cAorICAgICAgICAodW5wYXJlbnRl ZCBhbmQgY2xlYXJlZCBvdXQpIHdoZW4gdGhlIGRyYWcgaW50ZXJhY3Rpb24gaGFzIGVuZGVkLCBp biAtY2xlYW5VcERyYWdTb3VyY2VTZXNzaW9uU3RhdGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorCisgICAgICAgIEFkZCBfZHJhZ1ByZXZp ZXdDb250YWluZXJWaWV3LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZENvbW1pdExvYWRG b3JNYWluRnJhbWVdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkYXRhRGV0ZWN0aW9uQ29u dGV4dEZvclBvc2l0aW9uSW5mb3JtYXRpb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg Y29udGFpbmVyRm9yRHJhZ1ByZXZpZXdzXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY29u dGFpbmVyRm9yQ29udGV4dE1lbnVIaW50UHJldmlld3NdKToKKworICAgICAgICBTcGxpdCAtY29u dGFpbmVyVmlld0ZvclRhcmdldGVkUHJldmlld3MgaW50byAtY29udGFpbmVyRm9yRHJhZ1ByZXZp ZXdzIGFuZCAtY29udGFpbmVyRm9yQ29udGV4dE1lbnVIaW50UHJldmlld3MsCisgICAgICAgIGFu ZCB1c2UgdGhlbSBhcyBhcHByb3ByaWF0ZS4KKworICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9o aWRlVGFyZ2V0ZWRQcmV2aWV3Q29udGFpbmVyVmlld3NdKToKKworICAgICAgICBSZW5hbWVkIGZy b20gX2hpZGVDb250ZXh0TWVudUhpbnRDb250YWluZXIsIHNpbmNlIGl0IGhpZGVzIGJvdGggdHlw ZXMgb2YgdGFyZ2V0ZWQgcHJldmlldyBjb250YWluZXJzIG5vdy4KKworICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IGNsZWFuVXBEcmFnU291cmNlU2Vzc2lvblN0YXRlXSk6CisKKyAgICAgICAgQ2xl YXIgb3V0IGFuZCByZW1vdmUgX2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyBoZXJlLgorCisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgX2RlbGl2ZXJEZWxheWVkRHJvcFByZXZpZXdJZlBvc3NpYmxl Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRyYWdJbnRlcmFjdGlvbjpwcmV2aWV3Rm9y TGlmdGluZ0l0ZW06c2Vzc2lvbjpdKToKKworICAgICAgICBVc2UgLWNvbnRhaW5lckZvckRyYWdQ cmV2aWV3cyB3aGVuIGNyZWF0aW5nIHByZXZpZXdzIGZvciBkcmFnZ2luZy4KKworICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IF9jcmVhdGVUYXJnZXRlZENvbnRleHRNZW51SGludFByZXZpZXdJZlBv c3NpYmxlXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgY29udGV4dE1lbnVJbnRlcmFjdGlv bjpwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVudVdpdGhDb25maWd1cmF0aW9uOl0pOgorCisgICAg ICAgIFVzZSAtY29udGFpbmVyRm9yQ29udGV4dE1lbnVIaW50UHJldmlld3Mgd2hlbiBjcmVhdGlu ZyBwcmV2aWV3cyBmb3IgdGhlIGNvbnRleHQgbWVudSBoaW50LgorCisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgY29udGFpbmVyVmlld0ZvclRhcmdldGVkUHJldmlld3NdKTogRGVsZXRlZC4KKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBfaGlkZUNvbnRleHRNZW51SGludENvbnRhaW5lcl0pOiBE ZWxldGVkLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9jcmVhdGVUYXJnZXRlZFByZXZpZXdJ ZlBvc3NpYmxlXSk6IERlbGV0ZWQuCisKIDIwMjAtMDItMjIgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBzb21lIGluY2x1ZGUgbWlzdGFrZXMgYW5kIG1ha2Ug c29tZSBjb2Rpbmcgc3R5bGUgdHdlYWtzIHRvIFdlYktpdCBhbmQgV2ViS2l0VGVzdFJ1bm5lcgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5oCmluZGV4IDE4MGQ2ZTlhM2I2OWUwY2ExZmNlYTlkYTIwYjc5ZmM2MjZkZjI3ZGMu LmI3YmUzMTUzN2IwNDQyODc1YWEwZmZiN2NhZDk4YTcyZjJkYzMwOWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgK QEAgLTI1Miw2ICsyNTIsNyBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEgewogICAgIFJl dGFpblB0cjxfVUlIaWdobGlnaHRWaWV3PiBfaGlnaGxpZ2h0VmlldzsKICAgICBSZXRhaW5QdHI8 VUlWaWV3PiBfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZpZXc7CiAgICAgUmV0YWluUHRyPFVJ Vmlldz4gX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXc7CisgICAgUmV0YWluUHRyPFVJVmll dz4gX2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldzsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9t YXJrZWRUZXh0OwogICAgIFJldGFpblB0cjxXS0FjdGlvblNoZWV0QXNzaXN0YW50PiBfYWN0aW9u U2hlZXRBc3Npc3RhbnQ7CiAjaWYgRU5BQkxFKEFJUlBMQVlfUElDS0VSKQpAQCAtNDg2LDcgKzQ4 Nyw3IEBAIEZPUl9FQUNIX1BSSVZBVEVfV0tDT05URU5UVklFV19BQ1RJT04oREVDTEFSRV9XS0NP TlRFTlRWSUVXX0FDVElPTl9GT1JfV0VCX1ZJRVcpCiAtICh2b2lkKV9lbGVtZW50RGlkRm9jdXM6 KGNvbnN0IFdlYktpdDo6Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiYpaW5mb3JtYXRpb24gdXNl cklzSW50ZXJhY3Rpbmc6KEJPT0wpdXNlcklzSW50ZXJhY3RpbmcgYmx1clByZXZpb3VzTm9kZToo Qk9PTClibHVyUHJldmlvdXNOb2RlIGFjdGl2aXR5U3RhdGVDaGFuZ2VzOihPcHRpb25TZXQ8V2Vi Q29yZTo6QWN0aXZpdHlTdGF0ZTo6RmxhZz4pYWN0aXZpdHlTdGF0ZUNoYW5nZXMgdXNlck9iamVj dDooTlNPYmplY3QgPE5TU2VjdXJlQ29kaW5nPiAqKXVzZXJPYmplY3Q7CiAtICh2b2lkKV91cGRh dGVJbnB1dENvbnRleHRBZnRlckJsdXJyaW5nQW5kUmVmb2N1c2luZ0VsZW1lbnQ7CiAtICh2b2lk KV9lbGVtZW50RGlkQmx1cjsKLS0gKHZvaWQpX2hpZGVDb250ZXh0TWVudUhpbnRDb250YWluZXI7 CistICh2b2lkKV9oaWRlVGFyZ2V0ZWRQcmV2aWV3Q29udGFpbmVyVmlld3M7CiAtICh2b2lkKV9k aWRVcGRhdGVJbnB1dE1vZGU6KFdlYkNvcmU6OklucHV0TW9kZSltb2RlOwogLSAodm9pZClfZGlk VXBkYXRlRWRpdG9yU3RhdGU7CiAtICh2b2lkKV9oYXJkd2FyZUtleWJvYXJkQXZhaWxhYmlsaXR5 Q2hhbmdlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDk0MDZmZmM4ZTM1MzExMTFiMGQ0MGJhN2I0ZGNi N2YzN2U4MjczYmYuLmFkNzgxNDM1NzcyZTZhY2I1NzFmZTg5Njc5Y2E1ZGRjMWNlMjY4MzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbQpAQCAtNDI1Nyw3ICs0MjU3LDcgQEAgLSAodm9pZClfZGlkQ29tbWl0TG9h ZEZvck1haW5GcmFtZQogI2VuZGlmCiAgICAgW3NlbGYgX2VsZW1lbnREaWRCbHVyXTsKICAgICBb c2VsZiBfY2FuY2VsTG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXJdOwotICAgIFtzZWxmIF9oaWRl Q29udGV4dE1lbnVIaW50Q29udGFpbmVyXTsKKyAgICBbc2VsZiBfaGlkZVRhcmdldGVkUHJldmll d0NvbnRhaW5lclZpZXdzXTsKICAgICBbX3dlYlZpZXcgX2RpZENvbW1pdExvYWRGb3JNYWluRnJh bWVdOwogCiAgICAgX2hhc1ZhbGlkUG9zaXRpb25JbmZvcm1hdGlvbiA9IE5POwpAQCAtNjc2MSw3 ICs2NzYxLDcgQEAgLSAoTlNEaWN0aW9uYXJ5ICopZGF0YURldGVjdGlvbkNvbnRleHRGb3JQb3Np dGlvbkluZm9ybWF0aW9uOihXZWJLaXQ6OkludGVyYWN0aW8KICAgICBlbHNlCiAgICAgICAgIHNv dXJjZVJlY3QgPSBwb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kczsKIAotICAgIENHUmVjdCBmcmFt ZUluQ29udGFpbmVyVmlld0Nvb3JkaW5hdGVzID0gW3NlbGYgY29udmVydFJlY3Q6c291cmNlUmVj dCB0b1ZpZXc6c2VsZi5jb250YWluZXJWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3c107CisgICAgQ0dS ZWN0IGZyYW1lSW5Db250YWluZXJWaWV3Q29vcmRpbmF0ZXMgPSBbc2VsZiBjb252ZXJ0UmVjdDpz b3VyY2VSZWN0IHRvVmlldzpzZWxmLmNvbnRhaW5lckZvckNvbnRleHRNZW51SGludFByZXZpZXdz XTsKICAgICBjb250ZXh0LmdldCgpW2dldGtEYXRhRGV0ZWN0b3JzU291cmNlUmVjdEtleSgpXSA9 IFtOU1ZhbHVlIHZhbHVlV2l0aENHUmVjdDpmcmFtZUluQ29udGFpbmVyVmlld0Nvb3JkaW5hdGVz XTsKICNlbmRpZgogICAgIApAQCAtNjgyMSw4ICs2ODIxLDIzIEBAIC0gKEJPT0wpX3Nob3VsZFVz ZUxlZ2FjeVNlbGVjdFBvcG92ZXJEaXNtaXNzYWxCZWhhdmlvcgogICAgIHJldHVybiBXZWJDb3Jl OjpJT1NBcHBsaWNhdGlvbjo6aXNEYXRhQWN0aXZhdGlvbigpOwogfQogCi0vLyBGSVhNRTogVGhp cyBpcyB1c2VkIGZvciBkcmFnIHByZXZpZXdzIGFuZCBjb250ZXh0IG1lbnUgaGludHM7IGl0IG5l ZWRzIGEgYmV0dGVyIG5hbWUuCi0tIChVSVZpZXcgKiljb250YWluZXJWaWV3Rm9yVGFyZ2V0ZWRQ cmV2aWV3cworLSAoVUlWaWV3ICopY29udGFpbmVyRm9yRHJhZ1ByZXZpZXdzCit7CisgICAgaWYg KF9kcmFnUHJldmlld0NvbnRhaW5lclZpZXcpIHsKKyAgICAgICAgQVNTRVJUKFtfZHJhZ1ByZXZp ZXdDb250YWluZXJWaWV3IHN1cGVydmlld10pOworICAgICAgICBbX2RyYWdQcmV2aWV3Q29udGFp bmVyVmlldyBzZXRIaWRkZW46Tk9dOworICAgICAgICByZXR1cm4gX2RyYWdQcmV2aWV3Q29udGFp bmVyVmlldy5nZXQoKTsKKyAgICB9CisKKyAgICBfZHJhZ1ByZXZpZXdDb250YWluZXJWaWV3ID0g YWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOworICAgIFtfZHJhZ1ByZXZpZXdDb250YWlu ZXJWaWV3IGxheWVyXS5hbmNob3JQb2ludCA9IENHUG9pbnRaZXJvOworICAgIFtfZHJhZ1ByZXZp ZXdDb250YWluZXJWaWV3IGxheWVyXS5uYW1lID0gQCJEcmFnIFByZXZpZXcgQ29udGFpbmVyIjsK KyAgICBbX2ludGVyYWN0aW9uVmlld3NDb250YWluZXJWaWV3IGFkZFN1YnZpZXc6X2RyYWdQcmV2 aWV3Q29udGFpbmVyVmlldy5nZXQoKV07CisKKyAgICByZXR1cm4gX2RyYWdQcmV2aWV3Q29udGFp bmVyVmlldy5nZXQoKTsKK30KKworLSAoVUlWaWV3ICopY29udGFpbmVyRm9yQ29udGV4dE1lbnVI aW50UHJldmlld3MKIHsKICAgICBpZiAoX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcpIHsK ICAgICAgICAgQVNTRVJUKFtfY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldyBzdXBlcnZpZXdd KTsKQEAgLTY4MzIsMTQgKzY4NDcsMTUgQEAgLSAoVUlWaWV3ICopY29udGFpbmVyVmlld0ZvclRh cmdldGVkUHJldmlld3MKIAogICAgIF9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3ID0gYWRv cHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOwogICAgIFtfY29udGV4dE1lbnVIaW50Q29udGFp bmVyVmlldyBsYXllcl0uYW5jaG9yUG9pbnQgPSBDR1BvaW50WmVybzsKLSAgICBbX2NvbnRleHRN ZW51SGludENvbnRhaW5lclZpZXcgbGF5ZXJdLm5hbWUgPSBAIkNvbnRleHQgTWVudSBDb250YWlu ZXIiOworICAgIFtfY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldyBsYXllcl0ubmFtZSA9IEAi Q29udGV4dCBNZW51IEhpbnQgQ29udGFpbmVyIjsKICAgICBbX2ludGVyYWN0aW9uVmlld3NDb250 YWluZXJWaWV3IGFkZFN1YnZpZXc6X2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcuZ2V0KCld OwogCiAgICAgcmV0dXJuIF9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3LmdldCgpOwogfQog Ci0tICh2b2lkKV9oaWRlQ29udGV4dE1lbnVIaW50Q29udGFpbmVyCistICh2b2lkKV9oaWRlVGFy Z2V0ZWRQcmV2aWV3Q29udGFpbmVyVmlld3MKIHsKKyAgICBbX2RyYWdQcmV2aWV3Q29udGFpbmVy VmlldyBzZXRIaWRkZW46WUVTXTsKICAgICBbX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcg c2V0SGlkZGVuOllFU107CiB9CiAKQEAgLTcwNjcsNiArNzA4Myw3IEBAIC0gKHZvaWQpY2xlYW5V cERyYWdTb3VyY2VTZXNzaW9uU3RhdGUKICAgICBbW1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQg c2hhcmVkSW5zdGFuY2VdIGNsZWFyUmVnaXN0cmF0aW9uTGlzdHNdOwogICAgIFtzZWxmIF9yZXN0 b3JlQ2FsbG91dEJhcklmTmVlZGVkXTsKIAorICAgIFtzdGQ6OmV4Y2hhbmdlKF9kcmFnUHJldmll d0NvbnRhaW5lclZpZXcsIG5pbCkgcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgW3N0ZDo6ZXhj aGFuZ2UoX3Zpc2libGVDb250ZW50Vmlld1NuYXBzaG90LCBuaWwpIHJlbW92ZUZyb21TdXBlcnZp ZXddOwogICAgIFtfZWRpdERyb3BDYXJldFZpZXcgcmVtb3ZlXTsKICAgICBfZWRpdERyb3BDYXJl dFZpZXcgPSBuaWw7CkBAIC03MTM0LDcgKzcxNTEsNyBAQCAtICh2b2lkKV9kZWxpdmVyRGVsYXll ZERyb3BQcmV2aWV3SWZQb3NzaWJsZTooT3B0aW9uYWw8V2ViQ29yZTo6VGV4dEluZGljYXRvckRh dAogICAgIFtfdW5zZWxlY3RlZENvbnRlbnRTbmFwc2hvdCBzZXRGcmFtZTpkYXRhLT5jb250ZW50 SW1hZ2VXaXRob3V0U2VsZWN0aW9uUmVjdEluUm9vdFZpZXdDb29yZGluYXRlc107CiAKICAgICBb c2VsZiBpbnNlcnRTdWJ2aWV3Ol91bnNlbGVjdGVkQ29udGVudFNuYXBzaG90LmdldCgpIGJlbG93 U3VidmlldzpfdmlzaWJsZUNvbnRlbnRWaWV3U25hcHNob3QuZ2V0KCldOwotICAgIF9kcmFnRHJv cEludGVyYWN0aW9uU3RhdGUuZGVsaXZlckRlbGF5ZWREcm9wUHJldmlldyhzZWxmLCBzZWxmLmNv bnRhaW5lclZpZXdGb3JUYXJnZXRlZFByZXZpZXdzLCBkYXRhLnZhbHVlKCkpOworICAgIF9kcmFn RHJvcEludGVyYWN0aW9uU3RhdGUuZGVsaXZlckRlbGF5ZWREcm9wUHJldmlldyhzZWxmLCBzZWxm LmNvbnRhaW5lckZvckRyYWdQcmV2aWV3cywgZGF0YS52YWx1ZSgpKTsKIH0KIAogLSAodm9pZClf ZGlkUGVyZm9ybURyYWdPcGVyYXRpb246KEJPT0wpaGFuZGxlZApAQCAtNzU3MSw3ICs3NTg4LDcg QEAgLSAoVUlUYXJnZXRlZERyYWdQcmV2aWV3ICopZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRl cmFjdGlvbiAqKWludGVyYWN0aW9uIHByZXYKICAgICAgICAgaWYgKG92ZXJyaWRkZW5QcmV2aWV3 KQogICAgICAgICAgICAgcmV0dXJuIG92ZXJyaWRkZW5QcmV2aWV3OwogICAgIH0KLSAgICByZXR1 cm4gX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5wcmV2aWV3Rm9yRHJhZ0l0ZW0oaXRlbSwgc2Vs Ziwgc2VsZi5jb250YWluZXJWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3cyk7CisgICAgcmV0dXJuIF9k cmFnRHJvcEludGVyYWN0aW9uU3RhdGUucHJldmlld0ZvckRyYWdJdGVtKGl0ZW0sIHNlbGYsIHNl bGYuY29udGFpbmVyRm9yRHJhZ1ByZXZpZXdzKTsKIH0KIAogLSAodm9pZClkcmFnSW50ZXJhY3Rp b246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gd2lsbEFuaW1hdGVMaWZ0V2l0aEFu aW1hdG9yOihpZCA8VUlEcmFnQW5pbWF0aW5nPilhbmltYXRvciBzZXNzaW9uOihpZCA8VUlEcmFn U2Vzc2lvbj4pc2Vzc2lvbgpAQCAtODc1NCwyMiArODc3MSwyMiBAQCBzdGF0aWMgUmV0YWluUHRy PFVJVGFyZ2V0ZWRQcmV2aWV3PiBjcmVhdGVGYWxsYmFja1RhcmdldGVkUHJldmlldyhVSVZpZXcg KnJvb3RWaQogICAgIHJldHVybiBhZG9wdE5TKFtbVUlUYXJnZXRlZFByZXZpZXcgYWxsb2NdIGlu aXRXaXRoVmlldzpzbmFwc2hvdFZpZXcgcGFyYW1ldGVyczpwYXJhbWV0ZXJzLmdldCgpIHRhcmdl dDp0YXJnZXQuZ2V0KCldKTsKIH0KIAotLSAoVUlUYXJnZXRlZFByZXZpZXcgKilfY3JlYXRlVGFy Z2V0ZWRQcmV2aWV3SWZQb3NzaWJsZQorLSAoVUlUYXJnZXRlZFByZXZpZXcgKilfY3JlYXRlVGFy Z2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3SWZQb3NzaWJsZQogewogICAgIFJldGFpblB0cjxV SVRhcmdldGVkUHJldmlldz4gdGFyZ2V0ZWRQcmV2aWV3OwogCiAgICAgaWYgKF9wb3NpdGlvbklu Zm9ybWF0aW9uLmlzTGluayAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5kaWNhdG9yLmNv bnRlbnRJbWFnZSkgewogICAgICAgICBhdXRvIGluZGljYXRvciA9IF9wb3NpdGlvbkluZm9ybWF0 aW9uLmxpbmtJbmRpY2F0b3I7CiAgICAgICAgIGF1dG8gdGV4dEluZGljYXRvckltYWdlID0gdWlJ bWFnZUZvckltYWdlKGluZGljYXRvci5jb250ZW50SW1hZ2UuZ2V0KCkpOwotICAgICAgICB0YXJn ZXRlZFByZXZpZXcgPSBjcmVhdGVUYXJnZXRlZFByZXZpZXcodGV4dEluZGljYXRvckltYWdlLmdl dCgpLCBzZWxmLCBzZWxmLmNvbnRhaW5lclZpZXdGb3JUYXJnZXRlZFByZXZpZXdzLCBpbmRpY2F0 b3IudGV4dEJvdW5kaW5nUmVjdEluUm9vdFZpZXdDb29yZGluYXRlcywgaW5kaWNhdG9yLnRleHRS ZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMsIFtVSUNvbG9yIGNvbG9yV2l0aENHQ29sb3I6 Y2FjaGVkQ0dDb2xvcihpbmRpY2F0b3IuZXN0aW1hdGVkQmFja2dyb3VuZENvbG9yKV0pOworICAg ICAgICB0YXJnZXRlZFByZXZpZXcgPSBjcmVhdGVUYXJnZXRlZFByZXZpZXcodGV4dEluZGljYXRv ckltYWdlLmdldCgpLCBzZWxmLCBzZWxmLmNvbnRhaW5lckZvckNvbnRleHRNZW51SGludFByZXZp ZXdzLCBpbmRpY2F0b3IudGV4dEJvdW5kaW5nUmVjdEluUm9vdFZpZXdDb29yZGluYXRlcywgaW5k aWNhdG9yLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMsIFtVSUNvbG9yIGNvbG9y V2l0aENHQ29sb3I6Y2FjaGVkQ0dDb2xvcihpbmRpY2F0b3IuZXN0aW1hdGVkQmFja2dyb3VuZENv bG9yKV0pOwogICAgIH0gZWxzZSBpZiAoKF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzQXR0YWNobWVu dCB8fCBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0ltYWdlKSAmJiBfcG9zaXRpb25JbmZvcm1hdGlv bi5pbWFnZSkgewogICAgICAgICBhdXRvIGNnSW1hZ2UgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5p bWFnZS0+bWFrZUNHSW1hZ2VDb3B5KCk7CiAgICAgICAgIGF1dG8gaW1hZ2UgPSBhZG9wdE5TKFtb VUlJbWFnZSBhbGxvY10gaW5pdFdpdGhDR0ltYWdlOmNnSW1hZ2UuZ2V0KCldKTsKLSAgICAgICAg dGFyZ2V0ZWRQcmV2aWV3ID0gY3JlYXRlVGFyZ2V0ZWRQcmV2aWV3KGltYWdlLmdldCgpLCBzZWxm LCBzZWxmLmNvbnRhaW5lclZpZXdGb3JUYXJnZXRlZFByZXZpZXdzLCBfcG9zaXRpb25JbmZvcm1h dGlvbi5ib3VuZHMsIHsgfSwgbmlsKTsKKyAgICAgICAgdGFyZ2V0ZWRQcmV2aWV3ID0gY3JlYXRl VGFyZ2V0ZWRQcmV2aWV3KGltYWdlLmdldCgpLCBzZWxmLCBzZWxmLmNvbnRhaW5lckZvckNvbnRl eHRNZW51SGludFByZXZpZXdzLCBfcG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHMsIHsgfSwgbmls KTsKICAgICB9CiAKICAgICBpZiAoIXRhcmdldGVkUHJldmlldykKLSAgICAgICAgdGFyZ2V0ZWRQ cmV2aWV3ID0gY3JlYXRlRmFsbGJhY2tUYXJnZXRlZFByZXZpZXcoc2VsZiwgc2VsZi5jb250YWlu ZXJWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3cywgX3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzKTsK KyAgICAgICAgdGFyZ2V0ZWRQcmV2aWV3ID0gY3JlYXRlRmFsbGJhY2tUYXJnZXRlZFByZXZpZXco c2VsZiwgc2VsZi5jb250YWluZXJGb3JDb250ZXh0TWVudUhpbnRQcmV2aWV3cywgX3Bvc2l0aW9u SW5mb3JtYXRpb24uYm91bmRzKTsKIAogICAgIGlmIChfcG9zaXRpb25JbmZvcm1hdGlvbi5jb250 YWluZXJTY3JvbGxpbmdOb2RlSUQpIHsKICAgICAgICAgVUlTY3JvbGxWaWV3ICpwb3NpdGlvblRy YWNraW5nVmlldyA9IHNlbGYud2ViVmlldy5zY3JvbGxWaWV3OwpAQCAtODc4Nyw3ICs4ODA0LDcg QEAgLSAoVUlUYXJnZXRlZFByZXZpZXcgKilfY3JlYXRlVGFyZ2V0ZWRQcmV2aWV3SWZQb3NzaWJs ZQogLSAoVUlUYXJnZXRlZFByZXZpZXcgKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRl eHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmV2aWV3Rm9ySGlnaGxpZ2h0aW5nTWVu dVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3Vy YXRpb24KIHsKICAgICBbc2VsZiBfc3RhcnRTdXBwcmVzc2luZ1NlbGVjdGlvbkFzc2lzdGFudEZv clJlYXNvbjpXZWJLaXQ6OkludGVyYWN0aW9uSXNIYXBwZW5pbmddOwotICAgIHJldHVybiBbc2Vs ZiBfY3JlYXRlVGFyZ2V0ZWRQcmV2aWV3SWZQb3NzaWJsZV07CisgICAgcmV0dXJuIFtzZWxmIF9j cmVhdGVUYXJnZXRlZENvbnRleHRNZW51SGludFByZXZpZXdJZlBvc3NpYmxlXTsKIH0KIAogLSAo dm9pZCljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilp bnRlcmFjdGlvbiB3aWxsRGlzcGxheU1lbnVGb3JDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51 Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24gYW5pbWF0b3I6KGlkPFVJQ29udGV4dE1lbnVJ bnRlcmFjdGlvbkFuaW1hdGluZz4pYW5pbWF0b3IK