193809 2019-01-24 19:23:22 -0800 Remove usage of internal macro from private header 2019-01-24 20:40:29 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller commit-queue ews-watchlist mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1498101 0 keith_miller 2019-01-24 19:23:22 -0800 Remove usage of internal macro from private header 1498103 1 360072 keith_miller 2019-01-24 19:25:10 -0800 Created attachment 360072 Patch 1498106 2 ews-watchlist 2019-01-24 19:26:42 -0800 Attachment 360072 did not pass style-queue: ERROR: Source/JavaScriptCore/API/tests/testIncludes.m:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1498107 3 saam 2019-01-24 19:28:02 -0800 Can you fix the style issue? 1498108 4 keith_miller 2019-01-24 19:33:33 -0800 (In reply to Saam Barati from comment #3) > Can you fix the style issue? The style issue is that the public umbrella header should be included after our private headers but I'd rather include the public header first. 1498126 5 360072 commit-queue 2019-01-24 20:39:38 -0800 Comment on attachment 360072 Patch Clearing flags on attachment: 360072 Committed r240468: <https://trac.webkit.org/changeset/240468> 1498127 6 commit-queue 2019-01-24 20:39:39 -0800 All reviewed patches have been landed. Closing bug. 1498128 7 webkit-bug-importer 2019-01-24 20:40:29 -0800 <rdar://problem/47538853> 360072 2019-01-24 19:25:10 -0800 2019-01-24 20:39:38 -0800 Patch bug-193809-20190124192508.patch text/plain 9655 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk ZTE0MGI3OTBiZjhlNzhjYTJmMjYzZjg4NmFlNWI3ZWUxM2U1ZWRjLi5mZGVlNjNjNDNiYzhkYzEw MDIzOTkyMjZjNzZjN2M5MWU1ZmZkZWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxOS0wMS0yNCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBSZW1vdmUgdXNhZ2Ugb2YgaW50ZXJuYWwgbWFjcm8gZnJvbSBwcml2 YXRlIGhlYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTkzODA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWxzbywgYWRkIGEgbmV3IGZpbGUgdG8gaW5jbHVkZSBhbGwgb2Ygb3VyIEFQSSBoZWFkZXJz IHRvIG1ha2Ugc3VyZQorICAgICAgICB0aGV5IGRvbid0IGFjY2lkZW50YWxseSBpbmNsdWRlIEMr KyBvciBpbnRlcm5hbCB2YWx1ZXMuCisKKyAgICAgICAgKiBBUEkvSlNTY3JpcHQuaDoKKyAgICAg ICAgKiBBUEkvdGVzdHMvdGVzdEluY2x1ZGVzLm06IEFkZGVkLgorICAgICAgICAqIEphdmFTY3Jp cHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTktMDEtMjQgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBD UFUgVXNhZ2UgVGltZWxpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkv SlNTY3JpcHQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNTY3JpcHQuaAppbmRleCA4 ZGVkN2NhNzcwZWZjMWI4NzFkYjA0ZjI0NWRiNTUzMWM2MTdkNGUxLi40YWFhODk5OGJiYzE4NDM2 MDNmOGFiNTg5NDlhNzE2NWM0OTc2MDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQVBJL0pTU2NyaXB0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1Njcmlw dC5oCkBAIC0yOSw3ICsyOSw3IEBACiAKIE5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCiAKLU9CSkNf Q0xBU1MgSlNWaXJ0dWFsTWFjaGluZTsKK0BjbGFzcyBKU1ZpcnR1YWxNYWNoaW5lOwogCiBKU0Nf Q0xBU1NfQVZBSUxBQkxFKG1hY29zeChKU0NfTUFDX1RCQSksIGlvcyhKU0NfSU9TX1RCQSkpCiBA aW50ZXJmYWNlIEpTU2NyaXB0IDogTlNPYmplY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9BUEkvdGVzdHMvdGVzdEluY2x1ZGVzLm0gYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv QVBJL3Rlc3RzL3Rlc3RJbmNsdWRlcy5tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYxZjA1ZGFiMTI3MmYzZjdhYzdi N2JlNzJkZDQ3YTIwZDk3YzgzYmUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQVBJL3Rlc3RzL3Rlc3RJbmNsdWRlcy5tCkBAIC0wLDAgKzEsNDEgQEAKKy8qCisgKiBD b3B5cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisg KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1 Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRh dGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlv bi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJ UycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRP UlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1Mg SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElB QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisg KiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworCisvLyBTaW5jZSB3ZSBpbmNs dWRlIGZpbGVzIHRoYXQgaGF2ZW4ndCBwYXNzZWQgdGhyb3VnaCB0aGUgcmV3cml0ZXIgd2UgbmVl ZCB0byBoYW5kbGUgdGhlIG5vbi1yZXdyaXR0ZW4gdmFsdWVzLi4uCisjZGVmaW5lIEpTQ19BUElf QVZBSUxBQkxFKC4uLikKKyNkZWZpbmUgSlNDX0NMQVNTX0FWQUlMQUJMRSguLi4pCisjZGVmaW5l IEpTQ19NQUNfVkVSU0lPTl9UQkEgMAorI2RlZmluZSBKU0NfSU9TX1ZFUlNJT05fVEJBIDAKKwor Ly8gdW1icmVsbGEgaGVhZGVyCisjaW1wb3J0IDxKYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29y ZS5oPgorCisvLyBwcml2YXRlIGhlYWRlcnMKKyNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL0pTQ29u dGV4dFByaXZhdGUuaD4KKyNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL0pTU2NyaXB0Lmg+CisjaW1w b3J0IDxKYXZhU2NyaXB0Q29yZS9KU1ZhbHVlUHJpdmF0ZS5oPgorI2ltcG9ydCA8SmF2YVNjcmlw dENvcmUvSlNWaXJ0dWFsTWFjaGluZVByaXZhdGUuaD4KKwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagppbmRleCA0MGFkYTJhMmY1MzRlYzg2ZDY5MWE2ZmIzYjYzNmNhYmUyMTViNzc5Li40N2E3 YzczYzBiMWFhODU1NTRiY2VkMzQzMzlkNThmOTM5NzlmNWFiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagpAQCAtODg0LDYgKzg4NCw3IEBACiAJCTUzMEE2NkM0MUZBM0U3OEIwMDI2QTU0 NSAvKiBVbmlmaWVkU291cmNlMTQ1LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDUzMEE2NkIwMUZBM0U3N0EwMDI2QTU0NSAvKiBVbmlmaWVkU291cmNl MTQ1LmNwcCAqLzsgfTsKIAkJNTMwQTY2Q0QxRkIxMzQ2RDAwMjZBNTQ1IC8qIFN1cGVyU2FtcGxl ckJ5dGVjb2RlU2NvcGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDUzMEE2NkNDMUZCMTM0NkQwMDI2QTU0NSAvKiBTdXBlclNhbXBsZXJCeXRlY29kZVNj b3BlLmggKi87IH07CiAJCTUzMEZCMzAyMUU3QTBCNkUwMDNDMTlERCAvKiBXYXNtV29ya2xpc3Qu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUzMEZCMzAx MUU3QTBCNkUwMDNDMTlERCAvKiBXYXNtV29ya2xpc3QuaCAqLzsgfTsKKwkJNTMwRkRFNzUyMUZB QjAwNjAwMDU5RDY1IC8qIHRlc3RJbmNsdWRlcy5tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gNTMwRkRFNzMyMUZBQUZDNjAwMDU5RDY1IC8qIHRlc3RJbmNs dWRlcy5tICovOyB9OwogCQk1MzExQkQ0QjFFQTU4MUU1MDA1MjUyODEgLyogV2FzbU9NR1BsYW4u aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUzMTFCRDQ5 MUVBNTgxRTUwMDUyNTI4MSAvKiBXYXNtT01HUGxhbi5oICovOyB9OwogCQk1MzEzNzRCRDFENUNF Njc2MDBBRjdBMEIgLyogV2FzbVBsYW4uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDUzMTM3NEJDMUQ1Q0U2NzYwMEFGN0EwQiAvKiBXYXNtUGxhbi5oICov OyB9OwogCQk1MzMzQkJEQjIxMTBGN0QyMDA3NjE4RUMgLyogREZHU3BlY3VsYXRpdmVKSVQzMl82 NC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4Njg4 MEYxQjE0MzI4QkI5MDBCMDhENDIgLyogREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAgKi87IH07 CkBAIC0xMDgxLDcgKzEwODIsNiBAQAogCQk1REJCMTUxQjEzMUQwQjMxMDA1NkFEMzYgLyogdGVz dGFwaS5qcyBpbiBDb3B5IFN1cHBvcnQgU2NyaXB0ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDE0RDg1Nzc0MEE0Njk2QzgwMDMyMTQ2QyAvKiB0ZXN0YXBpLmpzICovOyB9Owog CQk1REJCMTUyNTEzMUQwQkQ3MDA1NkFEMzYgLyogbWluaWRvbS5qcyBpbiBDb3B5IFN1cHBvcnQg U2NyaXB0ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDE0MTIxMTBEMEE0ODc4 ODcwMDQ4MDI1NSAvKiBtaW5pZG9tLmpzICovOyB9OwogCQk1REU2RTVCMzBFMTcyOEVDMDAxODA0 MDcgLyogY3JlYXRlX2hhc2hfdGFibGUgaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBGNjkyQTg1NDAyNTU1OTdEMDFGRjYwRjcgLyogY3JlYXRlX2hhc2hfdGFi bGUgKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoKTsgfTsgfTsKLQkJNUUxNThBQzM1MEJD NEVDNzg3N0RDMEY0IC8qIE9iamVjdFByb3RvdHlwZUlubGluZXMuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDZEMENDOUUxQ0JDMTQ5QUI4RjQwMzQzNCAv KiBPYmplY3RQcm90b3R5cGVJbmxpbmVzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo UHJpdmF0ZSwgKTsgfTsgfTsKIAkJNjIzQTM3RUMxQjg3QTdDMDAwNzU0MjA5IC8qIFJlZ2lzdGVy TWFwLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2MjNB MzdFQjFCODdBN0JEMDA3NTQyMDkgLyogUmVnaXN0ZXJNYXAuaCAqLzsgc2V0dGluZ3MgPSB7QVRU UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk2Mjc2NzMyNDFCNjgwQzFFMDBGRDlGMkUg LyogQ2FsbE1vZGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDYyNzY3MzIyMUI2ODBDMUUwMEZEOUYyRSAvKiBDYWxsTW9kZS5oICovOyBzZXR0aW5ncyA9 IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTYyRDJEMzkwMUFERjEwM0YwMDAy MDZDMSAvKiBGdW5jdGlvblJhcmVEYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA2MkQyRDM4RTFBREYxMDNGMDAwMjA2QzEgLyogRnVuY3Rpb25SYXJl RGF0YS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CkBA IC0zMzY3LDYgKzMzNjcsNyBAQAogCQk1MzBBNjZDQzFGQjEzNDZEMDAyNkE1NDUgLyogU3VwZXJT YW1wbGVyQnl0ZWNvZGVTY29wZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTdXBlclNhbXBsZXJCeXRlY29k ZVNjb3BlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUzMEZCMzAxMUU3QTBCNkUw MDNDMTlERCAvKiBXYXNtV29ya2xpc3QuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gV2FzbVdvcmtsaXN0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUzMEZCMzAz MUU3QTExNDYwMDNDMTlERCAvKiBXYXNtV29ya2xpc3QuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gV2FzbVdvcmtsaXN0LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKKwkJNTMwRkRFNzMyMUZBQUZDNjAwMDU5RDY1IC8qIHRlc3RJbmNsdWRlcy5tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lm9iamM7IG5hbWUgPSB0ZXN0SW5jbHVkZXMubTsgcGF0aCA9IEFQSS90ZXN0cy90ZXN0SW5jbHVk ZXMubTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTMxMUJENDgxRUE1ODFFNTAwNTI1 MjgxIC8qIFdhc21PTUdQbGFuLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IFdhc21PTUdQbGFuLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTMxMUJE NDkxRUE1ODFFNTAwNTI1MjgxIC8qIFdhc21PTUdQbGFuLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IFdhc21PTUdQbGFuLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTUzMTM3NEJDMUQ1Q0U2NzYwMEFGN0EwQiAvKiBXYXNtUGxhbi5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBXYXNtUGxhbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtMzY2Niw3ICszNjY3LDYgQEAKIAkJNkEzOENGQTgxRTMyQjU4QjAwNjAyMDZGIC8qIEFzeW5j U3RhY2tUcmFjZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBBc3luY1N0YWNr VHJhY2UuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNkFEMkNCNEMxOUI5MTQwMTAw MDY1NzE5IC8qIERlYnVnZ2VyRXZhbEVuYWJsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gRGVidWdnZXJFdmFsRW5hYmxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQk2QkE5M0M5NTkwNDg0QzVCQUQ5MzE2RUEgLyogSlNTY3JpcHRGZXRjaGVyLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTU2NyaXB0RmV0Y2hlci5oOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwotCQk2RDBDQzlFMUNCQzE0OUFCOEY0MDM0MzQgLyogT2JqZWN0UHJv dG90eXBlSW5saW5lcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBPYmplY3RQ cm90b3R5cGVJbmxpbmVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTcwMTEzRDQ5 MUE4REIwOTMwMDM4NDhDNCAvKiBJdGVyYXRvck9wZXJhdGlvbnMuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSXRlcmF0b3JPcGVyYXRpb25zLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNzAxMTNENEExQThEQjA5MzAwMzg0OEM0IC8qIEl0ZXJhdG9y T3BlcmF0aW9ucy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBJdGVyYXRvck9w ZXJhdGlvbnMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNzAxM0NBODkxQjQ5MUE5 NDAwQ0FFNjEzIC8qIEpTTWljcm90YXNrLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IEpTTWljcm90YXNrLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg LTU1ODAsNiArNTU4MCw3IEBACiAJCQkJNTMxRDRFMTkxRjU5Q0REMjAwRUM4MzZDIC8qIHRlc3Rh cGkuY3BwICovLAogCQkJCTE0RDg1Nzc0MEE0Njk2QzgwMDMyMTQ2QyAvKiB0ZXN0YXBpLmpzICov LAogCQkJCTg2RDIyMjE5MTY3RUY5NDQwMDI0QzgwNCAvKiB0ZXN0YXBpLm1tICovLAorCQkJCTUz MEZERTczMjFGQUFGQzYwMDA1OUQ2NSAvKiB0ZXN0SW5jbHVkZXMubSAqLywKIAkJCQk2NTExMjJF NTE0MDQ2OUJBMDAyQjEwMUQgLyogdGVzdFJlZ0V4cC5jcHAgKi8sCiAJCQkJNTM0OTAyODIxQzcy NDJDODAwMTJCQ0I4IC8qIFR5cGVkQXJyYXlDVGVzdC5jcHAgKi8sCiAJCQkJNTM0OTAyODMxQzcy NDJDODAwMTJCQ0I4IC8qIFR5cGVkQXJyYXlDVGVzdC5oICovLApAQCAtMTA0MDQsNiArMTA0MDUs NyBAQAogCQkJCTE0NDBGNjEwMEE0Rjg1NjcwMDA1RjA2MSAvKiB0ZXN0YXBpLmMgaW4gU291cmNl cyAqLywKIAkJCQk1M0VBRkUyRjIwOERGQUI0MDA3RDUyNEIgLyogdGVzdGFwaS5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQk4NkQyMjIxQTE2N0VGOTQ0MDAyNEM4MDQgLyogdGVzdGFwaS5tbSBpbiBT b3VyY2VzICovLAorCQkJCTUzMEZERTc1MjFGQUIwMDYwMDA1OUQ2NSAvKiB0ZXN0SW5jbHVkZXMu bSBpbiBTb3VyY2VzICovLAogCQkJCTUzNDkwMjg1MUM3Mjc2QjcwMDEyQkNCOCAvKiBUeXBlZEFy cmF5Q1Rlc3QuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1l bnRQb3N0cHJvY2Vzc2luZyA9IDA7Cg==