50294 2010-11-30 16:47:18 -0800 [OpenVG] Remove "current path" of GraphicsContext 2010-12-02 12:44:20 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 48516 1 paroga paroga jpetsovits kling oldest_to_newest 315404 0 paroga 2010-11-30 16:47:18 -0800 see patch 315408 1 75226 paroga 2010-11-30 16:49:10 -0800 Created attachment 75226 Patch 315453 2 75226 jpetsovits 2010-11-30 17:50:07 -0800 Comment on attachment 75226 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75226&action=review Big fan of the patch overall! Just two minor nitpicks from my side (I'm not a reviewer though). > WebCore/platform/graphics/openvg/PainterOpenVG.cpp:733 > + path.platformPath()->makeCompatibleContextCurrent(); This is not necessary. We want the surface current that's being drawn on, and need to expect the path to be compatible to that surface, otherwise we won't get anything drawn anyways. > WebCore/platform/graphics/openvg/PainterOpenVG.h:139 > +} // namespace WebCore On his initial review, Niko advised me against these labels, indicating that it's probably "better" WebKit coding style. I'd say leave it like that, because there's no good reason to change and it doesn't thematically belong in this commit. 315563 3 75261 paroga 2010-12-01 00:45:13 -0800 Created attachment 75261 Patch 316108 4 75261 paroga 2010-12-02 06:34:01 -0800 Comment on attachment 75261 Patch patch won't apply, I'll commit it manually 316355 5 75261 paroga 2010-12-02 12:43:57 -0800 Comment on attachment 75261 Patch Clearing flags on attachment: 75261 Manually committed r73184: <http://trac.webkit.org/changeset/73184> 316356 6 paroga 2010-12-02 12:44:20 -0800 All reviewed patches have been landed. Closing bug. 75226 2010-11-30 16:49:10 -0800 2010-12-01 00:45:13 -0800 Patch bug-50294.patch text/plain 6539 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjM5ZGE4OC4uODA1NzEwZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMS0zMCAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbT3BlblZHXSBSZW1vdmUgImN1cnJlbnQgcGF0aCIgb2YgR3Jh cGhpY3NDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01MDI5NAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0dyYXBoaWNzQ29udGV4dE9w ZW5WRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxQYXRoKToK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCk6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsaXBQYXRoKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQ YWludGVyT3BlblZHOjpQYWludGVyT3BlblZHKToKKyAgICAgICAgKFdlYkNvcmU6OlBhaW50ZXJP cGVuVkc6On5QYWludGVyT3BlblZHKToKKyAgICAgICAgKFdlYkNvcmU6OlBhaW50ZXJPcGVuVkc6 OmRyYXdQYXRoKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9w ZW5WRy5oOgorCiAyMDEwLTExLTMwICBDaHJpcyBHdWlsbG9yeSAgPGNocmlzLmd1aWxsb3J5QGdv b2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCA5NDI1YmY2Li5kMzYw MjhmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKQEAg LTMwMSw3ICszMDEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgdm9pZCBzZXRD b21wb3NpdGVPcGVyYXRpb24oQ29tcG9zaXRlT3BlcmF0b3IpOwogCi0jaWYgUExBVEZPUk0oU0tJ QSkgfHwgUExBVEZPUk0oV1gpIHx8IFBMQVRGT1JNKE9QRU5WRykgfHwgT1MoV0lOQ0UpCisjaWYg UExBVEZPUk0oU0tJQSkgfHwgUExBVEZPUk0oV1gpIHx8IE9TKFdJTkNFKQogICAgICAgICB2b2lk IGJlZ2luUGF0aCgpOwogICAgICAgICB2b2lkIGFkZFBhdGgoY29uc3QgUGF0aCYpOwogI2VuZGlm CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9HcmFwaGljc0Nv bnRleHRPcGVuVkcuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvR3JhcGhp Y3NDb250ZXh0T3BlblZHLmNwcAppbmRleCAwNGE1ZTI2Li41YjFlYjFkIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9HcmFwaGljc0NvbnRleHRPcGVuVkcuY3Bw CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0dyYXBoaWNzQ29udGV4dE9w ZW5WRy5jcHAKQEAgLTE0NCwxMSArMTQ0LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZpbGxQ YXRoKGNvbnN0IFBhdGgmIHBhdGgpCiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgLy8gRklYTUU6IEJlIHNtYXJ0ZXIgYWJvdXQgdGhpcy4KLSAgICBi ZWdpblBhdGgoKTsKLSAgICBhZGRQYXRoKHBhdGgpOwotCi0gICAgbV9kYXRhLT5kcmF3UGF0aChW R19GSUxMX1BBVEgsIG1fY29tbW9uLT5zdGF0ZS5maWxsUnVsZSk7CisgICAgbV9kYXRhLT5kcmF3 UGF0aChwYXRoLCBWR19GSUxMX1BBVEgsIG1fY29tbW9uLT5zdGF0ZS5maWxsUnVsZSk7CiB9CiAK IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKGNvbnN0IFBhdGgmIHBhdGgpCkBAIC0x NTYsMTEgKzE1Miw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKGNvbnN0IFBh dGgmIHBhdGgpCiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgLy8gRklYTUU6IEJlIHNtYXJ0ZXIgYWJvdXQgdGhpcy4KLSAgICBiZWdpblBhdGgoKTsK LSAgICBhZGRQYXRoKHBhdGgpOwotCi0gICAgbV9kYXRhLT5kcmF3UGF0aChWR19TVFJPS0VfUEFU SCwgbV9jb21tb24tPnN0YXRlLmZpbGxSdWxlKTsKKyAgICBtX2RhdGEtPmRyYXdQYXRoKHBhdGgs IFZHX1NUUk9LRV9QQVRILCBtX2NvbW1vbi0+c3RhdGUuZmlsbFJ1bGUpOwogfQogCiB2b2lkIEdy YXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQpAQCAtMTk3LDIy ICsxODksNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJvdW5kZWRSZWN0KGNvbnN0IElu dFJlY3QmIHJlY3QsIGNvbnN0IEludFNpemUmIHRvcExlZgogICAgIFVOVVNFRF9QQVJBTShjb2xv clNwYWNlKTsgLy8gRklYTUUKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmJlZ2luUGF0aCgp Ci17Ci0gICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg bV9kYXRhLT5iZWdpblBhdGgoKTsKLX0KLQotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmFkZFBhdGgo Y29uc3QgUGF0aCYgcGF0aCkKLXsKLSAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBtX2RhdGEtPmFkZFBhdGgocGF0aCk7Ci19Ci0KIHZvaWQgR3JhcGhp Y3NDb250ZXh0OjpjbGlwKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHsKICAgICBpZiAocGFpbnRp bmdEaXNhYmxlZCgpKQpAQCAtMjI2LDExICsyMDIsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 Y2xpcFBhdGgoY29uc3QgUGF0aCYgcGF0aCwgV2luZFJ1bGUgY2xpcFJ1bGUpCiAgICAgaWYgKHBh aW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRklYTUU6IEJlIHNt YXJ0ZXIgYWJvdXQgdGhpcy4KLSAgICBiZWdpblBhdGgoKTsKLSAgICBhZGRQYXRoKHBhdGgpOwot Ci0gICAgbV9kYXRhLT5jbGlwUGF0aCgqKG1fZGF0YS0+Y3VycmVudFBhdGgoKSksIFBhaW50ZXJP cGVuVkc6OkludGVyc2VjdENsaXAsIGNsaXBSdWxlKTsKKyAgICBtX2RhdGEtPmNsaXBQYXRoKHBh dGgsIFBhaW50ZXJPcGVuVkc6OkludGVyc2VjdENsaXAsIGNsaXBSdWxlKTsKIH0KIAogdm9pZCBH cmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29uc3QgVmVjdG9yPEludFJlY3Q+JiByZWN0 cywgaW50IHdpZHRoLCBpbnQgb2Zmc2V0LCBjb25zdCBDb2xvciYgY29sb3IpCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9QYWludGVyT3BlblZHLmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL1BhaW50ZXJPcGVuVkcuY3BwCmluZGV4IGIy ZjIzMDIuLmY2ZjYxODkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bnZnL1BhaW50ZXJPcGVuVkcuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bnZnL1BhaW50ZXJPcGVuVkcuY3BwCkBAIC0zOTksMTQgKzM5OSwxMiBAQCBzdHJ1Y3QgUGxhdGZv cm1QYWludGVyU3RhdGUgewogUGFpbnRlck9wZW5WRzo6UGFpbnRlck9wZW5WRygpCiAgICAgOiBt X3N0YXRlKDApCiAgICAgLCBtX3N1cmZhY2UoMCkKLSAgICAsIG1fY3VycmVudFBhdGgoMCkKIHsK IH0KIAogUGFpbnRlck9wZW5WRzo6UGFpbnRlck9wZW5WRyhTdXJmYWNlT3BlblZHKiBzdXJmYWNl KQogICAgIDogbV9zdGF0ZSgwKQogICAgICwgbV9zdXJmYWNlKDApCi0gICAgLCBtX2N1cnJlbnRQ YXRoKDApCiB7CiAgICAgQVNTRVJUKHN1cmZhY2UpOwogICAgIGJlZ2luKHN1cmZhY2UpOwpAQCAt NDE1LDcgKzQxMyw2IEBAIFBhaW50ZXJPcGVuVkc6OlBhaW50ZXJPcGVuVkcoU3VyZmFjZU9wZW5W Ryogc3VyZmFjZSkKIFBhaW50ZXJPcGVuVkc6On5QYWludGVyT3BlblZHKCkKIHsKICAgICBlbmQo KTsKLSAgICBkZWxldGUgbV9jdXJyZW50UGF0aDsKIH0KIAogdm9pZCBQYWludGVyT3BlblZHOjpi ZWdpbihTdXJmYWNlT3BlblZHKiBzdXJmYWNlKQpAQCAtNzE3LDI2ICs3MTQsNyBAQCB2b2lkIFBh aW50ZXJPcGVuVkc6OnRyYW5zbGF0ZShmbG9hdCBkeCwgZmxvYXQgZHkpCiAgICAgc2V0VHJhbnNm b3JtYXRpb24odHJhbnNmb3JtYXRpb24pOwogfQogCi12b2lkIFBhaW50ZXJPcGVuVkc6OmJlZ2lu UGF0aCgpCi17Ci0gICAgZGVsZXRlIG1fY3VycmVudFBhdGg7Ci0gICAgbV9jdXJyZW50UGF0aCA9 IG5ldyBQYXRoKCk7Ci19Ci0KLXZvaWQgUGFpbnRlck9wZW5WRzo6YWRkUGF0aChjb25zdCBQYXRo JiBwYXRoKQotewotICAgIG1fY3VycmVudFBhdGgtPnBsYXRmb3JtUGF0aCgpLT5tYWtlQ29tcGF0 aWJsZUNvbnRleHRDdXJyZW50KCk7Ci0KLSAgICB2Z0FwcGVuZFBhdGgobV9jdXJyZW50UGF0aC0+ cGxhdGZvcm1QYXRoKCktPnZnUGF0aCgpLCBwYXRoLnBsYXRmb3JtUGF0aCgpLT52Z1BhdGgoKSk7 Ci0gICAgQVNTRVJUX1ZHX05PX0VSUk9SKCk7Ci19Ci0KLVBhdGgqIFBhaW50ZXJPcGVuVkc6OmN1 cnJlbnRQYXRoKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9jdXJyZW50UGF0aDsKLX0KLQotdm9p ZCBQYWludGVyT3BlblZHOjpkcmF3UGF0aChWR2JpdGZpZWxkIHNwZWNpZmllZFBhaW50TW9kZXMs IFdpbmRSdWxlIGZpbGxSdWxlKQordm9pZCBQYWludGVyT3BlblZHOjpkcmF3UGF0aChjb25zdCBQ YXRoJiBwYXRoLCBWR2JpdGZpZWxkIHNwZWNpZmllZFBhaW50TW9kZXMsIFdpbmRSdWxlIGZpbGxS dWxlKQogewogICAgIEFTU0VSVChtX3N0YXRlKTsKIApAQCAtNzUyLDkgKzczMCwxMCBAQCB2b2lk IFBhaW50ZXJPcGVuVkc6OmRyYXdQYXRoKFZHYml0ZmllbGQgc3BlY2lmaWVkUGFpbnRNb2Rlcywg V2luZFJ1bGUgZmlsbFJ1bGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fc3VyZmFjZS0+bWFr ZUN1cnJlbnQoKTsKKyAgICBwYXRoLnBsYXRmb3JtUGF0aCgpLT5tYWtlQ29tcGF0aWJsZUNvbnRl eHRDdXJyZW50KCk7CiAKICAgICB2Z1NldGkoVkdfRklMTF9SVUxFLCB0b1ZHRmlsbFJ1bGUoZmls bFJ1bGUpKTsKLSAgICB2Z0RyYXdQYXRoKG1fY3VycmVudFBhdGgtPnBsYXRmb3JtUGF0aCgpLT52 Z1BhdGgoKSwgcGFpbnRNb2Rlcyk7CisgICAgdmdEcmF3UGF0aChwYXRoLnBsYXRmb3JtUGF0aCgp LT52Z1BhdGgoKSwgcGFpbnRNb2Rlcyk7CiAgICAgQVNTRVJUX1ZHX05PX0VSUk9SKCk7CiB9CiAK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL1BhaW50ZXJPcGVu VkcuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL1BhaW50ZXJPcGVuVkcuaApp bmRleCBlNGM2Njg4Li5mMjc0ODM1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL29wZW52Zy9QYWludGVyT3BlblZHLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVudmcvUGFpbnRlck9wZW5WRy5oCkBAIC0xMTEsMTAgKzExMSw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIHJvdGF0ZShmbG9hdCByYWRpYW5zKTsKICAgICB2b2lkIHRyYW5zbGF0ZShmbG9hdCBk eCwgZmxvYXQgZHkpOwogCi0gICAgdm9pZCBiZWdpblBhdGgoKTsKLSAgICB2b2lkIGFkZFBhdGgo Y29uc3QgUGF0aCYpOwotICAgIFBhdGgqIGN1cnJlbnRQYXRoKCkgY29uc3Q7Ci0gICAgdm9pZCBk cmF3UGF0aChWR2JpdGZpZWxkIHBhaW50TW9kZXMgPSAoVkdfU1RST0tFX1BBVEggfCBWR19GSUxM X1BBVEgpLCBXaW5kUnVsZSBmaWxsUnVsZSA9IFJVTEVfTk9OWkVSTyk7CisgICAgdm9pZCBkcmF3 UGF0aChjb25zdCBQYXRoJiwgVkdiaXRmaWVsZCBwYWludE1vZGVzID0gKFZHX1NUUk9LRV9QQVRI IHwgVkdfRklMTF9QQVRIKSwgV2luZFJ1bGUgZmlsbFJ1bGUgPSBSVUxFX05PTlpFUk8pOwogCiAg ICAgdm9pZCBpbnRlcnNlY3RDbGlwUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2b2lkIGNs aXBQYXRoKGNvbnN0IFBhdGgmLCBQYWludGVyT3BlblZHOjpDbGlwT3BlcmF0aW9uLCBXaW5kUnVs ZSBjbGlwUnVsZSA9IFJVTEVfTk9OWkVSTyk7CkBAIC0xMzcsOSArMTM0LDggQEAgcHJpdmF0ZToK ICAgICBWZWN0b3I8UGxhdGZvcm1QYWludGVyU3RhdGUqPiBtX3N0YXRlU3RhY2s7CiAgICAgUGxh dGZvcm1QYWludGVyU3RhdGUqIG1fc3RhdGU7CiAgICAgU3VyZmFjZU9wZW5WRyogbV9zdXJmYWNl OwotICAgIFBhdGgqIG1fY3VycmVudFBhdGg7CiB9OwogCi19Cit9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCiAKLSNlbmRpZgorI2VuZGlmIC8vIFBhaW50ZXJPcGVuVkdfaAo= 75261 2010-12-01 00:45:13 -0800 2010-12-02 12:43:57 -0800 Patch bug-50294b.patch text/plain 6390 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWY5MTM4NC4uYjY2NGYxOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0xMi0wMSAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbT3BlblZHXSBSZW1vdmUgImN1cnJlbnQgcGF0aCIgb2YgR3Jh cGhpY3NDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01MDI5NAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0dyYXBoaWNzQ29udGV4dE9w ZW5WRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxQYXRoKToK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCk6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsaXBQYXRoKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQ YWludGVyT3BlblZHOjpQYWludGVyT3BlblZHKToKKyAgICAgICAgKFdlYkNvcmU6OlBhaW50ZXJP cGVuVkc6On5QYWludGVyT3BlblZHKToKKyAgICAgICAgKFdlYkNvcmU6OlBhaW50ZXJPcGVuVkc6 OmRyYXdQYXRoKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9w ZW5WRy5oOgorCiAyMDEwLTExLTMwICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDk0MjViZjYuLmQzNjAyOGYgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApAQCAtMzAxLDcgKzMw MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHNldENvbXBvc2l0ZU9w ZXJhdGlvbihDb21wb3NpdGVPcGVyYXRvcik7CiAKLSNpZiBQTEFURk9STShTS0lBKSB8fCBQTEFU Rk9STShXWCkgfHwgUExBVEZPUk0oT1BFTlZHKSB8fCBPUyhXSU5DRSkKKyNpZiBQTEFURk9STShT S0lBKSB8fCBQTEFURk9STShXWCkgfHwgT1MoV0lOQ0UpCiAgICAgICAgIHZvaWQgYmVnaW5QYXRo KCk7CiAgICAgICAgIHZvaWQgYWRkUGF0aChjb25zdCBQYXRoJik7CiAjZW5kaWYKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0dyYXBoaWNzQ29udGV4dE9wZW5W Ry5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9HcmFwaGljc0NvbnRleHRP cGVuVkcuY3BwCmluZGV4IDA0YTVlMjYuLjViMWViMWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0dyYXBoaWNzQ29udGV4dE9wZW5WRy5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvR3JhcGhpY3NDb250ZXh0T3BlblZHLmNwcApA QCAtMTQ0LDExICsxNDQsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoY29uc3Qg UGF0aCYgcGF0aCkKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICAvLyBGSVhNRTogQmUgc21hcnRlciBhYm91dCB0aGlzLgotICAgIGJlZ2luUGF0aCgp OwotICAgIGFkZFBhdGgocGF0aCk7Ci0KLSAgICBtX2RhdGEtPmRyYXdQYXRoKFZHX0ZJTExfUEFU SCwgbV9jb21tb24tPnN0YXRlLmZpbGxSdWxlKTsKKyAgICBtX2RhdGEtPmRyYXdQYXRoKHBhdGgs IFZHX0ZJTExfUEFUSCwgbV9jb21tb24tPnN0YXRlLmZpbGxSdWxlKTsKIH0KIAogdm9pZCBHcmFw aGljc0NvbnRleHQ6OnN0cm9rZVBhdGgoY29uc3QgUGF0aCYgcGF0aCkKQEAgLTE1NiwxMSArMTUy LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVBhdGgoY29uc3QgUGF0aCYgcGF0aCkK ICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBG SVhNRTogQmUgc21hcnRlciBhYm91dCB0aGlzLgotICAgIGJlZ2luUGF0aCgpOwotICAgIGFkZFBh dGgocGF0aCk7Ci0KLSAgICBtX2RhdGEtPmRyYXdQYXRoKFZHX1NUUk9LRV9QQVRILCBtX2NvbW1v bi0+c3RhdGUuZmlsbFJ1bGUpOworICAgIG1fZGF0YS0+ZHJhd1BhdGgocGF0aCwgVkdfU1RST0tF X1BBVEgsIG1fY29tbW9uLT5zdGF0ZS5maWxsUnVsZSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250 ZXh0OjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCkBAIC0xOTcsMjIgKzE4OSw2IEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRlZFJlY3QoY29uc3QgSW50UmVjdCYgcmVj dCwgY29uc3QgSW50U2l6ZSYgdG9wTGVmCiAgICAgVU5VU0VEX1BBUkFNKGNvbG9yU3BhY2UpOyAv LyBGSVhNRQogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6YmVnaW5QYXRoKCkKLXsKLSAgICBp ZiAocGFpbnRpbmdEaXNhYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2RhdGEtPmJl Z2luUGF0aCgpOwotfQotCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6YWRkUGF0aChjb25zdCBQYXRo JiBwYXRoKQotewotICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCi0gICAgICAgIHJldHVybjsK LQotICAgIG1fZGF0YS0+YWRkUGF0aChwYXRoKTsKLX0KLQogdm9pZCBHcmFwaGljc0NvbnRleHQ6 OmNsaXAoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVk KCkpCkBAIC0yMjYsMTEgKzIwMiw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwUGF0aChj b25zdCBQYXRoJiBwYXRoLCBXaW5kUnVsZSBjbGlwUnVsZSkKICAgICBpZiAocGFpbnRpbmdEaXNh YmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBGSVhNRTogQmUgc21hcnRlciBhYm91 dCB0aGlzLgotICAgIGJlZ2luUGF0aCgpOwotICAgIGFkZFBhdGgocGF0aCk7Ci0KLSAgICBtX2Rh dGEtPmNsaXBQYXRoKCoobV9kYXRhLT5jdXJyZW50UGF0aCgpKSwgUGFpbnRlck9wZW5WRzo6SW50 ZXJzZWN0Q2xpcCwgY2xpcFJ1bGUpOworICAgIG1fZGF0YS0+Y2xpcFBhdGgocGF0aCwgUGFpbnRl ck9wZW5WRzo6SW50ZXJzZWN0Q2xpcCwgY2xpcFJ1bGUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8SW50UmVjdD4mIHJlY3RzLCBpbnQgd2lk dGgsIGludCBvZmZzZXQsIGNvbnN0IENvbG9yJiBjb2xvcikKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL1BhaW50ZXJPcGVuVkcuY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5jcHAKaW5kZXggYjJmMjMwMi4uNzQw OWE5NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRl ck9wZW5WRy5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvUGFpbnRl ck9wZW5WRy5jcHAKQEAgLTM5OSwxNCArMzk5LDEyIEBAIHN0cnVjdCBQbGF0Zm9ybVBhaW50ZXJT dGF0ZSB7CiBQYWludGVyT3BlblZHOjpQYWludGVyT3BlblZHKCkKICAgICA6IG1fc3RhdGUoMCkK ICAgICAsIG1fc3VyZmFjZSgwKQotICAgICwgbV9jdXJyZW50UGF0aCgwKQogewogfQogCiBQYWlu dGVyT3BlblZHOjpQYWludGVyT3BlblZHKFN1cmZhY2VPcGVuVkcqIHN1cmZhY2UpCiAgICAgOiBt X3N0YXRlKDApCiAgICAgLCBtX3N1cmZhY2UoMCkKLSAgICAsIG1fY3VycmVudFBhdGgoMCkKIHsK ICAgICBBU1NFUlQoc3VyZmFjZSk7CiAgICAgYmVnaW4oc3VyZmFjZSk7CkBAIC00MTUsNyArNDEz LDYgQEAgUGFpbnRlck9wZW5WRzo6UGFpbnRlck9wZW5WRyhTdXJmYWNlT3BlblZHKiBzdXJmYWNl KQogUGFpbnRlck9wZW5WRzo6flBhaW50ZXJPcGVuVkcoKQogewogICAgIGVuZCgpOwotICAgIGRl bGV0ZSBtX2N1cnJlbnRQYXRoOwogfQogCiB2b2lkIFBhaW50ZXJPcGVuVkc6OmJlZ2luKFN1cmZh Y2VPcGVuVkcqIHN1cmZhY2UpCkBAIC03MTcsMjYgKzcxNCw3IEBAIHZvaWQgUGFpbnRlck9wZW5W Rzo6dHJhbnNsYXRlKGZsb2F0IGR4LCBmbG9hdCBkeSkKICAgICBzZXRUcmFuc2Zvcm1hdGlvbih0 cmFuc2Zvcm1hdGlvbik7CiB9CiAKLXZvaWQgUGFpbnRlck9wZW5WRzo6YmVnaW5QYXRoKCkKLXsK LSAgICBkZWxldGUgbV9jdXJyZW50UGF0aDsKLSAgICBtX2N1cnJlbnRQYXRoID0gbmV3IFBhdGgo KTsKLX0KLQotdm9pZCBQYWludGVyT3BlblZHOjphZGRQYXRoKGNvbnN0IFBhdGgmIHBhdGgpCi17 Ci0gICAgbV9jdXJyZW50UGF0aC0+cGxhdGZvcm1QYXRoKCktPm1ha2VDb21wYXRpYmxlQ29udGV4 dEN1cnJlbnQoKTsKLQotICAgIHZnQXBwZW5kUGF0aChtX2N1cnJlbnRQYXRoLT5wbGF0Zm9ybVBh dGgoKS0+dmdQYXRoKCksIHBhdGgucGxhdGZvcm1QYXRoKCktPnZnUGF0aCgpKTsKLSAgICBBU1NF UlRfVkdfTk9fRVJST1IoKTsKLX0KLQotUGF0aCogUGFpbnRlck9wZW5WRzo6Y3VycmVudFBhdGgo KSBjb25zdAotewotICAgIHJldHVybiBtX2N1cnJlbnRQYXRoOwotfQotCi12b2lkIFBhaW50ZXJP cGVuVkc6OmRyYXdQYXRoKFZHYml0ZmllbGQgc3BlY2lmaWVkUGFpbnRNb2RlcywgV2luZFJ1bGUg ZmlsbFJ1bGUpCit2b2lkIFBhaW50ZXJPcGVuVkc6OmRyYXdQYXRoKGNvbnN0IFBhdGgmIHBhdGgs IFZHYml0ZmllbGQgc3BlY2lmaWVkUGFpbnRNb2RlcywgV2luZFJ1bGUgZmlsbFJ1bGUpCiB7CiAg ICAgQVNTRVJUKG1fc3RhdGUpOwogCkBAIC03NTQsNyArNzMyLDcgQEAgdm9pZCBQYWludGVyT3Bl blZHOjpkcmF3UGF0aChWR2JpdGZpZWxkIHNwZWNpZmllZFBhaW50TW9kZXMsIFdpbmRSdWxlIGZp bGxSdWxlKQogICAgIG1fc3VyZmFjZS0+bWFrZUN1cnJlbnQoKTsKIAogICAgIHZnU2V0aShWR19G SUxMX1JVTEUsIHRvVkdGaWxsUnVsZShmaWxsUnVsZSkpOwotICAgIHZnRHJhd1BhdGgobV9jdXJy ZW50UGF0aC0+cGxhdGZvcm1QYXRoKCktPnZnUGF0aCgpLCBwYWludE1vZGVzKTsKKyAgICB2Z0Ry YXdQYXRoKHBhdGgucGxhdGZvcm1QYXRoKCktPnZnUGF0aCgpLCBwYWludE1vZGVzKTsKICAgICBB U1NFUlRfVkdfTk9fRVJST1IoKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVudmcvUGFpbnRlck9wZW5WRy5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVudmcvUGFpbnRlck9wZW5WRy5oCmluZGV4IGU0YzY2ODguLjI0ZmQ4YTAgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL1BhaW50ZXJPcGVuVkcuaAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9QYWludGVyT3BlblZHLmgKQEAgLTEx MSwxMCArMTExLDcgQEAgcHVibGljOgogICAgIHZvaWQgcm90YXRlKGZsb2F0IHJhZGlhbnMpOwog ICAgIHZvaWQgdHJhbnNsYXRlKGZsb2F0IGR4LCBmbG9hdCBkeSk7CiAKLSAgICB2b2lkIGJlZ2lu UGF0aCgpOwotICAgIHZvaWQgYWRkUGF0aChjb25zdCBQYXRoJik7Ci0gICAgUGF0aCogY3VycmVu dFBhdGgoKSBjb25zdDsKLSAgICB2b2lkIGRyYXdQYXRoKFZHYml0ZmllbGQgcGFpbnRNb2RlcyA9 IChWR19TVFJPS0VfUEFUSCB8IFZHX0ZJTExfUEFUSCksIFdpbmRSdWxlIGZpbGxSdWxlID0gUlVM RV9OT05aRVJPKTsKKyAgICB2b2lkIGRyYXdQYXRoKGNvbnN0IFBhdGgmLCBWR2JpdGZpZWxkIHBh aW50TW9kZXMgPSAoVkdfU1RST0tFX1BBVEggfCBWR19GSUxMX1BBVEgpLCBXaW5kUnVsZSBmaWxs UnVsZSA9IFJVTEVfTk9OWkVSTyk7CiAKICAgICB2b2lkIGludGVyc2VjdENsaXBSZWN0KGNvbnN0 IEZsb2F0UmVjdCYpOwogICAgIHZvaWQgY2xpcFBhdGgoY29uc3QgUGF0aCYsIFBhaW50ZXJPcGVu Vkc6OkNsaXBPcGVyYXRpb24sIFdpbmRSdWxlIGNsaXBSdWxlID0gUlVMRV9OT05aRVJPKTsKQEAg LTEzNyw3ICsxMzQsNiBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxQbGF0Zm9ybVBhaW50ZXJTdGF0 ZSo+IG1fc3RhdGVTdGFjazsKICAgICBQbGF0Zm9ybVBhaW50ZXJTdGF0ZSogbV9zdGF0ZTsKICAg ICBTdXJmYWNlT3BlblZHKiBtX3N1cmZhY2U7Ci0gICAgUGF0aCogbV9jdXJyZW50UGF0aDsKIH07 CiAKIH0K