142134 2015-02-28 11:50:18 -0800 Simplify WebResourceCacheManagerCFNet.mm code 2015-02-28 12:20:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1073054 0 andersca 2015-02-28 11:50:18 -0800 Simplify WebResourceCacheManagerCFNet.mm code 1073055 1 247608 andersca 2015-02-28 11:56:45 -0800 Created attachment 247608 Patch 1073056 2 commit-queue 2015-02-28 11:58:34 -0800 Attachment 247608 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm:53: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h:50: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1073057 3 247609 andersca 2015-02-28 12:05:12 -0800 Created attachment 247609 Patch 1073058 4 commit-queue 2015-02-28 12:07:32 -0800 Attachment 247609 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.mm:53: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h:50: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1073059 5 andersca 2015-02-28 12:20:50 -0800 Committed r180838: <http://trac.webkit.org/changeset/180838> 247608 2015-02-28 11:56:45 -0800 2015-02-28 12:05:10 -0800 Patch bug-142134-20150228115632.patch text/plain 6640 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzVlODRmYzc4Y2E4OWZh MWUwMGRkZDFjY2FhNzM0YTNjNmQ4OGQzZS4uNTg3NDY5Zjk3Yjg3YWNkZTQyMWY0MjI2Mzc5N2Uw NTg2NWFlOTllNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAyLTI4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgV2Vi UmVzb3VyY2VDYWNoZU1hbmFnZXJDRk5ldC5tbSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIxMzQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpIGlz IGFsd2F5cyB0cnVlIG9uIE1hYyBhbmQgaU9TLCBzbyByZW1vdmUgdGhvc2UgI2lmZGVmcy4KKyAg ICAgICAgLSBNYWtlIGNmVVJMQ2FjaGVIb3N0TmFtZXNXaXRoQ2FsbGJhY2sgYW5kIGNsZWFyQ0ZV UkxDYWNoZUZvckhvc3ROYW1lcyBwdWJsaWMKKyAgICAgICAgICBzbyB0aGV5IGNhbiBiZSB1c2Vk IGJ5IHRoZSBuZXcgV2Vic2l0ZURhdGFTdG9yZSBjb2RlIGluIGFuIHVwY29taW5nIHBhdGNoLgor ICAgICAgICAtIENoYW5nZSBjZlVSTENhY2hlSG9zdE5hbWVzV2l0aENhbGxiYWNrIHRvIHRha2Ug YW4gc3RkOjpmdW5jdGlvbiBpbnN0ZWFkIG9mIGEgYmxvY2suCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1Jlc291cmNlQ2FjaGUvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6Z2V0Q2FjaGVPcmlnaW5zKToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvY2YvV2ViUmVzb3VyY2VDYWNoZU1h bmFnZXJDRk5ldC5tbToKKyAgICAgICAgKFdlYktpdDo6cGFydGl0aW9uTmFtZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpjZlVSTENhY2hlSG9zdE5hbWVzV2l0 aENhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OmNs ZWFyQ0ZVUkxDYWNoZUZvckhvc3ROYW1lcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNl Q2FjaGVNYW5hZ2VyOjpjZlVSTENhY2hlSG9zdE5hbWVzKTogRGVsZXRlZC4KKwogMjAxNS0wMi0y NyAgSHVuc2VvcCBKZW9uZyAgPGhzODUuamVvbmdAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VG TF1bR1RLXSBGaXggYnVpbGQgYnJlYWsgYWZ0ZXIgcjE4MDc5MCwxODA3OTggCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2ViUmVzb3VyY2VDYWNo ZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9SZXNvdXJjZUNhY2hlL1dl YlJlc291cmNlQ2FjaGVNYW5hZ2VyLmNwcAppbmRleCAzNTQ5MmY4MjVmNmVkNjBkOTBkYTE2YjRi YjU0NzE2ZTc1ZDQ3MzM0Li44YzRhOGU2MDc4NDkyOGM2YzU1YjI2YjBjN2NlNzQzMjM4ZTFkOTAz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2Vi UmVzb3VyY2VDYWNoZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UmVzb3VyY2VDYWNoZS9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlci5jcHAKQEAgLTUyLDE5ICs1Miwx MyBAQCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIoV2Vi UHJvY2VzcyogcHJvY2VzcykKIAogdm9pZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6Z2V0Q2Fj aGVPcmlnaW5zKHVpbnQ2NF90IGNhbGxiYWNrSUQpIGNvbnN0CiB7Ci0jaWYgVVNFKENGVVJMQ0FD SEUpICYmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCisjaWYgVVNFKENGVVJMQ0FDSEUpCiAg ICAgX19ibG9jayBNZW1vcnlDYWNoZTo6U2VjdXJpdHlPcmlnaW5TZXQgb3JpZ2luczsKLSNlbHNl Ci0gICAgTWVtb3J5Q2FjaGU6OlNlY3VyaXR5T3JpZ2luU2V0IG9yaWdpbnM7CiAjZW5kaWYKICAg ICBNZW1vcnlDYWNoZTo6c2luZ2xldG9uKCkuZ2V0T3JpZ2luc1dpdGhDYWNoZShvcmlnaW5zKTsK IAogI2lmIFVTRShDRlVSTENBQ0hFKQotI2lmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCiAg ICAgY2ZVUkxDYWNoZUhvc3ROYW1lc1dpdGhDYWxsYmFjayheKFJldGFpblB0cjxDRkFycmF5UmVm PiBjZlVSTEhvc3RzKSB7Ci0jZWxzZQotICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gY2ZV UkxIb3N0cyA9IGNmVVJMQ2FjaGVIb3N0TmFtZXMoKTsKLSNlbmRpZgogICAgICAgICBDRkluZGV4 IHNpemUgPSBjZlVSTEhvc3RzID8gQ0ZBcnJheUdldENvdW50KGNmVVJMSG9zdHMuZ2V0KCkpIDog MDsKIAogICAgICAgICBTdHJpbmcgaHR0cFN0cmluZygiaHR0cCIpOwpAQCAtNzYsNyArNzAsNyBA QCB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpnZXRDYWNoZU9yaWdpbnModWludDY0X3Qg Y2FsbGJhY2tJRCkgY29uc3QKIAogICAgICAgICByZXR1cm5DYWNoZU9yaWdpbnMoY2FsbGJhY2tJ RCwgb3JpZ2lucyk7CiAKLSNpZiBVU0UoQ0ZVUkxDQUNIRSkgJiYgRU5BQkxFKENBQ0hFX1BBUlRJ VElPTklORykKKyNpZiBVU0UoQ0ZVUkxDQUNIRSkKICAgICB9KTsKICNlbmRpZgogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9SZXNvdXJjZUNhY2hlL1dlYlJlc291cmNl Q2FjaGVNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUv V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIuaAppbmRleCBkM2YzNTc5MDRiOTM3OTRkYmNmNmMyNGFl NjA2MGY1NDYxOGFhYmFjLi5mOTkwMDc0MWM4NDkzYjgxMzUzNDU1ZGYzM2FhOWE1NzYwM2I5MjU3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2Vi UmVzb3VyY2VDYWNoZU1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jl c291cmNlQ2FjaGUvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIuaApAQCAtNDYsNiArNDYsMTEgQEAg cHVibGljOgogCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIHN1cHBsZW1lbnROYW1lKCk7CiAKKyNp ZiBVU0UoQ0ZVUkxDQUNIRSkKKyAgICBzdGF0aWMgdm9pZCBjZlVSTENhY2hlSG9zdE5hbWVzV2l0 aENhbGxiYWNrKHN0ZDo6ZnVuY3Rpb248dm9pZCAoUmV0YWluUHRyPENGQXJyYXlSZWY+KT4pOwor ICAgIHN0YXRpYyB2b2lkIGNsZWFyQ0ZVUkxDYWNoZUZvckhvc3ROYW1lcyhDRkFycmF5UmVmKTsK KyNlbmRpZgorCiBwcml2YXRlOgogICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCiAgICAgLy8g SW1wbGVtZW50ZWQgaW4gZ2VuZXJhdGVkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyTWVzc2FnZVJl Y2VpdmVyLmNwcApAQCAtNTYsMTUgKzYxLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNsZWFyQ2Fj aGVGb3JPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiwgdWludDMyX3QgY2FjaGVzVG9D bGVhcikgY29uc3Q7CiAgICAgdm9pZCBjbGVhckNhY2hlRm9yQWxsT3JpZ2lucyh1aW50MzJfdCBj YWNoZXNUb0NsZWFyKSBjb25zdDsKIAotI2lmIFVTRShDRlVSTENBQ0hFKQotICAgIHN0YXRpYyBS ZXRhaW5QdHI8Q0ZBcnJheVJlZj4gY2ZVUkxDYWNoZUhvc3ROYW1lcygpOwotI2lmIEVOQUJMRShD QUNIRV9QQVJUSVRJT05JTkcpCi0gICAgdHlwZWRlZiB2b2lkICheQ2FjaGVDYWxsYmFjaykoUmV0 YWluUHRyPENGQXJyYXlSZWY+KTsKLSAgICBzdGF0aWMgdm9pZCBjZlVSTENhY2hlSG9zdE5hbWVz V2l0aENhbGxiYWNrKENhY2hlQ2FsbGJhY2spOwotI2VuZGlmCi0gICAgc3RhdGljIHZvaWQgY2xl YXJDRlVSTENhY2hlRm9ySG9zdE5hbWVzKENGQXJyYXlSZWYpOwotI2VuZGlmCi0KICAgICBXZWJQ cm9jZXNzKiBtX3Byb2Nlc3M7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1Jlc291cmNlQ2FjaGUvY2YvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJDRk5ldC5tbSBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUmVzb3VyY2VDYWNoZS9jZi9XZWJSZXNvdXJjZUNh Y2hlTWFuYWdlckNGTmV0Lm1tCmluZGV4IDU4OGU0ZmZiZjI0NjI4MDJkYzRlODIxYTcxNTZlOTY5 YjhhMGU4MjMuLmUzYTU1MjEzNjc3OTM1NjUxYTRmNDQxY2JkYWRkZTZhYWNiNWY5YTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUmVzb3VyY2VDYWNoZS9jZi9XZWJSZXNv dXJjZUNhY2hlTWFuYWdlckNGTmV0Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UmVzb3VyY2VDYWNoZS9jZi9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlckNGTmV0Lm1tCkBAIC0yMyw4 ICsyMyw4IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lu Y2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyLmgiCisj aW1wb3J0ICJjb25maWcuaCIKKyNpbXBvcnQgIldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyLmgiCiAK ICNpZiBVU0UoQ0ZVUkxDQUNIRSkKIApAQCAtMzMsMTQgKzMzLDEwIEBACiAjaW5jbHVkZSA8d3Rm L3RleHQvQ1N0cmluZy5oPgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShDT0NPQSkKLSNpbmNsdWRl ICJXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaCIKLSNlbmRpZgotCisjaW1wb3J0ICJXZWJLaXRTeXN0 ZW1JbnRlcmZhY2UuaCIKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLSNpZiBFTkFCTEUoQ0FDSEVf UEFSVElUSU9OSU5HKQogc3RhdGljIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gcGFydGl0aW9uTmFt ZShDRlN0cmluZ1JlZiBkb21haW4pCiB7CiAjaWYgRU5BQkxFKFBVQkxJQ19TVUZGSVhfTElTVCkK QEAgLTUzLDE1ICs0OSw4IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHBhcnRpdGlv bk5hbWUoQ0ZTdHJpbmdSZWYgZG9tYWluKQogICAgIHJldHVybiBkb21haW47CiAjZW5kaWYKIH0K LSNlbmRpZgogCi1SZXRhaW5QdHI8Q0ZBcnJheVJlZj4gV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6 OmNmVVJMQ2FjaGVIb3N0TmFtZXMoKQotewotICAgIHJldHVybiBhZG9wdENGKFdLQ0ZVUkxDYWNo ZUNvcHlBbGxIb3N0TmFtZXNJblBlcnNpc3RlbnRTdG9yZSgpKTsKLX0KLQotI2lmIEVOQUJMRShD QUNIRV9QQVJUSVRJT05JTkcpCi12b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpjZlVSTENh Y2hlSG9zdE5hbWVzV2l0aENhbGxiYWNrKENhY2hlQ2FsbGJhY2sgY2FsbGJhY2spCit2b2lkIFdl YlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpjZlVSTENhY2hlSG9zdE5hbWVzV2l0aENhbGxiYWNrKHN0 ZDo6ZnVuY3Rpb248dm9pZCAoUmV0YWluUHRyPENGQXJyYXlSZWY+KT4gY2FsbGJhY2spCiB7CiAg ICAgV0tDRlVSTENhY2hlQ29weUFsbFBhcnRpdGlvbk5hbWVzKF4oQ0ZBcnJheVJlZiBwYXJ0aXRp b25OYW1lcykgewogICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gaG9zdE5hbWVzSW5QZXJz aXN0ZW50U3RvcmUgPSBhZG9wdENGKFdLQ0ZVUkxDYWNoZUNvcHlBbGxIb3N0TmFtZXNJblBlcnNp c3RlbnRTdG9yZUZvclBhcnRpdGlvbihDRlNUUigiIikpKTsKQEAgLTczLDIwICs2MiwxNyBAQCB2 b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpjZlVSTENhY2hlSG9zdE5hbWVzV2l0aENhbGxi YWNrKENhY2hlQ2FsbGJhY2sgY2FsbAogICAgICAgICBjYWxsYmFjayhXVEY6Om1vdmUoaG9zdE5h bWVzKSk7CiAgICAgfSk7CiB9Ci0jZW5kaWYKIAogdm9pZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdl cjo6Y2xlYXJDRlVSTENhY2hlRm9ySG9zdE5hbWVzKENGQXJyYXlSZWYgaG9zdE5hbWVzKQogewog ICAgIFdLQ0ZVUkxDYWNoZURlbGV0ZUhvc3ROYW1lc0luUGVyc2lzdGVudFN0b3JlKGhvc3ROYW1l cyk7CiAKLSNpZiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKQogICAgIENGSW5kZXggc2l6ZSA9 IENGQXJyYXlHZXRDb3VudChob3N0TmFtZXMpOwogICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8 IHNpemU7ICsraSkgewogICAgICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHBhcnRpdGlvbiA9 IHBhcnRpdGlvbk5hbWUoc3RhdGljX2Nhc3Q8Q0ZTdHJpbmdSZWY+KENGQXJyYXlHZXRWYWx1ZUF0 SW5kZXgoaG9zdE5hbWVzLCBpKSkpOwogICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gcGFy dGl0aW9uSG9zdE5hbWVzID0gYWRvcHRDRihXS0NGVVJMQ2FjaGVDb3B5QWxsSG9zdE5hbWVzSW5Q ZXJzaXN0ZW50U3RvcmVGb3JQYXJ0aXRpb24ocGFydGl0aW9uLmdldCgpKSk7CiAgICAgICAgIFdL Q0ZVUkxDYWNoZURlbGV0ZUhvc3ROYW1lc0luUGVyc2lzdGVudFN0b3JlRm9yUGFydGl0aW9uKHBh cnRpdGlvbkhvc3ROYW1lcy5nZXQoKSwgcGFydGl0aW9uLmdldCgpKTsKICAgICB9Ci0jZW5kaWYK IH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 247609 2015-02-28 12:05:12 -0800 2015-02-28 12:11:18 -0800 Patch bug-142134-20150228120500.patch text/plain 7053 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzVlODRmYzc4Y2E4OWZh MWUwMGRkZDFjY2FhNzM0YTNjNmQ4OGQzZS4uNTg3NDY5Zjk3Yjg3YWNkZTQyMWY0MjI2Mzc5N2Uw NTg2NWFlOTllNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAyLTI4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgV2Vi UmVzb3VyY2VDYWNoZU1hbmFnZXJDRk5ldC5tbSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIxMzQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpIGlz IGFsd2F5cyB0cnVlIG9uIE1hYyBhbmQgaU9TLCBzbyByZW1vdmUgdGhvc2UgI2lmZGVmcy4KKyAg ICAgICAgLSBNYWtlIGNmVVJMQ2FjaGVIb3N0TmFtZXNXaXRoQ2FsbGJhY2sgYW5kIGNsZWFyQ0ZV UkxDYWNoZUZvckhvc3ROYW1lcyBwdWJsaWMKKyAgICAgICAgICBzbyB0aGV5IGNhbiBiZSB1c2Vk IGJ5IHRoZSBuZXcgV2Vic2l0ZURhdGFTdG9yZSBjb2RlIGluIGFuIHVwY29taW5nIHBhdGNoLgor ICAgICAgICAtIENoYW5nZSBjZlVSTENhY2hlSG9zdE5hbWVzV2l0aENhbGxiYWNrIHRvIHRha2Ug YW4gc3RkOjpmdW5jdGlvbiBpbnN0ZWFkIG9mIGEgYmxvY2suCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1Jlc291cmNlQ2FjaGUvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6Z2V0Q2FjaGVPcmlnaW5zKToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvY2YvV2ViUmVzb3VyY2VDYWNoZU1h bmFnZXJDRk5ldC5tbToKKyAgICAgICAgKFdlYktpdDo6cGFydGl0aW9uTmFtZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpjZlVSTENhY2hlSG9zdE5hbWVzV2l0 aENhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OmNs ZWFyQ0ZVUkxDYWNoZUZvckhvc3ROYW1lcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNl Q2FjaGVNYW5hZ2VyOjpjZlVSTENhY2hlSG9zdE5hbWVzKTogRGVsZXRlZC4KKwogMjAxNS0wMi0y NyAgSHVuc2VvcCBKZW9uZyAgPGhzODUuamVvbmdAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VG TF1bR1RLXSBGaXggYnVpbGQgYnJlYWsgYWZ0ZXIgcjE4MDc5MCwxODA3OTggCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2ViUmVzb3VyY2VDYWNo ZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9SZXNvdXJjZUNhY2hlL1dl YlJlc291cmNlQ2FjaGVNYW5hZ2VyLmNwcAppbmRleCAzNTQ5MmY4MjVmNmVkNjBkOTBkYTE2YjRi YjU0NzE2ZTc1ZDQ3MzM0Li44M2UyZTI2YzNmNzYwMmMyYzBiNWIxYTUxODAzNjlmZTYzMWFjNzFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2Vi UmVzb3VyY2VDYWNoZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UmVzb3VyY2VDYWNoZS9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlci5jcHAKQEAgLTUyLDE5ICs1Miwx MiBAQCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIoV2Vi UHJvY2VzcyogcHJvY2VzcykKIAogdm9pZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6Z2V0Q2Fj aGVPcmlnaW5zKHVpbnQ2NF90IGNhbGxiYWNrSUQpIGNvbnN0CiB7Ci0jaWYgVVNFKENGVVJMQ0FD SEUpICYmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCi0gICAgX19ibG9jayBNZW1vcnlDYWNo ZTo6U2VjdXJpdHlPcmlnaW5TZXQgb3JpZ2luczsKLSNlbHNlCiAgICAgTWVtb3J5Q2FjaGU6OlNl Y3VyaXR5T3JpZ2luU2V0IG9yaWdpbnM7Ci0jZW5kaWYKKwogICAgIE1lbW9yeUNhY2hlOjpzaW5n bGV0b24oKS5nZXRPcmlnaW5zV2l0aENhY2hlKG9yaWdpbnMpOwogCiAjaWYgVVNFKENGVVJMQ0FD SEUpCi0jaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKLSAgICBjZlVSTENhY2hlSG9zdE5h bWVzV2l0aENhbGxiYWNrKF4oUmV0YWluUHRyPENGQXJyYXlSZWY+IGNmVVJMSG9zdHMpIHsKLSNl bHNlCi0gICAgICAgIFJldGFpblB0cjxDRkFycmF5UmVmPiBjZlVSTEhvc3RzID0gY2ZVUkxDYWNo ZUhvc3ROYW1lcygpOwotI2VuZGlmCisgICAgY2ZVUkxDYWNoZUhvc3ROYW1lc1dpdGhDYWxsYmFj ayhbJm9yaWdpbnNdKFJldGFpblB0cjxDRkFycmF5UmVmPiBjZlVSTEhvc3RzKSB7CiAgICAgICAg IENGSW5kZXggc2l6ZSA9IGNmVVJMSG9zdHMgPyBDRkFycmF5R2V0Q291bnQoY2ZVUkxIb3N0cy5n ZXQoKSkgOiAwOwogCiAgICAgICAgIFN0cmluZyBodHRwU3RyaW5nKCJodHRwIik7CkBAIC03Miwx MyArNjUsMTAgQEAgdm9pZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6Z2V0Q2FjaGVPcmlnaW5z KHVpbnQ2NF90IGNhbGxiYWNrSUQpIGNvbnN0CiAgICAgICAgICAgICBDRlN0cmluZ1JlZiBob3N0 ID0gc3RhdGljX2Nhc3Q8Q0ZTdHJpbmdSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoY2ZVUkxI b3N0cy5nZXQoKSwgaSkpOwogICAgICAgICAgICAgb3JpZ2lucy5hZGQoU2VjdXJpdHlPcmlnaW46 OmNyZWF0ZShodHRwU3RyaW5nLCBob3N0LCAwKSk7CiAgICAgICAgIH0KLSNlbmRpZgotCi0gICAg ICAgIHJldHVybkNhY2hlT3JpZ2lucyhjYWxsYmFja0lELCBvcmlnaW5zKTsKLQotI2lmIFVTRShD RlVSTENBQ0hFKSAmJiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKQogICAgIH0pOwogI2VuZGlm CisKKyAgICByZXR1cm5DYWNoZU9yaWdpbnMoY2FsbGJhY2tJRCwgb3JpZ2lucyk7CiB9CiAKIHZv aWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OnJldHVybkNhY2hlT3JpZ2lucyh1aW50NjRfdCBj YWxsYmFja0lELCBjb25zdCBNZW1vcnlDYWNoZTo6U2VjdXJpdHlPcmlnaW5TZXQmIG9yaWdpbnMp IGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2Fj aGUvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UmVzb3VyY2VDYWNoZS9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlci5oCmluZGV4IGQzZjM1NzkwNGI5 Mzc5NGRiY2Y2YzI0YWU2MDYwZjU0NjE4YWFiYWMuLmY5OTAwNzQxYzg0OTNiODEzNTM0NTVkZjMz YWE5YTU3NjAzYjkyNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUmVz b3VyY2VDYWNoZS9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUmVzb3VyY2VDYWNoZS9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlci5oCkBAIC00 Niw2ICs0NiwxMSBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgY29uc3QgY2hhciogc3VwcGxlbWVu dE5hbWUoKTsKIAorI2lmIFVTRShDRlVSTENBQ0hFKQorICAgIHN0YXRpYyB2b2lkIGNmVVJMQ2Fj aGVIb3N0TmFtZXNXaXRoQ2FsbGJhY2soc3RkOjpmdW5jdGlvbjx2b2lkIChSZXRhaW5QdHI8Q0ZB cnJheVJlZj4pPik7CisgICAgc3RhdGljIHZvaWQgY2xlYXJDRlVSTENhY2hlRm9ySG9zdE5hbWVz KENGQXJyYXlSZWYpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgLy8gSVBDOjpNZXNzYWdlUmVj ZWl2ZXIKICAgICAvLyBJbXBsZW1lbnRlZCBpbiBnZW5lcmF0ZWQgV2ViUmVzb3VyY2VDYWNoZU1h bmFnZXJNZXNzYWdlUmVjZWl2ZXIuY3BwCkBAIC01NiwxNSArNjEsNiBAQCBwcml2YXRlOgogICAg IHZvaWQgY2xlYXJDYWNoZUZvck9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmLCB1aW50 MzJfdCBjYWNoZXNUb0NsZWFyKSBjb25zdDsKICAgICB2b2lkIGNsZWFyQ2FjaGVGb3JBbGxPcmln aW5zKHVpbnQzMl90IGNhY2hlc1RvQ2xlYXIpIGNvbnN0OwogCi0jaWYgVVNFKENGVVJMQ0FDSEUp Ci0gICAgc3RhdGljIFJldGFpblB0cjxDRkFycmF5UmVmPiBjZlVSTENhY2hlSG9zdE5hbWVzKCk7 Ci0jaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKLSAgICB0eXBlZGVmIHZvaWQgKF5DYWNo ZUNhbGxiYWNrKShSZXRhaW5QdHI8Q0ZBcnJheVJlZj4pOwotICAgIHN0YXRpYyB2b2lkIGNmVVJM Q2FjaGVIb3N0TmFtZXNXaXRoQ2FsbGJhY2soQ2FjaGVDYWxsYmFjayk7Ci0jZW5kaWYKLSAgICBz dGF0aWMgdm9pZCBjbGVhckNGVVJMQ2FjaGVGb3JIb3N0TmFtZXMoQ0ZBcnJheVJlZik7Ci0jZW5k aWYKLQogICAgIFdlYlByb2Nlc3MqIG1fcHJvY2VzczsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUmVzb3VyY2VDYWNoZS9jZi9XZWJSZXNvdXJjZUNhY2hlTWFu YWdlckNGTmV0Lm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9SZXNvdXJjZUNhY2hlL2Nm L1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyQ0ZOZXQubW0KaW5kZXggNTg4ZTRmZmJmMjQ2MjgwMmRj NGU4MjFhNzE1NmU5NjliOGEwZTgyMy4uZTNhNTUyMTM2Nzc5MzU2NTFhNGY0NDFjYmRhZGRlNmFh Y2I1ZjlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9SZXNvdXJjZUNh Y2hlL2NmL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyQ0ZOZXQubW0KKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9SZXNvdXJjZUNhY2hlL2NmL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyQ0ZO ZXQubW0KQEAgLTIzLDggKzIzLDggQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KICAqLwogCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiV2ViUmVzb3VyY2VDYWNo ZU1hbmFnZXIuaCIKKyNpbXBvcnQgImNvbmZpZy5oIgorI2ltcG9ydCAiV2ViUmVzb3VyY2VDYWNo ZU1hbmFnZXIuaCIKIAogI2lmIFVTRShDRlVSTENBQ0hFKQogCkBAIC0zMywxNCArMzMsMTAgQEAK ICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKENP Q09BKQotI2luY2x1ZGUgIldlYktpdFN5c3RlbUludGVyZmFjZS5oIgotI2VuZGlmCi0KKyNpbXBv cnQgIldlYktpdFN5c3RlbUludGVyZmFjZS5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotI2lm IEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCiBzdGF0aWMgUmV0YWluUHRyPENGU3RyaW5nUmVm PiBwYXJ0aXRpb25OYW1lKENGU3RyaW5nUmVmIGRvbWFpbikKIHsKICNpZiBFTkFCTEUoUFVCTElD X1NVRkZJWF9MSVNUKQpAQCAtNTMsMTUgKzQ5LDggQEAgc3RhdGljIFJldGFpblB0cjxDRlN0cmlu Z1JlZj4gcGFydGl0aW9uTmFtZShDRlN0cmluZ1JlZiBkb21haW4pCiAgICAgcmV0dXJuIGRvbWFp bjsKICNlbmRpZgogfQotI2VuZGlmCiAKLVJldGFpblB0cjxDRkFycmF5UmVmPiBXZWJSZXNvdXJj ZUNhY2hlTWFuYWdlcjo6Y2ZVUkxDYWNoZUhvc3ROYW1lcygpCi17Ci0gICAgcmV0dXJuIGFkb3B0 Q0YoV0tDRlVSTENhY2hlQ29weUFsbEhvc3ROYW1lc0luUGVyc2lzdGVudFN0b3JlKCkpOwotfQot Ci0jaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKLXZvaWQgV2ViUmVzb3VyY2VDYWNoZU1h bmFnZXI6OmNmVVJMQ2FjaGVIb3N0TmFtZXNXaXRoQ2FsbGJhY2soQ2FjaGVDYWxsYmFjayBjYWxs YmFjaykKK3ZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OmNmVVJMQ2FjaGVIb3N0TmFtZXNX aXRoQ2FsbGJhY2soc3RkOjpmdW5jdGlvbjx2b2lkIChSZXRhaW5QdHI8Q0ZBcnJheVJlZj4pPiBj YWxsYmFjaykKIHsKICAgICBXS0NGVVJMQ2FjaGVDb3B5QWxsUGFydGl0aW9uTmFtZXMoXihDRkFy cmF5UmVmIHBhcnRpdGlvbk5hbWVzKSB7CiAgICAgICAgIFJldGFpblB0cjxDRkFycmF5UmVmPiBo b3N0TmFtZXNJblBlcnNpc3RlbnRTdG9yZSA9IGFkb3B0Q0YoV0tDRlVSTENhY2hlQ29weUFsbEhv c3ROYW1lc0luUGVyc2lzdGVudFN0b3JlRm9yUGFydGl0aW9uKENGU1RSKCIiKSkpOwpAQCAtNzMs MjAgKzYyLDE3IEBAIHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OmNmVVJMQ2FjaGVIb3N0 TmFtZXNXaXRoQ2FsbGJhY2soQ2FjaGVDYWxsYmFjayBjYWxsCiAgICAgICAgIGNhbGxiYWNrKFdU Rjo6bW92ZShob3N0TmFtZXMpKTsKICAgICB9KTsKIH0KLSNlbmRpZgogCiB2b2lkIFdlYlJlc291 cmNlQ2FjaGVNYW5hZ2VyOjpjbGVhckNGVVJMQ2FjaGVGb3JIb3N0TmFtZXMoQ0ZBcnJheVJlZiBo b3N0TmFtZXMpCiB7CiAgICAgV0tDRlVSTENhY2hlRGVsZXRlSG9zdE5hbWVzSW5QZXJzaXN0ZW50 U3RvcmUoaG9zdE5hbWVzKTsKIAotI2lmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCiAgICAg Q0ZJbmRleCBzaXplID0gQ0ZBcnJheUdldENvdW50KGhvc3ROYW1lcyk7CiAgICAgZm9yIChDRklu ZGV4IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7CiAgICAgICAgIFJldGFpblB0cjxDRlN0cmluZ1Jl Zj4gcGFydGl0aW9uID0gcGFydGl0aW9uTmFtZShzdGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ0ZB cnJheUdldFZhbHVlQXRJbmRleChob3N0TmFtZXMsIGkpKSk7CiAgICAgICAgIFJldGFpblB0cjxD RkFycmF5UmVmPiBwYXJ0aXRpb25Ib3N0TmFtZXMgPSBhZG9wdENGKFdLQ0ZVUkxDYWNoZUNvcHlB bGxIb3N0TmFtZXNJblBlcnNpc3RlbnRTdG9yZUZvclBhcnRpdGlvbihwYXJ0aXRpb24uZ2V0KCkp KTsKICAgICAgICAgV0tDRlVSTENhY2hlRGVsZXRlSG9zdE5hbWVzSW5QZXJzaXN0ZW50U3RvcmVG b3JQYXJ0aXRpb24ocGFydGl0aW9uSG9zdE5hbWVzLmdldCgpLCBwYXJ0aXRpb24uZ2V0KCkpOwog ICAgIH0KLSNlbmRpZgogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK