214771 2020-07-24 17:10:26 -0700 WebCoreResourceHandleAsOperationQueueDelegate can use RunLoop::dispatch 2020-07-28 10:03:07 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 1 ggaren ggaren aakash_jain achristensen ap benjamin cdumez cmarcelo darin ews-watchlist rackler webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1674924 0 ggaren 2020-07-24 17:10:26 -0700 WebCoreResourceHandleAsOperationQueueDelegate can use RunLoop::dispatch 1674935 1 405207 ggaren 2020-07-24 17:35:24 -0700 Created attachment 405207 Patch 1674970 2 405207 achristensen 2020-07-24 19:55:54 -0700 Comment on attachment 405207 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405207&action=review The code in WebCoreResourceHandleAsOperationQueueDelegate.mm took several iterations to get just right, and I don't think the code in WTF is equivalent. Could you include a radar with a list of clients? > Source/WTF/wtf/cf/RunLoopCF.cpp:91 > + if (schedulePair->mode() == kCFRunLoopCommonModes What about kCFRunLoopDefaultMode? 1675026 3 ggaren 2020-07-25 15:00:07 -0700 > Could you include a radar with a list of clients? I can assemble a list. But what would the Radar say? > > Source/WTF/wtf/cf/RunLoopCF.cpp:91 > > + if (schedulePair->mode() == kCFRunLoopCommonModes > > What about kCFRunLoopDefaultMode? The kCFRunLoopDefaultMode was subtly incorrect. dispatch() dispatches in kCFRunLoopCommonModes, so if a client took care to first unschedule kCFRunLoopCommonModes (which WebKit schedules by default) and then schedule kCFRunLoopDefaultMode, applying this optimization would sometimes dispatch in the wrong modes. 1675030 4 405233 ggaren 2020-07-25 15:38:18 -0700 Created attachment 405233 Patch 1675054 5 405233 darin 2020-07-25 22:10:30 -0700 Comment on attachment 405233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405233&action=review > Source/WTF/wtf/cf/RunLoopCF.cpp:92 > + if (schedulePair->mode() == kCFRunLoopCommonModes > + && schedulePair->runLoop() == RunLoop::main().m_runLoop) Easier to read as a long line. 1675313 6 405295 ggaren 2020-07-27 11:06:48 -0700 Created attachment 405295 Patch for landing 1675448 7 ggaren 2020-07-27 16:45:44 -0700 Those failing API tests pass locally (Debug and Release), and the flakiness dashboard also reports that they fail regularly on bots. Not sure how to interpret these contradictory reasons to exonerate this patch. I guess I'll try landing and see what happens. 1675451 8 ews-feeder 2020-07-27 16:48:21 -0700 Committed r264955: <https://trac.webkit.org/changeset/264955> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405295. 1675454 9 webkit-bug-importer 2020-07-27 16:49:27 -0700 <rdar://problem/66189145> 1675563 10 aakash_jain 2020-07-28 03:46:10 -0700 (In reply to EWS from comment #8) > Committed r264955: <https://trac.webkit.org/changeset/264955> TestWebKitAPI.WKWebViewCloseAllMediaPresentations.PictureInPicture seems to have started to consistently timeout after this change. History: https://results.webkit.org/?suite=api-tests&test=TestWebKitAPI.WKWebViewCloseAllMediaPresentations.PictureInPicture 1675662 11 rackler 2020-07-28 10:03:07 -0700 Reverted r264955 for reason: Reverting because this commit may have caused issues with tests. Committed r264993: <https://trac.webkit.org/changeset/264993> 405207 2020-07-24 17:35:24 -0700 2020-07-25 15:38:16 -0700 Patch bug-214771-20200724173523.patch text/plain 4296 ggaren SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjQ4NzMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA3LTI0ICBHZW9mZnJleSBHYXJlbiAgPGdn YXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRp b25RdWV1ZURlbGVnYXRlIGNhbiB1c2UgUnVuTG9vcDo6ZGlzcGF0Y2gKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDc3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL2NmL1J1bkxvb3BDRi5jcHA6 CisgICAgICAgIChXVEY6OlJ1bkxvb3A6OmRpc3BhdGNoKTogTWlncmF0ZWQgdGhlIG9wdGltaXph dGlvbiBmcm9tCisgICAgICAgIFdlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVE ZWxlZ2F0ZS4gQWxsIENvY29hIFdlYlZpZXdzIGJlZ2luCisgICAgICAgIGxpZmUgd2l0aCBhIHNp bmdsZSBTY2hlZHVsZVBhaXIsIHNvIHRoaXMgb3B0aW1pemF0aW9uIGlzIHRoZSBkZWZhdWx0Lgor CiAyMDIwLTA3LTIzICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIGlPUyBzaW11bGF0b3IgZG9lcyBub3Qgc3VwcG9ydCBXZWJBc3NlbWJseQpJbmRleDog U291cmNlL1dURi93dGYvY2YvUnVuTG9vcENGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RG L3d0Zi9jZi9SdW5Mb29wQ0YuY3BwCShyZXZpc2lvbiAyNjQ4NDEpCisrKyBTb3VyY2UvV1RGL3d0 Zi9jZi9SdW5Mb29wQ0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Niw2ICs4NiwxMyBAQCB2b2lk IFJ1bkxvb3A6OnN0b3AoKQogCiB2b2lkIFJ1bkxvb3A6OmRpc3BhdGNoKGNvbnN0IFNjaGVkdWxl UGFpckhhc2hTZXQmIHNjaGVkdWxlUGFpcnMsIEZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikK IHsKKyAgICBpZiAoc2NoZWR1bGVQYWlycy5zaXplKCkgPT0gMSkgeworICAgICAgICBhdXRvJiBz Y2hlZHVsZVBhaXIgPSAqc2NoZWR1bGVQYWlycy5iZWdpbigpOworICAgICAgICBpZiAoc2NoZWR1 bGVQYWlyLT5tb2RlKCkgPT0ga0NGUnVuTG9vcENvbW1vbk1vZGVzCisgICAgICAgICAgICAmJiBz Y2hlZHVsZVBhaXItPnJ1bkxvb3AoKSA9PSBSdW5Mb29wOjptYWluKCkubV9ydW5Mb29wKQorICAg ICAgICAgICAgcmV0dXJuIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChXVEZNb3ZlKGZ1bmN0aW9u KSk7CisgICAgfQorCiAgICAgYXV0byB0aW1lciA9IGNyZWF0ZVRpbWVyKDBfcywgZmFsc2UsIFtd IChDRlJ1bkxvb3BUaW1lclJlZiB0aW1lciwgdm9pZCogY29udGV4dCkgewogICAgICAgICBBdXRv ZHJhaW5lZFBvb2wgcG9vbDsKIApJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjY0ODcxKQorKysg U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAK KzIwMjAtMDctMjQgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdhdGUgY2FuIHVzZSBS dW5Mb29wOjpkaXNwYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE0NzcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVXNlIHRoZSBuZXcgaGVscGVyIGZ1bmN0aW9uIGZvciBjb25zaXN0ZW5jeSwgYW5k IHRvIHJlbW92ZSBhIGJpdCBvZiBjb2RlLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9t YWMvV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlLm1tOgorICAg ICAgICAoc2NoZWR1bGVkV2l0aEN1c3RvbVJ1bkxvb3BNb2RlKTogRGVsZXRlZC4KKyAgICAgICAg KC1bV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlIGNhbGxGdW5j dGlvbk9uTWFpblRocmVhZDpdKTogRGVsZXRlZC4KKwogMjAyMC0wNy0yNCAgTWFyayBMYW0gIDxt YXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGV4Y2VwdGlvbiBjaGVjayBoYW5kbGlu ZyBiZWxvdyBwb3N0TWVzc2FnZSgpLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9tYWMvV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1dlYkNv cmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMjY0 ODQxKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvV2ViQ29yZVJlc291 cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00 MywxOCArNDMsNiBAQAogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotc3RhdGljIGJvb2wg c2NoZWR1bGVkV2l0aEN1c3RvbVJ1bkxvb3BNb2RlKGNvbnN0IE9wdGlvbmFsPFNjaGVkdWxlUGFp ckhhc2hTZXQ+JiBwYWlycykKLXsKLSAgICBpZiAoIXBhaXJzKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgZm9yIChhdXRvJiBwYWlyIDogKnBhaXJzKSB7Ci0gICAgICAgIGF1dG8gbW9kZSA9 IHBhaXItPm1vZGUoKTsKLSAgICAgICAgaWYgKG1vZGUgIT0ga0NGUnVuTG9vcENvbW1vbk1vZGVz ICYmIG1vZGUgIT0ga0NGUnVuTG9vcERlZmF1bHRNb2RlKQotICAgICAgICAgICAgcmV0dXJuIHRy dWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogQGltcGxlbWVudGF0aW9uIFdlYkNv cmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZQogCiAtICh2b2lkKWNhbGxG dW5jdGlvbk9uTWFpblRocmVhZDooRnVuY3Rpb248dm9pZCgpPiYmKWZ1bmN0aW9uCkBAIC02Mywy MCArNTEsMTAgQEAgLSAodm9pZCljYWxsRnVuY3Rpb25Pbk1haW5UaHJlYWQ6KEZ1bmN0aQogICAg IGlmIChtX21lc3NhZ2VRdWV1ZSkKICAgICAgICAgcmV0dXJuIG1fbWVzc2FnZVF1ZXVlLT5hcHBl bmQobWFrZVVuaXF1ZTxGdW5jdGlvbjx2b2lkKCk+PihXVEZNb3ZlKGZ1bmN0aW9uKSkpOwogCi0g ICAgLy8gVGhpcyBpcyB0aGUgY29tbW9uIGNhc2UuCi0gICAgaWYgKCFzY2hlZHVsZWRXaXRoQ3Vz dG9tUnVuTG9vcE1vZGUobV9zY2hlZHVsZWRQYWlycykpCisgICAgaWYgKCFtX3NjaGVkdWxlZFBh aXJzKQogICAgICAgICByZXR1cm4gY2FsbE9uTWFpblRocmVhZChXVEZNb3ZlKGZ1bmN0aW9uKSk7 CiAKLSAgICAvLyBJZiB3ZSBoYXZlIGJlZW4gc2NoZWR1bGVkIGluIGEgY3VzdG9tIHJ1biBsb29w IG1vZGUsIHNjaGVkdWxlIGEgYmxvY2sgaW4gdGhhdCBtb2RlLgotICAgIGF1dG8gYmxvY2sgPSBt YWtlQmxvY2tQdHIoW2FscmVhZHlDYWxsZWQgPSBmYWxzZSwgZnVuY3Rpb24gPSBXVEZNb3ZlKGZ1 bmN0aW9uKV0gKCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmIChhbHJlYWR5Q2FsbGVkKQotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICBhbHJlYWR5Q2FsbGVkID0gdHJ1ZTsKLSAgICAgICAgZnVu Y3Rpb24oKTsKLSAgICAgICAgZnVuY3Rpb24gPSBudWxscHRyOwotICAgIH0pOwotICAgIGZvciAo YXV0byYgcGFpciA6ICptX3NjaGVkdWxlZFBhaXJzKQotICAgICAgICBDRlJ1bkxvb3BQZXJmb3Jt QmxvY2socGFpci0+cnVuTG9vcCgpLCBwYWlyLT5tb2RlKCksIGJsb2NrLmdldCgpKTsKKyAgICBS dW5Mb29wOjpkaXNwYXRjaCgqbV9zY2hlZHVsZWRQYWlycywgV1RGTW92ZShmdW5jdGlvbikpOwog fQogCiAtIChpZClpbml0V2l0aEhhbmRsZTooV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqKWhhbmRs ZSBtZXNzYWdlUXVldWU6KFJlZlB0cjxXZWJDb3JlOjpTeW5jaHJvbm91c0xvYWRlck1lc3NhZ2VR dWV1ZT4mJiltZXNzYWdlUXVldWUK 405233 2020-07-25 15:38:18 -0700 2020-07-25 22:10:30 -0700 Patch bug-214771-20200725153817.patch text/plain 4838 ggaren SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjQ4NzMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA3LTI0ICBHZW9mZnJleSBHYXJlbiAgPGdn YXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRp b25RdWV1ZURlbGVnYXRlIGNhbiB1c2UgUnVuTG9vcDo6ZGlzcGF0Y2gKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDc3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL2NmL1J1bkxvb3BDRi5jcHA6 CisgICAgICAgIChXVEY6OlJ1bkxvb3A6OmRpc3BhdGNoKTogTWlncmF0ZWQgdGhlIG9wdGltaXph dGlvbiBmcm9tCisgICAgICAgIFdlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVE ZWxlZ2F0ZS4gQWxsIENvY29hIFdlYlZpZXdzIGJlZ2luCisgICAgICAgIGxpZmUgd2l0aCBhIHNp bmdsZSBTY2hlZHVsZVBhaXIgc2NoZWR1bGVkIGluIGtDRlJ1bkxvb3BDb21tb25Nb2Rlcywgc28K KyAgICAgICAgdGhpcyBvcHRpbWl6YXRpb24gaXMgdGhlIGNvbW1vbiBjYXNlLgorCisgICAgICAg IChOb3RlIHRoYXQgSSBkaWQgbm90IGNvcHkgdGhlIGtDRlJ1bkxvb3BEZWZhdWx0TW9kZSBjbGF1 c2UgZnJvbQorICAgICAgICB0aGUgV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1 ZURlbGVnYXRlIG9wdGltaXphdGlvbi4gVGhhdCdzCisgICAgICAgIGJlY2F1c2UgaXQncyBub3Qg dGhlIGNvbW1vbiBjYXNlLCBhbmQgYWxzbyBiZWNhdXNlIGl0J3Mgbm90IGNvcnJlY3QgdG8KKyAg ICAgICAgZG8gYSB2YW5pbGxhIGRpc3B0YWNoKCkgaW4gdGhlIGNhc2Ugb2Yga0NGUnVuTG9vcERl ZmF1bHRNb2RlIGJlY2F1c2UgYQorICAgICAgICB2YW5pbGxhIGRpc3BhdGNoKCkgd291bGQgdXNl IGtDRlJ1bkxvb3BDb21tb25Nb2Rlcy4pCisKIDIwMjAtMDctMjMgIEtlaXRoIE1pbGxlciAgPGtl aXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgaU9TIHNpbXVsYXRvciBkb2VzIG5vdCBz dXBwb3J0IFdlYkFzc2VtYmx5CkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9jZi9SdW5Mb29wQ0YuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL2NmL1J1bkxvb3BDRi5jcHAJKHJldmlzaW9u IDI2NDg0MSkKKysrIFNvdXJjZS9XVEYvd3RmL2NmL1J1bkxvb3BDRi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTg2LDYgKzg2LDEzIEBAIHZvaWQgUnVuTG9vcDo6c3RvcCgpCiAKIHZvaWQgUnVuTG9v cDo6ZGlzcGF0Y2goY29uc3QgU2NoZWR1bGVQYWlySGFzaFNldCYgc2NoZWR1bGVQYWlycywgRnVu Y3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uKQogeworICAgIGlmIChzY2hlZHVsZVBhaXJzLnNpemUo KSA9PSAxKSB7CisgICAgICAgIGF1dG8mIHNjaGVkdWxlUGFpciA9ICpzY2hlZHVsZVBhaXJzLmJl Z2luKCk7CisgICAgICAgIGlmIChzY2hlZHVsZVBhaXItPm1vZGUoKSA9PSBrQ0ZSdW5Mb29wQ29t bW9uTW9kZXMKKyAgICAgICAgICAgICYmIHNjaGVkdWxlUGFpci0+cnVuTG9vcCgpID09IFJ1bkxv b3A6Om1haW4oKS5tX3J1bkxvb3ApCisgICAgICAgICAgICByZXR1cm4gUnVuTG9vcDo6bWFpbigp LmRpc3BhdGNoKFdURk1vdmUoZnVuY3Rpb24pKTsKKyAgICB9CisKICAgICBhdXRvIHRpbWVyID0g Y3JlYXRlVGltZXIoMF9zLCBmYWxzZSwgW10gKENGUnVuTG9vcFRpbWVyUmVmIHRpbWVyLCB2b2lk KiBjb250ZXh0KSB7CiAgICAgICAgIEF1dG9kcmFpbmVkUG9vbCBwb29sOwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCShyZXZpc2lvbiAyNjQ4NzEpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wNy0yNCAgR2VvZmZyZXkgR2FyZW4gIDxn Z2FyZW5AYXBwbGUuY29tPgorCisgICAgICAgIFdlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0 aW9uUXVldWVEZWxlZ2F0ZSBjYW4gdXNlIFJ1bkxvb3A6OmRpc3BhdGNoCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ3NzEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhlIG5ldyBoZWxwZXIgZnVu Y3Rpb24gZm9yIGNvbnNpc3RlbmN5LCBhbmQgdG8gcmVtb3ZlIGEgYml0IG9mIGNvZGUuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJh dGlvblF1ZXVlRGVsZWdhdGUubW06CisgICAgICAgIChzY2hlZHVsZWRXaXRoQ3VzdG9tUnVuTG9v cE1vZGUpOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJh dGlvblF1ZXVlRGVsZWdhdGUgY2FsbEZ1bmN0aW9uT25NYWluVGhyZWFkOl0pOiBEZWxldGVkLgor CiAyMDIwLTA3LTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggZXhjZXB0aW9uIGNoZWNrIGhhbmRsaW5nIGJlbG93IHBvc3RNZXNzYWdlKCkuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9XZWJDb3JlUmVzb3VyY2VIYW5kbGVB c09wZXJhdGlvblF1ZXVlRGVsZWdhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9tYWMvV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1 ZURlbGVnYXRlLm1tCShyZXZpc2lvbiAyNjQ4NDEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL21hYy9XZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdh dGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTQwLDIxICs0MCwxMCBAQAogI2ltcG9ydCA8cGFsL3Nw aS9jZi9DRk5ldHdvcmtTUEkuaD4KICNpbXBvcnQgPHd0Zi9CbG9ja1B0ci5oPgogI2ltcG9ydCA8 d3RmL01haW5UaHJlYWQuaD4KKyNpbXBvcnQgPHd0Zi9SdW5Mb29wLmg+CiAKIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwogCi1zdGF0aWMgYm9vbCBzY2hlZHVsZWRXaXRoQ3VzdG9tUnVuTG9vcE1v ZGUoY29uc3QgT3B0aW9uYWw8U2NoZWR1bGVQYWlySGFzaFNldD4mIHBhaXJzKQotewotICAgIGlm ICghcGFpcnMpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBmb3IgKGF1dG8mIHBhaXIgOiAq cGFpcnMpIHsKLSAgICAgICAgYXV0byBtb2RlID0gcGFpci0+bW9kZSgpOwotICAgICAgICBpZiAo bW9kZSAhPSBrQ0ZSdW5Mb29wQ29tbW9uTW9kZXMgJiYgbW9kZSAhPSBrQ0ZSdW5Mb29wRGVmYXVs dE1vZGUpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNl OwotfQotCiBAaW1wbGVtZW50YXRpb24gV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25R dWV1ZURlbGVnYXRlCiAKIC0gKHZvaWQpY2FsbEZ1bmN0aW9uT25NYWluVGhyZWFkOihGdW5jdGlv bjx2b2lkKCk+JiYpZnVuY3Rpb24KQEAgLTYzLDIwICs1MiwxMCBAQCAtICh2b2lkKWNhbGxGdW5j dGlvbk9uTWFpblRocmVhZDooRnVuY3RpCiAgICAgaWYgKG1fbWVzc2FnZVF1ZXVlKQogICAgICAg ICByZXR1cm4gbV9tZXNzYWdlUXVldWUtPmFwcGVuZChtYWtlVW5pcXVlPEZ1bmN0aW9uPHZvaWQo KT4+KFdURk1vdmUoZnVuY3Rpb24pKSk7CiAKLSAgICAvLyBUaGlzIGlzIHRoZSBjb21tb24gY2Fz ZS4KLSAgICBpZiAoIXNjaGVkdWxlZFdpdGhDdXN0b21SdW5Mb29wTW9kZShtX3NjaGVkdWxlZFBh aXJzKSkKKyAgICBpZiAoIW1fc2NoZWR1bGVkUGFpcnMpCiAgICAgICAgIHJldHVybiBjYWxsT25N YWluVGhyZWFkKFdURk1vdmUoZnVuY3Rpb24pKTsKIAotICAgIC8vIElmIHdlIGhhdmUgYmVlbiBz Y2hlZHVsZWQgaW4gYSBjdXN0b20gcnVuIGxvb3AgbW9kZSwgc2NoZWR1bGUgYSBibG9jayBpbiB0 aGF0IG1vZGUuCi0gICAgYXV0byBibG9jayA9IG1ha2VCbG9ja1B0cihbYWxyZWFkeUNhbGxlZCA9 IGZhbHNlLCBmdW5jdGlvbiA9IFdURk1vdmUoZnVuY3Rpb24pXSAoKSBtdXRhYmxlIHsKLSAgICAg ICAgaWYgKGFscmVhZHlDYWxsZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGFscmVh ZHlDYWxsZWQgPSB0cnVlOwotICAgICAgICBmdW5jdGlvbigpOwotICAgICAgICBmdW5jdGlvbiA9 IG51bGxwdHI7Ci0gICAgfSk7Ci0gICAgZm9yIChhdXRvJiBwYWlyIDogKm1fc2NoZWR1bGVkUGFp cnMpCi0gICAgICAgIENGUnVuTG9vcFBlcmZvcm1CbG9jayhwYWlyLT5ydW5Mb29wKCksIHBhaXIt Pm1vZGUoKSwgYmxvY2suZ2V0KCkpOworICAgIFJ1bkxvb3A6OmRpc3BhdGNoKCptX3NjaGVkdWxl ZFBhaXJzLCBXVEZNb3ZlKGZ1bmN0aW9uKSk7CiB9CiAKIC0gKGlkKWluaXRXaXRoSGFuZGxlOihX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSopaGFuZGxlIG1lc3NhZ2VRdWV1ZTooUmVmUHRyPFdlYkNv cmU6OlN5bmNocm9ub3VzTG9hZGVyTWVzc2FnZVF1ZXVlPiYmKW1lc3NhZ2VRdWV1ZQo= 405295 2020-07-27 11:06:48 -0700 2020-07-27 16:48:22 -0700 Patch for landing bug-214771-20200727110647.patch text/plain 4819 ggaren SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjQ4NzMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA3LTI0ICBHZW9mZnJleSBHYXJlbiAgPGdn YXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRp b25RdWV1ZURlbGVnYXRlIGNhbiB1c2UgUnVuTG9vcDo6ZGlzcGF0Y2gKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDc3MQorCisgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogd3RmL2NmL1J1bkxvb3BDRi5jcHA6Cisg ICAgICAgIChXVEY6OlJ1bkxvb3A6OmRpc3BhdGNoKTogTWlncmF0ZWQgdGhlIG9wdGltaXphdGlv biBmcm9tCisgICAgICAgIFdlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxl Z2F0ZS4gQWxsIENvY29hIFdlYlZpZXdzIGJlZ2luCisgICAgICAgIGxpZmUgd2l0aCBhIHNpbmds ZSBTY2hlZHVsZVBhaXIgc2NoZWR1bGVkIGluIGtDRlJ1bkxvb3BDb21tb25Nb2Rlcywgc28KKyAg ICAgICAgdGhpcyBvcHRpbWl6YXRpb24gaXMgdGhlIGNvbW1vbiBjYXNlLgorCisgICAgICAgIChO b3RlIHRoYXQgSSBkaWQgbm90IGNvcHkgdGhlIGtDRlJ1bkxvb3BEZWZhdWx0TW9kZSBjbGF1c2Ug ZnJvbQorICAgICAgICB0aGUgV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURl bGVnYXRlIG9wdGltaXphdGlvbi4gVGhhdCdzCisgICAgICAgIGJlY2F1c2UgaXQncyBub3QgdGhl IGNvbW1vbiBjYXNlLCBhbmQgYWxzbyBiZWNhdXNlIGl0J3Mgbm90IGNvcnJlY3QgdG8KKyAgICAg ICAgZG8gYSB2YW5pbGxhIGRpc3B0YWNoKCkgaW4gdGhlIGNhc2Ugb2Yga0NGUnVuTG9vcERlZmF1 bHRNb2RlIGJlY2F1c2UgYQorICAgICAgICB2YW5pbGxhIGRpc3BhdGNoKCkgd291bGQgdXNlIGtD RlJ1bkxvb3BDb21tb25Nb2Rlcy4pCisKIDIwMjAtMDctMjMgIEtlaXRoIE1pbGxlciAgPGtlaXRo X21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgaU9TIHNpbXVsYXRvciBkb2VzIG5vdCBzdXBw b3J0IFdlYkFzc2VtYmx5CkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9jZi9SdW5Mb29wQ0YuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL2NmL1J1bkxvb3BDRi5jcHAJKHJldmlzaW9uIDI2 NDg0MSkKKysrIFNvdXJjZS9XVEYvd3RmL2NmL1J1bkxvb3BDRi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTg2LDYgKzg2LDEyIEBAIHZvaWQgUnVuTG9vcDo6c3RvcCgpCiAKIHZvaWQgUnVuTG9vcDo6 ZGlzcGF0Y2goY29uc3QgU2NoZWR1bGVQYWlySGFzaFNldCYgc2NoZWR1bGVQYWlycywgRnVuY3Rp b248dm9pZCgpPiYmIGZ1bmN0aW9uKQogeworICAgIGlmIChzY2hlZHVsZVBhaXJzLnNpemUoKSA9 PSAxKSB7CisgICAgICAgIGF1dG8mIHNjaGVkdWxlUGFpciA9ICpzY2hlZHVsZVBhaXJzLmJlZ2lu KCk7CisgICAgICAgIGlmIChzY2hlZHVsZVBhaXItPm1vZGUoKSA9PSBrQ0ZSdW5Mb29wQ29tbW9u TW9kZXMgJiYgc2NoZWR1bGVQYWlyLT5ydW5Mb29wKCkgPT0gUnVuTG9vcDo6bWFpbigpLm1fcnVu TG9vcCkKKyAgICAgICAgICAgIHJldHVybiBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goV1RGTW92 ZShmdW5jdGlvbikpOworICAgIH0KKwogICAgIGF1dG8gdGltZXIgPSBjcmVhdGVUaW1lcigwX3Ms IGZhbHNlLCBbXSAoQ0ZSdW5Mb29wVGltZXJSZWYgdGltZXIsIHZvaWQqIGNvbnRleHQpIHsKICAg ICAgICAgQXV0b2RyYWluZWRQb29sIHBvb2w7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2 NDg3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTA3LTI0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViQ29yZVJlc291cmNlSGFuZGxlQXNPcGVyYXRpb25RdWV1ZURlbGVnYXRl IGNhbiB1c2UgUnVuTG9vcDo6ZGlzcGF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxNDc3MQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgorCisgICAgICAgIFVzZSB0aGUgbmV3IGhlbHBlciBmdW5jdGlvbiBmb3IgY29uc2lzdGVu Y3ksIGFuZCB0byByZW1vdmUgYSBiaXQgb2YgY29kZS4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvbWFjL1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZS5t bToKKyAgICAgICAgKHNjaGVkdWxlZFdpdGhDdXN0b21SdW5Mb29wTW9kZSk6IERlbGV0ZWQuCisg ICAgICAgICgtW1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZSBj YWxsRnVuY3Rpb25Pbk1haW5UaHJlYWQ6XSk6IERlbGV0ZWQuCisKIDIwMjAtMDctMjQgIE1hcmsg TGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBleGNlcHRpb24gY2hlY2sg aGFuZGxpbmcgYmVsb3cgcG9zdE1lc3NhZ2UoKS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvbWFjL1dlYkNvcmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxl Z2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21h Yy9XZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdhdGUubW0JKHJldmlz aW9uIDI2NDg0MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1dlYkNv cmVSZXNvdXJjZUhhbmRsZUFzT3BlcmF0aW9uUXVldWVEZWxlZ2F0ZS5tbQkod29ya2luZyBjb3B5 KQpAQCAtNDAsMjEgKzQwLDEwIEBACiAjaW1wb3J0IDxwYWwvc3BpL2NmL0NGTmV0d29ya1NQSS5o PgogI2ltcG9ydCA8d3RmL0Jsb2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgor I2ltcG9ydCA8d3RmL1J1bkxvb3AuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLXN0 YXRpYyBib29sIHNjaGVkdWxlZFdpdGhDdXN0b21SdW5Mb29wTW9kZShjb25zdCBPcHRpb25hbDxT Y2hlZHVsZVBhaXJIYXNoU2V0PiYgcGFpcnMpCi17Ci0gICAgaWYgKCFwYWlycykKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIGZvciAoYXV0byYgcGFpciA6ICpwYWlycykgewotICAgICAgICBh dXRvIG1vZGUgPSBwYWlyLT5tb2RlKCk7Ci0gICAgICAgIGlmIChtb2RlICE9IGtDRlJ1bkxvb3BD b21tb25Nb2RlcyAmJiBtb2RlICE9IGtDRlJ1bkxvb3BEZWZhdWx0TW9kZSkKLSAgICAgICAgICAg IHJldHVybiB0cnVlOwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KIEBpbXBsZW1lbnRh dGlvbiBXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc09wZXJhdGlvblF1ZXVlRGVsZWdhdGUKIAogLSAo dm9pZCljYWxsRnVuY3Rpb25Pbk1haW5UaHJlYWQ6KEZ1bmN0aW9uPHZvaWQoKT4mJilmdW5jdGlv bgpAQCAtNjMsMjAgKzUyLDEwIEBAIC0gKHZvaWQpY2FsbEZ1bmN0aW9uT25NYWluVGhyZWFkOihG dW5jdGkKICAgICBpZiAobV9tZXNzYWdlUXVldWUpCiAgICAgICAgIHJldHVybiBtX21lc3NhZ2VR dWV1ZS0+YXBwZW5kKG1ha2VVbmlxdWU8RnVuY3Rpb248dm9pZCgpPj4oV1RGTW92ZShmdW5jdGlv bikpKTsKIAotICAgIC8vIFRoaXMgaXMgdGhlIGNvbW1vbiBjYXNlLgotICAgIGlmICghc2NoZWR1 bGVkV2l0aEN1c3RvbVJ1bkxvb3BNb2RlKG1fc2NoZWR1bGVkUGFpcnMpKQorICAgIGlmICghbV9z Y2hlZHVsZWRQYWlycykKICAgICAgICAgcmV0dXJuIGNhbGxPbk1haW5UaHJlYWQoV1RGTW92ZShm dW5jdGlvbikpOwogCi0gICAgLy8gSWYgd2UgaGF2ZSBiZWVuIHNjaGVkdWxlZCBpbiBhIGN1c3Rv bSBydW4gbG9vcCBtb2RlLCBzY2hlZHVsZSBhIGJsb2NrIGluIHRoYXQgbW9kZS4KLSAgICBhdXRv IGJsb2NrID0gbWFrZUJsb2NrUHRyKFthbHJlYWR5Q2FsbGVkID0gZmFsc2UsIGZ1bmN0aW9uID0g V1RGTW92ZShmdW5jdGlvbildICgpIG11dGFibGUgewotICAgICAgICBpZiAoYWxyZWFkeUNhbGxl ZCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgYWxyZWFkeUNhbGxlZCA9IHRydWU7Ci0g ICAgICAgIGZ1bmN0aW9uKCk7Ci0gICAgICAgIGZ1bmN0aW9uID0gbnVsbHB0cjsKLSAgICB9KTsK LSAgICBmb3IgKGF1dG8mIHBhaXIgOiAqbV9zY2hlZHVsZWRQYWlycykKLSAgICAgICAgQ0ZSdW5M b29wUGVyZm9ybUJsb2NrKHBhaXItPnJ1bkxvb3AoKSwgcGFpci0+bW9kZSgpLCBibG9jay5nZXQo KSk7CisgICAgUnVuTG9vcDo6ZGlzcGF0Y2goKm1fc2NoZWR1bGVkUGFpcnMsIFdURk1vdmUoZnVu Y3Rpb24pKTsKIH0KIAogLSAoaWQpaW5pdFdpdGhIYW5kbGU6KFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlKiloYW5kbGUgbWVzc2FnZVF1ZXVlOihSZWZQdHI8V2ViQ29yZTo6U3luY2hyb25vdXNMb2Fk ZXJNZXNzYWdlUXVldWU+JiYpbWVzc2FnZVF1ZXVlCg==