126466 2014-01-03 15:28:04 -0800 Give all PlatformCALayers a PlatformLayerID, not just remote ones 2014-01-03 16:12:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue dino kondapallykalyan simon.fraser thorton oldest_to_newest 964291 0 simon.fraser 2014-01-03 15:28:04 -0800 Give all PlatformCALayers a PlatformLayerID, not just remote ones 964292 1 220345 simon.fraser 2014-01-03 15:31:57 -0800 Created attachment 220345 Patch 964295 2 220345 thorton 2014-01-03 15:33:53 -0800 Comment on attachment 220345 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220345&action=review > Source/WebCore/ChangeLog:14 > + Also constify const LayerType m_layerType on PlatformCALayer, which required sentence starts out weird 964311 3 simon.fraser 2014-01-03 16:12:06 -0800 http://trac.webkit.org/changeset/161293 220345 2014-01-03 15:31:57 -0800 2014-01-03 15:33:53 -0800 Patch bug-126466-20140103153156.patch text/plain 18240 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDY2NTc1YmE1NjRhNWQ2 YjFmYzc5NDQ3NGEwMGJhNGMwMDdiZTVkNC4uOTZhOTE5M2Q4ODJmNjc3NjNhYjk3ZDJkZGU0MGVm NmYzYWU4MGRkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDE0LTAxLTAzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEdpdmUgYWxsIFBs YXRmb3JtQ0FMYXllcnMgYSBQbGF0Zm9ybUxheWVySUQsIG5vdCBqdXN0IHJlbW90ZSBvbmVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY0NjYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgU2Nyb2xs aW5nU3RhdGVUcmVlIGhhcyByZWZlcmVuY2VzIHRvIGJvdGggR3JhcGhpY3NMYXllcnMgYW5kIFBs YXRmb3JtTGF5ZXJzCisgICAgICAgIHdoaWNoIGlzIGNvbmZ1c2luZywgYW5kIGlzIG5lY2Vzc2Fy eSBiZWNhdXNlIHRoZSB1bmRlcmx5aW5nIFBsYXRmb3JtTGF5ZXIKKyAgICAgICAgaW5zaWRlIGEg R3JhcGhpY3NMYXllciBjYW4gY2hhbmdlLiBJbiBvcmRlciB0byBoaWRlIHNvbWUgb2YgdGhpcyBj b21wbGV4aXR5LAorICAgICAgICBleHBvc2UgR3JhcGhpY3NMYXllcjo6cHJpbWFyeUxheWVySUQo KSB3aGljaCBpcyBhIFBsYXRmb3JtTGF5ZXJJRCB0aGF0IGNsaWVudHMKKyAgICAgICAgY2FuIGhv bGQgb250byB0byB0ZXN0IGZvciB1bmRlcmx5aW5nIGxheWVyIHN3YXBwaW5nLgorICAgICAgICAK KyAgICAgICAgQWxzbyBjb25zdGlmeSBjb25zdCBMYXllclR5cGUgbV9sYXllclR5cGUgb24gUGxh dGZvcm1DQUxheWVyLCB3aGljaCByZXF1aXJlZAorICAgICAgICBjbGVhbmluZyB1cCB0aGUgY29u c3RydWN0aW9uIG9mIFBsYXRmb3JtQ0FMYXllck1hYyBpbiB0aGUgY2FzZSB3aGVyZSBhCisgICAg ICAgIFBsYXRmb3JtQ0FMYXllck1hYyBpcyB3cmFwcGluZyBhbiBleGlzdGluZyBDQUxheWVyICh3 aGljaCBoYXBwZW5zIGZvciB2aWRlbykuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmg6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0xheWVyOjpwcmltYXJ5TGF5ZXJJRCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJDQTo6cHJpbWFyeUxheWVySUQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2NhL0dyYXBoaWNzTGF5ZXJDQS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1Bs YXRmb3JtQ0FMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZW5lcmF0ZUxheWVySUQpOgor ICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjpQbGF0Zm9ybUNBTGF5ZXIpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjpsYXllcklEKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbToKKyAgICAgICAgKFBsYXRmb3Jt Q0FMYXllck1hYzo6Y3JlYXRlKToKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllck1hYzo6UGxhdGZv cm1DQUxheWVyTWFjKToKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllck1hYzo6Y29tbW9uSW5pdCk6 CisKKzIwMTQtMDEtMDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisK ICAgICAgICAgTWF5YmUgZml4IFdpbmRvd3MgYnVpbGQuCiAKICAgICAgICAgKiBXZWJDb3JlLnZj eHByb2ovY29weUZvcndhcmRpbmdIZWFkZXJzLmNtZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlNTE5MjAzYmIy ZWRkMDY5M2ZlNmRmMjgxNGFkNDM1YjJjNzJiYzIwLi4wOGJmZjkyMGQ4NzZjZjNmNTVlZTdjOTgy ZjU5NTA3NTM5MGU4NzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTQtMDEtMDMg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgR2l2ZSBh bGwgUGxhdGZvcm1DQUxheWVycyBhIFBsYXRmb3JtTGF5ZXJJRCwgbm90IGp1c3QgcmVtb3RlIG9u ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjQ2 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBT Y3JvbGxpbmdTdGF0ZVRyZWUgaGFzIHJlZmVyZW5jZXMgdG8gYm90aCBHcmFwaGljc0xheWVycyBh bmQgUGxhdGZvcm1MYXllcnMKKyAgICAgICAgd2hpY2ggaXMgY29uZnVzaW5nLCBhbmQgaXMgbmVj ZXNzYXJ5IGJlY2F1c2UgdGhlIHVuZGVybHlpbmcgUGxhdGZvcm1MYXllcgorICAgICAgICBpbnNp ZGUgYSBHcmFwaGljc0xheWVyIGNhbiBjaGFuZ2UuIEluIG9yZGVyIHRvIGhpZGUgc29tZSBvZiB0 aGlzIGNvbXBsZXhpdHksCisgICAgICAgIGV4cG9zZSBHcmFwaGljc0xheWVyOjpwcmltYXJ5TGF5 ZXJJRCgpIHdoaWNoIGlzIGEgUGxhdGZvcm1MYXllcklEIHRoYXQgY2xpZW50cworICAgICAgICBj YW4gaG9sZCBvbnRvIHRvIHRlc3QgZm9yIHVuZGVybHlpbmcgbGF5ZXIgc3dhcHBpbmcuCisgICAg ICAgIAorICAgICAgICBHcmFwaGljc0xheWVyQ0FSZW1vdGUgYW5kIFBsYXRmb3JtQ0FMYXllclJl bW90ZSBjYW4gbm93IGp1c3QgdXNlIHRoZQorICAgICAgICBwcmltYXJ5TGF5ZXJJRCgpIGZ1bmN0 aW9uIGV4cG9zZWQgdmlhIHRoZSBiYXNlIGNsYXNzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9HcmFwaGljc0xheWVyQ0FSZW1vdGUuY3BwOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9tYWMvR3JhcGhpY3NMYXllckNBUmVtb3RlLmg6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3BwOgorICAgICAgICAoUGxh dGZvcm1DQUxheWVyUmVtb3RlOjpQbGF0Zm9ybUNBTGF5ZXJSZW1vdGUpOgorICAgICAgICAoUGxh dGZvcm1DQUxheWVyUmVtb3RlOjpyZWN1cnNpdmVCdWlsZFRyYW5zYWN0aW9uKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5oOgorCiAyMDE0 LTAxLTAzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBEZWZpbmUgV2ViUHJvY2Vzczo6dXNlc05ldHdvcmtQcm9jZXNzIHVuY29uZGl0aW9uYWxs eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCA2YWVkMjMxZGIzNTFjYjdhZjQxODU1ZDJiNDJhYmY5 MDM5ODVhNzM5Li5iZTg0Y2NhYjlhNmI4NWIyNmExZDg4YTcxNDQ0MzAwMzU4N2YxZGRiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLmV4cC5pbgpAQCAtNTc1LDEyICs1NzUsMTQgQEAgX19aTjdXZWJDb3JlMTVHcmFw aGljc0xheWVyQ0E4YWRkQ2hpbGRFUE5TXzEzR3JhcGhpY3NMYXllckUKIF9fWk43V2ViQ29yZTE1 R3JhcGhpY3NMYXllckNBQzJFUE5TXzE5R3JhcGhpY3NMYXllckNsaWVudEUKIF9fWk43V2ViQ29y ZTE1R3JhcGhpY3NMYXllckNBRDJFdgogX19aTjdXZWJDb3JlMTVHcmFwaGljc0xheWVyQ0ExOXNl dEN1c3RvbUFwcGVhcmFuY2VFTlNfMTNHcmFwaGljc0xheWVyMTZDdXN0b21BcHBlYXJhbmNlRQor X19aTks3V2ViQ29yZTE1R3JhcGhpY3NMYXllckNBMTRwcmltYXJ5TGF5ZXJJREV2CiBfX1pON1dl YkNvcmUxNUhpdFRlc3RMb2NhdGlvbjEycmVjdEZvclBvaW50RVJLTlNfMTFMYXlvdXRQb2ludEVq ampqCiBfX1pON1dlYkNvcmUxNUhpdFRlc3RMb2NhdGlvbkMxRVJLTlNfMTBGbG9hdFBvaW50RQog X19aTjdXZWJDb3JlMTVIaXRUZXN0TG9jYXRpb25EMUV2CiBfX1pON1dlYkNvcmUxNUpTRE9NV2lu ZG93QmFzZThjb21tb25WTUV2CiBfX1pON1dlYkNvcmUxNVBhc3RlYm9hcmRJbWFnZUMxRXYKIF9f Wk43V2ViQ29yZTE1UGFzdGVib2FyZEltYWdlRDFFdgorX19aTjdXZWJDb3JlMTVQbGF0Zm9ybUNB TGF5ZXJDMkVOUzBfOUxheWVyVHlwZUVQTlNfMjFQbGF0Zm9ybUNBTGF5ZXJDbGllbnRFCiBfX1pO N1dlYkNvcmUxNVBsYXRmb3JtQ0FMYXllckQyRXYKIF9fWk43V2ViQ29yZTE1UHJvdGVjdGlvblNw YWNlQzFFUktOM1dURjZTdHJpbmdFaU5TXzI1UHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZUVTNF9O U18zNVByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lRQogX19aTjdXZWJDb3JlMTVQ cm90ZWN0aW9uU3BhY2VDMUV2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0xheWVyLmgKaW5kZXggZmY5NTA4Njk1N2U4ZGM5NWY2OTVmMTM4NDdmYTE0NTdh ZDlkOThlMi4uNjQ0ZWUwNDk1OTg1NmY4NGY5ZjdiMjE2ZGQ0MGI1OTk5ZTY0NTgzZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaApAQCAt MjI2LDEyICsyMjYsMTMgQEAgY2xhc3MgR3JhcGhpY3NMYXllciB7CiBwdWJsaWM6CiAgICAgc3Rh dGljIHN0ZDo6dW5pcXVlX3B0cjxHcmFwaGljc0xheWVyPiBjcmVhdGUoR3JhcGhpY3NMYXllckZh Y3RvcnkqLCBHcmFwaGljc0xheWVyQ2xpZW50Kik7CiAgICAgCi0gICAgdHlwZWRlZiB1aW50NjRf dCBQbGF0Zm9ybUxheWVySUQ7Ci0KICAgICB2aXJ0dWFsIH5HcmFwaGljc0xheWVyKCk7CiAKICAg ICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZSgpIHsgfQogCisgICAgdHlwZWRlZiB1aW50NjRfdCBQ bGF0Zm9ybUxheWVySUQ7CisgICAgdmlydHVhbCBQbGF0Zm9ybUxheWVySUQgcHJpbWFyeUxheWVy SUQoKSBjb25zdCB7IHJldHVybiAwOyB9CisKICAgICBHcmFwaGljc0xheWVyQ2xpZW50KiBjbGll bnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudDsgfQogCiAgICAgLy8gTGF5ZXIgbmFtZS4gT25s eSB1c2VkIHRvIGlkZW50aWZ5IGxheWVycyBpbiBkZWJ1ZyBvdXRwdXQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCmlu ZGV4IDYxMDRiNWQ4ZjNmMGIyYWI5OWM5MTk5Mjk4M2UwNzQ2YTNkMTlkMzUuLjNlYmRlZjVhMTJk YWNlZTk4ODRiMzEwM2ZhYmNmZjBiNWVkNTM2MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcApAQCAtMzk3LDYg KzM5NywxMSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0TmFtZShjb25zdCBTdHJpbmcmIG5h bWUpCiAgICAgbm90ZUxheWVyUHJvcGVydHlDaGFuZ2VkKE5hbWVDaGFuZ2VkKTsKIH0KIAorR3Jh cGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIEdyYXBoaWNzTGF5ZXJDQTo6cHJpbWFyeUxheWVy SUQoKSBjb25zdAoreworICAgIHJldHVybiBwcmltYXJ5TGF5ZXIoKS0+bGF5ZXJJRCgpOworfQor CiBQbGF0Zm9ybUxheWVyKiBHcmFwaGljc0xheWVyQ0E6OnBsYXRmb3JtTGF5ZXIoKSBjb25zdAog ewogICAgIHJldHVybiBwcmltYXJ5TGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaApp bmRleCBiNjJlM2EwZDNkODNhNmM3ZjkxOTU2ZWQ5NTliOWQ1NzQzMTIxOTI5Li5hYTdjYjAyOTUz YzViOTUwYzY4MDgyYTg1Yzc2ZjkyMjk1NjJkZjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaApAQCAtNjAsNiArNjAs OCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmFtZShjb25zdCBTdHJpbmcmKTsK IAorICAgIHZpcnR1YWwgUGxhdGZvcm1MYXllcklEIHByaW1hcnlMYXllcklEKCkgY29uc3QgT1ZF UlJJREU7CisKICAgICB2aXJ0dWFsIFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25z dDsKICAgICB2aXJ0dWFsIFBsYXRmb3JtQ0FMYXllciogcGxhdGZvcm1DQUxheWVyKCkgY29uc3Qg eyByZXR1cm4gcHJpbWFyeUxheWVyKCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5jcHAKaW5kZXggM2VmOGJmNDA0 MzYzMzNhMGJjMDk4ZDNiNTRlNTEzY2FhMjcyOTY3Zi4uM2IzMWY4N2ZmMDI5NTQ1NzkwOTg2MjJh N2M1ODhkYTAxZmYyNzY3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuY3BwCkBAIC0zMCw2ICszMCwxOSBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0YXRpYyBHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVy SUQgZ2VuZXJhdGVMYXllcklEKCkKK3sKKyAgICBzdGF0aWMgR3JhcGhpY3NMYXllcjo6UGxhdGZv cm1MYXllcklEIGxheWVySUQ7CisgICAgcmV0dXJuICsrbGF5ZXJJRDsKK30KKworUGxhdGZvcm1D QUxheWVyOjpQbGF0Zm9ybUNBTGF5ZXIoTGF5ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZvcm1DQUxh eWVyQ2xpZW50KiBvd25lcikKKyAgICA6IG1fbGF5ZXJUeXBlKGxheWVyVHlwZSkKKyAgICAsIG1f bGF5ZXJJRChnZW5lcmF0ZUxheWVySUQoKSkKKyAgICAsIG1fb3duZXIob3duZXIpCit7Cit9CisK IFBsYXRmb3JtQ0FMYXllcjo6flBsYXRmb3JtQ0FMYXllcigpCiB7CiAgICAgLy8gQ2xlYXIgdGhl IG93bmVyLCB3aGljaCBhbHNvIGNsZWFycyBpdCBpbiB0aGUgZGVsZWdhdGUgdG8gcHJldmVudCBh dHRlbXB0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev UGxhdGZvcm1DQUxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9Q bGF0Zm9ybUNBTGF5ZXIuaAppbmRleCAzYWVjZGJhMjBhMjg1Y2ZmZWQ4MWQ2MzM3NjZkOWNmYzE3 YmQzMGQ1Li5mYjdlNjEwMWY2NzI0ZjY2OTA0MzYzMTNiNDg4YTFjMTQwNmJjNDIxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5 ZXIuaApAQCAtMjksNiArMjksNyBAQAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK IAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXIu aCIKICNpbmNsdWRlICJQbGF0Zm9ybUNBQW5pbWF0aW9uLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1D QUxheWVyQ2xpZW50LmgiCiAjaW5jbHVkZSA8UXVhcnR6Q29yZS9DQUJhc2UuaD4KQEAgLTgwLDYg KzgxLDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+UGxhdGZvcm1DQUxheWVyKCk7CiAKKyAg ICBHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQgbGF5ZXJJRCgpIGNvbnN0IHsgcmV0dXJu IG1fbGF5ZXJJRDsgfQorCiAgICAgdmlydHVhbCBib29sIGlzUGxhdGZvcm1DQUxheWVyTWFjKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNQbGF0Zm9ybUNBTGF5 ZXJSZW1vdGUoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCkBAIC0yMTAsMTIgKzIxMywxMCBA QCBwdWJsaWM6CiAjZW5kaWYKIAogcHJvdGVjdGVkOgotICAgIFBsYXRmb3JtQ0FMYXllcihMYXll clR5cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVyKQotICAgICAgICA6 IG1fbGF5ZXJUeXBlKGxheWVyVHlwZSkKLSAgICAgICAgLCBtX293bmVyKG93bmVyKQotICAgIHsg fQorICAgIFBsYXRmb3JtQ0FMYXllcihMYXllclR5cGUsIFBsYXRmb3JtQ0FMYXllckNsaWVudCog b3duZXIpOwogCi0gICAgTGF5ZXJUeXBlIG1fbGF5ZXJUeXBlOworICAgIGNvbnN0IExheWVyVHlw ZSBtX2xheWVyVHlwZTsKKyAgICBjb25zdCBHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQg bV9sYXllcklEOwogICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX2xheWVyOwogICAgIFBs YXRmb3JtQ0FMYXllckNsaWVudCogbV9vd25lcjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmgK aW5kZXggOThmZjYwMjcyNDlmMGU5Nzc5N2Q0ZDM5NzYzYmI0ZGRkNzY2NjM1YS4uMGJiZTUyNjBk NDM3YjJjOTA2MDg1OGE2MGE1OTZiNmRkNDMzZjIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMu aApAQCAtMTQ3LDcgKzE0NywxMSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGVudW1lcmF0 ZVJlY3RzQmVpbmdEcmF3bihDR0NvbnRleHRSZWYsIHZvaWQgKF5ibG9jaykoQ0dSZWN0KSkgT1ZF UlJJREU7CiAKIHByaXZhdGU6Ci0gICAgUGxhdGZvcm1DQUxheWVyTWFjKExheWVyVHlwZSwgUGxh dGZvcm1MYXllciosIFBsYXRmb3JtQ0FMYXllckNsaWVudCogb3duZXIpOworICAgIFBsYXRmb3Jt Q0FMYXllck1hYyhMYXllclR5cGUsIFBsYXRmb3JtQ0FMYXllckNsaWVudCogb3duZXIpOworICAg IFBsYXRmb3JtQ0FMYXllck1hYyhQbGF0Zm9ybUxheWVyKiwgUGxhdGZvcm1DQUxheWVyQ2xpZW50 KiBvd25lcik7CisKKyAgICB2b2lkIGNvbW1vbkluaXQoKTsKKwogICAgIHZpcnR1YWwgYm9vbCBp c1BsYXRmb3JtQ0FMYXllck1hYygpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KIAog ICAgIGJvb2wgcmVxdWlyZXNDdXN0b21BcHBlYXJhbmNlVXBkYXRlT25Cb3VuZHNDaGFuZ2UoKSBj b25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21h Yy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tCmluZGV4IGUzNjNhMDBlNWY4ZjdjZDQ4MDhm ZjUyNjhmMDIyYjIxNjQwOTFkZjIuLjMxYjQ4MjQ5MThjY2Y4YTFlMGE3Yzc2ZTU4NDIxMGY5ZWU1 ODY4NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21h Yy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQpAQCAtNTUsMTIgKzU1LDEyIEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBQYXNzUmVmUHRyPFBsYXRmb3JtQ0FMYXllcj4gUGxh dGZvcm1DQUxheWVyTWFjOjpjcmVhdGUoTGF5ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZvcm1DQUxh eWVyQ2xpZW50KiBvd25lcikKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFBsYXRmb3JtQ0FM YXllck1hYyhsYXllclR5cGUsIDAsIG93bmVyKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQ bGF0Zm9ybUNBTGF5ZXJNYWMobGF5ZXJUeXBlLCBvd25lcikpOwogfQogCiBQYXNzUmVmUHRyPFBs YXRmb3JtQ0FMYXllcj4gUGxhdGZvcm1DQUxheWVyTWFjOjpjcmVhdGUodm9pZCogcGxhdGZvcm1M YXllciwgUGxhdGZvcm1DQUxheWVyQ2xpZW50KiBvd25lcikKIHsKLSAgICByZXR1cm4gYWRvcHRS ZWYobmV3IFBsYXRmb3JtQ0FMYXllck1hYyhMYXllclR5cGVDdXN0b20sIHN0YXRpY19jYXN0PFBs YXRmb3JtTGF5ZXIqPihwbGF0Zm9ybUxheWVyKSwgb3duZXIpKTsKKyAgICByZXR1cm4gYWRvcHRS ZWYobmV3IFBsYXRmb3JtQ0FMYXllck1hYyhzdGF0aWNfY2FzdDxQbGF0Zm9ybUxheWVyKj4ocGxh dGZvcm1MYXllciksIG93bmVyKSk7CiB9CiAKIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IHBsYXRm b3JtQ0FMYXllclBvaW50ZXIgPSBAIldLUGxhdGZvcm1DQUxheWVyIjsKQEAgLTE3Nyw1MCArMTc3 LDU3IEBAIHN0YXRpYyBOU1N0cmluZyAqdG9DQUZpbHRlclR5cGUoUGxhdGZvcm1DQUxheWVyOjpG aWx0ZXJUeXBlIHR5cGUpCiAgICAgfQogfQogCi1QbGF0Zm9ybUNBTGF5ZXJNYWM6OlBsYXRmb3Jt Q0FMYXllck1hYyhMYXllclR5cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUxheWVyKiBsYXllciwgUGxh dGZvcm1DQUxheWVyQ2xpZW50KiBvd25lcikKLSAgICA6IFBsYXRmb3JtQ0FMYXllcihsYXllciA/ IExheWVyVHlwZUN1c3RvbSA6IGxheWVyVHlwZSwgb3duZXIpCitQbGF0Zm9ybUNBTGF5ZXJNYWM6 OlBsYXRmb3JtQ0FMYXllck1hYyhMYXllclR5cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUNBTGF5ZXJD bGllbnQqIG93bmVyKQorICAgIDogUGxhdGZvcm1DQUxheWVyKGxheWVyVHlwZSwgb3duZXIpCiAg ICAgLCBtX2N1c3RvbUFwcGVhcmFuY2UoR3JhcGhpY3NMYXllcjo6Tm9DdXN0b21BcHBlYXJhbmNl KQogewotICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUwotICAgIGlmIChsYXllcikgewot ICAgICAgICBpZiAoW2xheWVyIGlzS2luZE9mQ2xhc3M6Z2V0QVZQbGF5ZXJMYXllckNsYXNzKCld KQotICAgICAgICAgICAgbV9sYXllclR5cGUgPSBMYXllclR5cGVBVlBsYXllckxheWVyOwotICAg ICAgICBtX2xheWVyID0gbGF5ZXI7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgQ2xhc3MgbGF5ZXJD bGFzcyA9IE5pbDsKLSAgICAgICAgc3dpdGNoIChsYXllclR5cGUpIHsKLSAgICAgICAgY2FzZSBM YXllclR5cGVMYXllcjoKLSAgICAgICAgY2FzZSBMYXllclR5cGVSb290TGF5ZXI6Ci0gICAgICAg ICAgICBsYXllckNsYXNzID0gW0NBTGF5ZXIgY2xhc3NdOwotICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGNhc2UgTGF5ZXJUeXBlV2ViTGF5ZXI6Ci0gICAgICAgICAgICBsYXllckNsYXNzID0g W1dlYkxheWVyIGNsYXNzXTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIExheWVy VHlwZVNpbXBsZUxheWVyOgotICAgICAgICBjYXNlIExheWVyVHlwZVRpbGVkQmFja2luZ1RpbGVM YXllcjoKLSAgICAgICAgICAgIGxheWVyQ2xhc3MgPSBbV2ViU2ltcGxlTGF5ZXIgY2xhc3NdOwot ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgTGF5ZXJUeXBlVHJhbnNmb3JtTGF5ZXI6 Ci0gICAgICAgICAgICBsYXllckNsYXNzID0gW0NBVHJhbnNmb3JtTGF5ZXIgY2xhc3NdOwotICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgTGF5ZXJUeXBlV2ViVGlsZWRMYXllcjoKLSAg ICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIGNhc2UgTGF5ZXJUeXBlVGlsZWRCYWNraW5nTGF5ZXI6Ci0gICAgICAgIGNhc2UgTGF5ZXJU eXBlUGFnZVRpbGVkQmFja2luZ0xheWVyOgotICAgICAgICAgICAgbGF5ZXJDbGFzcyA9IFtXZWJU aWxlZEJhY2tpbmdMYXllciBjbGFzc107Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2Fz ZSBMYXllclR5cGVBVlBsYXllckxheWVyOgotICAgICAgICAgICAgbGF5ZXJDbGFzcyA9IGdldEFW UGxheWVyTGF5ZXJDbGFzcygpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgTGF5 ZXJUeXBlQ3VzdG9tOgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLQotICAgICAgICBp ZiAobGF5ZXJDbGFzcykKLSAgICAgICAgICAgIG1fbGF5ZXIgPSBhZG9wdE5TKFtbbGF5ZXJDbGFz cyBhbGxvY10gaW5pdF0pOworICAgIENsYXNzIGxheWVyQ2xhc3MgPSBOaWw7CisgICAgc3dpdGNo IChsYXllclR5cGUpIHsKKyAgICBjYXNlIExheWVyVHlwZUxheWVyOgorICAgIGNhc2UgTGF5ZXJU eXBlUm9vdExheWVyOgorICAgICAgICBsYXllckNsYXNzID0gW0NBTGF5ZXIgY2xhc3NdOworICAg ICAgICBicmVhazsKKyAgICBjYXNlIExheWVyVHlwZVdlYkxheWVyOgorICAgICAgICBsYXllckNs YXNzID0gW1dlYkxheWVyIGNsYXNzXTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMYXllclR5 cGVTaW1wbGVMYXllcjoKKyAgICBjYXNlIExheWVyVHlwZVRpbGVkQmFja2luZ1RpbGVMYXllcjoK KyAgICAgICAgbGF5ZXJDbGFzcyA9IFtXZWJTaW1wbGVMYXllciBjbGFzc107CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgTGF5ZXJUeXBlVHJhbnNmb3JtTGF5ZXI6CisgICAgICAgIGxheWVyQ2xh c3MgPSBbQ0FUcmFuc2Zvcm1MYXllciBjbGFzc107CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug TGF5ZXJUeXBlV2ViVGlsZWRMYXllcjoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgTGF5ZXJUeXBlVGlsZWRCYWNraW5nTGF5ZXI6CisgICAg Y2FzZSBMYXllclR5cGVQYWdlVGlsZWRCYWNraW5nTGF5ZXI6CisgICAgICAgIGxheWVyQ2xhc3Mg PSBbV2ViVGlsZWRCYWNraW5nTGF5ZXIgY2xhc3NdOworICAgICAgICBicmVhazsKKyAgICBjYXNl IExheWVyVHlwZUFWUGxheWVyTGF5ZXI6CisgICAgICAgIGxheWVyQ2xhc3MgPSBnZXRBVlBsYXll ckxheWVyQ2xhc3MoKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMYXllclR5cGVDdXN0b206 CisgICAgICAgIGJyZWFrOwogICAgIH0KKworICAgIGlmIChsYXllckNsYXNzKQorICAgICAgICBt X2xheWVyID0gYWRvcHROUyhbW2xheWVyQ2xhc3MgYWxsb2NdIGluaXRdKTsKICAgICAKKyAgICBj b21tb25Jbml0KCk7Cit9CisKK1BsYXRmb3JtQ0FMYXllck1hYzo6UGxhdGZvcm1DQUxheWVyTWFj KFBsYXRmb3JtTGF5ZXIqIGxheWVyLCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVyKQorICAg IDogUGxhdGZvcm1DQUxheWVyKFtsYXllciBpc0tpbmRPZkNsYXNzOmdldEFWUGxheWVyTGF5ZXJD bGFzcygpXSA/IExheWVyVHlwZUFWUGxheWVyTGF5ZXIgOiBMYXllclR5cGVDdXN0b20sIG93bmVy KQorICAgICwgbV9jdXN0b21BcHBlYXJhbmNlKEdyYXBoaWNzTGF5ZXI6Ok5vQ3VzdG9tQXBwZWFy YW5jZSkKK3sKKyAgICBtX2xheWVyID0gbGF5ZXI7CisgICAgY29tbW9uSW5pdCgpOworfQorCit2 b2lkIFBsYXRmb3JtQ0FMYXllck1hYzo6Y29tbW9uSW5pdCgpCit7CisgICAgQkVHSU5fQkxPQ0tf T0JKQ19FWENFUFRJT05TCiAgICAgLy8gU2F2ZSBhIHBvaW50ZXIgdG8gJ3RoaXMnIGluIHRoZSBD QUxheWVyCiAgICAgW21fbGF5ZXIuZ2V0KCkgc2V0VmFsdWU6W05TVmFsdWUgdmFsdWVXaXRoUG9p bnRlcjp0aGlzXSBmb3JLZXk6cGxhdGZvcm1DQUxheWVyUG9pbnRlcl07CiAgICAgCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBoaWNzTGF5ZXJD QVJlbW90ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBo aWNzTGF5ZXJDQVJlbW90ZS5jcHAKaW5kZXggMjg5Njg3M2YxZDdiNzIzYTllMDliYjliODUyNGYx ZTU1NzBjODU0My4uMGQ4MWYxN2NiY2JmYTFjMjJmOGRjNDA5M2FkNjNhYjRiNWI1OTg3OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9HcmFwaGljc0xh eWVyQ0FSZW1vdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvR3JhcGhpY3NMYXllckNBUmVtb3RlLmNwcApAQCAtMzgsMTEgKzM4LDYgQEAgR3JhcGhpY3NM YXllckNBUmVtb3RlOjp+R3JhcGhpY3NMYXllckNBUmVtb3RlKCkKIHsKIH0KIAotR3JhcGhpY3NM YXllcjo6UGxhdGZvcm1MYXllcklEIEdyYXBoaWNzTGF5ZXJDQVJlbW90ZTo6cHJpbWFyeUxheWVy SUQoKSBjb25zdAotewotICAgIHJldHVybiB0b1BsYXRmb3JtQ0FMYXllclJlbW90ZShwbGF0Zm9y bUNBTGF5ZXIoKSktPmxheWVySUQoKTsKLX0KLQogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKIGJv b2wgR3JhcGhpY3NMYXllckNBUmVtb3RlOjpmaWx0ZXJzQ2FuQmVDb21wb3NpdGVkKGNvbnN0IEZp bHRlck9wZXJhdGlvbnMmIGZpbHRlcnMpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBoaWNzTGF5ZXJDQVJlbW90ZS5oIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9HcmFwaGljc0xheWVyQ0FSZW1vdGUuaAppbmRl eCBhYTZjNDZkZjIwMGY4YjcwMGVlODNhNjM5OWIyNWYzNjc0NjgyYjc0Li5jMmRhZDQ0MGM0MmNk ZWEwZWM0ZDI1MGQ1NDQ1NTNkNDc4MTUwMWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBoaWNzTGF5ZXJDQVJlbW90ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvR3JhcGhpY3NMYXllckNBUmVtb3RlLmgK QEAgLTQ1LDggKzQ1LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+R3JhcGhpY3NMYXllckNB UmVtb3RlKCk7CiAgICAgCi0gICAgUGxhdGZvcm1MYXllcklEIHByaW1hcnlMYXllcklEKCkgY29u c3Q7Ci0KICNpZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCiAgICAgdmlydHVhbCBib29sIGZpbHRlcnND YW5CZUNvbXBvc2l0ZWQoY29uc3QgV2ViQ29yZTo6RmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVycykg T1ZFUlJJREU7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmNwcAppbmRleCA3M2M5 MWU5ZGQ5NTI0YTRlNTQxZmFhODQ0YzE5NDBiMzA1NjAyMzAzLi4yNTExM2E0NmUwZWRmMjkwNGQ5 ZDYzZmQyODEwMDYwMjlmYWFlYTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3BwCkBA IC00NywxMiArNDcsNiBAQAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3Bh Y2UgV2ViS2l0OwogCi1zdGF0aWMgV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXll cklEIGdlbmVyYXRlTGF5ZXJJRCgpCi17Ci0gICAgc3RhdGljIFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXI6OlBsYXRmb3JtTGF5ZXJJRCBsYXllcklEOwotICAgIHJldHVybiArK2xheWVySUQ7Ci19Ci0K IFBhc3NSZWZQdHI8UGxhdGZvcm1DQUxheWVyUmVtb3RlPiBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6 OmNyZWF0ZShMYXllclR5cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVy LCBSZW1vdGVMYXllclRyZWVDb250ZXh0KiBjb250ZXh0KQogewogICAgIFJlZlB0cjxQbGF0Zm9y bUNBTGF5ZXJSZW1vdGU+IGxheWVyOwpAQCAtNzgsNyArNzIsNiBAQCBQYXNzUmVmUHRyPFBsYXRm b3JtQ0FMYXllclJlbW90ZT4gUGxhdGZvcm1DQUxheWVyUmVtb3RlOjpjcmVhdGUoUGxhdGZvcm1M YXllciAqcAogCiBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6OlBsYXRmb3JtQ0FMYXllclJlbW90ZShM YXllclR5cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVyLCBSZW1vdGVM YXllclRyZWVDb250ZXh0KiBjb250ZXh0KQogICAgIDogUGxhdGZvcm1DQUxheWVyKGxheWVyVHlw ZSwgb3duZXIpCi0gICAgLCBtX2xheWVySUQoZ2VuZXJhdGVMYXllcklEKCkpCiAgICAgLCBtX3N1 cGVybGF5ZXIobnVsbHB0cikKICAgICAsIG1fbWFza0xheWVyKG51bGxwdHIpCiAgICAgLCBtX2Fj Y2VsZXJhdGVzRHJhd2luZyhmYWxzZSkKQEAgLTExMiw3ICsxMDUsNyBAQCB2b2lkIFBsYXRmb3Jt Q0FMYXllclJlbW90ZTo6cmVjdXJzaXZlQnVpbGRUcmFuc2FjdGlvbihSZW1vdGVMYXllclRyZWVU cmFuc2FjdGlvbgogICAgICAgICBpZiAobV9wcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYg UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkNoaWxkcmVuQ2hhbmdlZCkgewogICAgICAgICAg ICAgbV9wcm9wZXJ0aWVzLmNoaWxkcmVuLmNsZWFyKCk7CiAgICAgICAgICAgICBmb3IgKGF1dG8g bGF5ZXIgOiBtX2NoaWxkcmVuKQotICAgICAgICAgICAgICAgIG1fcHJvcGVydGllcy5jaGlsZHJl bi5hcHBlbmQodG9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUobGF5ZXIuZ2V0KCkpLT5sYXllcklEKCkp OworICAgICAgICAgICAgICAgIG1fcHJvcGVydGllcy5jaGlsZHJlbi5hcHBlbmQobGF5ZXItPmxh eWVySUQoKSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAobV9sYXllclR5cGUgPT0gTGF5ZXJU eXBlQ3VzdG9tKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaAppbmRleCAzNTQ0YjUwNGFjNDFk NjY4MjJkNjRiM2RkNDRlYTkzMDJjZjZiOWYzLi40NDQzMWFmZDE5MzUxOWMwNDIwOGFjZmI1NmYw YWY1YzBhYjM4NTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmgKQEAgLTQ0LDggKzQ0LDYg QEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+UGxhdGZvcm1DQUxheWVyUmVtb3RlKCk7CiAKLSAg ICBXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQgbGF5ZXJJRCgpIHsgcmV0 dXJuIG1fbGF5ZXJJRDsgfQotCiAgICAgdmlydHVhbCBib29sIHVzZXNUaWxlZEJhY2tpbmdMYXll cigpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIGxheWVyVHlwZSgpID09IExheWVyVHlwZVBhZ2VU aWxlZEJhY2tpbmdMYXllciB8fCBsYXllclR5cGUoKSA9PSBMYXllclR5cGVUaWxlZEJhY2tpbmdM YXllcjsgfQogCiAgICAgdmlydHVhbCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29u c3QgT1ZFUlJJREUgeyByZXR1cm4gbnVsbHB0cjsgfQpAQCAtMTYxLDcgKzE1OSw2IEBAIHByaXZh dGU6CiAKICAgICBib29sIHJlcXVpcmVzQ3VzdG9tQXBwZWFyYW5jZVVwZGF0ZU9uQm91bmRzQ2hh bmdlKCkgY29uc3Q7CiAKLSAgICBjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9y bUxheWVySUQgbV9sYXllcklEOwogICAgIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXll clByb3BlcnRpZXMgbV9wcm9wZXJ0aWVzOwogICAgIFdlYkNvcmU6OlBsYXRmb3JtQ0FMYXllckxp c3QgbV9jaGlsZHJlbjsKICAgICBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGUqIG1fc3VwZXJsYXllcjsK