223400 2021-03-17 15:13:31 -0700 [iOS] Refactor some gesture deferral logic to account for image extraction 2021-03-17 19:51:55 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1740920 0 wenson_hsieh 2021-03-17 15:13:31 -0700 <rdar://problem/75502285> 1740939 1 423534 wenson_hsieh 2021-03-17 16:02:24 -0700 Created attachment 423534 Patch 1741010 2 ews-feeder 2021-03-17 19:51:54 -0700 Committed r274610: <https://commits.webkit.org/r274610> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423534. 423534 2021-03-17 16:02:24 -0700 2021-03-17 19:51:54 -0700 Patch bug-223400-20210317160223.patch text/plain 15407 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU1MThjMWUwN2U3NzZhYjk4 NWMyMTIwM2U1ZjIzYTE1ZjI2NDI4M2EuLjNlMGM3MzhiNjVkNDBmZWZhNThlODBjZjQ5MWNlNGQ3 OWEwODhiMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcgQEAKKzIwMjEtMDMtMTcgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVmYWN0b3Ig c29tZSBnZXN0dXJlIGRlZmVycmFsIGxvZ2ljIHRvIGFjY291bnQgZm9yIGltYWdlIGV4dHJhY3Rp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQw MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzU1MDIyODU+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Igc29tZSBsb2dpYyBhcm91bmQg ZGVmZXJyaW5nIGdlc3R1cmVzLiBTZWUgYmVsb3cgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICog VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgc2V0VXBJbnRlcmFjdGlvbl0pOgorCisgICAgICAgIFJlbmFtZSBhIGZldyBl eGlzdGluZyBkZWZlcnJpbmcgZ2VzdHVyZXMsIHRvIGJldHRlciByZWZsZWN0IHRoYXQgdGhlIG5h bWVzIGFyZSBkZWZlcnJhbCByZWFzb25zIChpLmUuIHRvdWNoCisgICAgICAgIHN0YXJ0LCB0b3Vj aCBlbmQsIG9yIGltYWdlIGV4dHJhY3Rpb24pLCByYXRoZXIgdGhhbiB0aGUgbmFtZXMgb2YgdGhl IHRoaW5ncyBiZWluZyBkZWZlcnJlZC4KKworICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRlZmVy cmluZ0dlc3R1cmVzXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RvbmVEZWZlcnJpbmdU b3VjaFN0YXJ0Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kb25lRGVmZXJyaW5nVG91 Y2hFbmQ6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgaGFzU2VsZWN0YWJsZVBvc2l0aW9u QXRQb2ludDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyB0ZXh0SW50ZXJhY3Rpb25HZXN0 dXJlOnNob3VsZEJlZ2luQXRQb2ludDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkZWZl cnJpbmdHZXN0dXJlUmVjb2duaXplcjpzaG91bGREZWZlck90aGVyR2VzdHVyZVJlY29nbml6ZXI6 XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2VuZEltYWdlRXh0cmFjdGlvbkdlc3R1cmVE ZWZlcnJhbDpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLRGVmZXJyaW5nR2VzdHVyZVJl Y29nbml6ZXIuaDoKKworICAgICAgICBBZGQgYSBwcm9wZXJ0eSB0byBpbmRpY2F0ZSB0aGF0IHRo ZSBkZWZlcnJpbmcgZ2VzdHVyZSByZWNvZ25pemVyIHNob3VsZCBpbW1lZGlhdGVseSBmYWlsIHVw b24gdG91Y2hlbmQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLRGVmZXJyaW5nR2VzdHVy ZVJlY29nbml6ZXIubW06CisgICAgICAgICgtW1dLRGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXIg dG91Y2hlc0VuZGVkOndpdGhFdmVudDpdKToKKyAgICAgICAgKC1bV0tEZWZlcnJpbmdHZXN0dXJl UmVjb2duaXplciBlbmREZWZlcnJhbDpdKToKKyAgICAgICAgKC1bV0tEZWZlcnJpbmdHZXN0dXJl UmVjb2duaXplciBzZXREZWZhdWx0UHJldmVudGVkOl0pOiBEZWxldGVkLgorCisgICAgICAgIFJl bmFtZSBgLXNldERlZmF1bHRQcmV2ZW50ZWQ6YCB0byBgLWVuZERlZmVycmFsOmAgdG8gZGVjb3Vw bGUgdGhpcyB0ZXJtaW5vbG9neSBmcm9tIGBFdmVudC5wcmV2ZW50RGVmYXVsdCgpYCBpbgorICAg ICAgICBiaW5kaW5ncyAod2hpY2ggaXMgaW1wb3J0YW50LCBub3cgdGhhdCB3ZSBoYXZlIGEgbmV3 IGRlZmVycmVyIHRoYXQgaXMgbm90IGFzc29jaWF0ZWQgd2l0aCB0b3VjaCBldmVudHMpLgorICAg ICAgICBBZGRpdGlvbmFsbHksIGNoYW5nZSB0aGlzIHRha2UgYW4gYGVudW0gY2xhc3NgIGluc3Rl YWQgb2YgYSBgQk9PTGAgdG8gaGVscCBjbGFyaWZ5IHRoZSBpbnRlbnQgb2YgdGhlIGdpdmVuIGZs YWcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLSW1hZ2VFeHRyYWN0aW9uR2VzdHVyZVJl Y29nbml6ZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLSW1hZ2VFeHRyYWN0aW9uR2Vz dHVyZVJlY29nbml6ZXIubW06CisgICAgICAgICgtW1dLSW1hZ2VFeHRyYWN0aW9uR2VzdHVyZVJl Y29nbml6ZXIgc2V0U3RhdGU6XSk6CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIGEgbmV3IGlt YWdlIGV4dHJhY3Rpb24gZ2VzdHVyZSBkZWxlZ2F0ZSBtZXRob2Qgd2hpY2ggaW5mb3JtcyB0aGUg Y2xpZW50IHRoYXQgdGhlIGdlc3R1cmUgaGFzCisgICAgICAgIHRyYW5zaXRpb25lZCB0byBGYWls ZWQgc3RhdGUuCisKIDIwMjEtMDMtMTYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgogCiAgICAgICAgIFttYWNPU10gY2hhbmdlIGZvciB0aGUgbGFuZ3VhZ2Uvc3VidGl0bGUgdHJh Y2tzIGJ1dHRvbiB0byB1c2UgYW4gYE5TTWVudWAgaW5zdGVhZCBvZiB3ZWIgY29udGVudApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5oCmluZGV4IDg2OTM3ZGMzYWJkNGY3NDg5MzlmMzU0YmFjZmNkZTdjMjY1YTZjOWYuLjk3 ZmI1MmI4YTQyNmI3MmViMDk4YWFiOGJiOGI4NDM2ODM4MWFmM2YgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAg LTI0Niw2ICsyNDYsOSBAQCBlbnVtIGNsYXNzIFByb2NlZWRXaXRoSW1hZ2VFeHRyYWN0aW9uIDog Ym9vbCB7CiAgICAgUmV0YWluUHRyPFdLRGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXI+IF90b3Vj aEVuZERlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyRm9ySW1tZWRpYXRlbHlSZXNldHRhYmxlR2Vz dHVyZXM7CiAgICAgUmV0YWluUHRyPFdLRGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXI+IF90b3Vj aEVuZERlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyRm9yRGVsYXllZFJlc2V0dGFibGVHZXN0dXJl czsKICAgICBSZXRhaW5QdHI8V0tEZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplcj4gX3RvdWNoRW5k RGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXJGb3JTeW50aGV0aWNUYXBHZXN0dXJlczsKKyNpZiBF TkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKyAgICBSZXRhaW5QdHI8V0tEZWZlcnJpbmdHZXN0dXJl UmVjb2duaXplcj4gX2ltYWdlRXh0cmFjdGlvbkRlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyOwor I2VuZGlmCiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6R2VzdHVyZVJlY29nbml6ZXJDb25z aXN0ZW5jeUVuZm9yY2VyPiBfZ2VzdHVyZVJlY29nbml6ZXJDb25zaXN0ZW5jeUVuZm9yY2VyOwog ICAgIFJldGFpblB0cjxVSVdlYlRvdWNoRXZlbnRzR2VzdHVyZVJlY29nbml6ZXI+IF90b3VjaEV2 ZW50R2VzdHVyZVJlY29nbml6ZXI7CiAKQEAgLTY5Niw2ICs2OTksMTAgQEAgRk9SX0VBQ0hfUFJJ VkFURV9XS0NPTlRFTlRWSUVXX0FDVElPTihERUNMQVJFX1dLQ09OVEVOVFZJRVdfQUNUSU9OX0ZP Ul9XRUJfVklFVykKIC0gKHZvaWQpc2V0VXBBcHBIaWdobGlnaHRNZW51c0lmTmVlZGVkOwogI2Vu ZGlmCiAKKyNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKy0gKHZvaWQpX2VuZEltYWdlRXh0 cmFjdGlvbkdlc3R1cmVEZWZlcnJhbDooV2ViS2l0OjpTaG91bGRQcmV2ZW50R2VzdHVyZXMpc2hv dWxkUHJldmVudEdlc3R1cmVzOworI2VuZGlmCisKIEBlbmQKIAogQGludGVyZmFjZSBXS0NvbnRl bnRWaWV3IChXS1Rlc3RpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCAwODc2MGZhZDc2NDVmNTFjNmFi NmM3ODY0MWMyZDY4ODMyY2E1NmJmLi5lM2I1OGRiMWMyY2E5ZDE0MDUwOGMzZDJkZjYxYzJhM2Q3 MzUwODIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTc3NCwyMiArNzc0LDI4IEBAIC0gKHZvaWQpc2V0 VXBJbnRlcmFjdGlvbgogICAgIFtzZWxmIGFkZEdlc3R1cmVSZWNvZ25pemVyOl90b3VjaEFjdGlv bkRvd25Td2lwZUdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKIAogICAgIF90b3VjaFN0YXJ0RGVm ZXJyaW5nR2VzdHVyZVJlY29nbml6ZXJGb3JJbW1lZGlhdGVseVJlc2V0dGFibGVHZXN0dXJlcyA9 IGFkb3B0TlMoW1tXS0RlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyIGFsbG9jXSBpbml0V2l0aERl ZmVycmluZ0dlc3R1cmVEZWxlZ2F0ZTpzZWxmXSk7Ci0gICAgW190b3VjaFN0YXJ0RGVmZXJyaW5n R2VzdHVyZVJlY29nbml6ZXJGb3JJbW1lZGlhdGVseVJlc2V0dGFibGVHZXN0dXJlcyBzZXROYW1l OkAiVG91Y2ggc3RhcnQgZGVmZXJyZXIgKGltbWVkaWF0ZSByZXNldCkiXTsKKyAgICBbX3RvdWNo U3RhcnREZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplckZvckltbWVkaWF0ZWx5UmVzZXR0YWJsZUdl c3R1cmVzIHNldE5hbWU6QCJEZWZlcnJlciBmb3IgdG91Y2ggc3RhcnQgKGltbWVkaWF0ZSByZXNl dCkiXTsKIAogICAgIF90b3VjaFN0YXJ0RGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXJGb3JEZWxh eWVkUmVzZXR0YWJsZUdlc3R1cmVzID0gYWRvcHROUyhbW1dLRGVmZXJyaW5nR2VzdHVyZVJlY29n bml6ZXIgYWxsb2NdIGluaXRXaXRoRGVmZXJyaW5nR2VzdHVyZURlbGVnYXRlOnNlbGZdKTsKLSAg ICBbX3RvdWNoU3RhcnREZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplckZvckRlbGF5ZWRSZXNldHRh YmxlR2VzdHVyZXMgc2V0TmFtZTpAIlRvdWNoIHN0YXJ0IGRlZmVycmVyIChkZWxheWVkIHJlc2V0 KSJdOworICAgIFtfdG91Y2hTdGFydERlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyRm9yRGVsYXll ZFJlc2V0dGFibGVHZXN0dXJlcyBzZXROYW1lOkAiRGVmZXJyZXIgZm9yIHRvdWNoIHN0YXJ0IChk ZWxheWVkIHJlc2V0KSJdOwogCiAgICAgX3RvdWNoU3RhcnREZWZlcnJpbmdHZXN0dXJlUmVjb2du aXplckZvclN5bnRoZXRpY1RhcEdlc3R1cmVzID0gYWRvcHROUyhbW1dLRGVmZXJyaW5nR2VzdHVy ZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoRGVmZXJyaW5nR2VzdHVyZURlbGVnYXRlOnNlbGZd KTsKLSAgICBbX3RvdWNoU3RhcnREZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplckZvclN5bnRoZXRp Y1RhcEdlc3R1cmVzIHNldE5hbWU6QCJUb3VjaCBzdGFydCBkZWZlcnJlciAoc3ludGhldGljIHRh cCkiXTsKKyAgICBbX3RvdWNoU3RhcnREZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplckZvclN5bnRo ZXRpY1RhcEdlc3R1cmVzIHNldE5hbWU6QCJEZWZlcnJlciBmb3IgdG91Y2ggc3RhcnQgKHN5bnRo ZXRpYyB0YXApIl07CiAKICAgICBfdG91Y2hFbmREZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplckZv ckltbWVkaWF0ZWx5UmVzZXR0YWJsZUdlc3R1cmVzID0gYWRvcHROUyhbW1dLRGVmZXJyaW5nR2Vz dHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoRGVmZXJyaW5nR2VzdHVyZURlbGVnYXRlOnNl bGZdKTsKLSAgICBbX3RvdWNoRW5kRGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXJGb3JJbW1lZGlh dGVseVJlc2V0dGFibGVHZXN0dXJlcyBzZXROYW1lOkAiVG91Y2ggZW5kIGRlZmVycmVyIChpbW1l ZGlhdGUgcmVzZXQpIl07CisgICAgW190b3VjaEVuZERlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVy Rm9ySW1tZWRpYXRlbHlSZXNldHRhYmxlR2VzdHVyZXMgc2V0TmFtZTpAIkRlZmVycmVyIGZvciB0 b3VjaCBlbmQgKGltbWVkaWF0ZSByZXNldCkiXTsKIAogICAgIF90b3VjaEVuZERlZmVycmluZ0dl c3R1cmVSZWNvZ25pemVyRm9yRGVsYXllZFJlc2V0dGFibGVHZXN0dXJlcyA9IGFkb3B0TlMoW1tX S0RlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyIGFsbG9jXSBpbml0V2l0aERlZmVycmluZ0dlc3R1 cmVEZWxlZ2F0ZTpzZWxmXSk7Ci0gICAgW190b3VjaEVuZERlZmVycmluZ0dlc3R1cmVSZWNvZ25p emVyRm9yRGVsYXllZFJlc2V0dGFibGVHZXN0dXJlcyBzZXROYW1lOkAiVG91Y2ggZW5kIGRlZmVy cmVyIChkZWxheWVkIHJlc2V0KSJdOworICAgIFtfdG91Y2hFbmREZWZlcnJpbmdHZXN0dXJlUmVj b2duaXplckZvckRlbGF5ZWRSZXNldHRhYmxlR2VzdHVyZXMgc2V0TmFtZTpAIkRlZmVycmVyIGZv ciB0b3VjaCBlbmQgKGRlbGF5ZWQgcmVzZXQpIl07CiAKICAgICBfdG91Y2hFbmREZWZlcnJpbmdH ZXN0dXJlUmVjb2duaXplckZvclN5bnRoZXRpY1RhcEdlc3R1cmVzID0gYWRvcHROUyhbW1dLRGVm ZXJyaW5nR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoRGVmZXJyaW5nR2VzdHVyZURl bGVnYXRlOnNlbGZdKTsKLSAgICBbX3RvdWNoRW5kRGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXJG b3JTeW50aGV0aWNUYXBHZXN0dXJlcyBzZXROYW1lOkAiVG91Y2ggZW5kIGRlZmVycmVyIChzeW50 aGV0aWMgdGFwKSJdOworICAgIFtfdG91Y2hFbmREZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplckZv clN5bnRoZXRpY1RhcEdlc3R1cmVzIHNldE5hbWU6QCJEZWZlcnJlciBmb3IgdG91Y2ggZW5kIChz eW50aGV0aWMgdGFwKSJdOworCisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCisgICAgX2lt YWdlRXh0cmFjdGlvbkRlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyID0gYWRvcHROUyhbW1dLRGVm ZXJyaW5nR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoRGVmZXJyaW5nR2VzdHVyZURl bGVnYXRlOnNlbGZdKTsKKyAgICBbX2ltYWdlRXh0cmFjdGlvbkRlZmVycmluZ0dlc3R1cmVSZWNv Z25pemVyIHNldE5hbWU6QCJEZWZlcnJlciBmb3IgaW1hZ2UgZXh0cmFjdGlvbiJdOworICAgIFtf aW1hZ2VFeHRyYWN0aW9uRGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXIgc2V0SW1tZWRpYXRlbHlG YWlsc0FmdGVyVG91Y2hFbmQ6WUVTXTsKKyNlbmRpZgogCiAgICAgZm9yIChXS0RlZmVycmluZ0dl c3R1cmVSZWNvZ25pemVyICpnZXN0dXJlIGluIHNlbGYuZGVmZXJyaW5nR2VzdHVyZXMpIHsKICAg ICAgICAgZ2VzdHVyZS5kZWxlZ2F0ZSA9IHNlbGY7CkBAIC0xNzYwLDkgKzE3NjYsMTIgQEAgLSAo V2ViS2l0OjpHZXN0dXJlUmVjb2duaXplckNvbnNpc3RlbmN5RW5mb3JjZXImKWdlc3R1cmVSZWNv Z25pemVyQ29uc2lzdGVuY3lFbmYKIAogLSAoTlNBcnJheTxXS0RlZmVycmluZ0dlc3R1cmVSZWNv Z25pemVyICo+ICopZGVmZXJyaW5nR2VzdHVyZXMKIHsKLSAgICBhdXRvIGdlc3R1cmVzID0gW05T TXV0YWJsZUFycmF5IGFycmF5V2l0aENhcGFjaXR5OjZdOworICAgIGF1dG8gZ2VzdHVyZXMgPSBb TlNNdXRhYmxlQXJyYXkgYXJyYXlXaXRoQ2FwYWNpdHk6N107CiAgICAgW2dlc3R1cmVzIGFkZE9i amVjdHNGcm9tQXJyYXk6c2VsZi5fdG91Y2hTdGFydERlZmVycmluZ0dlc3R1cmVzXTsKICAgICBb Z2VzdHVyZXMgYWRkT2JqZWN0c0Zyb21BcnJheTpzZWxmLl90b3VjaEVuZERlZmVycmluZ0dlc3R1 cmVzXTsKKyNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKKyAgICBbZ2VzdHVyZXMgYWRkT2Jq ZWN0Ol9pbWFnZUV4dHJhY3Rpb25EZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplci5nZXQoKV07Cisj ZW5kaWYKICAgICByZXR1cm4gZ2VzdHVyZXM7CiB9CiAKQEAgLTE3OTcsMTMgKzE4MDYsMTMgQEAg LSAoTlNBcnJheTxXS0RlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyICo+ICopX3RvdWNoRW5kRGVm ZXJyaW5nR2VzdHVyZXMKIC0gKHZvaWQpX2RvbmVEZWZlcnJpbmdUb3VjaFN0YXJ0OihCT09MKXBy ZXZlbnROYXRpdmVHZXN0dXJlcwogewogICAgIGZvciAoV0tEZWZlcnJpbmdHZXN0dXJlUmVjb2du aXplciAqZ2VzdHVyZSBpbiBzZWxmLl90b3VjaFN0YXJ0RGVmZXJyaW5nR2VzdHVyZXMpCi0gICAg ICAgIFtnZXN0dXJlIHNldERlZmF1bHRQcmV2ZW50ZWQ6cHJldmVudE5hdGl2ZUdlc3R1cmVzXTsK KyAgICAgICAgW2dlc3R1cmUgZW5kRGVmZXJyYWw6cHJldmVudE5hdGl2ZUdlc3R1cmVzID8gV2Vi S2l0OjpTaG91bGRQcmV2ZW50R2VzdHVyZXM6OlllcyA6IFdlYktpdDo6U2hvdWxkUHJldmVudEdl c3R1cmVzOjpOb107CiB9CiAKIC0gKHZvaWQpX2RvbmVEZWZlcnJpbmdUb3VjaEVuZDooQk9PTClw cmV2ZW50TmF0aXZlR2VzdHVyZXMKIHsKICAgICBmb3IgKFdLRGVmZXJyaW5nR2VzdHVyZVJlY29n bml6ZXIgKmdlc3R1cmUgaW4gc2VsZi5fdG91Y2hFbmREZWZlcnJpbmdHZXN0dXJlcykKLSAgICAg ICAgW2dlc3R1cmUgc2V0RGVmYXVsdFByZXZlbnRlZDpwcmV2ZW50TmF0aXZlR2VzdHVyZXNdOwor ICAgICAgICBbZ2VzdHVyZSBlbmREZWZlcnJhbDpwcmV2ZW50TmF0aXZlR2VzdHVyZXMgPyBXZWJL aXQ6OlNob3VsZFByZXZlbnRHZXN0dXJlczo6WWVzIDogV2ViS2l0OjpTaG91bGRQcmV2ZW50R2Vz dHVyZXM6Ok5vXTsKIH0KIAogLSAoQk9PTClfaXNUb3VjaFN0YXJ0RGVmZXJyaW5nR2VzdHVyZToo V0tEZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmUKQEAgLTI2NjcsNyArMjY3Niw3 IEBAIC0gKEJPT0wpaGFzU2VsZWN0YWJsZVBvc2l0aW9uQXRQb2ludDooQ0dQb2ludClwb2ludAog CiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCiAgICAgaWYgKF9lbGVtZW50UGVuZGluZ0lt YWdlRXh0cmFjdGlvbiAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5lbGVtZW50Q29udGV4dCA9PSBf ZWxlbWVudFBlbmRpbmdJbWFnZUV4dHJhY3Rpb24pCi0gICAgICAgIHJldHVybiBOTzsKKyAgICAg ICAgcmV0dXJuIFlFUzsKICNlbmRpZgogCiAgICAgcmV0dXJuIF9wb3NpdGlvbkluZm9ybWF0aW9u LmlzU2VsZWN0YWJsZTsKQEAgLTI3NDUsNyArMjc1NCw3IEBAIC0gKEJPT0wpdGV4dEludGVyYWN0 aW9uR2VzdHVyZTooVUlXS0dlc3R1cmVUeXBlKWdlc3R1cmUgc2hvdWxkQmVnaW5BdFBvaW50OihD R1BvCiAKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKICAgICBpZiAoX2VsZW1lbnRQZW5k aW5nSW1hZ2VFeHRyYWN0aW9uICYmIF9wb3NpdGlvbkluZm9ybWF0aW9uLmVsZW1lbnRDb250ZXh0 ID09IF9lbGVtZW50UGVuZGluZ0ltYWdlRXh0cmFjdGlvbikKLSAgICAgICAgcmV0dXJuIE5POwor ICAgICAgICByZXR1cm4gWUVTOwogI2VuZGlmCiAKICAgICAvLyBJZiB3ZSdyZSBjdXJyZW50bHkg Zm9jdXNpbmcgYW4gZWRpdGFibGUgZWxlbWVudCwgb25seSBhbGxvdyB0aGUgc2VsZWN0aW9uIHRv IG1vdmUgd2l0aGluIHRoYXQgZm9jdXNlZCBlbGVtZW50LgpAQCAtNzYwOCw2ICs3NjE3LDE0IEBA IC0gKEJPT0wpZGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXI6KFdLRGVmZXJyaW5nR2VzdHVyZVJl Y29nbml6ZXIgKilkZWZlcnJpbmdHZXN0CiAgICAgaWYgKGdlc3R1cmVSZWNvZ25pemVyID09IF90 b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIpCiAgICAgICAgIHJldHVybiBOTzsKIAorICAgIEJP T0wgaXNMb3VwZUdlc3R1cmUgPSBnZXN0dXJlUmVjb2duaXplciA9PSBbX3RleHRJbnRlcmFjdGlv bkFzc2lzdGFudCBsb3VwZUdlc3R1cmVdOworICAgIEJPT0wgaXNUYXBBbmRBSGFsZkdlc3R1cmUg PSBbZ2VzdHVyZVJlY29nbml6ZXIgaXNLaW5kT2ZDbGFzczp0YXBBbmRBSGFsZlJlY29nbml6ZXJD bGFzcygpXTsKKworI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQorICAgIGlmIChkZWZlcnJp bmdHZXN0dXJlUmVjb2duaXplciA9PSBfaW1hZ2VFeHRyYWN0aW9uRGVmZXJyaW5nR2VzdHVyZVJl Y29nbml6ZXIpCisgICAgICAgIHJldHVybiBpc0xvdXBlR2VzdHVyZSB8fCBpc1RhcEFuZEFIYWxm R2VzdHVyZSB8fCBnZXN0dXJlUmVjb2duaXplciA9PSBbX3RleHRJbnRlcmFjdGlvbkFzc2lzdGFu dCBmb3JjZVByZXNzR2VzdHVyZV07CisjZW5kaWYKKwogICAgIGF1dG8gbWF5RGVsYXlSZXNldE9m Q29udGFpbmluZ1N1YmdyYXBoID0gWyZdKFVJR2VzdHVyZVJlY29nbml6ZXIgKmdlc3R1cmUpIC0+ IEJPT0wgewogI2lmIFVTRShVSUNPTlRFWFRNRU5VKSAmJiBIQVZFKExJTktfUFJFVklFVykKICAg ICAgICAgaWYgKGdlc3R1cmUgPT0gW19jb250ZXh0TWVudUludGVyYWN0aW9uIGdlc3R1cmVSZWNv Z25pemVyRm9yRmFpbHVyZVJlbGF0aW9uc2hpcHNdKQpAQCAtNzYxOSwxMCArNzYzNiwxMCBAQCAt IChCT09MKWRlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyOihXS0RlZmVycmluZ0dlc3R1cmVSZWNv Z25pemVyICopZGVmZXJyaW5nR2VzdAogICAgICAgICAgICAgcmV0dXJuIFlFUzsKICNlbmRpZgog Ci0gICAgICAgIGlmIChbZ2VzdHVyZSBpc0tpbmRPZkNsYXNzOnRhcEFuZEFIYWxmUmVjb2duaXpl ckNsYXNzKCldKQorICAgICAgICBpZiAoaXNUYXBBbmRBSGFsZkdlc3R1cmUpCiAgICAgICAgICAg ICByZXR1cm4gWUVTOwogCi0gICAgICAgIGlmIChnZXN0dXJlID09IFtfdGV4dEludGVyYWN0aW9u QXNzaXN0YW50IGxvdXBlR2VzdHVyZV0pCisgICAgICAgIGlmIChpc0xvdXBlR2VzdHVyZSkKICAg ICAgICAgICAgIHJldHVybiBZRVM7CiAKICAgICAgICAgaWYgKFtnZXN0dXJlIGlzS2luZE9mQ2xh c3M6VUlUYXBHZXN0dXJlUmVjb2duaXplci5jbGFzc10pIHsKQEAgLTk0MDIsNiArOTQxOSwxMSBA QCAtICh2b2lkKV93cml0ZVByb21pc2VkQXR0YWNobWVudFRvUGFzdGVib2FyZDooV2ViQ29yZTo6 UHJvbWlzZWRBdHRhY2htZW50SW5mbyYmKQogCiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04p CiAKKy0gKHZvaWQpX2VuZEltYWdlRXh0cmFjdGlvbkdlc3R1cmVEZWZlcnJhbDooV2ViS2l0OjpT aG91bGRQcmV2ZW50R2VzdHVyZXMpc2hvdWxkUHJldmVudEdlc3R1cmVzCit7CisgICAgW19pbWFn ZUV4dHJhY3Rpb25EZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplciBlbmREZWZlcnJhbDpzaG91bGRQ cmV2ZW50R2VzdHVyZXNdOworfQorCiAtICh2b2lkKV9kb0FmdGVyUGVuZGluZ0ltYWdlRXh0cmFj dGlvbjoodm9pZCheKShXZWJLaXQ6OlByb2NlZWRXaXRoSW1hZ2VFeHRyYWN0aW9uIHByb2NlZWRX aXRoSW1hZ2VFeHRyYWN0aW9uKSlibG9jawogewogICAgIGlmIChfaGFzUGVuZGluZ0ltYWdlRXh0 cmFjdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0RlZmVy cmluZ0dlc3R1cmVSZWNvZ25pemVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tE ZWZlcnJpbmdHZXN0dXJlUmVjb2duaXplci5oCmluZGV4IDBmM2I1MmI5NWU3Yzc5M2MyYWNjZmQ4 YzgyZTJkOGZlZmEzMjRmMTkuLjE5YzgxMmIyZWUwZmRiOTdmNWM3YmM2NWUwZGE2MGYzZWVhZDA0 M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0RlZmVycmluZ0dl c3R1cmVSZWNvZ25pemVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLRGVm ZXJyaW5nR2VzdHVyZVJlY29nbml6ZXIuaApAQCAtMzAsNiArMzAsNyBAQAogbmFtZXNwYWNlIFdl YktpdCB7CiAKIGVudW0gY2xhc3MgU2hvdWxkRGVmZXJHZXN0dXJlcyA6IGJvb2wgeyBObywgWWVz IH07CitlbnVtIGNsYXNzIFNob3VsZFByZXZlbnRHZXN0dXJlcyA6IGJvb2wgeyBObywgWWVzIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCkBAIC00NSw4ICs0NiwxMSBAQCBlbnVtIGNsYXNz IFNob3VsZERlZmVyR2VzdHVyZXMgOiBib29sIHsgTm8sIFllcyB9OwogQGludGVyZmFjZSBXS0Rl ZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyIDogVUlHZXN0dXJlUmVjb2duaXplcgogCiAtIChpbnN0 YW5jZXR5cGUpaW5pdFdpdGhEZWZlcnJpbmdHZXN0dXJlRGVsZWdhdGU6KGlkIDxXS0RlZmVycmlu Z0dlc3R1cmVSZWNvZ25pemVyRGVsZWdhdGU+KWRlZmVycmluZ0dlc3R1cmVEZWxlZ2F0ZTsKLS0g KHZvaWQpc2V0RGVmYXVsdFByZXZlbnRlZDooQk9PTClkZWZhdWx0UHJldmVudGVkOworCiAtIChC T09MKXNob3VsZERlZmVyR2VzdHVyZVJlY29nbml6ZXI6KFVJR2VzdHVyZVJlY29nbml6ZXIgKiln ZXN0dXJlUmVjb2duaXplcjsKKy0gKHZvaWQpZW5kRGVmZXJyYWw6KFdlYktpdDo6U2hvdWxkUHJl dmVudEdlc3R1cmVzKXNob3VsZFByZXZlbnRHZXN0dXJlczsKKworQHByb3BlcnR5IChub25hdG9t aWMpIEJPT0wgaW1tZWRpYXRlbHlGYWlsc0FmdGVyVG91Y2hFbmQ7CiAKIEBlbmQKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLRGVmZXJyaW5nR2VzdHVyZVJlY29n bml6ZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEZWZlcnJpbmdHZXN0dXJl UmVjb2duaXplci5tbQppbmRleCA4ZTY1NWQ3NmRlMzRhZjg1YmFkNzA1MDQyMzE4MWE1ZjQ4Zjk4 OTdjLi5hOWNjYzdiOGExNTE4MjcxYTAxNzM5ZWMxMGVhN2M0ZDlhY2NiZTcxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEZWZlcnJpbmdHZXN0dXJlUmVjb2duaXpl ci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tEZWZlcnJpbmdHZXN0dXJl UmVjb2duaXplci5tbQpAQCAtNTQsNiArNTQsOSBAQCAtICh2b2lkKXRvdWNoZXNFbmRlZDooTlNT ZXQ8VUlUb3VjaCAqPiAqKXRvdWNoZXMgd2l0aEV2ZW50OihVSUV2ZW50ICopZXZlbnQKIHsKICAg ICBbc3VwZXIgdG91Y2hlc0VuZGVkOnRvdWNoZXMgd2l0aEV2ZW50OmV2ZW50XTsKIAorICAgIGlm IChzZWxmLmltbWVkaWF0ZWx5RmFpbHNBZnRlclRvdWNoRW5kKQorICAgICAgICBzZWxmLnN0YXRl ID0gVUlHZXN0dXJlUmVjb2duaXplclN0YXRlRmFpbGVkOworCiAgICAgW19kZWZlcnJpbmdHZXN0 dXJlRGVsZWdhdGUgZGVmZXJyaW5nR2VzdHVyZVJlY29nbml6ZXI6c2VsZiBkaWRFbmRUb3VjaGVz V2l0aEV2ZW50OmV2ZW50XTsKIH0KIApAQCAtNjMsOSArNjYsOSBAQCAtICh2b2lkKXRvdWNoZXND YW5jZWxsZWQ6KE5TU2V0PFVJVG91Y2ggKj4gKil0b3VjaGVzIHdpdGhFdmVudDooVUlFdmVudCAq KWV2ZW50CiAgICAgc2VsZi5zdGF0ZSA9IFVJR2VzdHVyZVJlY29nbml6ZXJTdGF0ZUZhaWxlZDsK IH0KIAotLSAodm9pZClzZXREZWZhdWx0UHJldmVudGVkOihCT09MKWRlZmF1bHRQcmV2ZW50ZWQK Ky0gKHZvaWQpZW5kRGVmZXJyYWw6KFdlYktpdDo6U2hvdWxkUHJldmVudEdlc3R1cmVzKXNob3Vs ZFByZXZlbnRHZXN0dXJlcwogewotICAgIGlmIChkZWZhdWx0UHJldmVudGVkKQorICAgIGlmIChz aG91bGRQcmV2ZW50R2VzdHVyZXMgPT0gV2ViS2l0OjpTaG91bGRQcmV2ZW50R2VzdHVyZXM6Olll cykKICAgICAgICAgc2VsZi5zdGF0ZSA9IFVJR2VzdHVyZVJlY29nbml6ZXJTdGF0ZUVuZGVkOwog ICAgIGVsc2UKICAgICAgICAgc2VsZi5zdGF0ZSA9IFVJR2VzdHVyZVJlY29nbml6ZXJTdGF0ZUZh aWxlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0ltYWdlRXh0 cmFjdGlvbkdlc3R1cmVSZWNvZ25pemVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tJbWFnZUV4dHJhY3Rpb25HZXN0dXJlUmVjb2duaXplci5oCmluZGV4IDA4MWFiMWI3ZjAyZGNi ZGNkM2JhNjNmZDhlMDJmODg2MGE3ZTIzNDguLjI5ZGEwYTBlMzBjNmU2YjlkZjM5ZmJjMzA5YWNm MGRjOTdlOTFiZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0lt YWdlRXh0cmFjdGlvbkdlc3R1cmVSZWNvZ25pemVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLSW1hZ2VFeHRyYWN0aW9uR2VzdHVyZVJlY29nbml6ZXIuaApAQCAtMzMsNiAr MzMsNyBAQAogCiBAcHJvdG9jb2wgV0tJbWFnZUV4dHJhY3Rpb25HZXN0dXJlUmVjb2duaXplckRl bGVnYXRlIDxVSUdlc3R1cmVSZWNvZ25pemVyRGVsZWdhdGU+CiAtICh2b2lkKWltYWdlRXh0cmFj dGlvbkdlc3R1cmVEaWRCZWdpbjooV0tJbWFnZUV4dHJhY3Rpb25HZXN0dXJlUmVjb2duaXplciAq KWdlc3R1cmU7CistICh2b2lkKWltYWdlRXh0cmFjdGlvbkdlc3R1cmVEaWRGYWlsOihXS0ltYWdl RXh0cmFjdGlvbkdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZTsKIEBlbmQKIAogQGludGVyZmFj ZSBXS0ltYWdlRXh0cmFjdGlvbkdlc3R1cmVSZWNvZ25pemVyIDogVUlMb25nUHJlc3NHZXN0dXJl UmVjb2duaXplcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLSW1h Z2VFeHRyYWN0aW9uR2VzdHVyZVJlY29nbml6ZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tJbWFnZUV4dHJhY3Rpb25HZXN0dXJlUmVjb2duaXplci5tbQppbmRleCA1NmJmY2Fm OGYxOWI1NWY1MDJjM2ZkNzYwZWRhMDEwNmE0NDg3ODIzLi4xMGU4MzQzMjBjZjkxZjAyZDU0YTk5 NGU3NzUxNTMxNGJiNDlhN2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tJbWFnZUV4dHJhY3Rpb25HZXN0dXJlUmVjb2duaXplci5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tJbWFnZUV4dHJhY3Rpb25HZXN0dXJlUmVjb2duaXplci5tbQpA QCAtNTEsOCArNTEsMTMgQEAgLSAodm9pZClzZXRTdGF0ZTooVUlHZXN0dXJlUmVjb2duaXplclN0 YXRlKXN0YXRlCiAgICAgc3VwZXIuc3RhdGUgPSBzdGF0ZTsKIAogICAgIGF1dG8gbmV3U3RhdGUg PSBzZWxmLnN0YXRlOwotICAgIGlmIChwcmV2aW91c1N0YXRlICE9IG5ld1N0YXRlICYmIG5ld1N0 YXRlID09IFVJR2VzdHVyZVJlY29nbml6ZXJTdGF0ZUJlZ2FuKQorICAgIGlmIChwcmV2aW91c1N0 YXRlID09IG5ld1N0YXRlKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAobmV3U3RhdGUgPT0g VUlHZXN0dXJlUmVjb2duaXplclN0YXRlQmVnYW4pCiAgICAgICAgIFtfaW1hZ2VFeHRyYWN0aW9u RGVsZWdhdGUgaW1hZ2VFeHRyYWN0aW9uR2VzdHVyZURpZEJlZ2luOnNlbGZdOworICAgIGVsc2Ug aWYgKG5ld1N0YXRlID09IFVJR2VzdHVyZVJlY29nbml6ZXJTdGF0ZUZhaWxlZCkKKyAgICAgICAg W19pbWFnZUV4dHJhY3Rpb25EZWxlZ2F0ZSBpbWFnZUV4dHJhY3Rpb25HZXN0dXJlRGlkRmFpbDpz ZWxmXTsKIH0KIAogQGVuZAo=