219089 2020-11-18 08:22:05 -0800 Clean up some code in SharedDisplayListHandle 2020-11-18 10:43:17 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 219091 1 wenson_hsieh wenson_hsieh ggaren sabouhallawa thorton webkit-bug-importer oldest_to_newest 1708613 0 wenson_hsieh 2020-11-18 08:22:05 -0800 ... 1708616 1 414452 wenson_hsieh 2020-11-18 08:26:42 -0800 Created attachment 414452 Patch 1708640 2 414452 ggaren 2020-11-18 09:44:42 -0800 Comment on attachment 414452 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414452&action=review r=me > Source/WebKit/Shared/SharedDisplayListHandle.h:40 > + static constexpr size_t reservedCapacityAtStart() We usually say "reserved capacity" to mean unused bytes. But these bytes are used -- by the DisplayListSharedMemoryHeader. How about just calling this "headerSize"? > Source/WebKit/Shared/SharedDisplayListHandle.h:42 > + return roundUpToMultipleOf<sizeof(uint64_t)>(sizeof(DisplayListSharedMemoryHeader)); Slightly better to use std::max_align_t instead of sizeof(uint64_t). 1708643 3 414452 wenson_hsieh 2020-11-18 09:46:02 -0800 Comment on attachment 414452 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414452&action=review >> Source/WebKit/Shared/SharedDisplayListHandle.h:40 >> + static constexpr size_t reservedCapacityAtStart() > > We usually say "reserved capacity" to mean unused bytes. But these bytes are used -- by the DisplayListSharedMemoryHeader. > > How about just calling this "headerSize"? Sounds good! Changed to headerSize(). >> Source/WebKit/Shared/SharedDisplayListHandle.h:42 >> + return roundUpToMultipleOf<sizeof(uint64_t)>(sizeof(DisplayListSharedMemoryHeader)); > > Slightly better to use std::max_align_t instead of sizeof(uint64_t). 👍🏻 1708649 4 414457 wenson_hsieh 2020-11-18 10:01:37 -0800 Created attachment 414457 Patch 1708672 5 ews-feeder 2020-11-18 10:42:58 -0800 Committed r269969: <https://trac.webkit.org/changeset/269969> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414457. 1708673 6 webkit-bug-importer 2020-11-18 10:43:17 -0800 <rdar://problem/71546202> 414452 2020-11-18 08:26:42 -0800 2020-11-18 10:01:36 -0800 Patch bug-219089-20201118082641.patch text/plain 7175 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5OTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMyZDRhZjY1OTlmYjhlNDQy YTMyOGY0NDY4MWQ5ZDQ2NjRjNjQ4MWQuLmQxYjBiMWQxYzIzMGJkZTYyMTdkNTk5MjA3OWZhMTM3 ODZjOTg0NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjAtMTEtMTggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgc29tZSBj b2RlIGluIFNoYXJlZERpc3BsYXlMaXN0SGFuZGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkwODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIGByZXNlcnZlZENhcGFjaXR5QXRTdGFy dGAgaXMgZGVmaW5lZCBhcyBhIGNvbnN0YW50IDE2IGJ5dGVzLCB3aGljaCBpcyBlbm91Z2ggdG8g ZW5jb21wYXNzIHRoZQorICAgICAgICBjb250ZW50cyBvZiB0aGUgaGVhZGVyIHN0cnVjdHVyZSBp biBhIHNoYXJlZCBkaXNwbGF5IGxpc3QgaGFuZGxlIChpLmUuIGFuIDgtYnl0ZSBhdG9taWMgZm9y IHRoZSBsb2NrLCBhbmQKKyAgICAgICAgYW5vdGhlciA4IGJ5dGVzIGZvciB0aGUgdW5yZWFkIGNv dW50KS4KKworICAgICAgICBJbnN0ZWFkIG9mIGhhcmQtY29kaW5nIHRoaXMsIHdlIGNvdWxkIHNp bXBseSBtYWtlIHRoaXMgYSBjb25zdGV4cHIgZnVuY3Rpb24gdGhhdCByZXR1cm5zIHRoZSBzaXpl IG9mCisgICAgICAgIGBEaXNwbGF5TGlzdFNoYXJlZE1lbW9yeUhlYWRlcmAgKHJvdW5kZWQgdXAg dG8gdGhlIG5lYXJlc3QgOCBieXRlcyBpZiBuZWNlc3NhcnksIHRvIGVuc3VyZSA4LWJ5dGUgYWxp Z25tZW50IG9mCisgICAgICAgIHRoZSBkaXNwbGF5IGxpc3QgaXRlbSBkYXRhKS4KKworICAgICAg ICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL2dyYXBoaWNz L1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kOjp3YWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KToKKyAgICAgICAgKFdlYktp dDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6ZGlkQ3JlYXRlU2hhcmVkRGlzcGxheUxpc3RIYW5k bGUpOgorICAgICAgICAqIFNoYXJlZC9TaGFyZWREaXNwbGF5TGlzdEhhbmRsZS5oOgorICAgICAg ICAoV2ViS2l0OjpTaGFyZWREaXNwbGF5TGlzdEhhbmRsZTo6cmVzZXJ2ZWRDYXBhY2l0eUF0U3Rh cnQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL0Rpc3BsYXlMaXN0V3JpdGVy SGFuZGxlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RGlzcGxheUxpc3RXcml0ZXJIYW5kbGU6OnJl c2V0V3JpdGFibGVPZmZzZXRJZlBvc3NpYmxlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9EaXNwbGF5TGlzdFdyaXRlckhhbmRsZS5oOgorICAgICAgICAoV2ViS2l0OjpEaXNw bGF5TGlzdFdyaXRlckhhbmRsZTo6RGlzcGxheUxpc3RXcml0ZXJIYW5kbGUpOgorICAgICAgICAq IFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Y3JlYXRlSXRl bUJ1ZmZlcik6CisKKyAgICAgICAgQWxzbyBhZGQgYSBzdGF0aWMgYXNzZXJ0IHRoYXQgdGhlIHNp emUgb2YgYSBuZXdseSBhbGxvY2F0ZWQgYnVmZmVyIGlzIGxhcmdlciB0aGFuIHRoZSByZXNlcnZl ZCBoZWFkZXIgY2FwYWNpdHkuCisKIDIwMjAtMTEtMTcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9o c2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvbmN1cnJlbnQgZGlzcGxheSBsaXN0c10gQWRk IGEgd2F5IGZvciBkaXNwbGF5IGxpc3RzIHRvIHBhcnRpYWxseSByZXBsYXkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5k LmNwcCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdC YWNrZW5kLmNwcAppbmRleCAzYjJjNDU3YjJjMDkwYmMzNzc2OTQ4NmU5NjU1YjU2MjcxNmFjZjQz Li4zNTU1OWE1YTgyZjljMmIwZWJiMjcyYWJiOWQ4ZDQwZTgyMzk2MWU4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmlu Z0JhY2tlbmQuY3BwCkBAIC0yMDEsNyArMjAxLDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNr ZW5kOjp3YWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KERpc3BsYXlMaXN0OjpJdGVtQnVmZmVySWQK ICAgICAgICAgfQogICAgICAgICAvLyBPdGhlcndpc2UsIGNvbnRpbnVlIHJlYWRpbmcgdGhlIG5l eHQgZGlzcGxheSBsaXN0IGl0ZW0gYnVmZmVyIGZyb20gdGhlIHN0YXJ0LgogICAgICAgICBtX25l eHRJdGVtQnVmZmVyVG9SZWFkID0geyB9OwotICAgICAgICBhcHBseURpc3BsYXlMaXN0c0Zyb21I YW5kbGUoKmltYWdlQnVmZmVyLCAqbmV4dEhhbmRsZSwgU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6 OnJlc2VydmVkQ2FwYWNpdHlBdFN0YXJ0KTsKKyAgICAgICAgYXBwbHlEaXNwbGF5TGlzdHNGcm9t SGFuZGxlKCppbWFnZUJ1ZmZlciwgKm5leHRIYW5kbGUsIFNoYXJlZERpc3BsYXlMaXN0SGFuZGxl OjpyZXNlcnZlZENhcGFjaXR5QXRTdGFydCgpKTsKICAgICB9CiB9CiAKQEAgLTI0Niw3ICsyNDYs NyBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmRpZENyZWF0ZVNoYXJlZERpc3BsYXlM aXN0SGFuZGxlKERpc3BsYXlMaXN0OjpJdGVtQgogCiAgICAgaWYgKG1fbmV4dEl0ZW1CdWZmZXJU b1JlYWQgPT0gaWRlbnRpZmllcikgewogICAgICAgICBtX25leHRJdGVtQnVmZmVyVG9SZWFkID0g eyB9OwotICAgICAgICB3YWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KGlkZW50aWZpZXIsIFNoYXJl ZERpc3BsYXlMaXN0SGFuZGxlOjpyZXNlcnZlZENhcGFjaXR5QXRTdGFydCwgZGVzdGluYXRpb25C dWZmZXJJZGVudGlmaWVyKTsKKyAgICAgICAgd2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdChpZGVu dGlmaWVyLCBTaGFyZWREaXNwbGF5TGlzdEhhbmRsZTo6cmVzZXJ2ZWRDYXBhY2l0eUF0U3RhcnQo KSwgZGVzdGluYXRpb25CdWZmZXJJZGVudGlmaWVyKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1NoYXJlZERpc3BsYXlMaXN0SGFuZGxlLmggYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9TaGFyZWREaXNwbGF5TGlzdEhhbmRsZS5oCmluZGV4IDkxMDZlOTAxMTUx YmYyODQ0YzkwMTJjNjYyOGIzZmIzMWJkZTA0OTcuLjQ2ZDExZTMyYWMyYmFhNjUzOGFkYjI0ZmUx Y2Q5YjRlNDY4NDM0OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1NoYXJlZERp c3BsYXlMaXN0SGFuZGxlLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvU2hhcmVkRGlzcGxh eUxpc3RIYW5kbGUuaApAQCAtMzcsNyArMzcsMTAgQEAgY2xhc3MgU2hhcmVkRGlzcGxheUxpc3RI YW5kbGUgOiBwdWJsaWMgUmVmQ291bnRlZDxTaGFyZWREaXNwbGF5TGlzdEhhbmRsZT4gewogcHVi bGljOgogICAgIHZpcnR1YWwgflNoYXJlZERpc3BsYXlMaXN0SGFuZGxlKCkgPSBkZWZhdWx0Owog Ci0gICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIHJlc2VydmVkQ2FwYWNpdHlBdFN0YXJ0ID0gMiAq IHNpemVvZih1aW50NjRfdCk7CisgICAgc3RhdGljIGNvbnN0ZXhwciBzaXplX3QgcmVzZXJ2ZWRD YXBhY2l0eUF0U3RhcnQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHJvdW5kVXBUb011bHRpcGxl T2Y8c2l6ZW9mKHVpbnQ2NF90KT4oc2l6ZW9mKERpc3BsYXlMaXN0U2hhcmVkTWVtb3J5SGVhZGVy KSk7CisgICAgfQogCiAgICAgU2hhcmVkTWVtb3J5JiBzaGFyZWRNZW1vcnkoKSB7IHJldHVybiBt X3NoYXJlZE1lbW9yeS5nZXQoKTsgfQogICAgIGNvbnN0IFNoYXJlZE1lbW9yeSYgc2hhcmVkTWVt b3J5KCkgY29uc3QgeyByZXR1cm4gbV9zaGFyZWRNZW1vcnkuZ2V0KCk7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvRGlzcGxheUxpc3RXcml0ZXJI YW5kbGUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9EaXNwbGF5 TGlzdFdyaXRlckhhbmRsZS5jcHAKaW5kZXggYjViN2MwODAyM2QzNTc4ZGE0NjU0ZDUxMmE1Zjhk NWVhMzViMmI5MC4uYWI3OTM3Njc5MjA4ZDZmNzA2ZmRhYzc1MzUwYmNhZmUxNjgxOWNiMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9EaXNwbGF5TGlz dFdyaXRlckhhbmRsZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFw aGljcy9EaXNwbGF5TGlzdFdyaXRlckhhbmRsZS5jcHAKQEAgLTY4LDE1ICs2OCwxNSBAQCBEaXNw bGF5TGlzdDo6SXRlbUJ1ZmZlckhhbmRsZSBEaXNwbGF5TGlzdFdyaXRlckhhbmRsZTo6Y3JlYXRl SGFuZGxlKCkgY29uc3QKIAogYm9vbCBEaXNwbGF5TGlzdFdyaXRlckhhbmRsZTo6cmVzZXRXcml0 YWJsZU9mZnNldElmUG9zc2libGUoKQogewotICAgIGlmIChtX3dyaXRhYmxlT2Zmc2V0IDw9IFNo YXJlZERpc3BsYXlMaXN0SGFuZGxlOjpyZXNlcnZlZENhcGFjaXR5QXRTdGFydCkgewotICAgICAg ICBSRUxFQVNFX0FTU0VSVChtX3dyaXRhYmxlT2Zmc2V0ID09IFNoYXJlZERpc3BsYXlMaXN0SGFu ZGxlOjpyZXNlcnZlZENhcGFjaXR5QXRTdGFydCk7CisgICAgaWYgKG1fd3JpdGFibGVPZmZzZXQg PD0gU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJlc2VydmVkQ2FwYWNpdHlBdFN0YXJ0KCkpIHsK KyAgICAgICAgUkVMRUFTRV9BU1NFUlQobV93cml0YWJsZU9mZnNldCA9PSBTaGFyZWREaXNwbGF5 TGlzdEhhbmRsZTo6cmVzZXJ2ZWRDYXBhY2l0eUF0U3RhcnQoKSk7CiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIAogICAgIGlmICh1bnJlYWRCeXRlcygpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBtX3dyaXRhYmxlT2Zmc2V0ID0gU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJl c2VydmVkQ2FwYWNpdHlBdFN0YXJ0OworICAgIG1fd3JpdGFibGVPZmZzZXQgPSBTaGFyZWREaXNw bGF5TGlzdEhhbmRsZTo6cmVzZXJ2ZWRDYXBhY2l0eUF0U3RhcnQoKTsKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9EaXNwbGF5TGlzdFdyaXRlckhhbmRsZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQ VS9ncmFwaGljcy9EaXNwbGF5TGlzdFdyaXRlckhhbmRsZS5oCmluZGV4IDc1ZjY1MDg0ZDAwZjg5 MTE3ZDBhMWUwNjUwMjRhZWQ5MzI1MTMzZmYuLjQyZjQ4OTg4NTlmOTA2OWFmYjliYmE3ZjgwZjBm OWEzZDBmNGEzN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3Jh cGhpY3MvRGlzcGxheUxpc3RXcml0ZXJIYW5kbGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL0Rpc3BsYXlMaXN0V3JpdGVySGFuZGxlLmgKQEAgLTQ5LDcgKzQ5 LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBEaXNwbGF5TGlzdFdyaXRlckhhbmRsZShXZWJD b3JlOjpEaXNwbGF5TGlzdDo6SXRlbUJ1ZmZlcklkZW50aWZpZXIgaWRlbnRpZmllciwgUmVmPFNo YXJlZE1lbW9yeT4mJiBzaGFyZWRNZW1vcnkpCiAgICAgICAgIDogU2hhcmVkRGlzcGxheUxpc3RI YW5kbGUoaWRlbnRpZmllciwgV1RGTW92ZShzaGFyZWRNZW1vcnkpKQotICAgICAgICAsIG1fd3Jp dGFibGVPZmZzZXQoU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJlc2VydmVkQ2FwYWNpdHlBdFN0 YXJ0KQorICAgICAgICAsIG1fd3JpdGFibGVPZmZzZXQoU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6 OnJlc2VydmVkQ2FwYWNpdHlBdFN0YXJ0KCkpCiAgICAgewogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCmluZGV4IDE0ODZkMmI3M2NmNTkyYmI3ZmEzYTRj ZmEzOGE3OWIwNjFmNDg1MzQuLjAwYTZhM2Y3OThhMmZiZGQyMGJiYzUzMjJkMGVmNjI2MTY1ZGZh MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVt b3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKQEAgLTIzOSw4 ICsyMzksOSBAQCBEaXNwbGF5TGlzdDo6SXRlbUJ1ZmZlckhhbmRsZSBSZW1vdGVSZW5kZXJpbmdC YWNrZW5kUHJveHk6OmNyZWF0ZUl0ZW1CdWZmZXIoc2l6ZQogICAgIH0KIAogICAgIHN0YXRpYyBj b25zdGV4cHIgc2l6ZV90IGRlZmF1bHRTaGFyZWRJdGVtQnVmZmVyU2l6ZSA9IDEgPDwgMTY7Cisg ICAgc3RhdGljX2Fzc2VydChkZWZhdWx0U2hhcmVkSXRlbUJ1ZmZlclNpemUgPiBTaGFyZWREaXNw bGF5TGlzdEhhbmRsZTo6cmVzZXJ2ZWRDYXBhY2l0eUF0U3RhcnQoKSk7CiAKLSAgICBhdXRvIHNo YXJlZE1lbW9yeSA9IFNoYXJlZE1lbW9yeTo6YWxsb2NhdGUoc3RkOjptYXgoZGVmYXVsdFNoYXJl ZEl0ZW1CdWZmZXJTaXplLCBjYXBhY2l0eSArIFNoYXJlZERpc3BsYXlMaXN0SGFuZGxlOjpyZXNl cnZlZENhcGFjaXR5QXRTdGFydCkpOworICAgIGF1dG8gc2hhcmVkTWVtb3J5ID0gU2hhcmVkTWVt b3J5OjphbGxvY2F0ZShzdGQ6Om1heChkZWZhdWx0U2hhcmVkSXRlbUJ1ZmZlclNpemUsIGNhcGFj aXR5ICsgU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJlc2VydmVkQ2FwYWNpdHlBdFN0YXJ0KCkp KTsKICAgICBpZiAoIXNoYXJlZE1lbW9yeSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAo= 414457 2020-11-18 10:01:37 -0800 2020-11-18 10:42:58 -0800 Patch bug-219089-20201118100137.patch text/plain 6997 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5OTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMyZDRhZjY1OTlmYjhlNDQy YTMyOGY0NDY4MWQ5ZDQ2NjRjNjQ4MWQuLjJkMDQ3YjgyNWE2NWY5Nzc3MGFmZDE1ZDE3N2JiMjIy MjBjYzczMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAtMTEtMTggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgc29tZSBj b2RlIGluIFNoYXJlZERpc3BsYXlMaXN0SGFuZGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkwODkKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9m ZiBHYXJlbi4KKworICAgICAgICBDdXJyZW50bHksIGByZXNlcnZlZENhcGFjaXR5QXRTdGFydGAg aXMgZGVmaW5lZCBhcyBhIGNvbnN0YW50IDE2IGJ5dGVzLCB3aGljaCBpcyBlbm91Z2ggdG8gZW5j b21wYXNzIHRoZQorICAgICAgICBjb250ZW50cyBvZiB0aGUgaGVhZGVyIHN0cnVjdHVyZSBpbiBh IHNoYXJlZCBkaXNwbGF5IGxpc3QgaGFuZGxlIChpLmUuIGFuIDgtYnl0ZSBhdG9taWMgZm9yIHRo ZSBsb2NrLCBhbmQKKyAgICAgICAgYW5vdGhlciA4IGJ5dGVzIGZvciB0aGUgdW5yZWFkIGNvdW50 KS4KKworICAgICAgICBJbnN0ZWFkIG9mIGhhcmQtY29kaW5nIHRoaXMsIHdlIGNvdWxkIHNpbXBs eSBtYWtlIHRoaXMgYSBjb25zdGV4cHIgZnVuY3Rpb24gdGhhdCByZXR1cm5zIHRoZSBzaXplIG9m CisgICAgICAgIGBEaXNwbGF5TGlzdFNoYXJlZE1lbW9yeUhlYWRlcmAgKHJvdW5kZWQgdXAgdG8g ZW5zdXJlIGFsaWdubWVudCBvZiBhbGwgZGlzcGxheSBsaXN0IGl0ZW0gZGF0YSkuCisKKyAgICAg ICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogR1BVUHJvY2Vzcy9ncmFwaGlj cy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVu ZGVyaW5nQmFja2VuZDo6d2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdCk6CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmRpZENyZWF0ZVNoYXJlZERpc3BsYXlMaXN0SGFu ZGxlKToKKyAgICAgICAgKiBTaGFyZWQvU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUuaDoKKyAgICAg ICAgKFdlYktpdDo6U2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OmhlYWRlclNpemUpOgorICAgICAg ICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL0Rpc3BsYXlMaXN0V3JpdGVySGFuZGxlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6RGlzcGxheUxpc3RXcml0ZXJIYW5kbGU6OnJlc2V0V3JpdGFibGVP ZmZzZXRJZlBvc3NpYmxlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9EaXNw bGF5TGlzdFdyaXRlckhhbmRsZS5oOgorICAgICAgICAoV2ViS2l0OjpEaXNwbGF5TGlzdFdyaXRl ckhhbmRsZTo6RGlzcGxheUxpc3RXcml0ZXJIYW5kbGUpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv R1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Y3JlYXRlSXRlbUJ1ZmZlcik6CisK KyAgICAgICAgQWxzbyBhZGQgYSBzdGF0aWMgYXNzZXJ0IHRoYXQgdGhlIHNpemUgb2YgYSBuZXds eSBhbGxvY2F0ZWQgYnVmZmVyIGlzIGxhcmdlciB0aGFuIHRoZSByZXNlcnZlZCBoZWFkZXIgY2Fw YWNpdHkuCisKIDIwMjAtMTEtMTcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgW0NvbmN1cnJlbnQgZGlzcGxheSBsaXN0c10gQWRkIGEgd2F5IGZvciBk aXNwbGF5IGxpc3RzIHRvIHBhcnRpYWxseSByZXBsYXkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcCBiL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcApp bmRleCAzYjJjNDU3YjJjMDkwYmMzNzc2OTQ4NmU5NjU1YjU2MjcxNmFjZjQzLi4yNDBmM2ExOTdh NDUyNzE5ZTYzOGJjNTQ5OTQ3MzQ4OWI3NmMyYTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3Bw CkBAIC0yMDEsNyArMjAxLDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjp3YWtlVXBB bmRBcHBseURpc3BsYXlMaXN0KERpc3BsYXlMaXN0OjpJdGVtQnVmZmVySWQKICAgICAgICAgfQog ICAgICAgICAvLyBPdGhlcndpc2UsIGNvbnRpbnVlIHJlYWRpbmcgdGhlIG5leHQgZGlzcGxheSBs aXN0IGl0ZW0gYnVmZmVyIGZyb20gdGhlIHN0YXJ0LgogICAgICAgICBtX25leHRJdGVtQnVmZmVy VG9SZWFkID0geyB9OwotICAgICAgICBhcHBseURpc3BsYXlMaXN0c0Zyb21IYW5kbGUoKmltYWdl QnVmZmVyLCAqbmV4dEhhbmRsZSwgU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJlc2VydmVkQ2Fw YWNpdHlBdFN0YXJ0KTsKKyAgICAgICAgYXBwbHlEaXNwbGF5TGlzdHNGcm9tSGFuZGxlKCppbWFn ZUJ1ZmZlciwgKm5leHRIYW5kbGUsIFNoYXJlZERpc3BsYXlMaXN0SGFuZGxlOjpoZWFkZXJTaXpl KCkpOwogICAgIH0KIH0KIApAQCAtMjQ2LDcgKzI0Niw3IEBAIHZvaWQgUmVtb3RlUmVuZGVyaW5n QmFja2VuZDo6ZGlkQ3JlYXRlU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUoRGlzcGxheUxpc3Q6Okl0 ZW1CCiAKICAgICBpZiAobV9uZXh0SXRlbUJ1ZmZlclRvUmVhZCA9PSBpZGVudGlmaWVyKSB7CiAg ICAgICAgIG1fbmV4dEl0ZW1CdWZmZXJUb1JlYWQgPSB7IH07Ci0gICAgICAgIHdha2VVcEFuZEFw cGx5RGlzcGxheUxpc3QoaWRlbnRpZmllciwgU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJlc2Vy dmVkQ2FwYWNpdHlBdFN0YXJ0LCBkZXN0aW5hdGlvbkJ1ZmZlcklkZW50aWZpZXIpOworICAgICAg ICB3YWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KGlkZW50aWZpZXIsIFNoYXJlZERpc3BsYXlMaXN0 SGFuZGxlOjpoZWFkZXJTaXplKCksIGRlc3RpbmF0aW9uQnVmZmVySWRlbnRpZmllcik7CiAgICAg fQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9TaGFyZWREaXNwbGF5TGlz dEhhbmRsZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUu aAppbmRleCA5MTA2ZTkwMTE1MWJmMjg0NGM5MDEyYzY2MjhiM2ZiMzFiZGUwNDk3Li44NjVmYWVk Y2RlNzA2M2E4NDQyNDA1MGJiYjcxZmM0NmQwMjJkNTBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9TaGFyZWREaXNwbGF5TGlzdEhhbmRsZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv U2hhcmVkL1NoYXJlZERpc3BsYXlMaXN0SGFuZGxlLmgKQEAgLTM3LDcgKzM3LDEwIEBAIGNsYXNz IFNoYXJlZERpc3BsYXlMaXN0SGFuZGxlIDogcHVibGljIFJlZkNvdW50ZWQ8U2hhcmVkRGlzcGxh eUxpc3RIYW5kbGU+IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5TaGFyZWREaXNwbGF5TGlzdEhh bmRsZSgpID0gZGVmYXVsdDsKIAotICAgIHN0YXRpYyBjb25zdGV4cHIgYXV0byByZXNlcnZlZENh cGFjaXR5QXRTdGFydCA9IDIgKiBzaXplb2YodWludDY0X3QpOworICAgIHN0YXRpYyBjb25zdGV4 cHIgc2l6ZV90IGhlYWRlclNpemUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHJvdW5kVXBUb011 bHRpcGxlT2Y8c2l6ZW9mKHN0ZDo6bWF4X2FsaWduX3QpPihzaXplb2YoRGlzcGxheUxpc3RTaGFy ZWRNZW1vcnlIZWFkZXIpKTsKKyAgICB9CiAKICAgICBTaGFyZWRNZW1vcnkmIHNoYXJlZE1lbW9y eSgpIHsgcmV0dXJuIG1fc2hhcmVkTWVtb3J5LmdldCgpOyB9CiAgICAgY29uc3QgU2hhcmVkTWVt b3J5JiBzaGFyZWRNZW1vcnkoKSBjb25zdCB7IHJldHVybiBtX3NoYXJlZE1lbW9yeS5nZXQoKTsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9EaXNw bGF5TGlzdFdyaXRlckhhbmRsZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dy YXBoaWNzL0Rpc3BsYXlMaXN0V3JpdGVySGFuZGxlLmNwcAppbmRleCBiNWI3YzA4MDIzZDM1Nzhk YTQ2NTRkNTEyYTVmOGQ1ZWEzNWIyYjkwLi5kODJlM2RmYWRlZTg2ZWIwZDU1NDFiMjc4NTc2ODIx ODdmNjVjZjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL0Rpc3BsYXlMaXN0V3JpdGVySGFuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL0Rpc3BsYXlMaXN0V3JpdGVySGFuZGxlLmNwcApAQCAtNjgsMTUg KzY4LDE1IEBAIERpc3BsYXlMaXN0OjpJdGVtQnVmZmVySGFuZGxlIERpc3BsYXlMaXN0V3JpdGVy SGFuZGxlOjpjcmVhdGVIYW5kbGUoKSBjb25zdAogCiBib29sIERpc3BsYXlMaXN0V3JpdGVySGFu ZGxlOjpyZXNldFdyaXRhYmxlT2Zmc2V0SWZQb3NzaWJsZSgpCiB7Ci0gICAgaWYgKG1fd3JpdGFi bGVPZmZzZXQgPD0gU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJlc2VydmVkQ2FwYWNpdHlBdFN0 YXJ0KSB7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUKG1fd3JpdGFibGVPZmZzZXQgPT0gU2hhcmVk RGlzcGxheUxpc3RIYW5kbGU6OnJlc2VydmVkQ2FwYWNpdHlBdFN0YXJ0KTsKKyAgICBpZiAobV93 cml0YWJsZU9mZnNldCA8PSBTaGFyZWREaXNwbGF5TGlzdEhhbmRsZTo6aGVhZGVyU2l6ZSgpKSB7 CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKG1fd3JpdGFibGVPZmZzZXQgPT0gU2hhcmVkRGlzcGxh eUxpc3RIYW5kbGU6OmhlYWRlclNpemUoKSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K IAogICAgIGlmICh1bnJlYWRCeXRlcygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBt X3dyaXRhYmxlT2Zmc2V0ID0gU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OnJlc2VydmVkQ2FwYWNp dHlBdFN0YXJ0OworICAgIG1fd3JpdGFibGVPZmZzZXQgPSBTaGFyZWREaXNwbGF5TGlzdEhhbmRs ZTo6aGVhZGVyU2l6ZSgpOwogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL0Rpc3BsYXlMaXN0V3JpdGVySGFuZGxl LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL0Rpc3BsYXlMaXN0V3Jp dGVySGFuZGxlLmgKaW5kZXggNzVmNjUwODRkMDBmODkxMTdkMGExZTA2NTAyNGFlZDkzMjUxMzNm Zi4uNDRlZWZhYWI0OGY0OTExZmVhZGJlZDU4YWU1N2EyYTYzYjFkOGFkNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9EaXNwbGF5TGlzdFdyaXRlckhh bmRsZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvRGlzcGxh eUxpc3RXcml0ZXJIYW5kbGUuaApAQCAtNDksNyArNDksNyBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIERpc3BsYXlMaXN0V3JpdGVySGFuZGxlKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpJdGVtQnVm ZmVySWRlbnRpZmllciBpZGVudGlmaWVyLCBSZWY8U2hhcmVkTWVtb3J5PiYmIHNoYXJlZE1lbW9y eSkKICAgICAgICAgOiBTaGFyZWREaXNwbGF5TGlzdEhhbmRsZShpZGVudGlmaWVyLCBXVEZNb3Zl KHNoYXJlZE1lbW9yeSkpCi0gICAgICAgICwgbV93cml0YWJsZU9mZnNldChTaGFyZWREaXNwbGF5 TGlzdEhhbmRsZTo6cmVzZXJ2ZWRDYXBhY2l0eUF0U3RhcnQpCisgICAgICAgICwgbV93cml0YWJs ZU9mZnNldChTaGFyZWREaXNwbGF5TGlzdEhhbmRsZTo6aGVhZGVyU2l6ZSgpKQogICAgIHsKICAg ICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcAppbmRleCAxNDg2 ZDJiNzNjZjU5MmJiN2ZhM2E0Y2ZhMzhhNzliMDYxZjQ4NTM0Li5lNTJjYTQwNzM1ZTk3OWUzODdk ODNkMTRkMjdjNDk2NjE3OGVjZmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkuY3BwCkBAIC0yMzksOCArMjM5LDkgQEAgRGlzcGxheUxpc3Q6Okl0ZW1CdWZmZXJIYW5k bGUgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpjcmVhdGVJdGVtQnVmZmVyKHNpemUKICAg ICB9CiAKICAgICBzdGF0aWMgY29uc3RleHByIHNpemVfdCBkZWZhdWx0U2hhcmVkSXRlbUJ1ZmZl clNpemUgPSAxIDw8IDE2OworICAgIHN0YXRpY19hc3NlcnQoZGVmYXVsdFNoYXJlZEl0ZW1CdWZm ZXJTaXplID4gU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OmhlYWRlclNpemUoKSk7CiAKLSAgICBh dXRvIHNoYXJlZE1lbW9yeSA9IFNoYXJlZE1lbW9yeTo6YWxsb2NhdGUoc3RkOjptYXgoZGVmYXVs dFNoYXJlZEl0ZW1CdWZmZXJTaXplLCBjYXBhY2l0eSArIFNoYXJlZERpc3BsYXlMaXN0SGFuZGxl OjpyZXNlcnZlZENhcGFjaXR5QXRTdGFydCkpOworICAgIGF1dG8gc2hhcmVkTWVtb3J5ID0gU2hh cmVkTWVtb3J5OjphbGxvY2F0ZShzdGQ6Om1heChkZWZhdWx0U2hhcmVkSXRlbUJ1ZmZlclNpemUs IGNhcGFjaXR5ICsgU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OmhlYWRlclNpemUoKSkpOwogICAg IGlmICghc2hhcmVkTWVtb3J5KQogICAgICAgICByZXR1cm4geyB9OwogCg==