149785 2015-10-03 15:59:50 -0700 CodeBlock.h shouldn't be included from everywhere 2016-02-02 17:29:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=153810 P2 Normal --- 1 fpizlo fpizlo barraclough benjamin commit-queue ggaren mark.lam mhahnenb msaboff nrotem oliver saam sam simon.fraser oldest_to_newest 1130452 0 fpizlo 2015-10-03 15:59:50 -0700 CodeBlock.h shouldn't be included from everywhere 1130453 1 262383 fpizlo 2015-10-03 16:00:29 -0700 Created attachment 262383 Patch 1130523 2 262383 fpizlo 2015-10-04 12:35:04 -0700 Comment on attachment 262383 Patch Actually, I will land myself. I'll also try to make this more robust by making CodeBlock.h into a Project header so WebCore cannot include it. 1130534 3 262383 fpizlo 2015-10-04 15:40:22 -0700 Comment on attachment 262383 Patch OK, I'll let commit-queue land it. I was trying to remove a bunch of headers, including CodeBlock.h, from the Private headers list. But it turns out that there is some test support code in WebCore that includes CodeBlock.h directly. Removing that dependency didn't seem like an easy task. So, CodeBlock.h can still be included from anywhere, but at least it's no longer included from everywhere. 1130536 4 262383 commit-queue 2015-10-04 16:26:14 -0700 Comment on attachment 262383 Patch Clearing flags on attachment: 262383 Committed r190555: <http://trac.webkit.org/changeset/190555> 1130537 5 commit-queue 2015-10-04 16:26:18 -0700 All reviewed patches have been landed. Closing bug. 262383 2015-10-03 16:00:29 -0700 2015-10-04 16:26:14 -0700 Patch bug-149785-20151003160001.patch text/plain 15713 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkwNTQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBA CisyMDE1LTEwLTAzICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Q29kZUJsb2NrLmggc2hvdWxkbid0IGJlIGluY2x1ZGVkIGZyb20gZXZlcnl3aGVyZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5Nzg1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIGRmZy9ERkdBZGFwdGl2ZUlu ZmVycmVkUHJvcGVydHlWYWx1ZVdhdGNocG9pbnQuY3BwOgorICAgICAgICAqIGRmZy9ERkdBZGFw dGl2ZVN0cnVjdHVyZVdhdGNocG9pbnQuY3BwOgorICAgICAgICAqIGludGVycHJldGVyL0NhbGxG cmFtZS5jcHA6CisgICAgICAgIChKU0M6OkNhbGxGcmFtZTo6Y2FsbFNpdGVCaXRzQXJlQnl0ZWNv ZGVPZmZzZXQpOgorICAgICAgICAoSlNDOjpDYWxsRnJhbWU6OmNhbGxTaXRlQml0c0FyZUNvZGVP cmlnaW5JbmRleCk6CisgICAgICAgIChKU0M6OkNhbGxGcmFtZTo6Y2FsbFNpdGVBc1Jhd0JpdHMp OgorICAgICAgICAoSlNDOjpDYWxsRnJhbWU6OmNhbGxTaXRlSW5kZXgpOgorICAgICAgICAoSlND OjpDYWxsRnJhbWU6Omhhc0FjdGl2YXRpb24pOgorICAgICAgICAoSlNDOjpDYWxsRnJhbWU6OnVu Y2hlY2tlZEFjdGl2YXRpb24pOgorICAgICAgICAoSlNDOjpDYWxsRnJhbWU6OnN0YWNrKToKKyAg ICAgICAgKiBpbnRlcnByZXRlci9DYWxsRnJhbWVJbmxpbmVzLmg6IFJlbW92ZWQuCisgICAgICAg ICogaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwOgorICAgICAgICAqIGludGVycHJldGVyL1N0 YWNrVmlzaXRvci5jcHA6CisgICAgICAgICogcnVudGltZS9EaXJlY3RBcmd1bWVudHMuY3BwOgor ICAgICAgICAqIHJ1bnRpbWUvRXJyb3JJbnN0YW5jZS5jcHA6CisgICAgICAgICogcnVudGltZS9K U0FycmF5LmNwcDoKKyAgICAgICAgKiBydW50aW1lL0pTQ0lubGluZXMuaDoKKyAgICAgICAgKiBy dW50aW1lL0xpdGVyYWxQYXJzZXIuY3BwOgorICAgICAgICAqIHJ1bnRpbWUvTnVsbFNldHRlckZ1 bmN0aW9uLmNwcDoKKyAgICAgICAgKiB0b29scy9KU0RvbGxhclZNUHJvdG90eXBlLmNwcDoKKwog MjAxNS0xMC0wMiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogQWRkIGJyZWFrcG9pbnQgb3B0aW9uIHRvIGlnbm9yZSBuIHRpbWVzIGJl Zm9yZSBzdG9wcGluZwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL0phdmFTY3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9u IDE5MDI0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0xNDk4LDcgKzE0OTgsNiBAQAog CQlBN0MwQzRBQzE2ODEwMzAyMDAxNzAxMUQgLyogSlNTY3JpcHRSZWZQcml2YXRlLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0MwQzRBQjE2N0MwOENE MDAxNzAxMUQgLyogSlNTY3JpcHRSZWZQcml2YXRlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQTdDMEM0QUQxNjgxMDY3RTAwMTcwMTFEIC8qIEpT U2NyaXB0UmVmLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEE3QzBDNEFBMTY3QzA4Q0QwMDE3MDExRCAvKiBKU1NjcmlwdFJlZi5jcHAgKi87IH07CiAJ CUE3QzFFOEU0MTEyRTcyRUYwMEEzN0Y5OCAvKiBKSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE3QzFFOEM4MTEy RTcwMUMwMEEzN0Y5OCAvKiBKSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcCAqLzsgfTsKLQkJQTdD MUVBRUYxNzk4N0FCNjAwMjk5REIyIC8qIENhbGxGcmFtZUlubGluZXMuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE3QzFFQUVBMTc5ODdBQjYwMDI5OURC MiAvKiBDYWxsRnJhbWVJbmxpbmVzLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJp dmF0ZSwgKTsgfTsgfTsKIAkJQTdDMUVBRjAxNzk4N0FCNjAwMjk5REIyIC8qIEpTU3RhY2tJbmxp bmVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0Mx RUFFQjE3OTg3QUI2MDAyOTlEQjIgLyogSlNTdGFja0lubGluZXMuaCAqLzsgfTsKIAkJQTdDMUVB RjExNzk4N0FCNjAwMjk5REIyIC8qIFN0YWNrVmlzaXRvci5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0MxRUFFQzE3OTg3QUI2MDAyOTlEQjIgLyog U3RhY2tWaXNpdG9yLmNwcCAqLzsgfTsKIAkJQTdDMUVBRjIxNzk4N0FCNjAwMjk5REIyIC8qIFN0 YWNrVmlzaXRvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQTdDMUVBRUQxNzk4N0FCNjAwMjk5REIyIC8qIFN0YWNrVmlzaXRvci5oICovOyBzZXR0aW5n cyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CkBAIC0zMzgxLDcgKzMzODAsNiBA QAogCQlBN0MwQzRBQTE2N0MwOENEMDAxNzAxMUQgLyogSlNTY3JpcHRSZWYuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNTY3JpcHRSZWYuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQlBN0MwQzRBQjE2N0MwOENEMDAxNzAxMUQgLyogSlNTY3JpcHRS ZWZQcml2YXRlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTU2NyaXB0UmVm UHJpdmF0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBN0MxRThDODExMkU3MDFD MDBBMzdGOTggLyogSklUUHJvcGVydHlBY2Nlc3MzMl82NC5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IHBhdGggPSBKSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQTdDMUVBRUExNzk4N0FCNjAwMjk5REIyIC8qIENhbGxGcmFt ZUlubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ2FsbEZyYW1lSW5s aW5lcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBN0MxRUFFQjE3OTg3QUI2MDAy OTlEQjIgLyogSlNTdGFja0lubGluZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRo ID0gSlNTdGFja0lubGluZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTdDMUVB RUMxNzk4N0FCNjAwMjk5REIyIC8qIFN0YWNrVmlzaXRvci5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IGxpbmVFbmRpbmcgPSAwOyBwYXRoID0gU3RhY2tWaXNpdG9yLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTdDMUVBRUQxNzk4N0FCNjAwMjk5REIyIC8qIFN0 YWNrVmlzaXRvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTdGFja1Zpc2l0 b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQxMDQsNyArNDEwMiw2IEBACiAJ CQkJMTQyOUQ4REIwRUQyMjA1QjAwQjg5NjE5IC8qIENhbGxGcmFtZS5jcHAgKi8sCiAJCQkJMTQy OUQ4REMwRUQyMjA1QjAwQjg5NjE5IC8qIENhbGxGcmFtZS5oICovLAogCQkJCUE3Rjg2OUVDMEY5 NUMyRUMwMDU1ODY5NyAvKiBDYWxsRnJhbWVDbG9zdXJlLmggKi8sCi0JCQkJQTdDMUVBRUExNzk4 N0FCNjAwMjk5REIyIC8qIENhbGxGcmFtZUlubGluZXMuaCAqLywKIAkJCQkxNDI5RDdEMzBFRDIx MjgyMDBCODk2MTkgLyogSW50ZXJwcmV0ZXIuY3BwICovLAogCQkJCTE0MjlENzdCMEVEMjBENzMw MEI4OTYxOSAvKiBJbnRlcnByZXRlci5oICovLAogCQkJCTE0MjlEODVCMEVEMjE4RTkwMEI4OTYx OSAvKiBKU1N0YWNrLmNwcCAqLywKQEAgLTYwMTEsNyArNjAwOCw2IEBACiAJCQkJQkMxOEMzRUQw RTE2RjVDRDAwQjM0NDYwIC8qIENhbGxEYXRhLmggaW4gSGVhZGVycyAqLywKIAkJCQkwRjY0QjI3 QTFBNzk1N0IyMDA2RTRFNjYgLyogQ2FsbEVkZ2UuaCBpbiBIZWFkZXJzICovLAogCQkJCTE0MjlE OERFMEVEMjIwNUIwMEI4OTYxOSAvKiBDYWxsRnJhbWUuaCBpbiBIZWFkZXJzICovLAotCQkJCUE3 QzFFQUVGMTc5ODdBQjYwMDI5OURCMiAvKiBDYWxsRnJhbWVJbmxpbmVzLmggaW4gSGVhZGVycyAq LywKIAkJCQk2MkVDOUJCNzFCN0VCMDdDMDAzMDNBRDEgLyogQ2FsbEZyYW1lU2h1ZmZsZURhdGEu aCBpbiBIZWFkZXJzICovLAogCQkJCTYyRDc1NUQ3MUI4NEZCNEEwMDE4MDFGQSAvKiBDYWxsRnJh bWVTaHVmZmxlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJOTVFM0JDMDUwRTFBRTY4MjAwQjJEMUMx IC8qIENhbGxJZGVudGlmaWVyLmggaW4gSGVhZGVycyAqLywKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQWRhcHRpdmVJbmZlcnJlZFByb3BlcnR5VmFsdWVXYXRjaHBvaW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0FkYXB0aXZlSW5m ZXJyZWRQcm9wZXJ0eVZhbHVlV2F0Y2hwb2ludC5jcHAJKHJldmlzaW9uIDE5MDI0OSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWRhcHRpdmVJbmZlcnJlZFByb3BlcnR5VmFsdWVX YXRjaHBvaW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsOCBAQAogCiAjaWYgRU5B QkxFKERGR19KSVQpCiAKKyNpbmNsdWRlICJDb2RlQmxvY2suaCIKKyNpbmNsdWRlICJERkdDb21t b24uaCIKICNpbmNsdWRlICJKU0NJbmxpbmVzLmgiCiAKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3Bh Y2UgREZHIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWRhcHRpdmVTdHJ1 Y3R1cmVXYXRjaHBvaW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0FkYXB0aXZlU3RydWN0dXJlV2F0Y2hwb2ludC5jcHAJKHJldmlzaW9uIDE5MDI0OSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWRhcHRpdmVTdHJ1Y3R1cmVXYXRjaHBv aW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKERG R19KSVQpCiAKKyNpbmNsdWRlICJDb2RlQmxvY2suaCIKICNpbmNsdWRlICJKU0NJbmxpbmVzLmgi CiAKIG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgREZHIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuY3BwCShyZXZpc2lvbiAxOTAyNDkp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1 ZGUgIkNhbGxGcmFtZS5oIgogCi0jaW5jbHVkZSAiQ2FsbEZyYW1lSW5saW5lcy5oIgogI2luY2x1 ZGUgIkNvZGVCbG9jay5oIgogI2luY2x1ZGUgIklubGluZUNhbGxGcmFtZS5oIgogI2luY2x1ZGUg IkludGVycHJldGVyLmgiCkBAIC0zNyw2ICszNiw2OCBAQAogCiBuYW1lc3BhY2UgSlNDIHsKIAor Ym9vbCBDYWxsRnJhbWU6OmNhbGxTaXRlQml0c0FyZUJ5dGVjb2RlT2Zmc2V0KCkgY29uc3QKK3sK KyAgICBBU1NFUlQoY29kZUJsb2NrKCkpOworICAgIHN3aXRjaCAoY29kZUJsb2NrKCktPmppdFR5 cGUoKSkgeworICAgIGNhc2UgSklUQ29kZTo6SW50ZXJwcmV0ZXJUaHVuazoKKyAgICBjYXNlIEpJ VENvZGU6OkJhc2VsaW5lSklUOgorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBjYXNlIEpJVENv ZGU6Ok5vbmU6CisgICAgY2FzZSBKSVRDb2RlOjpIb3N0Q2FsbFRodW5rOgorICAgICAgICBSRUxF QVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgZGVm YXVsdDoKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIFJFTEVBU0VfQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCitib29sIENhbGxGcmFtZTo6 Y2FsbFNpdGVCaXRzQXJlQ29kZU9yaWdpbkluZGV4KCkgY29uc3QKK3sKKyAgICBBU1NFUlQoY29k ZUJsb2NrKCkpOworICAgIHN3aXRjaCAoY29kZUJsb2NrKCktPmppdFR5cGUoKSkgeworICAgIGNh c2UgSklUQ29kZTo6REZHSklUOgorICAgIGNhc2UgSklUQ29kZTo6RlRMSklUOgorICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICBjYXNlIEpJVENvZGU6Ok5vbmU6CisgICAgY2FzZSBKSVRDb2RlOjpI b3N0Q2FsbFRodW5rOgorICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH0KKworICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGZh bHNlOworfQorCit1bnNpZ25lZCBDYWxsRnJhbWU6OmNhbGxTaXRlQXNSYXdCaXRzKCkgY29uc3QK K3sKKyAgICByZXR1cm4gdGhpc1tKU1N0YWNrOjpBcmd1bWVudENvdW50XS50YWcoKTsKK30KKwor Q2FsbFNpdGVJbmRleCBDYWxsRnJhbWU6OmNhbGxTaXRlSW5kZXgoKSBjb25zdAoreworICAgIHJl dHVybiBDYWxsU2l0ZUluZGV4KGNhbGxTaXRlQXNSYXdCaXRzKCkpOworfQorCitib29sIENhbGxG cmFtZTo6aGFzQWN0aXZhdGlvbigpIGNvbnN0Cit7CisgICAgSlNWYWx1ZSBhY3RpdmF0aW9uID0g dW5jaGVja2VkQWN0aXZhdGlvbigpOworICAgIHJldHVybiAhIWFjdGl2YXRpb24gJiYgYWN0aXZh dGlvbi5pc0NlbGwoKTsKK30KKworSlNWYWx1ZSBDYWxsRnJhbWU6OnVuY2hlY2tlZEFjdGl2YXRp b24oKSBjb25zdAoreworICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gdGhpcy0+Y29kZUJsb2Nr KCk7CisgICAgUkVMRUFTRV9BU1NFUlQoY29kZUJsb2NrLT5uZWVkc0FjdGl2YXRpb24oKSk7Cisg ICAgVmlydHVhbFJlZ2lzdGVyIGFjdGl2YXRpb25SZWdpc3RlciA9IGNvZGVCbG9jay0+YWN0aXZh dGlvblJlZ2lzdGVyKCk7CisgICAgcmV0dXJuIHJlZ2lzdGVycygpW2FjdGl2YXRpb25SZWdpc3Rl ci5vZmZzZXQoKV0uanNWYWx1ZSgpOworfQorCiAjaWZuZGVmIE5ERUJVRwogSlNTdGFjayogQ2Fs bEZyYW1lOjpzdGFjaygpCiB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0 ZXIvQ2FsbEZyYW1lSW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnRlcnByZXRlci9DYWxsRnJhbWVJbmxpbmVzLmgJKHJldmlzaW9uIDE5MDI0OSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWVJbmxpbmVzLmgJKHdvcmtp bmcgY29weSkKQEAgLTEsOTggKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK LSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRI RQotICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgSU5DLiBPUgotICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCi0gKiBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IKLSAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKLSAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLiAKLSAqLwotCi0jaWZuZGVmIENhbGxGcmFtZUlubGluZXNfaAotI2RlZmluZSBDYWxs RnJhbWVJbmxpbmVzX2gKLQotI2luY2x1ZGUgIkNhbGxGcmFtZS5oIgotI2luY2x1ZGUgIkNvZGVC bG9jay5oIgotCi1uYW1lc3BhY2UgSlNDICB7Ci0KLWlubGluZSBib29sIENhbGxGcmFtZTo6Y2Fs bFNpdGVCaXRzQXJlQnl0ZWNvZGVPZmZzZXQoKSBjb25zdAotewotICAgIEFTU0VSVChjb2RlQmxv Y2soKSk7Ci0gICAgc3dpdGNoIChjb2RlQmxvY2soKS0+aml0VHlwZSgpKSB7Ci0gICAgY2FzZSBK SVRDb2RlOjpJbnRlcnByZXRlclRodW5rOgotICAgIGNhc2UgSklUQ29kZTo6QmFzZWxpbmVKSVQ6 Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIGNhc2UgSklUQ29kZTo6Tm9uZToKLSAgICBjYXNl IEpJVENvZGU6Okhvc3RDYWxsVGh1bms6Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBkZWZhdWx0OgotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KLWlubGluZSBib29sIENhbGxGcmFtZTo6Y2FsbFNpdGVCaXRz QXJlQ29kZU9yaWdpbkluZGV4KCkgY29uc3QKLXsKLSAgICBBU1NFUlQoY29kZUJsb2NrKCkpOwot ICAgIHN3aXRjaCAoY29kZUJsb2NrKCktPmppdFR5cGUoKSkgewotICAgIGNhc2UgSklUQ29kZTo6 REZHSklUOgotICAgIGNhc2UgSklUQ29kZTo6RlRMSklUOgotICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICBjYXNlIEpJVENvZGU6Ok5vbmU6Ci0gICAgY2FzZSBKSVRDb2RlOjpIb3N0Q2FsbFRodW5r OgotICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLQotICAg IFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi1p bmxpbmUgdW5zaWduZWQgQ2FsbEZyYW1lOjpjYWxsU2l0ZUFzUmF3Qml0cygpIGNvbnN0Ci17Ci0g ICAgcmV0dXJuIHRoaXNbSlNTdGFjazo6QXJndW1lbnRDb3VudF0udGFnKCk7Ci19Ci0KLWlubGlu ZSBDYWxsU2l0ZUluZGV4IENhbGxGcmFtZTo6Y2FsbFNpdGVJbmRleCgpIGNvbnN0Ci17Ci0gICAg cmV0dXJuIENhbGxTaXRlSW5kZXgoY2FsbFNpdGVBc1Jhd0JpdHMoKSk7Ci19Ci0KLWlubGluZSBi b29sIENhbGxGcmFtZTo6aGFzQWN0aXZhdGlvbigpIGNvbnN0Ci17Ci0gICAgSlNWYWx1ZSBhY3Rp dmF0aW9uID0gdW5jaGVja2VkQWN0aXZhdGlvbigpOwotICAgIHJldHVybiAhIWFjdGl2YXRpb24g JiYgYWN0aXZhdGlvbi5pc0NlbGwoKTsKLX0KLQotaW5saW5lIEpTVmFsdWUgQ2FsbEZyYW1lOjp1 bmNoZWNrZWRBY3RpdmF0aW9uKCkgY29uc3QKLXsKLSAgICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9 IHRoaXMtPmNvZGVCbG9jaygpOwotICAgIFJFTEVBU0VfQVNTRVJUKGNvZGVCbG9jay0+bmVlZHNB Y3RpdmF0aW9uKCkpOwotICAgIFZpcnR1YWxSZWdpc3RlciBhY3RpdmF0aW9uUmVnaXN0ZXIgPSBj b2RlQmxvY2stPmFjdGl2YXRpb25SZWdpc3RlcigpOwotICAgIHJldHVybiByZWdpc3RlcnMoKVth Y3RpdmF0aW9uUmVnaXN0ZXIub2Zmc2V0KCldLmpzVmFsdWUoKTsKLX0KLQotfSAvLyBuYW1lc3Bh Y2UgSlNDCi0KLSNlbmRpZiAvLyBDYWxsRnJhbWVJbmxpbmVzX2gKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAkocmV2aXNpb24g MTkwMjQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNiBAQAogCiAjaW5jbHVkZSAiQmF0Y2hl ZFRyYW5zaXRpb25PcHRpbWl6ZXIuaCIKICNpbmNsdWRlICJDYWxsRnJhbWVDbG9zdXJlLmgiCi0j aW5jbHVkZSAiQ2FsbEZyYW1lSW5saW5lcy5oIgogI2luY2x1ZGUgIkNsb25lZEFyZ3VtZW50cy5o IgogI2luY2x1ZGUgIkNvZGVCbG9jay5oIgogI2luY2x1ZGUgIkRpcmVjdEFyZ3VtZW50cy5oIgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrVmlzaXRvci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1N0YWNrVmlz aXRvci5jcHAJKHJldmlzaW9uIDE5MDI0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRl cnByZXRlci9TdGFja1Zpc2l0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw2IEBA CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU3RhY2tWaXNpdG9yLmgiCiAKLSNpbmNs dWRlICJDYWxsRnJhbWVJbmxpbmVzLmgiCiAjaW5jbHVkZSAiQ2xvbmVkQXJndW1lbnRzLmgiCiAj aW5jbHVkZSAiRXhlY3V0YWJsZS5oIgogI2luY2x1ZGUgIklubGluZUNhbGxGcmFtZS5oIgpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRGlyZWN0QXJndW1lbnRzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9EaXJlY3RBcmd1bWVudHMu Y3BwCShyZXZpc2lvbiAxOTAyNDkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9E aXJlY3RBcmd1bWVudHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRGlyZWN0QXJndW1lbnRzLmgiCiAKKyNpbmNsdWRl ICJDb2RlQmxvY2suaCIKICNpbmNsdWRlICJDb3B5VmlzaXRvcklubGluZXMuaCIKICNpbmNsdWRl ICJHZW5lcmljQXJndW1lbnRzSW5saW5lcy5oIgogI2luY2x1ZGUgIkpTQ0lubGluZXMuaCIKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vycm9ySW5zdGFuY2UuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Vycm9ySW5zdGFuY2UuY3Bw CShyZXZpc2lvbiAxOTAyNDkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FcnJv ckluc3RhbmNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIkVycm9ySW5zdGFuY2UuaCIKIAorI2luY2x1ZGUgIkNvZGVC bG9jay5oIgogI2luY2x1ZGUgIkpTU2NvcGUuaCIKICNpbmNsdWRlICJKU0NJbmxpbmVzLmgiCiAj aW5jbHVkZSAiSlNHbG9iYWxPYmplY3RGdW5jdGlvbnMuaCIKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTQXJyYXkuY3BwCShyZXZpc2lvbiAxOTAyNDkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYs NiArMjYsNyBAQAogI2luY2x1ZGUgIkFycmF5UHJvdG90eXBlLmgiCiAjaW5jbHVkZSAiQnV0dGVy Zmx5SW5saW5lcy5oIgogI2luY2x1ZGUgIkNhY2hlZENhbGwuaCIKKyNpbmNsdWRlICJDb2RlQmxv Y2suaCIKICNpbmNsdWRlICJDb3BpZWRTcGFjZS5oIgogI2luY2x1ZGUgIkVycm9yLmgiCiAjaW5j bHVkZSAiRXhlY3V0YWJsZS5oIgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNDSW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTQ0lubGluZXMuaAkocmV2aXNpb24gMTkwMjQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNDSW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw2IEBACiAv LyBJbiBmYWN0LCBpdCBjYW4gbWFrZSBhIGxvdCBvZiBzZW5zZTogb3V0c2lkZSBvZiBKU0MsIHRo aXMgZmlsZSBiZWNvbWVzIGEga2luZCBvZiB1bWJyZWxsYQogLy8gaGVhZGVyIHRoYXQgcHVsbHMg aW4gbW9zdCAoYWxsPykgb2YgdGhlIGludGVyZXN0aW5nIHRoaW5ncyBpbiBKU0MuCiAKLSNpbmNs dWRlICJDYWxsRnJhbWVJbmxpbmVzLmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uSGVscGVycy5oIgog I2luY2x1ZGUgIkdDSW5jb21pbmdSZWZDb3VudGVkSW5saW5lcy5oIgogI2luY2x1ZGUgIkhlYXBJ bmxpbmVzLmgiCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9MaXRlcmFsUGFy c2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9MaXRl cmFsUGFyc2VyLmNwcAkocmV2aXNpb24gMTkwMjQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvTGl0ZXJhbFBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcg QEAKICNpbmNsdWRlICJMaXRlcmFsUGFyc2VyLmgiCiAKICNpbmNsdWRlICJCdXR0ZXJmbHlJbmxp bmVzLmgiCisjaW5jbHVkZSAiQ29kZUJsb2NrLmgiCiAjaW5jbHVkZSAiQ29waWVkU3BhY2VJbmxp bmVzLmgiCiAjaW5jbHVkZSAiSlNBcnJheS5oIgogI2luY2x1ZGUgIkpTU3RyaW5nLmgiCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9OdWxsU2V0dGVyRnVuY3Rpb24uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL051bGxTZXR0ZXJGdW5j dGlvbi5jcHAJKHJldmlzaW9uIDE5MDI0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL051bGxTZXR0ZXJGdW5jdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcg QEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJOdWxsU2V0dGVyRnVuY3Rpb24uaCIK IAorI2luY2x1ZGUgIkNvZGVCbG9jay5oIgogI2luY2x1ZGUgIkVycm9yLmgiCiAjaW5jbHVkZSAi SlNDSW5saW5lcy5oIgogI2luY2x1ZGUgIkpTQ0pTVmFsdWVJbmxpbmVzLmgiCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvSlNEb2xsYXJWTVByb3RvdHlwZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0pTRG9sbGFyVk1Qcm90b3R5cGUuY3Bw CShyZXZpc2lvbiAxOTAyNDkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvSlNEb2xs YXJWTVByb3RvdHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJKU0RvbGxhclZNUHJvdG90eXBlLmgiCiAKKyNpbmNs dWRlICJDb2RlQmxvY2suaCIKICNpbmNsdWRlICJIZWFwLmgiCiAjaW5jbHVkZSAiSGVhcEl0ZXJh dGlvblNjb3BlLmgiCiAjaW5jbHVkZSAiSlNDSW5saW5lcy5oIgo=