212642 2020-06-02 09:54:10 -0700 Pass nullptr for the 2nd argument of FileReaderLoader 2020-06-02 11:11:19 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tetsuharu.ohzeki webkit-unassigned darin webkit-bug-importer oldest_to_newest 1658344 0 tetsuharu.ohzeki 2020-06-02 09:54:10 -0700 I seem this would make its constructor more clearly. 1658346 1 400832 tetsuharu.ohzeki 2020-06-02 09:56:07 -0700 Created attachment 400832 Patch 1658349 2 400832 darin 2020-06-02 10:02:05 -0700 Comment on attachment 400832 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400832&action=review > Source/WebCore/ChangeLog:3 > + Use WTF::Optional for the 2nd argument of FileReaderLoader Why? 1658350 3 400832 darin 2020-06-02 10:02:29 -0700 Comment on attachment 400832 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400832&action=review >> Source/WebCore/ChangeLog:3 >> + Use WTF::Optional for the 2nd argument of FileReaderLoader > > Why? Pointers are intrinsically "optional" and we use nullptr to mean "no value". 1658361 4 tetsuharu.ohzeki 2020-06-02 10:18:46 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 400832 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=400832&action=review > > >> Source/WebCore/ChangeLog:3 > >> + Use WTF::Optional for the 2nd argument of FileReaderLoader > > > > Why? > > Pointers are intrinsically "optional" and we use nullptr to mean "no value". I know it. First, I had thought replacing this `0` to `nullptr`. https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/fileapi/FileReaderSync.cpp#L48 But I think it maybe better to use WTF::Optional. To make it more simply, Is replacing nullptr best? 1658362 5 darin 2020-06-02 10:19:31 -0700 (In reply to Tetsuharu Ohzeki from comment #4) > To make it more simply, Is replacing nullptr best? Yes, I think so. 1658363 6 tetsuharu.ohzeki 2020-06-02 10:22:00 -0700 (In reply to Darin Adler from comment #5) > (In reply to Tetsuharu Ohzeki from comment #4) > > To make it more simply, Is replacing nullptr best? > > Yes, I think so. Okay. I'll change so. 1658366 7 400836 tetsuharu.ohzeki 2020-06-02 10:33:00 -0700 Created attachment 400836 Patch 1658367 8 tetsuharu.ohzeki 2020-06-02 10:34:11 -0700 Darin, thank you! 1658386 9 ews-feeder 2020-06-02 11:10:58 -0700 Committed r262430: <https://trac.webkit.org/changeset/262430> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400836. 1658387 10 webkit-bug-importer 2020-06-02 11:11:19 -0700 <rdar://problem/63883364> 400832 2020-06-02 09:56:07 -0700 2020-06-02 10:32:56 -0700 Patch bug-212642-20200603015606.patch text/plain 8148 tetsuharu.ohzeki U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk5MTVhNDhiMDMzMDU2 NGU4MTViZjU3MjljN2RhZDY2YmNlMjRjMi4uZWRiZTY2MTc4ODgxNDEyMWRiOTJjYzBlMDAyYmE1 Nzk0NTBjNTc3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA2LTAyICBUZXRz dWhhcnUgT2h6ZWtpICA8dGV0c3VoYXJ1Lm9oemVraUBnbWFpbC5jb20+CisKKyAgICAgICAgVXNl IFdURjo6T3B0aW9uYWwgZm9yIHRoZSAybmQgYXJndW1lbnQgb2YgRmlsZVJlYWRlckxvYWRlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyNjQyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmaWxlYXBp L0ZpbGVSZWFkZXJMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlckxvYWRl cjo6RmlsZVJlYWRlckxvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyTG9hZGVy OjpzdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyTG9hZGVyOjpkaWRSZWNlaXZl UmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlckxvYWRlcjo6ZGlkUmVjZWl2 ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlckxvYWRlcjo6ZGlkRmluaXNoTG9h ZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyTG9hZGVyOjpmYWlsZWQpOgorICAg ICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlckxvYWRlcjo6c3RyaW5nUmVzdWx0KToKKyAgICAgICAg KFdlYkNvcmU6OkZpbGVSZWFkZXJMb2FkZXI6OmNvbnZlcnRUb1RleHQpOgorICAgICAgICAqIGZp bGVhcGkvRmlsZVJlYWRlckxvYWRlci5oOgorICAgICAgICAqIGZpbGVhcGkvRmlsZVJlYWRlclN5 bmMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlclN5bmM6OnJlYWRBc0FycmF5QnVm ZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXJTeW5jOjpyZWFkQXNCaW5hcnlTdHJp bmcpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlclN5bmM6OnJlYWRBc1RleHQpOgorICAg ICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlclN5bmM6OnJlYWRBc0RhdGFVUkwpOgorCiAyMDIwLTA2 LTAyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgTWFrZSBnZW5lcmF0 ZWQgQysrIGNvZGUgdXNlIG1vZGVybiBDKysKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Zp bGVhcGkvRmlsZVJlYWRlckxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVS ZWFkZXJMb2FkZXIuY3BwCmluZGV4IDg5NzE1NWExMjI5MWRjNGU1MzUyMzRlMDg4YThjNDJlZmEw OWI1YTcuLjc4NDU5MzY0ZDc1NGFhMGRmZmI1YzQ1M2YwMzQ1ZDNhZGI2ODBmNDMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmNwcApAQCAtNDQsNiArNDQsNyBA QAogI2luY2x1ZGUgIlRocmVhZGFibGVCbG9iUmVnaXN0cnkuaCIKICNpbmNsdWRlICJUaHJlYWRh YmxlTG9hZGVyLmgiCiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvQXJyYXlCdWZmZXIuaD4KKyNp bmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAjaW5jbHVk ZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0Jhc2U2NC5oPgpAQCAtNTMsNyAr NTQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNvbnN0IGludCBkZWZhdWx0QnVmZmVyTGVu Z3RoID0gMzI3Njg7CiAKLUZpbGVSZWFkZXJMb2FkZXI6OkZpbGVSZWFkZXJMb2FkZXIoUmVhZFR5 cGUgcmVhZFR5cGUsIEZpbGVSZWFkZXJMb2FkZXJDbGllbnQqIGNsaWVudCkKK0ZpbGVSZWFkZXJM b2FkZXI6OkZpbGVSZWFkZXJMb2FkZXIoUmVhZFR5cGUgcmVhZFR5cGUsIE9wdGlvbmFsPEZpbGVS ZWFkZXJMb2FkZXJDbGllbnQqPiBjbGllbnQpCiAgICAgOiBtX3JlYWRUeXBlKHJlYWRUeXBlKQog ICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9pc1Jhd0RhdGFDb252ZXJ0ZWQoZmFsc2Up CkBAIC05NCw3ICs5NSw3IEBAIHZvaWQgRmlsZVJlYWRlckxvYWRlcjo6c3RhcnQoU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgQmxvCiAgICAgb3B0aW9ucy5t b2RlID0gRmV0Y2hPcHRpb25zOjpNb2RlOjpTYW1lT3JpZ2luOwogICAgIG9wdGlvbnMuY29udGVu dFNlY3VyaXR5UG9saWN5RW5mb3JjZW1lbnQgPSBDb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNl bWVudDo6RG9Ob3RFbmZvcmNlOwogCi0gICAgaWYgKG1fY2xpZW50KQorICAgIGlmIChtX2NsaWVu dC5oYXNWYWx1ZSgpKQogICAgICAgICBtX2xvYWRlciA9IFRocmVhZGFibGVMb2FkZXI6OmNyZWF0 ZSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgKnRoaXMsIFdURk1vdmUocmVxdWVzdCksIG9wdGlv bnMpOwogICAgIGVsc2UKICAgICAgICAgVGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlc291cmNlU3lu Y2hyb25vdXNseSgqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgV1RGTW92ZShyZXF1ZXN0KSwgKnRo aXMsIG9wdGlvbnMpOwpAQCAtMTU4LDggKzE1OSw4IEBAIHZvaWQgRmlsZVJlYWRlckxvYWRlcjo6 ZGlkUmVjZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcsIGNvbnN0IFJlc291cmNlUmVzcG9uc2Um CiAKICAgICBtX3RvdGFsQnl0ZXMgPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obGVuZ3RoKTsKIAot ICAgIGlmIChtX2NsaWVudCkKLSAgICAgICAgbV9jbGllbnQtPmRpZFN0YXJ0TG9hZGluZygpOwor ICAgIGlmIChtX2NsaWVudC5oYXNWYWx1ZSgpKQorICAgICAgICBtX2NsaWVudC52YWx1ZSgpLT5k aWRTdGFydExvYWRpbmcoKTsKIH0KIAogdm9pZCBGaWxlUmVhZGVyTG9hZGVyOjpkaWRSZWNlaXZl RGF0YShjb25zdCBjaGFyKiBkYXRhLCBpbnQgZGF0YUxlbmd0aCkKQEAgLTIxMCw4ICsyMTEsOCBA QCB2b2lkIEZpbGVSZWFkZXJMb2FkZXI6OmRpZFJlY2VpdmVEYXRhKGNvbnN0IGNoYXIqIGRhdGEs IGludCBkYXRhTGVuZ3RoKQogCiAgICAgbV9pc1Jhd0RhdGFDb252ZXJ0ZWQgPSBmYWxzZTsKIAot ICAgIGlmIChtX2NsaWVudCkKLSAgICAgICAgbV9jbGllbnQtPmRpZFJlY2VpdmVEYXRhKCk7Cisg ICAgaWYgKG1fY2xpZW50Lmhhc1ZhbHVlKCkpCisgICAgICAgIG1fY2xpZW50LnZhbHVlKCktPmRp ZFJlY2VpdmVEYXRhKCk7CiB9CiAKIHZvaWQgRmlsZVJlYWRlckxvYWRlcjo6ZGlkRmluaXNoTG9h ZGluZyh1bnNpZ25lZCBsb25nKQpAQCAtMjIxLDggKzIyMiw4IEBAIHZvaWQgRmlsZVJlYWRlckxv YWRlcjo6ZGlkRmluaXNoTG9hZGluZyh1bnNpZ25lZCBsb25nKQogICAgICAgICBtX3RvdGFsQnl0 ZXMgPSBtX2J5dGVzTG9hZGVkOwogICAgIH0KICAgICBjbGVhbnVwKCk7Ci0gICAgaWYgKG1fY2xp ZW50KQotICAgICAgICBtX2NsaWVudC0+ZGlkRmluaXNoTG9hZGluZygpOworICAgIGlmIChtX2Ns aWVudC5oYXNWYWx1ZSgpKQorICAgICAgICBtX2NsaWVudC52YWx1ZSgpLT5kaWRGaW5pc2hMb2Fk aW5nKCk7CiB9CiAKIHZvaWQgRmlsZVJlYWRlckxvYWRlcjo6ZGlkRmFpbChjb25zdCBSZXNvdXJj ZUVycm9yJiBlcnJvcikKQEAgLTIzOCw4ICsyMzksOCBAQCB2b2lkIEZpbGVSZWFkZXJMb2FkZXI6 OmZhaWxlZChGaWxlRXJyb3I6OkVycm9yQ29kZSBlcnJvckNvZGUpCiB7CiAgICAgbV9lcnJvckNv ZGUgPSBlcnJvckNvZGU7CiAgICAgY2xlYW51cCgpOwotICAgIGlmIChtX2NsaWVudCkKLSAgICAg ICAgbV9jbGllbnQtPmRpZEZhaWwobV9lcnJvckNvZGUpOworICAgIGlmIChtX2NsaWVudC5oYXNW YWx1ZSgpKQorICAgICAgICBtX2NsaWVudC52YWx1ZSgpLT5kaWRGYWlsKG1fZXJyb3JDb2RlKTsK IH0KIAogRmlsZUVycm9yOjpFcnJvckNvZGUgRmlsZVJlYWRlckxvYWRlcjo6dG9FcnJvckNvZGUo QmxvYlJlc291cmNlSGFuZGxlOjpFcnJvciBlcnJvcikKQEAgLTMwOCw3ICszMDksNyBAQCBTdHJp bmcgRmlsZVJlYWRlckxvYWRlcjo6c3RyaW5nUmVzdWx0KCkKICAgICBkZWZhdWx0OgogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9Ci0gICAgCisKICAgICByZXR1cm4gbV9zdHJp bmdSZXN1bHQ7CiB9CiAKQEAgLTMyMCw3ICszMjEsNyBAQCB2b2lkIEZpbGVSZWFkZXJMb2FkZXI6 OmNvbnZlcnRUb1RleHQoKQogICAgIC8vIERlY29kZSB0aGUgZGF0YS4KICAgICAvLyBUaGUgRmls ZSBBUEkgc3BlYyBzYXlzIHRoYXQgd2Ugc2hvdWxkIHVzZSB0aGUgc3VwcGxpZWQgZW5jb2Rpbmcg aWYgaXQgaXMgdmFsaWQuIEhvd2V2ZXIsIHdlIGNob29zZSB0byBpZ25vcmUgdGhpcwogICAgIC8v IHJlcXVpcmVtZW50IGluIG9yZGVyIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCBob3cgV2ViS2l0IGRl Y29kZXMgdGhlIHdlYiBjb250ZW50OiBhbHdheXMgaGFzIHRoZSBCT00gb3ZlcnJpZGUgdGhlCi0g ICAgLy8gcHJvdmlkZWQgZW5jb2RpbmcuICAgICAKKyAgICAvLyBwcm92aWRlZCBlbmNvZGluZy4K ICAgICAvLyBGSVhNRTogY29uc2lkZXIgc3VwcG9ydGluZyBpbmNyZW1lbnRhbCBkZWNvZGluZyB0 byBpbXByb3ZlIHRoZSBwZXJmLgogICAgIGlmICghbV9kZWNvZGVyKQogICAgICAgICBtX2RlY29k ZXIgPSBUZXh0UmVzb3VyY2VEZWNvZGVyOjpjcmVhdGUoInRleHQvcGxhaW4iLCBtX2VuY29kaW5n LmlzVmFsaWQoKSA/IG1fZW5jb2RpbmcgOiBVVEY4RW5jb2RpbmcoKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFkZXJMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5oCmluZGV4IDdhNDI4YmU1MDU3ZDJiYzZhYzQxY2U5 Mjk4YjI1NGZjNWEyOWUwMGEuLmQ3NTNhZDc1ZGRjNTdlM2EwYWY3NzU2MTFiYzAwNTY0NzI4NzRi OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5oCkBAIC0zNiw2 ICszNiw3IEBACiAjaW5jbHVkZSAiVGV4dEVuY29kaW5nLmgiCiAjaW5jbHVkZSAiVGhyZWFkYWJs ZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CisjaW5jbHVkZSA8d3Rm L09wdGlvbmFsLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFj ZSBKU0MgewpAQCAtNjEsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgfTsKIAogICAgIC8vIElmIGNs aWVudCBpcyBnaXZlbiwgZG8gdGhlIGxvYWRpbmcgYXN5bmNocm9ub3VzbHkuIE90aGVyd2lzZSwg bG9hZCBzeW5jaHJvbm91c2x5LgotICAgIFdFQkNPUkVfRVhQT1JUIEZpbGVSZWFkZXJMb2FkZXIo UmVhZFR5cGUsIEZpbGVSZWFkZXJMb2FkZXJDbGllbnQqKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBG aWxlUmVhZGVyTG9hZGVyKFJlYWRUeXBlLCBPcHRpb25hbDxGaWxlUmVhZGVyTG9hZGVyQ2xpZW50 Kj4pOwogICAgIH5GaWxlUmVhZGVyTG9hZGVyKCk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHN0YXJ0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBCbG9iJik7CkBAIC05Nyw3ICs5OCw3IEBA IHByaXZhdGU6CiAgICAgc3RhdGljIEZpbGVFcnJvcjo6RXJyb3JDb2RlIHRvRXJyb3JDb2RlKEJs b2JSZXNvdXJjZUhhbmRsZTo6RXJyb3IpOwogCiAgICAgUmVhZFR5cGUgbV9yZWFkVHlwZTsKLSAg ICBGaWxlUmVhZGVyTG9hZGVyQ2xpZW50KiBtX2NsaWVudDsKKyAgICBPcHRpb25hbDxGaWxlUmVh ZGVyTG9hZGVyQ2xpZW50Kj4gbV9jbGllbnQ7CiAgICAgVGV4dEVuY29kaW5nIG1fZW5jb2Rpbmc7 CiAgICAgU3RyaW5nIG1fZGF0YVR5cGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Zp bGVhcGkvRmlsZVJlYWRlclN5bmMuY3BwIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVh ZGVyU3luYy5jcHAKaW5kZXggNzAxNzUwMjU2Mjg4ZjlmOTNiZGJjYzUzY2Y3ZWEyZjFiMGVkZmQ5 Yy4uMTUzNTFhZmYxODI5MmI3ODgzODY2Nzk0ZmE3MDY0YjM3YThjNzM3ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyU3luYy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyU3luYy5jcHAKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNs dWRlICJCbG9iVVJMLmgiCiAjaW5jbHVkZSAiRmlsZVJlYWRlckxvYWRlci5oIgogI2luY2x1ZGUg PEphdmFTY3JpcHRDb3JlL0FycmF5QnVmZmVyLmg+CisjaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+ CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDUsNyArNDYsNyBAQCBGaWxlUmVhZGVyU3lu Yzo6RmlsZVJlYWRlclN5bmMoKQogCiBFeGNlcHRpb25PcjxSZWZQdHI8QXJyYXlCdWZmZXI+PiBG aWxlUmVhZGVyU3luYzo6cmVhZEFzQXJyYXlCdWZmZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYg c2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgQmxvYiYgYmxvYikKIHsKLSAgICBGaWxlUmVhZGVyTG9h ZGVyIGxvYWRlcihGaWxlUmVhZGVyTG9hZGVyOjpSZWFkQXNBcnJheUJ1ZmZlciwgMCk7CisgICAg RmlsZVJlYWRlckxvYWRlciBsb2FkZXIoRmlsZVJlYWRlckxvYWRlcjo6UmVhZEFzQXJyYXlCdWZm ZXIsIFdURjo6bnVsbG9wdCk7CiAgICAgYXV0byByZXN1bHQgPSBzdGFydExvYWRpbmcoc2NyaXB0 RXhlY3V0aW9uQ29udGV4dCwgbG9hZGVyLCBibG9iKTsKICAgICBpZiAocmVzdWx0Lmhhc0V4Y2Vw dGlvbigpKQogICAgICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2VFeGNlcHRpb24oKTsKQEAgLTU0 LDIwICs1NSwyMCBAQCBFeGNlcHRpb25PcjxSZWZQdHI8QXJyYXlCdWZmZXI+PiBGaWxlUmVhZGVy U3luYzo6cmVhZEFzQXJyYXlCdWZmZXIoU2NyaXB0RXhlY3V0aQogCiBFeGNlcHRpb25PcjxTdHJp bmc+IEZpbGVSZWFkZXJTeW5jOjpyZWFkQXNCaW5hcnlTdHJpbmcoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCYgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgQmxvYiYgYmxvYikKIHsKLSAgICBGaWxlUmVh ZGVyTG9hZGVyIGxvYWRlcihGaWxlUmVhZGVyTG9hZGVyOjpSZWFkQXNCaW5hcnlTdHJpbmcsIDAp OworICAgIEZpbGVSZWFkZXJMb2FkZXIgbG9hZGVyKEZpbGVSZWFkZXJMb2FkZXI6OlJlYWRBc0Jp bmFyeVN0cmluZywgV1RGOjpudWxsb3B0KTsKICAgICByZXR1cm4gc3RhcnRMb2FkaW5nU3RyaW5n KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIGxvYWRlciwgYmxvYik7CiB9CiAKIEV4Y2VwdGlvbk9y PFN0cmluZz4gRmlsZVJlYWRlclN5bmM6OnJlYWRBc1RleHQoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgQmxvYiYgYmxvYiwgY29uc3QgU3RyaW5nJiBlbmNv ZGluZykKIHsKLSAgICBGaWxlUmVhZGVyTG9hZGVyIGxvYWRlcihGaWxlUmVhZGVyTG9hZGVyOjpS ZWFkQXNUZXh0LCAwKTsKKyAgICBGaWxlUmVhZGVyTG9hZGVyIGxvYWRlcihGaWxlUmVhZGVyTG9h ZGVyOjpSZWFkQXNUZXh0LCBXVEY6Om51bGxvcHQpOwogICAgIGxvYWRlci5zZXRFbmNvZGluZyhl bmNvZGluZyk7CiAgICAgcmV0dXJuIHN0YXJ0TG9hZGluZ1N0cmluZyhzY3JpcHRFeGVjdXRpb25D b250ZXh0LCBsb2FkZXIsIGJsb2IpOwogfQogCiBFeGNlcHRpb25PcjxTdHJpbmc+IEZpbGVSZWFk ZXJTeW5jOjpyZWFkQXNEYXRhVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQsIEJsb2ImIGJsb2IpCiB7Ci0gICAgRmlsZVJlYWRlckxvYWRlciBsb2FkZXIo RmlsZVJlYWRlckxvYWRlcjo6UmVhZEFzRGF0YVVSTCwgMCk7CisgICAgRmlsZVJlYWRlckxvYWRl ciBsb2FkZXIoRmlsZVJlYWRlckxvYWRlcjo6UmVhZEFzRGF0YVVSTCwgV1RGOjpudWxsb3B0KTsK ICAgICBsb2FkZXIuc2V0RGF0YVR5cGUoYmxvYi50eXBlKCkpOwogICAgIHJldHVybiBzdGFydExv YWRpbmdTdHJpbmcoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgbG9hZGVyLCBibG9iKTsKIH0K 400836 2020-06-02 10:33:00 -0700 2020-06-02 11:10:59 -0700 Patch bug-212642-20200603023259.patch text/plain 2894 tetsuharu.ohzeki U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk5MTVhNDhiMDMzMDU2 NGU4MTViZjU3MjljN2RhZDY2YmNlMjRjMi4uYWZkMTZiMTBkOTRiZmM2ZDc5NTVmNDY5NzM2M2Q2 MTU3OTZjNDhmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA2LTAyICBUZXRz dWhhcnUgT2h6ZWtpICA8dGV0c3VoYXJ1Lm9oemVraUBnbWFpbC5jb20+CisKKyAgICAgICAgUGFz cyBudWxscHRyIGZvciB0aGUgMm5kIGFyZ3VtZW50IG9mIEZpbGVSZWFkZXJMb2FkZXIgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI2NDIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHBh c3NpbmcgYDBgLCBgbnVsbHB0cmAgaXMgYmV0dGVyCisgICAgICAgIGJlY2F1c2UgYEZpbGVSZWFk ZXJMb2FkZXJgIHRha2VzIGEgcG9pbnRlci4KKworICAgICAgICAqIGZpbGVhcGkvRmlsZVJlYWRl clN5bmMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlclN5bmM6OnJlYWRBc0FycmF5 QnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXJTeW5jOjpyZWFkQXNCaW5hcnlT dHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlclN5bmM6OnJlYWRBc1RleHQpOgor ICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlclN5bmM6OnJlYWRBc0RhdGFVUkwpOgorCiAyMDIw LTA2LTAyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgTWFrZSBnZW5l cmF0ZWQgQysrIGNvZGUgdXNlIG1vZGVybiBDKysKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2ZpbGVhcGkvRmlsZVJlYWRlclN5bmMuY3BwIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxl UmVhZGVyU3luYy5jcHAKaW5kZXggNzAxNzUwMjU2Mjg4ZjlmOTNiZGJjYzUzY2Y3ZWEyZjFiMGVk ZmQ5Yy4uMWNhNjNjNTJlYzc1MjUzMjFiOGM0NDE2OGIyYTY4NTY2NTBjMmQ5MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyU3luYy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyU3luYy5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAgRmls ZVJlYWRlclN5bmM6OkZpbGVSZWFkZXJTeW5jKCkKIAogRXhjZXB0aW9uT3I8UmVmUHRyPEFycmF5 QnVmZmVyPj4gRmlsZVJlYWRlclN5bmM6OnJlYWRBc0FycmF5QnVmZmVyKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQmIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIEJsb2ImIGJsb2IpCiB7Ci0gICAgRmls ZVJlYWRlckxvYWRlciBsb2FkZXIoRmlsZVJlYWRlckxvYWRlcjo6UmVhZEFzQXJyYXlCdWZmZXIs IDApOworICAgIEZpbGVSZWFkZXJMb2FkZXIgbG9hZGVyKEZpbGVSZWFkZXJMb2FkZXI6OlJlYWRB c0FycmF5QnVmZmVyLCBudWxscHRyKTsKICAgICBhdXRvIHJlc3VsdCA9IHN0YXJ0TG9hZGluZyhz Y3JpcHRFeGVjdXRpb25Db250ZXh0LCBsb2FkZXIsIGJsb2IpOwogICAgIGlmIChyZXN1bHQuaGFz RXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiByZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOwpA QCAtNTQsMjAgKzU0LDIwIEBAIEV4Y2VwdGlvbk9yPFJlZlB0cjxBcnJheUJ1ZmZlcj4+IEZpbGVS ZWFkZXJTeW5jOjpyZWFkQXNBcnJheUJ1ZmZlcihTY3JpcHRFeGVjdXRpCiAKIEV4Y2VwdGlvbk9y PFN0cmluZz4gRmlsZVJlYWRlclN5bmM6OnJlYWRBc0JpbmFyeVN0cmluZyhTY3JpcHRFeGVjdXRp b25Db250ZXh0JiBzY3JpcHRFeGVjdXRpb25Db250ZXh0LCBCbG9iJiBibG9iKQogewotICAgIEZp bGVSZWFkZXJMb2FkZXIgbG9hZGVyKEZpbGVSZWFkZXJMb2FkZXI6OlJlYWRBc0JpbmFyeVN0cmlu ZywgMCk7CisgICAgRmlsZVJlYWRlckxvYWRlciBsb2FkZXIoRmlsZVJlYWRlckxvYWRlcjo6UmVh ZEFzQmluYXJ5U3RyaW5nLCBudWxscHRyKTsKICAgICByZXR1cm4gc3RhcnRMb2FkaW5nU3RyaW5n KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQsIGxvYWRlciwgYmxvYik7CiB9CiAKIEV4Y2VwdGlvbk9y PFN0cmluZz4gRmlsZVJlYWRlclN5bmM6OnJlYWRBc1RleHQoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgQmxvYiYgYmxvYiwgY29uc3QgU3RyaW5nJiBlbmNv ZGluZykKIHsKLSAgICBGaWxlUmVhZGVyTG9hZGVyIGxvYWRlcihGaWxlUmVhZGVyTG9hZGVyOjpS ZWFkQXNUZXh0LCAwKTsKKyAgICBGaWxlUmVhZGVyTG9hZGVyIGxvYWRlcihGaWxlUmVhZGVyTG9h ZGVyOjpSZWFkQXNUZXh0LCBudWxscHRyKTsKICAgICBsb2FkZXIuc2V0RW5jb2RpbmcoZW5jb2Rp bmcpOwogICAgIHJldHVybiBzdGFydExvYWRpbmdTdHJpbmcoc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCwgbG9hZGVyLCBibG9iKTsKIH0KIAogRXhjZXB0aW9uT3I8U3RyaW5nPiBGaWxlUmVhZGVyU3lu Yzo6cmVhZEFzRGF0YVVSTChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBzY3JpcHRFeGVjdXRpb25D b250ZXh0LCBCbG9iJiBibG9iKQogewotICAgIEZpbGVSZWFkZXJMb2FkZXIgbG9hZGVyKEZpbGVS ZWFkZXJMb2FkZXI6OlJlYWRBc0RhdGFVUkwsIDApOworICAgIEZpbGVSZWFkZXJMb2FkZXIgbG9h ZGVyKEZpbGVSZWFkZXJMb2FkZXI6OlJlYWRBc0RhdGFVUkwsIG51bGxwdHIpOwogICAgIGxvYWRl ci5zZXREYXRhVHlwZShibG9iLnR5cGUoKSk7CiAgICAgcmV0dXJuIHN0YXJ0TG9hZGluZ1N0cmlu ZyhzY3JpcHRFeGVjdXRpb25Db250ZXh0LCBsb2FkZXIsIGJsb2IpOwogfQo=