44783 2010-08-27 12:13:43 -0700 Move Texture class from p/g/chromium to p/g/gpu 2010-08-27 14:19:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth eric fishd sam scheib senorblanco webkit.review.bot oldest_to_newest 270648 0 jamesr 2010-08-27 12:13:43 -0700 Move Texture class from p/g/chromium to p/g/gpu 270649 1 65749 jamesr 2010-08-27 12:15:59 -0700 Created attachment 65749 Patch 270654 2 65749 senorblanco 2010-08-27 12:23:05 -0700 Comment on attachment 65749 Patch ooks good to me, if people are ok with us taking the name. WebCore/platform/graphics/skia/PlatformContextSkia.h:39 + #include "SkDrawLooper.h" Not your fault, but it looks like this could be forward-declared, rather than #included. 270683 3 jamesr 2010-08-27 12:59:26 -0700 I'll try forward-declaring SkDrawLooper as well, separately. Thanks. 270708 4 jamesr 2010-08-27 13:37:32 -0700 Committed r66248: <http://trac.webkit.org/changeset/66248> 270744 5 webkit.review.bot 2010-08-27 14:19:20 -0700 http://trac.webkit.org/changeset/66248 might have broken Qt Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/66248 http://trac.webkit.org/changeset/66246 http://trac.webkit.org/changeset/66247 65749 2010-08-27 12:15:59 -0700 2010-08-27 12:57:47 -0700 Patch bug-44783-20100827121558.patch text/plain 17663 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9XZWJDb3JlL1dl YkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCmluZGV4IDI1YWQ0NTBlNTYxMDA2NjcyMGRjNWIxMmQ1ZjFj MDY3YzRkYTI3NWIuLjg2YmZmZGE5OTBlMDE1YTQ5ZmI2NzRjZWE5ZWJjNjBjYzA2NmYwOWIgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKKysrIGIvV2ViQ29yZS9X ZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMTM4LDYgKzEzOCw3IEBACiAgICAgICAnLi4vcGxh dGZvcm0vZ3JhcGhpY3MnLAogICAgICAgJy4uL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtJywK ICAgICAgICcuLi9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzJywKKyAgICAgICcuLi9wbGF0Zm9y bS9ncmFwaGljcy9ncHUnLAogICAgICAgJy4uL3BsYXRmb3JtL2dyYXBoaWNzL29wZW50eXBlJywK ICAgICAgICcuLi9wbGF0Zm9ybS9ncmFwaGljcy9za2lhJywKICAgICAgICcuLi9wbGF0Zm9ybS9n cmFwaGljcy90cmFuc2Zvcm1zJywKZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIv V2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggMzJjNGU1NzFmZjIxYzIyYTMyNjNmYjVlYjkzMWVl NzQ4ZGQwMzhmOC4uOGQ1ZjY3NjA0NTFjNjUyNTc3YWI3OTUzMWRiMTkzZjFiMmUxN2I4YiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmd5cGkK QEAgLTIyNTIsOCArMjI1Miw2IEBACiAgICAgICAgICAgICAncGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vRm9udFV0aWxzQ2hyb21pdW1XaW4uaCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuY3BwJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5oJywKLSAgICAgICAgICAgICdwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9HTEVTMlRleHR1cmUuY3BwJywKLSAgICAgICAgICAgICdwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9HTEVTMlRleHR1cmUuaCcsCiAgICAgICAgICAgICAncGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vR2x5cGhQYWdlVHJlZU5vZGVDaHJvbWl1bVdpbi5jcHAnLAog ICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dseXBoUGFnZVRyZWVOb2Rl TGludXguY3BwJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFw aGljc0xheWVyQ2hyb21pdW0uY3BwJywKQEAgLTIyNzUsOCArMjI3Myw2IEBACiAgICAgICAgICAg ICAncGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2hhZGVyLmgnLAogICAgICAgICAgICAgJ3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1NpbXBsZUZvbnREYXRhQ2hyb21pdW1XaW4uY3BwJywK ICAgICAgICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9TaW1wbGVGb250RGF0YUxp bnV4LmNwcCcsCi0gICAgICAgICAgICAncGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsaW5n RGF0YS5oJywKLSAgICAgICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxpbmdE YXRhLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVHJhbnNw YXJlbmN5V2luLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v VHJhbnNwYXJlbmN5V2luLmgnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL1VuaXNjcmliZUhlbHBlci5jcHAnLApAQCAtMjMwNCw2ICsyMzAwLDEwIEBACiAgICAgICAg ICAgICAncGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9Tb3VyY2VBbHBoYS5oJywKICAgICAgICAg ICAgICdwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL1NvdXJjZUdyYXBoaWMuY3BwJywKICAgICAg ICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL1NvdXJjZUdyYXBoaWMuaCcsCisgICAg ICAgICAgICAncGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L1RleHR1cmUuY3BwJywKKyAgICAgICAgICAg ICdwbGF0Zm9ybS9ncmFwaGljcy9ncHUvVGV4dHVyZS5oJywKKyAgICAgICAgICAgICdwbGF0Zm9y bS9ncmFwaGljcy9ncHUvVGlsaW5nRGF0YS5oJywKKyAgICAgICAgICAgICdwbGF0Zm9ybS9ncmFw aGljcy9ncHUvVGlsaW5nRGF0YS5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNz L2d0ay9Db2xvckd0ay5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9G b250Q2FjaGVHdGsuY3BwJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9u dEN1c3RvbVBsYXRmb3JtRGF0YS5jcHAnLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmNwcAppbmRleCA0NTBlOWZkODM0NGRhODRjYzI2MmIz ODkxNWYyNTI1MTIyNDZjMDBiLi42ZjU5NGRmMzhlYmI3ZDI2YzAzNjU2OGM3N2JiZGMyYTNmYzcw ZWQ1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMy Q2FudmFzLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMy Q2FudmFzLmNwcApAQCAtMzMsMTEgKzMzLDExIEBACiAjaW5jbHVkZSAiR0xFUzJDYW52YXMuaCIK IAogI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgotI2luY2x1ZGUgIkdMRVMyVGV4dHVyZS5oIgogI2lu Y2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1 ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiU2hhZGVyLmgiCisjaW5jbHVkZSAiVGV4 dHVyZS5oIgogCiAjZGVmaW5lIF9VU0VfTUFUSF9ERUZJTkVTCiAjaW5jbHVkZSA8bWF0aC5oPgpA QCAtMTY0LDEyICsxNjQsMTIgQEAgdm9pZCBHTEVTMkNhbnZhczo6cmVzdG9yZSgpCiAgICAgbV9z dGF0ZSA9ICZtX3N0YXRlU3RhY2subGFzdCgpOwogfQogCi12b2lkIEdMRVMyQ2FudmFzOjpkcmF3 VGV4dHVyZWRSZWN0KEdMRVMyVGV4dHVyZSogdGV4dHVyZSwgY29uc3QgRmxvYXRSZWN0JiBzcmNS ZWN0LCBjb25zdCBGbG9hdFJlY3QmIGRzdFJlY3QsIENvbG9yU3BhY2UgY29sb3JTcGFjZSwgQ29t cG9zaXRlT3BlcmF0b3IgY29tcG9zaXRlT3ApCit2b2lkIEdMRVMyQ2FudmFzOjpkcmF3VGV4dHVy ZWRSZWN0KFRleHR1cmUqIHRleHR1cmUsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3Qg RmxvYXRSZWN0JiBkc3RSZWN0LCBDb2xvclNwYWNlIGNvbG9yU3BhY2UsIENvbXBvc2l0ZU9wZXJh dG9yIGNvbXBvc2l0ZU9wKQogewogICAgIGRyYXdUZXh0dXJlZFJlY3QodGV4dHVyZSwgc3JjUmVj dCwgZHN0UmVjdCwgbV9zdGF0ZS0+bV9jdG0sIG1fc3RhdGUtPm1fYWxwaGEsIGNvbG9yU3BhY2Us IGNvbXBvc2l0ZU9wKTsKIH0KIAotdm9pZCBHTEVTMkNhbnZhczo6ZHJhd1RleHR1cmVkUmVjdChH TEVTMlRleHR1cmUqIHRleHR1cmUsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgRmxv YXRSZWN0JiBkc3RSZWN0LCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9ybSwgZmxvYXQg YWxwaGEsIENvbG9yU3BhY2UgY29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IgY29tcG9zaXRl T3ApCit2b2lkIEdMRVMyQ2FudmFzOjpkcmF3VGV4dHVyZWRSZWN0KFRleHR1cmUqIHRleHR1cmUs IGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0LCBjb25z dCBBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9ybSwgZmxvYXQgYWxwaGEsIENvbG9yU3BhY2UgY29s b3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IgY29tcG9zaXRlT3ApCiB7CiAgICAgYXBwbHlDb21w b3NpdGVPcGVyYXRvcihjb21wb3NpdGVPcCk7CiAKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIEdM RVMyQ2FudmFzOjpkcmF3VGV4dHVyZWRSZWN0KEdMRVMyVGV4dHVyZSogdGV4dHVyZSwgY29uc3Qg RmxvYXRSZWN0JiBzcmNSZQogICAgIH0KIH0KIAotdm9pZCBHTEVTMkNhbnZhczo6ZHJhd1RleHR1 cmVkUmVjdFRpbGUoR0xFUzJUZXh0dXJlKiB0ZXh0dXJlLCBpbnQgdGlsZSwgY29uc3QgRmxvYXRS ZWN0JiBzcmNSZWN0LCBjb25zdCBGbG9hdFJlY3QmIGRzdFJlY3QsIGNvbnN0IEFmZmluZVRyYW5z Zm9ybSYgdHJhbnNmb3JtLCBmbG9hdCBhbHBoYSkKK3ZvaWQgR0xFUzJDYW52YXM6OmRyYXdUZXh0 dXJlZFJlY3RUaWxlKFRleHR1cmUqIHRleHR1cmUsIGludCB0aWxlLCBjb25zdCBGbG9hdFJlY3Qm IHNyY1JlY3QsIGNvbnN0IEZsb2F0UmVjdCYgZHN0UmVjdCwgY29uc3QgQWZmaW5lVHJhbnNmb3Jt JiB0cmFuc2Zvcm0sIGZsb2F0IGFscGhhKQogewogICAgIGlmIChkc3RSZWN0LmlzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuOwpAQCAtMjk4LDIxICsyOTgsMjEgQEAgdW5zaWduZWQgR0xFUzJDYW52 YXM6OmdldFF1YWRWZXJ0aWNlcygpCiAgICAgcmV0dXJuIG1fcXVhZFZlcnRpY2VzOwogfQogCi1H TEVTMlRleHR1cmUqIEdMRVMyQ2FudmFzOjpjcmVhdGVUZXh0dXJlKE5hdGl2ZUltYWdlUHRyIHB0 ciwgR0xFUzJUZXh0dXJlOjpGb3JtYXQgZm9ybWF0LCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCitU ZXh0dXJlKiBHTEVTMkNhbnZhczo6Y3JlYXRlVGV4dHVyZShOYXRpdmVJbWFnZVB0ciBwdHIsIFRl eHR1cmU6OkZvcm1hdCBmb3JtYXQsIGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKLSAgICBQYXNz UmVmUHRyPEdMRVMyVGV4dHVyZT4gdGV4dHVyZSA9IG1fdGV4dHVyZXMuZ2V0KHB0cik7CisgICAg UGFzc1JlZlB0cjxUZXh0dXJlPiB0ZXh0dXJlID0gbV90ZXh0dXJlcy5nZXQocHRyKTsKICAgICBp ZiAodGV4dHVyZSkKICAgICAgICAgcmV0dXJuIHRleHR1cmUuZ2V0KCk7CiAKLSAgICB0ZXh0dXJl ID0gR0xFUzJUZXh0dXJlOjpjcmVhdGUobV9jb250ZXh0LCBmb3JtYXQsIHdpZHRoLCBoZWlnaHQp OwotICAgIEdMRVMyVGV4dHVyZSogdCA9IHRleHR1cmUuZ2V0KCk7CisgICAgdGV4dHVyZSA9IFRl eHR1cmU6OmNyZWF0ZShtX2NvbnRleHQsIGZvcm1hdCwgd2lkdGgsIGhlaWdodCk7CisgICAgVGV4 dHVyZSogdCA9IHRleHR1cmUuZ2V0KCk7CiAgICAgbV90ZXh0dXJlcy5zZXQocHRyLCB0ZXh0dXJl KTsKICAgICByZXR1cm4gdDsKIH0KIAotR0xFUzJUZXh0dXJlKiBHTEVTMkNhbnZhczo6Z2V0VGV4 dHVyZShOYXRpdmVJbWFnZVB0ciBwdHIpCitUZXh0dXJlKiBHTEVTMkNhbnZhczo6Z2V0VGV4dHVy ZShOYXRpdmVJbWFnZVB0ciBwdHIpCiB7Ci0gICAgUGFzc1JlZlB0cjxHTEVTMlRleHR1cmU+IHRl eHR1cmUgPSBtX3RleHR1cmVzLmdldChwdHIpOworICAgIFBhc3NSZWZQdHI8VGV4dHVyZT4gdGV4 dHVyZSA9IG1fdGV4dHVyZXMuZ2V0KHB0cik7CiAgICAgcmV0dXJuIHRleHR1cmUgPyB0ZXh0dXJl LmdldCgpIDogMDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9HTEVTMkNhbnZhcy5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9HTEVTMkNhbnZhcy5oCmluZGV4IDE2OWU3N2U3ZGJiOGFkNDM2YTQxYTQxYjAzOWMyNzNjNGVm NWI3YjUuLmY0OWFjOGJhMThkMWQzNDIzNGI4ZDA2Mjc4ZTcwMjhiZmU5Njk3ZTEgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuaAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmgKQEAgLTM0 LDkgKzM0LDkgQEAKICNpbmNsdWRlICJBZmZpbmVUcmFuc2Zvcm0uaCIKICNpbmNsdWRlICJDb2xv ci5oIgogI2luY2x1ZGUgIkNvbG9yU3BhY2UuaCIKLSNpbmNsdWRlICJHTEVTMlRleHR1cmUuaCIK ICNpbmNsdWRlICJHcmFwaGljc1R5cGVzLmgiCiAjaW5jbHVkZSAiSW1hZ2VTb3VyY2UuaCIKKyNp bmNsdWRlICJUZXh0dXJlLmgiCiAKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUg PHd0Zi9Ob25jb3B5YWJsZS5oPgpAQCAtNTAsNyArNTAsNyBAQCBjbGFzcyBHcmFwaGljc0NvbnRl eHQzRDsKIGNsYXNzIFNvbGlkRmlsbFNoYWRlcjsKIGNsYXNzIFRleFNoYWRlcjsKIAotdHlwZWRl ZiBIYXNoTWFwPE5hdGl2ZUltYWdlUHRyLCBSZWZQdHI8R0xFUzJUZXh0dXJlPiA+IFRleHR1cmVI YXNoTWFwOwordHlwZWRlZiBIYXNoTWFwPE5hdGl2ZUltYWdlUHRyLCBSZWZQdHI8VGV4dHVyZT4g PiBUZXh0dXJlSGFzaE1hcDsKIAogY2xhc3MgR0xFUzJDYW52YXMgOiBwdWJsaWMgTm9uY29weWFi bGUgewogcHVibGljOgpAQCAtNzQsMTQgKzc0LDE0IEBAIHB1YmxpYzoKICAgICAvLyBub24tc3Rh bmRhcmQgZnVuY3Rpb25zCiAgICAgLy8gVGhlc2UgYXJlIG5vdCBzdGFuZGFyZCBHcmFwaGljc0Nv bnRleHQgZnVuY3Rpb25zLCBhbmQgc2hvdWxkIGJlIHB1c2hlZAogICAgIC8vIGRvd24gaW50byBh IFBsYXRmb3JtQ29udGV4dEdMRVMyIGF0IHNvbWUgcG9pbnQuCi0gICAgdm9pZCBkcmF3VGV4dHVy ZWRSZWN0KEdMRVMyVGV4dHVyZSosIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgRmxv YXRSZWN0JiBkc3RSZWN0LCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mLCBmbG9hdCBhbHBoYSwgQ29s b3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IpOwotICAgIHZvaWQgZHJhd1RleHR1cmVkUmVjdChH TEVTMlRleHR1cmUqLCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEZsb2F0UmVjdCYg ZHN0UmVjdCwgQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IpOworICAgIHZvaWQgZHJhd1Rl eHR1cmVkUmVjdChUZXh0dXJlKiwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBGbG9h dFJlY3QmIGRzdFJlY3QsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYsIGZsb2F0IGFscGhhLCBDb2xv clNwYWNlLCBDb21wb3NpdGVPcGVyYXRvcik7CisgICAgdm9pZCBkcmF3VGV4dHVyZWRSZWN0KFRl eHR1cmUqLCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEZsb2F0UmVjdCYgZHN0UmVj dCwgQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IpOwogICAgIEdyYXBoaWNzQ29udGV4dDNE KiBjb250ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0OyB9Ci0gICAgR0xFUzJUZXh0dXJlKiBjcmVh dGVUZXh0dXJlKE5hdGl2ZUltYWdlUHRyLCBHTEVTMlRleHR1cmU6OkZvcm1hdCwgaW50IHdpZHRo LCBpbnQgaGVpZ2h0KTsKLSAgICBHTEVTMlRleHR1cmUqIGdldFRleHR1cmUoTmF0aXZlSW1hZ2VQ dHIpOworICAgIFRleHR1cmUqIGNyZWF0ZVRleHR1cmUoTmF0aXZlSW1hZ2VQdHIsIFRleHR1cmU6 OkZvcm1hdCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KTsKKyAgICBUZXh0dXJlKiBnZXRUZXh0dXJl KE5hdGl2ZUltYWdlUHRyKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIGRyYXdUZXh0dXJlZFJlY3RU aWxlKEdMRVMyVGV4dHVyZSogdGV4dHVyZSwgaW50IHRpbGUsIGNvbnN0IEZsb2F0UmVjdCYgc3Jj UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0LCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mLCBm bG9hdCBhbHBoYSk7CisgICAgdm9pZCBkcmF3VGV4dHVyZWRSZWN0VGlsZShUZXh0dXJlKiB0ZXh0 dXJlLCBpbnQgdGlsZSwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBGbG9hdFJlY3Qm IGRzdFJlY3QsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYsIGZsb2F0IGFscGhhKTsKICAgICB2b2lk IGFwcGx5Q29tcG9zaXRlT3BlcmF0b3IoQ29tcG9zaXRlT3BlcmF0b3IpOwogICAgIHZvaWQgY2hl Y2tHTEVycm9yKGNvbnN0IGNoYXIqIGhlYWRlcik7CiAgICAgdW5zaWduZWQgZ2V0UXVhZFZlcnRp Y2VzKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dM RVMyVGV4dHVyZS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9UZXh0dXJlLmNw cApzaW1pbGFyaXR5IGluZGV4IDg5JQpyZW5hbWUgZnJvbSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0dMRVMyVGV4dHVyZS5jcHAKcmVuYW1lIHRvIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3B1L1RleHR1cmUuY3BwCmluZGV4IDYxMDY1MjIyOTIxZTljMzI0YWNhODAxMDcy OGNlYTNkOWNmOWZkM2QuLjU1NzYwM2M5NzYzMmZlMGYzOGY1YjczNmVjNjVhM2M2NWM3MTQyMzYg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJUZXh0 dXJlLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9UZXh0dXJlLmNwcApA QCAtMzAsNyArMzAsNyBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKLSNpbmNsdWRlICJHTEVT MlRleHR1cmUuaCIKKyNpbmNsdWRlICJUZXh0dXJlLmgiCiAKICNpbmNsdWRlICJHcmFwaGljc0Nv bnRleHQzRC5oIgogI2luY2x1ZGUgIkludFJlY3QuaCIKQEAgLTM5LDcgKzM5LDcgQEAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogCi1HTEVTMlRleHR1cmU6OkdMRVMyVGV4dHVyZShHcmFwaGljc0Nv bnRleHQzRCogY29udGV4dCwgUGFzc093blB0cjxWZWN0b3I8dW5zaWduZWQgaW50PiA+IHRpbGVU ZXh0dXJlSWRzLCBGb3JtYXQgZm9ybWF0LCBpbnQgd2lkdGgsIGludCBoZWlnaHQsIGludCBtYXhU ZXh0dXJlU2l6ZSkKK1RleHR1cmU6OlRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQs IFBhc3NPd25QdHI8VmVjdG9yPHVuc2lnbmVkIGludD4gPiB0aWxlVGV4dHVyZUlkcywgRm9ybWF0 IGZvcm1hdCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBpbnQgbWF4VGV4dHVyZVNpemUpCiAgICAg OiBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fZm9ybWF0KGZvcm1hdCkKICAgICAsIG1fdGls ZXMobWF4VGV4dHVyZVNpemUsIHdpZHRoLCBoZWlnaHQsIHRydWUpCkBAIC00NywyMSArNDcsMjEg QEAgR0xFUzJUZXh0dXJlOjpHTEVTMlRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQs IFBhc3NPd25QdHI8VmVjdG9yPHVuc2lnbmUKIHsKIH0KIAotR0xFUzJUZXh0dXJlOjp+R0xFUzJU ZXh0dXJlKCkKK1RleHR1cmU6On5UZXh0dXJlKCkKIHsKICAgICBmb3IgKHVuc2lnbmVkIGludCBp ID0gMDsgaSA8IG1fdGlsZVRleHR1cmVJZHMtPnNpemUoKTsgaSsrKQogICAgICAgICBtX2NvbnRl eHQtPmRlbGV0ZVRleHR1cmUobV90aWxlVGV4dHVyZUlkcy0+YXQoaSkpOwogfQogCi1zdGF0aWMg dm9pZCBjb252ZXJ0Rm9ybWF0KEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBHTEVTMlRleHR1 cmU6OkZvcm1hdCBmb3JtYXQsIHVuc2lnbmVkIGludCogZ2xGb3JtYXQsIHVuc2lnbmVkIGludCog Z2xUeXBlLCBib29sKiBzd2l6emxlKQorc3RhdGljIHZvaWQgY29udmVydEZvcm1hdChHcmFwaGlj c0NvbnRleHQzRCogY29udGV4dCwgVGV4dHVyZTo6Rm9ybWF0IGZvcm1hdCwgdW5zaWduZWQgaW50 KiBnbEZvcm1hdCwgdW5zaWduZWQgaW50KiBnbFR5cGUsIGJvb2wqIHN3aXp6bGUpCiB7CiAgICAg KnN3aXp6bGUgPSBmYWxzZTsKICAgICBzd2l0Y2ggKGZvcm1hdCkgewotICAgIGNhc2UgR0xFUzJU ZXh0dXJlOjpSR0JBODoKKyAgICBjYXNlIFRleHR1cmU6OlJHQkE4OgogICAgICAgICAqZ2xGb3Jt YXQgPSBHcmFwaGljc0NvbnRleHQzRDo6UkdCQTsKICAgICAgICAgKmdsVHlwZSA9IEdyYXBoaWNz Q29udGV4dDNEOjpVTlNJR05FRF9CWVRFOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIEdMRVMy VGV4dHVyZTo6QkdSQTg6CisgICAgY2FzZSBUZXh0dXJlOjpCR1JBODoKICAgICAgICAgaWYgKGNv bnRleHQtPnN1cHBvcnRzQkdSQSgpKSB7CiAgICAgICAgICAgICAqZ2xGb3JtYXQgPSBHcmFwaGlj c0NvbnRleHQzRDo6QkdSQV9FWFQ7CiAgICAgICAgICAgICAqZ2xUeXBlID0gR3JhcGhpY3NDb250 ZXh0M0Q6OlVOU0lHTkVEX0JZVEU7CkBAIC03Nyw3ICs3Nyw3IEBAIHN0YXRpYyB2b2lkIGNvbnZl cnRGb3JtYXQoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEdMRVMyVGV4dHVyZTo6Rm9ybWF0 IGZvcm1hCiAgICAgfQogfQogCi1QYXNzUmVmUHRyPEdMRVMyVGV4dHVyZT4gR0xFUzJUZXh0dXJl OjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEZvcm1hdCBmb3JtYXQsIGludCB3 aWR0aCwgaW50IGhlaWdodCkKK1Bhc3NSZWZQdHI8VGV4dHVyZT4gVGV4dHVyZTo6Y3JlYXRlKEdy YXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBGb3JtYXQgZm9ybWF0LCBpbnQgd2lkdGgsIGludCBo ZWlnaHQpCiB7CiAgICAgaW50IG1heFRleHR1cmVTaXplID0gMDsKICAgICBjb250ZXh0LT5nZXRJ bnRlZ2VydihHcmFwaGljc0NvbnRleHQzRDo6TUFYX1RFWFRVUkVfU0laRSwgJm1heFRleHR1cmVT aXplKTsKQEAgLTEwOSw3ICsxMDksNyBAQCBQYXNzUmVmUHRyPEdMRVMyVGV4dHVyZT4gR0xFUzJU ZXh0dXJlOjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsIEZvcm1hdAogICAgICAg ICAgICAgdGlsZUJvdW5kc1dpdGhCb3JkZXIuaGVpZ2h0KCksCiAgICAgICAgICAgICAwLCBnbEZv cm1hdCwgZ2xUeXBlLCAwKTsKICAgICB9Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBHTEVTMlRl eHR1cmUoY29udGV4dCwgdGV4dHVyZUlkcy5sZWFrUHRyKCksIGZvcm1hdCwgd2lkdGgsIGhlaWdo dCwgbWF4VGV4dHVyZVNpemUpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFRleHR1cmUoY29u dGV4dCwgdGV4dHVyZUlkcy5sZWFrUHRyKCksIGZvcm1hdCwgd2lkdGgsIGhlaWdodCwgbWF4VGV4 dHVyZVNpemUpKTsKIH0KIAogdGVtcGxhdGUgPGJvb2wgc3dpenpsZT4KQEAgLTEzNCw3ICsxMzQs NyBAQCBzdGF0aWMgdWludDMyX3QqIGNvcHlTdWJSZWN0KHVpbnQzMl90KiBzcmMsIGludCBzcmNY LCBpbnQgc3JjWSwgdWludDMyX3QqIGRzdCwgaQogICAgIHJldHVybiBkc3Q7CiB9CiAKLXZvaWQg R0xFUzJUZXh0dXJlOjpsb2FkKHZvaWQqIHBpeGVscykKK3ZvaWQgVGV4dHVyZTo6bG9hZCh2b2lk KiBwaXhlbHMpCiB7CiAgICAgdWludDMyX3QqIHBpeGVsczMyID0gc3RhdGljX2Nhc3Q8dWludDMy X3QqPihwaXhlbHMpOwogICAgIHVuc2lnbmVkIGludCBnbEZvcm1hdCA9IDA7CkBAIC0xNjgsNyAr MTY4LDcgQEAgdm9pZCBHTEVTMlRleHR1cmU6OmxvYWQodm9pZCogcGl4ZWxzKQogICAgIH0KIH0K IAotdm9pZCBHTEVTMlRleHR1cmU6OmJpbmRUaWxlKGludCB0aWxlKQordm9pZCBUZXh0dXJlOjpi aW5kVGlsZShpbnQgdGlsZSkKIHsKICAgICBtX2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNz Q29udGV4dDNEOjpURVhUVVJFXzJELCBtX3RpbGVUZXh0dXJlSWRzLT5hdCh0aWxlKSk7CiAgICAg bV9jb250ZXh0LT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBH cmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9NSU5fRklMVEVSLCBHcmFwaGljc0NvbnRleHQzRDo6 TElORUFSKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v R0xFUzJUZXh0dXJlLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9UZXh0dXJlLmgK c2ltaWxhcml0eSBpbmRleCA4NCUKcmVuYW1lIGZyb20gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9HTEVTMlRleHR1cmUuaApyZW5hbWUgdG8gV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ncHUvVGV4dHVyZS5oCmluZGV4IDVmZDM3Y2E0ZDE1YTdhYWUzMWYyNjFiMWMyNmNkZDg0 NGRjMjAyZjkuLjdlNGE3MmI2MzU3YjllZGU3YzVjMTA4N2U5MTRjZmZkNWRiOTBhOWQgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJUZXh0dXJlLmgK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvVGV4dHVyZS5oCkBAIC0yOCw4ICsy OCw4IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNpZm5kZWYgR0xFUzJUZXh0dXJlX2gKLSNk ZWZpbmUgR0xFUzJUZXh0dXJlX2gKKyNpZm5kZWYgVGV4dHVyZV9oCisjZGVmaW5lIFRleHR1cmVf aAogCiAjaW5jbHVkZSAiUmVmQ291bnRlZC5oIgogI2luY2x1ZGUgIlJlZlB0ci5oIgpAQCAtNDEs MTcgKzQxLDE3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBHcmFwaGljc0NvbnRleHQz RDsKIAotY2xhc3MgR0xFUzJUZXh0dXJlIDogcHVibGljIFJlZkNvdW50ZWQ8R0xFUzJUZXh0dXJl PiB7CitjbGFzcyBUZXh0dXJlIDogcHVibGljIFJlZkNvdW50ZWQ8VGV4dHVyZT4gewogcHVibGlj OgotICAgIH5HTEVTMlRleHR1cmUoKTsKKyAgICB+VGV4dHVyZSgpOwogICAgIGVudW0gRm9ybWF0 IHsgUkdCQTgsIEJHUkE4IH07Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8R0xFUzJUZXh0dXJlPiBj cmVhdGUoR3JhcGhpY3NDb250ZXh0M0QqLCBGb3JtYXQsIGludCB3aWR0aCwgaW50IGhlaWdodCk7 CisgICAgc3RhdGljIFBhc3NSZWZQdHI8VGV4dHVyZT4gY3JlYXRlKEdyYXBoaWNzQ29udGV4dDNE KiwgRm9ybWF0LCBpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogICAgIHZvaWQgYmluZFRpbGUoaW50 IHRpbGUpOwogICAgIHZvaWQgbG9hZCh2b2lkKiBwaXhlbHMpOwogICAgIEZvcm1hdCBmb3JtYXQo KSBjb25zdCB7IHJldHVybiBtX2Zvcm1hdDsgfQogICAgIGNvbnN0IFRpbGluZ0RhdGEmIHRpbGVz KCkgY29uc3QgeyByZXR1cm4gbV90aWxlczsgfQogcHJpdmF0ZToKLSAgICBHTEVTMlRleHR1cmUo R3JhcGhpY3NDb250ZXh0M0QqLCBQYXNzT3duUHRyPFZlY3Rvcjx1bnNpZ25lZCBpbnQ+ID4gdGls ZVRleHR1cmVJZHMsIEZvcm1hdCBmb3JtYXQsIGludCB3aWR0aCwgaW50IGhlaWdodCwgaW50IG1h eFRleHR1cmVTaXplKTsKKyAgICBUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEKiwgUGFzc093blB0 cjxWZWN0b3I8dW5zaWduZWQgaW50PiA+IHRpbGVUZXh0dXJlSWRzLCBGb3JtYXQgZm9ybWF0LCBp bnQgd2lkdGgsIGludCBoZWlnaHQsIGludCBtYXhUZXh0dXJlU2l6ZSk7CiAgICAgR3JhcGhpY3ND b250ZXh0M0QqIG1fY29udGV4dDsKICAgICBGb3JtYXQgbV9mb3JtYXQ7CiAgICAgVGlsaW5nRGF0 YSBtX3RpbGVzOwpAQCAtNjAsNCArNjAsNCBAQCBwcml2YXRlOgogCiB9CiAKLSNlbmRpZiAvLyBH TEVTMlRleHR1cmVfaAorI2VuZGlmIC8vIFRleHR1cmVfaApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxpbmdEYXRhLmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L1RpbGluZ0RhdGEuY3BwCm9sZCBtb2RlIDEwMDc1NQpuZXcgbW9kZSAx MDA2NDQKc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBmcm9tIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vVGlsaW5nRGF0YS5jcHAKcmVuYW1lIHRvIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L1RpbGluZ0RhdGEuY3BwCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGluZ0RhdGEuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L1RpbGluZ0RhdGEuaApvbGQgbW9kZSAxMDA3NTUKbmV3IG1vZGUgMTAwNjQ0CnNp bWlsYXJpdHkgaW5kZXggMTAwJQpyZW5hbWUgZnJvbSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL1RpbGluZ0RhdGEuaApyZW5hbWUgdG8gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ncHUvVGlsaW5nRGF0YS5oCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3NraWEvSW1hZ2VTa2lhLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFn ZVNraWEuY3BwCmluZGV4IDVhZjEwOTA2NGM2MjFmNzY1N2ZhODU5YWUxMWY2ZDIwNGM5MjA0Mjku LmFlZDI4OWZlM2MxNTVhYTVkMzU5NmQ0OTRiNjA4OTNlNGMwMTZiYjYgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwCkBAIC00MTEsMTEgKzQxMSwxMSBA QCBzdGF0aWMgdm9pZCBkcmF3Qml0bWFwR0xFUzIoR3JhcGhpY3NDb250ZXh0KiBjdHh0LCBOYXRp dmVJbWFnZVNraWEqIGJpdG1hcCwgY29ucwogewogICAgIGN0eHQtPnBsYXRmb3JtQ29udGV4dCgp LT5wcmVwYXJlRm9ySGFyZHdhcmVEcmF3KCk7CiAgICAgR0xFUzJDYW52YXMqIGdwdUNhbnZhcyA9 IGN0eHQtPnBsYXRmb3JtQ29udGV4dCgpLT5ncHVDYW52YXMoKTsKLSAgICBHTEVTMlRleHR1cmUq IHRleHR1cmUgPSBncHVDYW52YXMtPmdldFRleHR1cmUoYml0bWFwKTsKKyAgICBUZXh0dXJlKiB0 ZXh0dXJlID0gZ3B1Q2FudmFzLT5nZXRUZXh0dXJlKGJpdG1hcCk7CiAgICAgaWYgKCF0ZXh0dXJl KSB7CiAgICAgICAgIEFTU0VSVChiaXRtYXAtPmNvbmZpZygpID09IFNrQml0bWFwOjprQVJHQl84 ODg4X0NvbmZpZyk7CiAgICAgICAgIEFTU0VSVChiaXRtYXAtPnJvd0J5dGVzKCkgPT0gYml0bWFw LT53aWR0aCgpICogNCk7Ci0gICAgICAgIHRleHR1cmUgPSBncHVDYW52YXMtPmNyZWF0ZVRleHR1 cmUoYml0bWFwLCBHTEVTMlRleHR1cmU6OkJHUkE4LCBiaXRtYXAtPndpZHRoKCksIGJpdG1hcC0+ aGVpZ2h0KCkpOworICAgICAgICB0ZXh0dXJlID0gZ3B1Q2FudmFzLT5jcmVhdGVUZXh0dXJlKGJp dG1hcCwgVGV4dHVyZTo6QkdSQTgsIGJpdG1hcC0+d2lkdGgoKSwgYml0bWFwLT5oZWlnaHQoKSk7 CiAgICAgICAgIFNrQXV0b0xvY2tQaXhlbHMgbG9jaygqYml0bWFwKTsKICAgICAgICAgQVNTRVJU KGJpdG1hcC0+Z2V0UGl4ZWxzKCkpOwogICAgICAgICB0ZXh0dXJlLT5sb2FkKGJpdG1hcC0+Z2V0 UGl4ZWxzKCkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1Bs YXRmb3JtQ29udGV4dFNraWEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1Bs YXRmb3JtQ29udGV4dFNraWEuY3BwCmluZGV4IGFmMGM0YzQxYWM3OWFlYmUyZjA4ODkxMWJlMzEx MjA4NjljMzBjNTcuLjNiMWQwMTVjZjEyMjM5NTI3NDNlN2FhNzY0OTM3MmFjNDc2YzhmNTIgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRT a2lhLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250 ZXh0U2tpYS5jcHAKQEAgLTM1LDEzICszNSwxMiBAQAogI2luY2x1ZGUgIkFmZmluZVRyYW5zZm9y bS5oIgogI2luY2x1ZGUgIkNhbnZhc0xheWVyQ2hyb21pdW0uaCIKICNpbmNsdWRlICJHTEVTMkNh bnZhcy5oIgotI2luY2x1ZGUgIkdMRVMyVGV4dHVyZS5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29u dGV4dC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiSW1hZ2VC dWZmZXIuaCIKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEuaCIKLSNpbmNsdWRlICJQbGF0Zm9y bUNvbnRleHRTa2lhLmgiCiAjaW5jbHVkZSAiU2tpYVV0aWxzLmgiCisjaW5jbHVkZSAiVGV4dHVy ZS5oIgogI2luY2x1ZGUgIlRpbGluZ0RhdGEuaCIKIAogI2luY2x1ZGUgInNraWEvZXh0L2ltYWdl X29wZXJhdGlvbnMuaCIKQEAgLTQ5LDggKzQ4LDggQEAKIAogI2luY2x1ZGUgIlNrQml0bWFwLmgi CiAjaW5jbHVkZSAiU2tDb2xvclByaXYuaCIKLSNpbmNsdWRlICJTa1NoYWRlci5oIgogI2luY2x1 ZGUgIlNrRGFzaFBhdGhFZmZlY3QuaCIKKyNpbmNsdWRlICJTa1NoYWRlci5oIgogCiAjaW5jbHVk ZSA8d3RmL01hdGhFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KQEAgLTc4 Nyw3ICs3ODYsNyBAQCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnVwbG9hZFNvZnR3YXJlVG9I YXJkd2FyZShDb21wb3NpdGVPcGVyYXRvciBvcCkgY29uc3QKICAgICBTa0F1dG9Mb2NrUGl4ZWxz IGxvY2soYml0bWFwKTsKICAgICBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCA9IG1fZ3B1Q2Fu dmFzLT5jb250ZXh0KCk7CiAgICAgaWYgKCFtX3VwbG9hZFRleHR1cmUgfHwgbV91cGxvYWRUZXh0 dXJlLT50aWxlcygpLnRvdGFsU2l6ZVgoKSA8IGJpdG1hcC53aWR0aCgpIHx8IG1fdXBsb2FkVGV4 dHVyZS0+dGlsZXMoKS50b3RhbFNpemVZKCkgPCBiaXRtYXAuaGVpZ2h0KCkpCi0gICAgICAgIG1f dXBsb2FkVGV4dHVyZSA9IEdMRVMyVGV4dHVyZTo6Y3JlYXRlKGNvbnRleHQsIEdMRVMyVGV4dHVy ZTo6QkdSQTgsIGJpdG1hcC53aWR0aCgpLCBiaXRtYXAuaGVpZ2h0KCkpOworICAgICAgICBtX3Vw bG9hZFRleHR1cmUgPSBUZXh0dXJlOjpjcmVhdGUoY29udGV4dCwgVGV4dHVyZTo6QkdSQTgsIGJp dG1hcC53aWR0aCgpLCBiaXRtYXAuaGVpZ2h0KCkpOwogICAgIG1fdXBsb2FkVGV4dHVyZS0+bG9h ZChiaXRtYXAuZ2V0UGl4ZWxzKCkpOwogICAgIEludFJlY3QgcmVjdCgwLCAwLCBiaXRtYXAud2lk dGgoKSwgYml0bWFwLmhlaWdodCgpKTsKICAgICBBZmZpbmVUcmFuc2Zvcm0gaWRlbnRpdHk7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0 U2tpYS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNr aWEuaAppbmRleCBmYzBmYjBiMTNlMGU1Y2I4OTk3MmFlMGY0Nzg5YjE5MmEyNDgxYjM2Li44MmVk YzE2ZDFmY2NmOGFlOWUxOTUxYzkyNTJjY2M5ZTk1NmY0MTAwIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgKQEAgLTM1LDEx ICszNSwxMSBAQAogI2luY2x1ZGUgIk5vbmNvcHlhYmxlLmgiCiAKICNpbmNsdWRlICJTa0Rhc2hQ YXRoRWZmZWN0LmgiCi0jaW5jbHVkZSAiU2tEcmF3TG9vcGVyLmgiCiAjaW5jbHVkZSAiU2tEZXF1 ZS5oIgotI2luY2x1ZGUgInNraWEvZXh0L3BsYXRmb3JtX2NhbnZhcy5oIgorI2luY2x1ZGUgIlNr RHJhd0xvb3Blci5oIgogI2luY2x1ZGUgIlNrUGFpbnQuaCIKICNpbmNsdWRlICJTa1BhdGguaCIK KyNpbmNsdWRlICJza2lhL2V4dC9wbGF0Zm9ybV9jYW52YXMuaCIKIAogI2luY2x1ZGUgPHd0Zi9W ZWN0b3IuaD4KIApAQCAtNDcsNyArNDcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGVudW0g Q29tcG9zaXRlT3BlcmF0b3I7CiBjbGFzcyBHTEVTMkNhbnZhczsKLWNsYXNzIEdMRVMyVGV4dHVy ZTsKK2NsYXNzIFRleHR1cmU7CiBjbGFzcyBHcmFwaGljc0NvbnRleHQzRDsKIAogLy8gVGhpcyBj bGFzcyBob2xkcyB0aGUgcGxhdGZvcm0tc3BlY2lmaWMgc3RhdGUgZm9yIEdyYXBoaWNzQ29udGV4 dC4gV2UgcHV0CkBAIC0yMjgsNyArMjI4LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdXNlR1BV OwogICAgIE93blB0cjxHTEVTMkNhbnZhcz4gbV9ncHVDYW52YXM7CiAgICAgbXV0YWJsZSBlbnVt IHsgTm9uZSwgU29mdHdhcmUsIE1peGVkLCBIYXJkd2FyZSB9IG1fYmFja2luZ1N0b3JlU3RhdGU7 Ci0gICAgbXV0YWJsZSBSZWZQdHI8R0xFUzJUZXh0dXJlPiBtX3VwbG9hZFRleHR1cmU7CisgICAg bXV0YWJsZSBSZWZQdHI8VGV4dHVyZT4gbV91cGxvYWRUZXh0dXJlOwogfTsKIAogfQo=