226030 2021-05-20 11:00:41 -0700 Move off UIKit IPI in WKMouseGestureRecognizer 2021-05-20 12:59:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton hi webkit-bug-importer wenson_hsieh oldest_to_newest 1762037 0 thorton 2021-05-20 11:00:41 -0700 Move off UIKit IPI in WKMouseGestureRecognizer 1762038 1 429189 thorton 2021-05-20 11:01:14 -0700 Created attachment 429189 Patch 1762039 2 thorton 2021-05-20 11:01:16 -0700 <rdar://problem/78266173> 1762046 3 429189 hi 2021-05-20 11:10:28 -0700 Comment on attachment 429189 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429189&action=review r=me > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1662 > + if (gestureRecognizer == _mouseGestureRecognizer) NIT: Can we merge this with the above `if`? > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1687 > + return gestureRecognizer != _mouseGestureRecognizer; I think this needs to be in `#if HAVE(UIKIT_WITH_MOUSE_SUPPORT)`. 1762047 4 429189 wenson_hsieh 2021-05-20 11:10:37 -0700 Comment on attachment 429189 Patch r=mews (once the watch/tv builds are fixed) 1762049 5 429193 thorton 2021-05-20 11:11:43 -0700 Created attachment 429193 Patch 1762052 6 429195 thorton 2021-05-20 11:16:27 -0700 Created attachment 429195 Patch 1762054 7 429196 thorton 2021-05-20 11:24:51 -0700 Created attachment 429196 Patch 1762075 8 429196 hi 2021-05-20 12:04:34 -0700 Comment on attachment 429196 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429196&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1660 > - if (gestureRecognizer != _mouseGestureRecognizer && [_mouseGestureRecognizer mouseTouch] == touch) > - return NO; > + if ([_mouseGestureRecognizer mouseTouch] == touch) > + return gestureRecognizer == _mouseGestureRecognizer; Thinking about this a bit more, I think you actually had it correct to have separate `if` for this as right now this won't `return NO;` in the case that `gestureRecognizer == _mouseGestureRecognizer && [_mouseGestureRecognizer mouseTouch] != touch`. Sorry for the trouble 😅 1762088 9 thorton 2021-05-20 12:34:34 -0700 Oh dear, you're right 1762108 10 ews-feeder 2021-05-20 12:59:42 -0700 Committed r277820 (237966@main): <https://commits.webkit.org/237966@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429195. 429189 2021-05-20 11:01:14 -0700 2021-05-20 11:17:27 -0700 Patch bug-226030-20210520110113.patch text/plain 3262 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3Nzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY4MzYzMDQ2MWQxMDE4NzNh YWJkNWM5ZDliMDQ5NzNkYzg3YWQ3YjguLmM3NDYxYjUzM2FmMDIxNjM5NGRjMWJlYTRiMTE5ODE2 ZjgxMWIwYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDUtMjAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBvZmYgVUlLaXQg SVBJIGluIFdLTW91c2VHZXN0dXJlUmVjb2duaXplcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MDMwCisgICAgICAgIHJkYXI6Ly83ODI2NjE3Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBVSUdl c3R1cmVSZWNvZ25pemVyRGVsZWdhdGUgaW5zdGVhZCBvZiBJUEkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRSZWNlaXZlVG91Y2g6XSk6CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgZ2VzdHVyZVJlY29nbml6ZXI6c2hvdWxkUmVjZWl2ZVByZXNzOl0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVyLm1tOgor ICAgICAgICAoLVtXS01vdXNlR2VzdHVyZVJlY29nbml6ZXIgX3Nob3VsZFJlY2VpdmVUb3VjaDpm b3JFdmVudDpyZWNvZ25pemVyVmlldzpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tNb3VzZUdl c3R1cmVSZWNvZ25pemVyIF9zaG91bGRSZWNlaXZlUHJlc3M6XSk6IERlbGV0ZWQuCisKIDIwMjEt MDUtMjAgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBHcmFw aGljc0xheWVyOjpzZXROYW1lKCkgY2F1c2VzIGhlYXAgZnJhZ21lbnRhdGlvbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KaW5kZXggZDNlNzAxNGIzYjk0ZGRlZDFhY2Y2MmU0ZGE4YjgxYzNlOTM4Y2RlYi4uMGQzODY3 YzFjYzJlYjExYjE2ZTYzMmYyZGQ0YTk2NzcyNGZhNWRkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0x NjU5LDYgKzE2NTksOSBAQCAtIChCT09MKWdlc3R1cmVSZWNvZ25pemVyOihVSUdlc3R1cmVSZWNv Z25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIgc2hvdWxkUmVjZWl2ZQogICAgIGlmIChnZXN0dXJl UmVjb2duaXplciAhPSBfbW91c2VHZXN0dXJlUmVjb2duaXplciAmJiBbX21vdXNlR2VzdHVyZVJl Y29nbml6ZXIgbW91c2VUb3VjaF0gPT0gdG91Y2gpCiAgICAgICAgIHJldHVybiBOTzsKIAorICAg IGlmIChnZXN0dXJlUmVjb2duaXplciA9PSBfbW91c2VHZXN0dXJlUmVjb2duaXplcikKKyAgICAg ICAgcmV0dXJuIFtfbW91c2VHZXN0dXJlUmVjb2duaXplciBtb3VzZVRvdWNoXSA9PSB0b3VjaDsK KwogICAgIGlmIChnZXN0dXJlUmVjb2duaXplciA9PSBfZG91YmxlVGFwR2VzdHVyZVJlY29nbml6 ZXIgfHwgZ2VzdHVyZVJlY29nbml6ZXIgPT0gX25vbkJsb2NraW5nRG91YmxlVGFwR2VzdHVyZVJl Y29nbml6ZXIpCiAgICAgICAgIHJldHVybiB0b3VjaC50eXBlICE9IFVJVG91Y2hUeXBlSW5kaXJl Y3RQb2ludGVyOwogI2VuZGlmCkBAIC0xNjc5LDYgKzE2ODIsMTEgQEAgLSAoQk9PTClnZXN0dXJl UmVjb2duaXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyIHNob3Vs ZFJlY2VpdmUKICAgICByZXR1cm4gWUVTOwogfQogCistIChCT09MKWdlc3R1cmVSZWNvZ25pemVy OihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIgc2hvdWxkUmVjZWl2ZVBy ZXNzOihVSVByZXNzICopcHJlc3MKK3sKKyAgICByZXR1cm4gZ2VzdHVyZVJlY29nbml6ZXIgIT0g X21vdXNlR2VzdHVyZVJlY29nbml6ZXI7Cit9CisKICNwcmFnbWEgbWFyayAtIFdLVG91Y2hBY3Rp b25HZXN0dXJlUmVjb2duaXplckRlbGVnYXRlIGltcGxlbWVudGF0aW9uCiAKIC0gKEJPT0wpZ2Vz dHVyZVJlY29nbml6ZXJNYXlQYW5XZWJWaWV3OihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVy ZVJlY29nbml6ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS01v dXNlR2VzdHVyZVJlY29nbml6ZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tN b3VzZUdlc3R1cmVSZWNvZ25pemVyLm1tCmluZGV4IGQ3Njc5MWIwZmVlYTY3ZGM4NTA5YWI4Njlj YTgxNTBlMTIzODc4NTkuLmI5ZjdlZDdmZjkyN2VmNTA2M2Q3ZDkyYjE3OGE4ZjU2YmVkMzJlNWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS01vdXNlR2VzdHVyZVJl Y29nbml6ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLTW91c2VHZXN0 dXJlUmVjb2duaXplci5tbQpAQCAtMTA5LDE2ICsxMDksNiBAQCAtICh2b2lkKXJlc2V0CiAgICAg X2N1cnJlbnRUb3VjaCA9IG5pbDsKIH0KIAotLSAoQk9PTClfc2hvdWxkUmVjZWl2ZVRvdWNoOihV SVRvdWNoICopdG91Y2ggZm9yRXZlbnQ6KFVJRXZlbnQgKilldmVudCByZWNvZ25pemVyVmlldzoo VUlWaWV3ICopcmVjb2duaXplclZpZXcKLXsKLSAgICByZXR1cm4gdG91Y2ggPT0gX2N1cnJlbnRU b3VjaDsKLX0KLQotLSAoQk9PTClfc2hvdWxkUmVjZWl2ZVByZXNzOihVSVByZXNzICopcHJlc3MK LXsKLSAgICByZXR1cm4gTk87Ci19Ci0KIC0gKHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6Ok5hdGl2 ZVdlYk1vdXNlRXZlbnQ+KWNyZWF0ZU1vdXNlRXZlbnRXaXRoVHlwZTooV2ViS2l0OjpXZWJFdmVu dDo6VHlwZSl0eXBlIHdhc0NhbmNlbGxlZDooQk9PTCljYW5jZWxsZWQKIHsKICAgICBhdXRvIG1v ZGlmaWVycyA9IHdlYkV2ZW50TW9kaWZpZXJzRm9yVUlLZXlNb2RpZmllckZsYWdzKHNlbGYubW9k aWZpZXJGbGFncyk7Cg== 429193 2021-05-20 11:11:43 -0700 2021-05-20 11:16:25 -0700 Patch bug-226030-20210520111142.patch text/plain 3340 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3Nzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY4MzYzMDQ2MWQxMDE4NzNh YWJkNWM5ZDliMDQ5NzNkYzg3YWQ3YjguLmM3NDYxYjUzM2FmMDIxNjM5NGRjMWJlYTRiMTE5ODE2 ZjgxMWIwYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDUtMjAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBvZmYgVUlLaXQg SVBJIGluIFdLTW91c2VHZXN0dXJlUmVjb2duaXplcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MDMwCisgICAgICAgIHJkYXI6Ly83ODI2NjE3Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBVSUdl c3R1cmVSZWNvZ25pemVyRGVsZWdhdGUgaW5zdGVhZCBvZiBJUEkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRSZWNlaXZlVG91Y2g6XSk6CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgZ2VzdHVyZVJlY29nbml6ZXI6c2hvdWxkUmVjZWl2ZVByZXNzOl0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVyLm1tOgor ICAgICAgICAoLVtXS01vdXNlR2VzdHVyZVJlY29nbml6ZXIgX3Nob3VsZFJlY2VpdmVUb3VjaDpm b3JFdmVudDpyZWNvZ25pemVyVmlldzpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tNb3VzZUdl c3R1cmVSZWNvZ25pemVyIF9zaG91bGRSZWNlaXZlUHJlc3M6XSk6IERlbGV0ZWQuCisKIDIwMjEt MDUtMjAgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBHcmFw aGljc0xheWVyOjpzZXROYW1lKCkgY2F1c2VzIGhlYXAgZnJhZ21lbnRhdGlvbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KaW5kZXggZDNlNzAxNGIzYjk0ZGRlZDFhY2Y2MmU0ZGE4YjgxYzNlOTM4Y2RlYi4uMWNjZDQ4 OTM1YzFiODgwMGM1MmY4Y2Q2MjAzNjU3ZTg2NTYwMWM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0x NjU5LDYgKzE2NTksOSBAQCAtIChCT09MKWdlc3R1cmVSZWNvZ25pemVyOihVSUdlc3R1cmVSZWNv Z25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIgc2hvdWxkUmVjZWl2ZQogICAgIGlmIChnZXN0dXJl UmVjb2duaXplciAhPSBfbW91c2VHZXN0dXJlUmVjb2duaXplciAmJiBbX21vdXNlR2VzdHVyZVJl Y29nbml6ZXIgbW91c2VUb3VjaF0gPT0gdG91Y2gpCiAgICAgICAgIHJldHVybiBOTzsKIAorICAg IGlmIChnZXN0dXJlUmVjb2duaXplciA9PSBfbW91c2VHZXN0dXJlUmVjb2duaXplcikKKyAgICAg ICAgcmV0dXJuIFtfbW91c2VHZXN0dXJlUmVjb2duaXplciBtb3VzZVRvdWNoXSA9PSB0b3VjaDsK KwogICAgIGlmIChnZXN0dXJlUmVjb2duaXplciA9PSBfZG91YmxlVGFwR2VzdHVyZVJlY29nbml6 ZXIgfHwgZ2VzdHVyZVJlY29nbml6ZXIgPT0gX25vbkJsb2NraW5nRG91YmxlVGFwR2VzdHVyZVJl Y29nbml6ZXIpCiAgICAgICAgIHJldHVybiB0b3VjaC50eXBlICE9IFVJVG91Y2hUeXBlSW5kaXJl Y3RQb2ludGVyOwogI2VuZGlmCkBAIC0xNjc5LDYgKzE2ODIsMTUgQEAgLSAoQk9PTClnZXN0dXJl UmVjb2duaXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyIHNob3Vs ZFJlY2VpdmUKICAgICByZXR1cm4gWUVTOwogfQogCistIChCT09MKWdlc3R1cmVSZWNvZ25pemVy OihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIgc2hvdWxkUmVjZWl2ZVBy ZXNzOihVSVByZXNzICopcHJlc3MKK3sKKyNpZiBIQVZFKFVJS0lUX1dJVEhfTU9VU0VfU1VQUE9S VCkKKyAgICBpZiAoZ2VzdHVyZVJlY29nbml6ZXIgPT0gX21vdXNlR2VzdHVyZVJlY29nbml6ZXIp CisgICAgICAgIHJldHVybiBOTzsKKyNlbmRpZgorICAgIHJldHVybiBZRVM7Cit9CisKICNwcmFn bWEgbWFyayAtIFdLVG91Y2hBY3Rpb25HZXN0dXJlUmVjb2duaXplckRlbGVnYXRlIGltcGxlbWVu dGF0aW9uCiAKIC0gKEJPT0wpZ2VzdHVyZVJlY29nbml6ZXJNYXlQYW5XZWJWaWV3OihVSUdlc3R1 cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS01vdXNlR2VzdHVyZVJlY29nbml6ZXIubW0gYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVyLm1tCmluZGV4IGQ3Njc5 MWIwZmVlYTY3ZGM4NTA5YWI4NjljYTgxNTBlMTIzODc4NTkuLmI5ZjdlZDdmZjkyN2VmNTA2M2Q3 ZDkyYjE3OGE4ZjU2YmVkMzJlNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS01vdXNlR2VzdHVyZVJlY29nbml6ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLTW91c2VHZXN0dXJlUmVjb2duaXplci5tbQpAQCAtMTA5LDE2ICsxMDksNiBA QCAtICh2b2lkKXJlc2V0CiAgICAgX2N1cnJlbnRUb3VjaCA9IG5pbDsKIH0KIAotLSAoQk9PTClf c2hvdWxkUmVjZWl2ZVRvdWNoOihVSVRvdWNoICopdG91Y2ggZm9yRXZlbnQ6KFVJRXZlbnQgKill dmVudCByZWNvZ25pemVyVmlldzooVUlWaWV3ICopcmVjb2duaXplclZpZXcKLXsKLSAgICByZXR1 cm4gdG91Y2ggPT0gX2N1cnJlbnRUb3VjaDsKLX0KLQotLSAoQk9PTClfc2hvdWxkUmVjZWl2ZVBy ZXNzOihVSVByZXNzICopcHJlc3MKLXsKLSAgICByZXR1cm4gTk87Ci19Ci0KIC0gKHN0ZDo6dW5p cXVlX3B0cjxXZWJLaXQ6Ok5hdGl2ZVdlYk1vdXNlRXZlbnQ+KWNyZWF0ZU1vdXNlRXZlbnRXaXRo VHlwZTooV2ViS2l0OjpXZWJFdmVudDo6VHlwZSl0eXBlIHdhc0NhbmNlbGxlZDooQk9PTCljYW5j ZWxsZWQKIHsKICAgICBhdXRvIG1vZGlmaWVycyA9IHdlYkV2ZW50TW9kaWZpZXJzRm9yVUlLZXlN b2RpZmllckZsYWdzKHNlbGYubW9kaWZpZXJGbGFncyk7Cg== 429195 2021-05-20 11:16:27 -0700 2021-05-20 12:59:42 -0700 Patch bug-226030-20210520111626.patch text/plain 3355 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3Nzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY4MzYzMDQ2MWQxMDE4NzNh YWJkNWM5ZDliMDQ5NzNkYzg3YWQ3YjguLjg0OGI1Y2IwYjYyMzAyYzcxOTZmOWUxOTg4NjU3OWZj Y2Q0MjYwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDUtMjAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBvZmYgVUlLaXQg SVBJIGluIFdLTW91c2VHZXN0dXJlUmVjb2duaXplcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MDMwCisgICAgICAgIHJkYXI6Ly83ODI2NjE3Mwor CisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzbyBhbmQgV2Vuc29uIEhzaWVoLgorCisg ICAgICAgIFVzZSBVSUdlc3R1cmVSZWNvZ25pemVyRGVsZWdhdGUgaW5zdGVhZCBvZiBJUEkuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRSZWNlaXZlVG91 Y2g6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZ2VzdHVyZVJlY29nbml6ZXI6c2hvdWxk UmVjZWl2ZVByZXNzOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tNb3VzZUdlc3R1cmVS ZWNvZ25pemVyLm1tOgorICAgICAgICAoLVtXS01vdXNlR2VzdHVyZVJlY29nbml6ZXIgX3Nob3Vs ZFJlY2VpdmVUb3VjaDpmb3JFdmVudDpyZWNvZ25pemVyVmlldzpdKTogRGVsZXRlZC4KKyAgICAg ICAgKC1bV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVyIF9zaG91bGRSZWNlaXZlUHJlc3M6XSk6IERl bGV0ZWQuCisKIDIwMjEtMDUtMjAgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4K IAogICAgICAgICBHcmFwaGljc0xheWVyOjpzZXROYW1lKCkgY2F1c2VzIGhlYXAgZnJhZ21lbnRh dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggZDNlNzAxNGIzYjk0ZGRlZDFhY2Y2MmU0ZGE4YjgxYzNl OTM4Y2RlYi4uMWNjZDQ4OTM1YzFiODgwMGM1MmY4Y2Q2MjAzNjU3ZTg2NTYwMWM3NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tCkBAIC0xNjU5LDYgKzE2NTksOSBAQCAtIChCT09MKWdlc3R1cmVSZWNvZ25pemVy OihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIgc2hvdWxkUmVjZWl2ZQog ICAgIGlmIChnZXN0dXJlUmVjb2duaXplciAhPSBfbW91c2VHZXN0dXJlUmVjb2duaXplciAmJiBb X21vdXNlR2VzdHVyZVJlY29nbml6ZXIgbW91c2VUb3VjaF0gPT0gdG91Y2gpCiAgICAgICAgIHJl dHVybiBOTzsKIAorICAgIGlmIChnZXN0dXJlUmVjb2duaXplciA9PSBfbW91c2VHZXN0dXJlUmVj b2duaXplcikKKyAgICAgICAgcmV0dXJuIFtfbW91c2VHZXN0dXJlUmVjb2duaXplciBtb3VzZVRv dWNoXSA9PSB0b3VjaDsKKwogICAgIGlmIChnZXN0dXJlUmVjb2duaXplciA9PSBfZG91YmxlVGFw R2VzdHVyZVJlY29nbml6ZXIgfHwgZ2VzdHVyZVJlY29nbml6ZXIgPT0gX25vbkJsb2NraW5nRG91 YmxlVGFwR2VzdHVyZVJlY29nbml6ZXIpCiAgICAgICAgIHJldHVybiB0b3VjaC50eXBlICE9IFVJ VG91Y2hUeXBlSW5kaXJlY3RQb2ludGVyOwogI2VuZGlmCkBAIC0xNjc5LDYgKzE2ODIsMTUgQEAg LSAoQk9PTClnZXN0dXJlUmVjb2duaXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVS ZWNvZ25pemVyIHNob3VsZFJlY2VpdmUKICAgICByZXR1cm4gWUVTOwogfQogCistIChCT09MKWdl c3R1cmVSZWNvZ25pemVyOihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIg c2hvdWxkUmVjZWl2ZVByZXNzOihVSVByZXNzICopcHJlc3MKK3sKKyNpZiBIQVZFKFVJS0lUX1dJ VEhfTU9VU0VfU1VQUE9SVCkKKyAgICBpZiAoZ2VzdHVyZVJlY29nbml6ZXIgPT0gX21vdXNlR2Vz dHVyZVJlY29nbml6ZXIpCisgICAgICAgIHJldHVybiBOTzsKKyNlbmRpZgorICAgIHJldHVybiBZ RVM7Cit9CisKICNwcmFnbWEgbWFyayAtIFdLVG91Y2hBY3Rpb25HZXN0dXJlUmVjb2duaXplckRl bGVnYXRlIGltcGxlbWVudGF0aW9uCiAKIC0gKEJPT0wpZ2VzdHVyZVJlY29nbml6ZXJNYXlQYW5X ZWJWaWV3OihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS01vdXNlR2VzdHVyZVJlY29nbml6ZXIu bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVy Lm1tCmluZGV4IGQ3Njc5MWIwZmVlYTY3ZGM4NTA5YWI4NjljYTgxNTBlMTIzODc4NTkuLmI5Zjdl ZDdmZjkyN2VmNTA2M2Q3ZDkyYjE3OGE4ZjU2YmVkMzJlNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS01vdXNlR2VzdHVyZVJlY29nbml6ZXIubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLTW91c2VHZXN0dXJlUmVjb2duaXplci5tbQpAQCAt MTA5LDE2ICsxMDksNiBAQCAtICh2b2lkKXJlc2V0CiAgICAgX2N1cnJlbnRUb3VjaCA9IG5pbDsK IH0KIAotLSAoQk9PTClfc2hvdWxkUmVjZWl2ZVRvdWNoOihVSVRvdWNoICopdG91Y2ggZm9yRXZl bnQ6KFVJRXZlbnQgKilldmVudCByZWNvZ25pemVyVmlldzooVUlWaWV3ICopcmVjb2duaXplclZp ZXcKLXsKLSAgICByZXR1cm4gdG91Y2ggPT0gX2N1cnJlbnRUb3VjaDsKLX0KLQotLSAoQk9PTClf c2hvdWxkUmVjZWl2ZVByZXNzOihVSVByZXNzICopcHJlc3MKLXsKLSAgICByZXR1cm4gTk87Ci19 Ci0KIC0gKHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6Ok5hdGl2ZVdlYk1vdXNlRXZlbnQ+KWNyZWF0 ZU1vdXNlRXZlbnRXaXRoVHlwZTooV2ViS2l0OjpXZWJFdmVudDo6VHlwZSl0eXBlIHdhc0NhbmNl bGxlZDooQk9PTCljYW5jZWxsZWQKIHsKICAgICBhdXRvIG1vZGlmaWVycyA9IHdlYkV2ZW50TW9k aWZpZXJzRm9yVUlLZXlNb2RpZmllckZsYWdzKHNlbGYubW9kaWZpZXJGbGFncyk7Cg== 429196 2021-05-20 11:24:51 -0700 2021-05-20 12:35:07 -0700 Patch bug-226030-20210520112451.patch text/plain 3391 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3Nzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY4MzYzMDQ2MWQxMDE4NzNh YWJkNWM5ZDliMDQ5NzNkYzg3YWQ3YjguLjg0OGI1Y2IwYjYyMzAyYzcxOTZmOWUxOTg4NjU3OWZj Y2Q0MjYwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDUtMjAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBvZmYgVUlLaXQg SVBJIGluIFdLTW91c2VHZXN0dXJlUmVjb2duaXplcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MDMwCisgICAgICAgIHJkYXI6Ly83ODI2NjE3Mwor CisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzbyBhbmQgV2Vuc29uIEhzaWVoLgorCisg ICAgICAgIFVzZSBVSUdlc3R1cmVSZWNvZ25pemVyRGVsZWdhdGUgaW5zdGVhZCBvZiBJUEkuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRSZWNlaXZlVG91 Y2g6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZ2VzdHVyZVJlY29nbml6ZXI6c2hvdWxk UmVjZWl2ZVByZXNzOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tNb3VzZUdlc3R1cmVS ZWNvZ25pemVyLm1tOgorICAgICAgICAoLVtXS01vdXNlR2VzdHVyZVJlY29nbml6ZXIgX3Nob3Vs ZFJlY2VpdmVUb3VjaDpmb3JFdmVudDpyZWNvZ25pemVyVmlldzpdKTogRGVsZXRlZC4KKyAgICAg ICAgKC1bV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVyIF9zaG91bGRSZWNlaXZlUHJlc3M6XSk6IERl bGV0ZWQuCisKIDIwMjEtMDUtMjAgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4K IAogICAgICAgICBHcmFwaGljc0xheWVyOjpzZXROYW1lKCkgY2F1c2VzIGhlYXAgZnJhZ21lbnRh dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggZDNlNzAxNGIzYjk0ZGRlZDFhY2Y2MmU0ZGE4YjgxYzNl OTM4Y2RlYi4uMzJjZTlhN2YyNWFlOWI0MDhlYTI5YTM4YzlkNTNhODM0NThhNTNhNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tCkBAIC0xNjU2LDggKzE2NTYsOCBAQCAtIChCT09MKWdlc3R1cmVSZWNvZ25pemVy OihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIgc2hvdWxkUmVjZWl2ZQog I2VuZGlmCiAKICNpZiBIQVZFKFVJS0lUX1dJVEhfTU9VU0VfU1VQUE9SVCkKLSAgICBpZiAoZ2Vz dHVyZVJlY29nbml6ZXIgIT0gX21vdXNlR2VzdHVyZVJlY29nbml6ZXIgJiYgW19tb3VzZUdlc3R1 cmVSZWNvZ25pemVyIG1vdXNlVG91Y2hdID09IHRvdWNoKQotICAgICAgICByZXR1cm4gTk87Cisg ICAgaWYgKFtfbW91c2VHZXN0dXJlUmVjb2duaXplciBtb3VzZVRvdWNoXSA9PSB0b3VjaCkKKyAg ICAgICAgcmV0dXJuIGdlc3R1cmVSZWNvZ25pemVyID09IF9tb3VzZUdlc3R1cmVSZWNvZ25pemVy OwogCiAgICAgaWYgKGdlc3R1cmVSZWNvZ25pemVyID09IF9kb3VibGVUYXBHZXN0dXJlUmVjb2du aXplciB8fCBnZXN0dXJlUmVjb2duaXplciA9PSBfbm9uQmxvY2tpbmdEb3VibGVUYXBHZXN0dXJl UmVjb2duaXplcikKICAgICAgICAgcmV0dXJuIHRvdWNoLnR5cGUgIT0gVUlUb3VjaFR5cGVJbmRp cmVjdFBvaW50ZXI7CkBAIC0xNjc5LDYgKzE2NzksMTUgQEAgLSAoQk9PTClnZXN0dXJlUmVjb2du aXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyIHNob3VsZFJlY2Vp dmUKICAgICByZXR1cm4gWUVTOwogfQogCistIChCT09MKWdlc3R1cmVSZWNvZ25pemVyOihVSUdl c3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIgc2hvdWxkUmVjZWl2ZVByZXNzOihV SVByZXNzICopcHJlc3MKK3sKKyNpZiBIQVZFKFVJS0lUX1dJVEhfTU9VU0VfU1VQUE9SVCkKKyAg ICBpZiAoZ2VzdHVyZVJlY29nbml6ZXIgPT0gX21vdXNlR2VzdHVyZVJlY29nbml6ZXIpCisgICAg ICAgIHJldHVybiBOTzsKKyNlbmRpZgorICAgIHJldHVybiBZRVM7Cit9CisKICNwcmFnbWEgbWFy ayAtIFdLVG91Y2hBY3Rpb25HZXN0dXJlUmVjb2duaXplckRlbGVnYXRlIGltcGxlbWVudGF0aW9u CiAKIC0gKEJPT0wpZ2VzdHVyZVJlY29nbml6ZXJNYXlQYW5XZWJWaWV3OihVSUdlc3R1cmVSZWNv Z25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS01vdXNlR2VzdHVyZVJlY29nbml6ZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tNb3VzZUdlc3R1cmVSZWNvZ25pemVyLm1tCmluZGV4IGQ3Njc5MWIwZmVl YTY3ZGM4NTA5YWI4NjljYTgxNTBlMTIzODc4NTkuLmI5ZjdlZDdmZjkyN2VmNTA2M2Q3ZDkyYjE3 OGE4ZjU2YmVkMzJlNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S01vdXNlR2VzdHVyZVJlY29nbml6ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLTW91c2VHZXN0dXJlUmVjb2duaXplci5tbQpAQCAtMTA5LDE2ICsxMDksNiBAQCAtICh2 b2lkKXJlc2V0CiAgICAgX2N1cnJlbnRUb3VjaCA9IG5pbDsKIH0KIAotLSAoQk9PTClfc2hvdWxk UmVjZWl2ZVRvdWNoOihVSVRvdWNoICopdG91Y2ggZm9yRXZlbnQ6KFVJRXZlbnQgKilldmVudCBy ZWNvZ25pemVyVmlldzooVUlWaWV3ICopcmVjb2duaXplclZpZXcKLXsKLSAgICByZXR1cm4gdG91 Y2ggPT0gX2N1cnJlbnRUb3VjaDsKLX0KLQotLSAoQk9PTClfc2hvdWxkUmVjZWl2ZVByZXNzOihV SVByZXNzICopcHJlc3MKLXsKLSAgICByZXR1cm4gTk87Ci19Ci0KIC0gKHN0ZDo6dW5pcXVlX3B0 cjxXZWJLaXQ6Ok5hdGl2ZVdlYk1vdXNlRXZlbnQ+KWNyZWF0ZU1vdXNlRXZlbnRXaXRoVHlwZToo V2ViS2l0OjpXZWJFdmVudDo6VHlwZSl0eXBlIHdhc0NhbmNlbGxlZDooQk9PTCljYW5jZWxsZWQK IHsKICAgICBhdXRvIG1vZGlmaWVycyA9IHdlYkV2ZW50TW9kaWZpZXJzRm9yVUlLZXlNb2RpZmll ckZsYWdzKHNlbGYubW9kaWZpZXJGbGFncyk7Cg==