209218 2020-03-17 20:36:59 -0700 REGRESSION (r257214): Targeted preview animates to the wrong place when dropping in editable content 2020-03-18 12:31:28 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin megan_gardner thorton webkit-bug-importer oldest_to_newest 1631028 0 wenson_hsieh 2020-03-17 20:36:59 -0700 <rdar://problem/60560831> 1631213 1 393872 wenson_hsieh 2020-03-18 10:00:01 -0700 Created attachment 393872 Patch 1631301 2 ews-feeder 2020-03-18 12:31:27 -0700 Committed r258659: <https://trac.webkit.org/changeset/258659> All reviewed patches have been landed. Closing bug and clearing flags on attachment 393872. 393872 2020-03-18 10:00:01 -0700 2020-03-18 12:31:27 -0700 Patch bug-209218-20200318100000.patch text/plain 12046 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQxN2Y2OTBjY2FjY2Y4NTBm N2FkMGEzM2JlMWRkMTg1YzM1NWE3YWYuLmI3OWM5Y2E0YjNjNDc4NWVkZTU2Yzg4N2IxYTViYzJk ZDBjMzlhMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTAgQEAKKzIwMjAtMDMtMTggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI1 NzIxNCk6IFRhcmdldGVkIHByZXZpZXcgYW5pbWF0ZXMgdG8gdGhlIHdyb25nIHBsYWNlIHdoZW4g ZHJvcHBpbmcgaW4gZWRpdGFibGUgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MjE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MDU2 MDgzMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biByMjU3MjE0LCB3ZSBzcGxpdCBvdXQgdGhlIGNvbnRleHQgbWVudSBoaW50IHByZXZpZXcgY29u dGFpbmVyIHZpZXcgaW50byB0d28gdmlld3M6IG9uZSBmb3IgZHJhZyBhbmQgZHJvcCwgYW5kCisg ICAgICAgIGFub3RoZXIgZm9yIHRoZSBjb250ZXh0IG1lbnUgaGludC4gVGhlIGNvbnRhaW5lciB2 aWV3IHVzZWQgZm9yIGJvdGggZHJhZyBhbmQgZHJvcCBwcmV2aWV3cyB3YXMgcmVtb3ZlZCB1bmRl cgorICAgICAgICAtY2xlYW5VcERyYWdTb3VyY2VTZXNzaW9uU3RhdGUsIHdoaWNoIGlzIGludm9r ZWQgYWZ0ZXIgYm90aCBkcmFnIGFuZCBkcm9wIHNlc3Npb25zIGhhdmUgZW5kZWQ7IGhvd2V2ZXIs IGluIHRoZQorICAgICAgICBjYXNlIG9mIGEgZHJvcCBpbiBlZGl0YWJsZSBjb250ZW50IHdoZXJl IHRoZSBkcm9wIHByZXZpZXcgaXMgZGVsYXllZCwgdGhlIGRyb3AgYW5pbWF0aW9uIGNhbiBlbmQg dXAgZmluaXNoaW5nCisgICAgICAgIGFmdGVyIC1jbGVhblVwRHJhZ1NvdXJjZVNlc3Npb25TdGF0 ZSBpcyBpbnZva2VkLiBUaGlzIG1lYW5zIHdlIGVuZCB1cCBwcmVtYXR1cmVseSB1bnBhcmVudGlu ZyB0aGUgcHJldmlldworICAgICAgICBjb250YWluZXIsIHdoaWNoIHJlc3VsdHMgaW4gYSBicm9r ZW4gZHJvcCBhbmltYXRpb24uCisKKyAgICAgICAgVG8gZml4IHRoaXMsIHNwbGl0IHRoZSBkcmFn IGFuZCBkcm9wIGNvbnRhaW5lciB2aWV3cyBmdXJ0aGVyLCBpbnRvIHNlcGFyYXRlIGNvbnRhaW5l ciB2aWV3cyBmb3IgZHJhZ2dpbmcgYW5kIGZvcgorICAgICAgICBkcm9wcGluZy4gVGhlIGRyYWcg cHJldmlldyBjb250YWluZXIgd2lsbCBjb250aW51ZSB0byBiZSByZW1vdmVkIHVuZGVyIC1jbGVh blVwRHJhZ1NvdXJjZVNlc3Npb25TdGF0ZSwgYW5kIHRoZQorICAgICAgICBkcm9wIHByZXZpZXcg Y29udGFpbmVyIHdpbGwgbm93IGJlIHJlbW92ZWQgdW5kZXIgdGhlIGRlbGVnYXRlIGNhbGwgdG8g LWRyb3BJbnRlcmFjdGlvbjpjb25jbHVkZURyb3A6LCB3aGljaCBpcworICAgICAgICBpbnZva2Vk IGJ5IFVJS2l0IGFmdGVyIGFsbCBkcm9wIHByZXZpZXdzIGFyZSBmaW5pc2hlZCBhbmltYXRpbmcu CisKKyAgICAgICAgQ292ZXJlZCBieSBhZGRpbmcgYWRkaXRpb25hbCB0ZXN0IGFzc2VydGlvbnMg d2hpbGUgcnVubmluZyBleGlzdGluZyBBUEkgdGVzdHMgKHNlZSBUb29scy9DaGFuZ2VMb2cgZm9y IG1vcmUKKyAgICAgICAgZGV0YWlscykuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9jcmVhdGVQcmV2 aWV3Q29udGFpbmVyV2l0aExheWVyTmFtZTpdKToKKworICAgICAgICBQdWxsIG91dCBjb21tb24g bG9naWMgZm9yIGNyZWF0aW5nIGFuZCBzZXR0aW5nIHVwIGEgcHJldmlldyBjb250YWluZXIgdmll dyBpbnRvIGEgaGVscGVyIG1ldGhvZC4gVGhpcyBpcyB1c2VkIGJ5CisgICAgICAgIHRoZSB0aHJl ZSBtZXRob2RzIGJlbG93LCB3aGljaCBlbnN1cmUgY29udGFpbmVyIHZpZXdzIGZvciBlYWNoIG9m IHRoZSB0eXBlcyBvZiBwcmV2aWV3cyB3ZSBjcmVhdGUgd2hlbiBzaG93aW5nCisgICAgICAgIHRo ZSBjb250ZXh0IG1lbnUsIGRyYWdnaW5nIGFuIGVsZW1lbnQsIGFuZCBkcm9wcGluZy4KKworICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IGNvbnRhaW5lckZvckRyb3BQcmV2aWV3c10pOgorICAgICAg ICAoLVtXS0NvbnRlbnRWaWV3IGNvbnRhaW5lckZvckRyYWdQcmV2aWV3c10pOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IGNvbnRhaW5lckZvckNvbnRleHRNZW51SGludFByZXZpZXdzXSk6CisK KyAgICAgICAgQWRkIGEgdGhpcmQgcHJldmlldyBjb250YWluZXIgdmlldyBmb3IgZHJvcCBwcmV2 aWV3cywgYW5kIGZhY3RvciBkdXBsaWNhdGVkIGNvZGUgaW4gdGhlc2UgdGhyZWUgbWV0aG9kcyBp bnRvIGEKKyAgICAgICAgY29tbW9uIGhlbHBlciAoc2VlIGFib3ZlKS4KKworICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9oaWRlVGFyZ2V0ZWRQcmV2aWV3Q29udGFpbmVyVmlld3NdKToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBfZGVsaXZlckRlbGF5ZWREcm9wUHJldmlld0lmUG9zc2libGU6 XSk6CisKKyAgICAgICAgSW5zdGVhZCBvZiB1c2luZyB0aGUgY29udGFpbmVyIGZvciBkcmFnIHBy ZXZpZXdzLCB1c2UgdGhlIGNvbnRhaW5lciBmb3IgZHJvcCBwcmV2aWV3cy4KKworICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IGRyb3BJbnRlcmFjdGlvbjpjb25jbHVkZURyb3A6XSk6CisKKyAgICAg ICAgUmVtb3ZlIHRoZSBkcm9wIHByZXZpZXcgY29udGFpbmVyIGFmdGVyIHRoZSBkcm9wIGhhcyBj b25jbHVkZWQgKGkuZS4gYWxsIGFuaW1hdGlvbnMgYXJlIGNvbXBsZXRlKS4KKwogMjAyMC0wMy0x NiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg YSBiaXQgbW9yZSBVSUhpdFRlc3RpbmcgbG9nZ2luZywgYW5kIG1ha2UgaXQgcG9zc2libGUgdG8g ZHVtcCBFdmVudFJlZ2lvbnMgZnJvbSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCA2OTQxYjE0ZDgw NDJkYzRhZjhmNTY1MWMwOGUxMGJhM2I4MWFkNGNlLi5lNzdhNTM4NmQwZWQzNWIxNjc5ODE5ZDBm NDJlZjU2Nzc4MTFlMDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC0yNDYsNiArMjQ2LDcgQEAgc3RydWN0 IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBSZXRhaW5QdHI8VUlWaWV3PiBfaW50ZXJhY3Rp b25WaWV3c0NvbnRhaW5lclZpZXc7CiAgICAgUmV0YWluUHRyPFVJVmlldz4gX2NvbnRleHRNZW51 SGludENvbnRhaW5lclZpZXc7CiAgICAgUmV0YWluUHRyPFVJVmlldz4gX2RyYWdQcmV2aWV3Q29u dGFpbmVyVmlldzsKKyAgICBSZXRhaW5QdHI8VUlWaWV3PiBfZHJvcFByZXZpZXdDb250YWluZXJW aWV3OwogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX21hcmtlZFRleHQ7CiAgICAgUmV0YWluUHRy PFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQ+IF9hY3Rpb25TaGVldEFzc2lzdGFudDsKICNpZiBFTkFC TEUoQUlSUExBWV9QSUNLRVIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCA3YmZmN2IxODBiM2I4ZWUyYTUx ZmQ0ZDJmOThlNDU5ZTBkYTA0ODZlLi45ZjQyMmExY2U4NTgyN2RjZGI3MDdjYzQ0ZGY5ZDEwYzc0 ZTFiNzA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTY4MTQsNDAgKzY4MTQsNDggQEAgLSAoQk9PTClf c2hvdWxkVXNlTGVnYWN5U2VsZWN0UG9wb3ZlckRpc21pc3NhbEJlaGF2aW9yCiAgICAgcmV0dXJu IFdlYkNvcmU6OklPU0FwcGxpY2F0aW9uOjppc0RhdGFBY3RpdmF0aW9uKCk7CiB9CiAKLS0gKFVJ VmlldyAqKWNvbnRhaW5lckZvckRyYWdQcmV2aWV3cworLSAoUmV0YWluUHRyPFVJVmlldz4pX2Ny ZWF0ZVByZXZpZXdDb250YWluZXJXaXRoTGF5ZXJOYW1lOihOU1N0cmluZyAqKWxheWVyTmFtZQog ewotICAgIGlmIChfZHJhZ1ByZXZpZXdDb250YWluZXJWaWV3KSB7Ci0gICAgICAgIEFTU0VSVChb X2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyBzdXBlcnZpZXddKTsKLSAgICAgICAgW19kcmFnUHJl dmlld0NvbnRhaW5lclZpZXcgc2V0SGlkZGVuOk5PXTsKLSAgICAgICAgcmV0dXJuIF9kcmFnUHJl dmlld0NvbnRhaW5lclZpZXcuZ2V0KCk7Ci0gICAgfQorICAgIGF1dG8gY29udGFpbmVyID0gYWRv cHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOworICAgIFtjb250YWluZXIgbGF5ZXJdLmFuY2hv clBvaW50ID0gQ0dQb2ludFplcm87CisgICAgW2NvbnRhaW5lciBsYXllcl0ubmFtZSA9IGxheWVy TmFtZTsKKyAgICBbX2ludGVyYWN0aW9uVmlld3NDb250YWluZXJWaWV3IGFkZFN1YnZpZXc6Y29u dGFpbmVyLmdldCgpXTsKKyAgICByZXR1cm4gY29udGFpbmVyOworfQogCi0gICAgX2RyYWdQcmV2 aWV3Q29udGFpbmVyVmlldyA9IGFkb3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRdKTsKLSAgICBb X2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyBsYXllcl0uYW5jaG9yUG9pbnQgPSBDR1BvaW50WmVy bzsKLSAgICBbX2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyBsYXllcl0ubmFtZSA9IEAiRHJhZyBQ cmV2aWV3IENvbnRhaW5lciI7Ci0gICAgW19pbnRlcmFjdGlvblZpZXdzQ29udGFpbmVyVmlldyBh ZGRTdWJ2aWV3Ol9kcmFnUHJldmlld0NvbnRhaW5lclZpZXcuZ2V0KCldOworLSAoVUlWaWV3ICop Y29udGFpbmVyRm9yRHJvcFByZXZpZXdzCit7CisgICAgaWYgKCFfZHJvcFByZXZpZXdDb250YWlu ZXJWaWV3KQorICAgICAgICBfZHJvcFByZXZpZXdDb250YWluZXJWaWV3ID0gW3NlbGYgX2NyZWF0 ZVByZXZpZXdDb250YWluZXJXaXRoTGF5ZXJOYW1lOkAiRHJvcCBQcmV2aWV3IENvbnRhaW5lciJd OworCisgICAgQVNTRVJUKFtfZHJvcFByZXZpZXdDb250YWluZXJWaWV3IHN1cGVydmlld10pOwor ICAgIFtfZHJvcFByZXZpZXdDb250YWluZXJWaWV3IHNldEhpZGRlbjpOT107CisgICAgcmV0dXJu IF9kcm9wUHJldmlld0NvbnRhaW5lclZpZXcuZ2V0KCk7Cit9CiAKKy0gKFVJVmlldyAqKWNvbnRh aW5lckZvckRyYWdQcmV2aWV3cworeworICAgIGlmICghX2RyYWdQcmV2aWV3Q29udGFpbmVyVmll dykKKyAgICAgICAgX2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyA9IFtzZWxmIF9jcmVhdGVQcmV2 aWV3Q29udGFpbmVyV2l0aExheWVyTmFtZTpAIkRyYWcgUHJldmlldyBDb250YWluZXIiXTsKKwor ICAgIEFTU0VSVChbX2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyBzdXBlcnZpZXddKTsKKyAgICBb X2RyYWdQcmV2aWV3Q29udGFpbmVyVmlldyBzZXRIaWRkZW46Tk9dOwogICAgIHJldHVybiBfZHJh Z1ByZXZpZXdDb250YWluZXJWaWV3LmdldCgpOwogfQogCiAtIChVSVZpZXcgKiljb250YWluZXJG b3JDb250ZXh0TWVudUhpbnRQcmV2aWV3cwogewotICAgIGlmIChfY29udGV4dE1lbnVIaW50Q29u dGFpbmVyVmlldykgewotICAgICAgICBBU1NFUlQoW19jb250ZXh0TWVudUhpbnRDb250YWluZXJW aWV3IHN1cGVydmlld10pOwotICAgICAgICBbX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcg c2V0SGlkZGVuOk5PXTsKLSAgICAgICAgcmV0dXJuIF9jb250ZXh0TWVudUhpbnRDb250YWluZXJW aWV3LmdldCgpOwotICAgIH0KLQotICAgIF9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3ID0g YWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOwotICAgIFtfY29udGV4dE1lbnVIaW50Q29u dGFpbmVyVmlldyBsYXllcl0uYW5jaG9yUG9pbnQgPSBDR1BvaW50WmVybzsKLSAgICBbX2NvbnRl eHRNZW51SGludENvbnRhaW5lclZpZXcgbGF5ZXJdLm5hbWUgPSBAIkNvbnRleHQgTWVudSBIaW50 IENvbnRhaW5lciI7Ci0gICAgW19pbnRlcmFjdGlvblZpZXdzQ29udGFpbmVyVmlldyBhZGRTdWJ2 aWV3Ol9jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3LmdldCgpXTsKKyAgICBpZiAoIV9jb250 ZXh0TWVudUhpbnRDb250YWluZXJWaWV3KQorICAgICAgICBfY29udGV4dE1lbnVIaW50Q29udGFp bmVyVmlldyA9IFtzZWxmIF9jcmVhdGVQcmV2aWV3Q29udGFpbmVyV2l0aExheWVyTmFtZTpAIkNv bnRleHQgTWVudSBIaW50IFByZXZpZXcgQ29udGFpbmVyIl07CiAKKyAgICBBU1NFUlQoW19jb250 ZXh0TWVudUhpbnRDb250YWluZXJWaWV3IHN1cGVydmlld10pOworICAgIFtfY29udGV4dE1lbnVI aW50Q29udGFpbmVyVmlldyBzZXRIaWRkZW46Tk9dOwogICAgIHJldHVybiBfY29udGV4dE1lbnVI aW50Q29udGFpbmVyVmlldy5nZXQoKTsKIH0KIAogLSAodm9pZClfaGlkZVRhcmdldGVkUHJldmll d0NvbnRhaW5lclZpZXdzCiB7CisgICAgW19kcm9wUHJldmlld0NvbnRhaW5lclZpZXcgc2V0SGlk ZGVuOllFU107CiAgICAgW19kcmFnUHJldmlld0NvbnRhaW5lclZpZXcgc2V0SGlkZGVuOllFU107 CiAgICAgW19jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3IHNldEhpZGRlbjpZRVNdOwogfQpA QCAtNzE0NCw3ICs3MTUyLDcgQEAgLSAodm9pZClfZGVsaXZlckRlbGF5ZWREcm9wUHJldmlld0lm UG9zc2libGU6KE9wdGlvbmFsPFdlYkNvcmU6OlRleHRJbmRpY2F0b3JEYXQKICAgICBbX3Vuc2Vs ZWN0ZWRDb250ZW50U25hcHNob3Qgc2V0RnJhbWU6ZGF0YS0+Y29udGVudEltYWdlV2l0aG91dFNl bGVjdGlvblJlY3RJblJvb3RWaWV3Q29vcmRpbmF0ZXNdOwogCiAgICAgW3NlbGYgaW5zZXJ0U3Vi dmlldzpfdW5zZWxlY3RlZENvbnRlbnRTbmFwc2hvdC5nZXQoKSBiZWxvd1N1YnZpZXc6X3Zpc2li bGVDb250ZW50Vmlld1NuYXBzaG90LmdldCgpXTsKLSAgICBfZHJhZ0Ryb3BJbnRlcmFjdGlvblN0 YXRlLmRlbGl2ZXJEZWxheWVkRHJvcFByZXZpZXcoc2VsZiwgc2VsZi5jb250YWluZXJGb3JEcmFn UHJldmlld3MsIGRhdGEudmFsdWUoKSk7CisgICAgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5k ZWxpdmVyRGVsYXllZERyb3BQcmV2aWV3KHNlbGYsIHNlbGYuY29udGFpbmVyRm9yRHJvcFByZXZp ZXdzLCBkYXRhLnZhbHVlKCkpOwogfQogCiAtICh2b2lkKV9kaWRQZXJmb3JtRHJhZ09wZXJhdGlv bjooQk9PTCloYW5kbGVkCkBAIC03ODMzLDYgKzc4NDEsNyBAQCAtICh2b2lkKWRyb3BJbnRlcmFj dGlvbjooVUlEcm9wSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBpdGVtOihVSURyYWdJdGVtICop aXRlbQogCiAtICh2b2lkKWRyb3BJbnRlcmFjdGlvbjooVUlEcm9wSW50ZXJhY3Rpb24gKilpbnRl cmFjdGlvbiBjb25jbHVkZURyb3A6KGlkIDxVSURyb3BTZXNzaW9uPilzZXNzaW9uCiB7CisgICAg W3N0ZDo6ZXhjaGFuZ2UoX2Ryb3BQcmV2aWV3Q29udGFpbmVyVmlldywgbmlsKSByZW1vdmVGcm9t U3VwZXJ2aWV3XTsKICAgICBbc3RkOjpleGNoYW5nZShfdmlzaWJsZUNvbnRlbnRWaWV3U25hcHNo b3QsIG5pbCkgcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgW3N0ZDo6ZXhjaGFuZ2UoX3Vuc2Vs ZWN0ZWRDb250ZW50U25hcHNob3QsIG5pbCkgcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgX2Ry YWdEcm9wSW50ZXJhY3Rpb25TdGF0ZS5jbGVhckFsbERlbGF5ZWRJdGVtUHJldmlld1Byb3ZpZGVy cygpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDQ2N2Q4MzdhOWZjZjg1ODIxZmYwODM4YWFlOGNlMDYyYTE3NDNiZTMuLjMwZjE0YjE0MWZkZTI5 MGY1ZDk1Njg3ZjBjNjI0YmMxMjE3N2RiZmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wMy0xOCAgV2Vuc29u IEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MjU3MjE0KTogVGFyZ2V0ZWQgcHJldmlldyBhbmltYXRlcyB0byB0aGUgd3JvbmcgcGxhY2Ugd2hl biBkcm9wcGluZyBpbiBlZGl0YWJsZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkyMTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYw NTYwODMxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEF1Z21lbnQgdGhlIGRyYWcgYW5kIGRyb3AgdGVzdCBoYXJuZXNzIHRvIHZlcmlmeSB0aGF0IGZv ciBhbGwgdGFyZ2V0ZWQgcHJldmlld3MsIGlmIHRoZXkgaGF2ZSBjb250YWluZXIgdmlld3MsCisg ICAgICAgIHRob3NlIHZpZXdzIG11c3QgYmUgcGFyZW50ZWQgKGkuZS4gdGhleSBtdXN0IGJlIGNv bm5lY3RlZCB0byBhIFVJV2luZG93KS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvaW9zL0Ry YWdBbmREcm9wU2ltdWxhdG9ySU9TLm1tOgorICAgICAgICAoLVtEcmFnQW5kRHJvcFNpbXVsYXRv ciBfY29uY2x1ZGVEcm9wQW5kUGVyZm9ybU9wZXJhdGlvbklmTmVjZXNzYXJ5XSk6CisgICAgICAg ICgtW0RyYWdBbmREcm9wU2ltdWxhdG9yIF9leHBlY3ROb0Ryb3BQcmV2aWV3c1dpdGhVbnBhcmVu dGVkQ29udGFpbmVyVmlld3NdKToKKyAgICAgICAgKC1bRHJhZ0FuZERyb3BTaW11bGF0b3IgX2lu dm9rZURyb3BBbmltYXRpb25Db21wbGV0aW9uQmxvY2tzQW5kQ29uY2x1ZGVEcm9wXSk6CisKIDIw MjAtMDMtMTYgIEp1c3RpbiBNaWNoYXVkICA8anVzdGluX21pY2hhdWRAYXBwbGUuY29tPgogCiAg ICAgICAgIEFkZCBwZXJzb25hbCBlbWFpbCB0byBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvY29udHJpYnV0b3JzLmpzb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvaW9zL0RyYWdBbmREcm9wU2ltdWxhdG9ySU9TLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9p b3MvRHJhZ0FuZERyb3BTaW11bGF0b3JJT1MubW0KaW5kZXggYWIxMThmMjZlYTNlNjdhMmZmY2U5 ZWFmYWQxMDA5NDA5ZTk1ZDNkYy4uMjcxZTY1YzNlZjc2N2Q1ZDYyZmY1NTcwNDgxYzZkZjcwNTI4 M2MxNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3MvRHJhZ0FuZERyb3BTaW11 bGF0b3JJT1MubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3MvRHJhZ0FuZERyb3BTaW11 bGF0b3JJT1MubW0KQEAgLTIzLDEzICsyMywxNCBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgogICovCiAKLSNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJEcmFnQW5k RHJvcFNpbXVsYXRvci5oIgorI2ltcG9ydCAiY29uZmlnLmgiCisjaW1wb3J0ICJEcmFnQW5kRHJv cFNpbXVsYXRvci5oIgogCiAjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkgJiYgUExBVEZPUk0oSU9T X0ZBTUlMWSkgJiYgIVBMQVRGT1JNKE1BQ0NBVEFMWVNUKQogCiAjaW1wb3J0ICJJbnN0YW5jZU1l dGhvZFN3aXp6bGVyLmgiCiAjaW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5oIgorI2ltcG9ydCAi VGVzdC5oIgogI2ltcG9ydCAiVUlLaXRTUEkuaCIKICNpbXBvcnQgPFVJS2l0L1VJRHJhZ0ludGVy YWN0aW9uLmg+CiAjaW1wb3J0IDxVSUtpdC9VSURyYWdJdGVtLmg+CkBAIC01MDAsMTEgKzUwMSwx NiBAQCAtICh2b2lkKV9jb25jbHVkZURyb3BBbmRQZXJmb3JtT3BlcmF0aW9uSWZOZWNlc3NhcnkK ICAgICAgICAgICAgICAgICBpZiAocHJldmlldykKICAgICAgICAgICAgICAgICAgICAgW19kZWxh eWVkRHJvcFByZXZpZXdzIHNldE9iamVjdDpwcmV2aWV3IGF0SW5kZXhlZFN1YnNjcmlwdDpkcm9w UHJldmlld0luZGV4XTsKIAotICAgICAgICAgICAgICAgIGlmICghLS1udW1iZXJPZlBlbmRpbmdQ cmV2aWV3cykKKyAgICAgICAgICAgICAgICBpZiAoIS0tbnVtYmVyT2ZQZW5kaW5nUHJldmlld3Mp IHsKICAgICAgICAgICAgICAgICAgICAgX2lzRG9uZVdhaXRpbmdGb3JEZWxheWVkRHJvcFByZXZp ZXdzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgW3NlbGYgX2V4cGVjdE5vRHJvcFByZXZp ZXdzV2l0aFVucGFyZW50ZWRDb250YWluZXJWaWV3c107CisgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfV07CiAgICAgICAgICAgICArK2Ryb3BQcmV2aWV3SW5kZXg7CiAgICAgICAgIH0K KworICAgICAgICBbc2VsZiBfZXhwZWN0Tm9Ecm9wUHJldmlld3NXaXRoVW5wYXJlbnRlZENvbnRh aW5lclZpZXdzXTsKKwogICAgICAgICBbW193ZWJWaWV3IGRyb3BJbnRlcmFjdGlvbkRlbGVnYXRl XSBkcm9wSW50ZXJhY3Rpb246W193ZWJWaWV3IGRyb3BJbnRlcmFjdGlvbl0gcGVyZm9ybURyb3A6 X2Ryb3BTZXNzaW9uLmdldCgpXTsKICAgICAgICAgX3BoYXNlID0gRHJhZ0FuZERyb3BQaGFzZVBl cmZvcm1pbmdEcm9wOwogCkBAIC04MjYsOCArODMyLDMyIEBAIC0gKHZvaWQpYWRkQ29tcGxldGlv bjoodm9pZCAoXikoVUlWaWV3QW5pbWF0aW5nUG9zaXRpb24pKWNvbXBsZXRpb24KICAgICBfZHJv cEFuaW1hdGlvbkNvbXBsZXRpb25CbG9ja3MuYXBwZW5kKG1ha2VCbG9ja1B0cihjb21wbGV0aW9u KSk7CiB9CiAKKy0gKHZvaWQpX2V4cGVjdE5vRHJvcFByZXZpZXdzV2l0aFVucGFyZW50ZWRDb250 YWluZXJWaWV3cworeworICAgIGF1dG8gY2hlY2tEcm9wUHJldmlldyA9IFsmXShpZCBkcm9wUHJl dmlld09yTnVsbCkgeworICAgICAgICBpZiAoIVtkcm9wUHJldmlld09yTnVsbCBpc0tpbmRPZkNs YXNzOlVJVGFyZ2V0ZWRQcmV2aWV3LmNsYXNzXSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAg ICAgICBhdXRvICpwcmV2aWV3Q29udGFpbmVyID0gWyhVSVRhcmdldGVkRHJhZ1ByZXZpZXcgKilk cm9wUHJldmlld09yTnVsbCB0YXJnZXRdLmNvbnRhaW5lcjsKKyAgICAgICAgaWYgKCFwcmV2aWV3 Q29udGFpbmVyKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmIChbcHJldmlld0Nv bnRhaW5lciBpc0tpbmRPZkNsYXNzOlVJV2luZG93LmNsYXNzXSkKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBFWFBFQ1RfTk9UX05VTEwocHJldmlld0NvbnRhaW5lci53aW5kb3cpOwor ICAgIH07CisKKyAgICBmb3IgKGlkIGRyb3BQcmV2aWV3T3JOdWxsIGluIF9kcm9wUHJldmlld3Mu Z2V0KCkpCisgICAgICAgIGNoZWNrRHJvcFByZXZpZXcoZHJvcFByZXZpZXdPck51bGwpOworCisg ICAgZm9yIChpZCBkcm9wUHJldmlld09yTnVsbCBpbiBfZGVsYXllZERyb3BQcmV2aWV3cy5nZXQo KSkKKyAgICAgICAgY2hlY2tEcm9wUHJldmlldyhkcm9wUHJldmlld09yTnVsbCk7Cit9CisKIC0g KHZvaWQpX2ludm9rZURyb3BBbmltYXRpb25Db21wbGV0aW9uQmxvY2tzQW5kQ29uY2x1ZGVEcm9w CiB7CisgICAgW3NlbGYgX2V4cGVjdE5vRHJvcFByZXZpZXdzV2l0aFVucGFyZW50ZWRDb250YWlu ZXJWaWV3c107CiAgICAgZm9yIChhdXRvIGJsb2NrIDogc3RkOjpleGNoYW5nZShfZHJvcEFuaW1h dGlvbkNvbXBsZXRpb25CbG9ja3MsIHsgfSkpCiAgICAgICAgIGJsb2NrKFVJVmlld0FuaW1hdGlu Z1Bvc2l0aW9uRW5kKTsKICAgICBbW193ZWJWaWV3IGRyb3BJbnRlcmFjdGlvbkRlbGVnYXRlXSBk cm9wSW50ZXJhY3Rpb246W193ZWJWaWV3IGRyb3BJbnRlcmFjdGlvbl0gY29uY2x1ZGVEcm9wOl9k cm9wU2Vzc2lvbi5nZXQoKV07Cg==