130778 2014-03-26 09:54:51 -0700 Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers 2014-03-26 12:37:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin commit-queue esprehn+autocc glenn kondapallykalyan sam sergio simon.fraser thorton oldest_to_newest 994601 0 simon.fraser 2014-03-26 09:54:51 -0700 Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers 994602 1 227854 simon.fraser 2014-03-26 09:56:35 -0700 Created attachment 227854 Patch 994628 2 227854 thorton 2014-03-26 10:47:49 -0700 Comment on attachment 227854 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227854&action=review > Source/WebCore/platform/graphics/GraphicsLayer.h:446 > + enum CustomBehavior { NoCustomBehavior, CustomBehaviorScrolling }; CustomScrollingBehavior? > Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h:455 > - typedef unsigned LayerChangeFlags; > + typedef uint64_t LayerChangeFlags; :( 994680 3 simon.fraser 2014-03-26 12:37:36 -0700 https://trac.webkit.org/r166308 227854 2014-03-26 09:56:35 -0700 2014-03-26 10:47:49 -0700 Patch bug-130778-20140326095614.patch text/plain 18802 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2Mjk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIxNjJiYzFiNzVmNmE4 ZDhlZTdlOGRjZTJjNjcyNzA3Nzg2ZDRjZi4uMTk5NGZlMzliMmEzOGIyYWUyMGQxNWMyNTVkNTRm MDhhNDJjOWY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE0LTAzLTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEFkZCBhIGN1c3Rv bSBiZWhhdmlvciBmbGFnIHRvIEdyYXBoaWNzTGF5ZXIsIHBpcGVkIGRvd24gdG8gUGxhdGZvcm1D QUxheWVyLCBmb3Igc2Nyb2xsaW5nIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNzc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBwdXQgYSAiY3VzdG9tIGJl aGF2aW9yIiBmbGFnIG9uIGEgbGF5ZXIgc28gdGhhdCwKKyAgICAgICAgd2l0aCBVSS1zaWRlIGNv bXBvc2l0aW5nLCB3ZSBrbm93IHRvIGNyZWF0ZSBhIHNwZWNpZmljIHR5cGUgb2YKKyAgICAgICAg bGF5ZXIgb3IgdmlldyBmb3IgdGhhdCBHcmFwaGljc0xheWVyLgorCisgICAgICAgICogV2ViQ29y ZS5leHAuaW46CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpHcmFwaGljc0xheWVyKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmg6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0xheWVyOjpzZXRDdXN0b21CZWhhdmlvcik6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0xheWVyOjpjdXN0b21CZWhhdmlvcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXJDQTo6Y29tbWl0TGF5ZXJDaGFuZ2VzQmVmb3JlU3VibGF5ZXJzKToKKyAgICAgICAgKFdlYkNv cmU6OkdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ3VzdG9tQmVoYXZpb3IpOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllckNBOjpzZXRDdXN0b21CZWhhdmlvcik6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW06CisgICAgICAgIChQbGF0Zm9ybUNBTGF5 ZXJNYWM6OlBsYXRmb3JtQ0FMYXllck1hYyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZVNjcm9sbGluZ0xheWVycyk6CisKKzIwMTQtMDMtMjYgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgRml4IHRoZSBpT1MgYnVpbGQuCiAKICAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA4ODVlMmRhYzQ5YTk0ZjUxNjZmN2Zk ZGQ2Y2E4NjFhODRlZjI0NzNkLi42YjE5N2Q0NDdiMGZjYTliMmJhNTliOGVjMGNmOTRkMWE4YjZl NjViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTQtMDMtMjYgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgY3VzdG9tIGJlaGF2 aW9yIGZsYWcgdG8gR3JhcGhpY3NMYXllciwgcGlwZWQgZG93biB0byBQbGF0Zm9ybUNBTGF5ZXIs IGZvciBzY3JvbGxpbmcgbGF5ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzA3NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWtlIGl0IHBvc3NpYmxlIHRvIHB1dCBhICJjdXN0b20gYmVoYXZpb3Ii IGZsYWcgb24gYSBsYXllciBzbyB0aGF0LAorICAgICAgICB3aXRoIFVJLXNpZGUgY29tcG9zaXRp bmcsIHdlIGtub3cgdG8gY3JlYXRlIGEgc3BlY2lmaWMgdHlwZSBvZgorICAgICAgICBsYXllciBv ciB2aWV3IGZvciB0aGF0IEdyYXBoaWNzTGF5ZXIuCisKKyAgICAgICAgKiBTaGFyZWQvbWFjL1Jl bW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmg6CisgICAgICAgICogU2hhcmVkL21hYy9SZW1vdGVM YXllclRyZWVUcmFuc2FjdGlvbi5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVl VHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6TGF5ZXJQcm9wZXJ0aWVzKToKKyAgICAgICAg KFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6ZW5j b2RlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVy UHJvcGVydGllczo6ZGVjb2RlKToKKyAgICAgICAgKFdlYktpdDo6ZHVtcENoYW5nZWRMYXllcnMp OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVtb3Rl LmNwcDoKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllclJlbW90ZTo6Y3VzdG9tQmVoYXZpb3IpOgor ICAgICAgICAoUGxhdGZvcm1DQUxheWVyUmVtb3RlOjp1cGRhdGVDdXN0b21CZWhhdmlvcik6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaDoK KwogMjAxNC0wMy0yNiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAog ICAgICAgICBbaU9TIFdlYktpdDJdIEZsdXNoIGFsbCBzdXJmYWNlcyBhZnRlciBwYWludGluZyBp bnRvIGFsbCBvZiB0aGVtLCBpbnN0ZWFkIG9mIGFmdGVyIHBhaW50aW5nIGludG8gZWFjaCBvbmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4KaW5kZXggZTY0NDY3Mzg2OWYyYmE2ODQyODE4ZTk1ZTkzMzAwMWI2 ZjVlNjMxMy4uMzVmNGE2ODYwMjE1MDY3NWZiNmMwNjViZmQ3NWIxOTRhNDM5MWRjNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KQEAgLTU0NSw2ICs1NDUsNyBAQCBfX1pON1dlYkNvcmUxNUdyYXBoaWNz TGF5ZXJDQTE2cmVtb3ZlRnJvbVBhcmVudEV2CiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzTGF5ZXJD QTE2cmVzdW1lQW5pbWF0aW9uc0V2CiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzTGF5ZXJDQTE2c2V0 TWFza3NUb0JvdW5kc0ViCiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzTGF5ZXJDQTE3c2V0Q29udGVu dHNPcGFxdWVFYgorX19aTjdXZWJDb3JlMTVHcmFwaGljc0xheWVyQ0ExN3NldEN1c3RvbUJlaGF2 aW9yRU5TXzEzR3JhcGhpY3NMYXllcjE0Q3VzdG9tQmVoYXZpb3JFCiBfX1pON1dlYkNvcmUxNUdy YXBoaWNzTGF5ZXJDQTE3c3VzcGVuZEFuaW1hdGlvbnNFZAogX19aTjdXZWJDb3JlMTVHcmFwaGlj c0xheWVyQ0ExOHNldEFsbG93VGlsZWRMYXllckViCiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzTGF5 ZXJDQTE4c2V0QmFja2dyb3VuZENvbG9yRVJLTlNfNUNvbG9yRQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcAppbmRleCBmZjIzNDNhY2Iz MzQ3ZTRjYjMxYjEwNDNkOGVmMzg5NzdkZTU2NjZjLi4wZmU4OGQ2YjAwNzhiOWYxMzc5ZTc0NWFk ZTUyZjg5YTU3Y2IyNTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0xheWVyLmNwcApAQCAtOTksNiArOTksNyBAQCBHcmFwaGljc0xheWVyOjpH cmFwaGljc0xheWVyKEdyYXBoaWNzTGF5ZXJDbGllbnQqIGNsaWVudCkKICAgICAsIG1fcmVwbGlj YXRlZExheWVyKDApCiAgICAgLCBtX3JlcGFpbnRDb3VudCgwKQogICAgICwgbV9jdXN0b21BcHBl YXJhbmNlKE5vQ3VzdG9tQXBwZWFyYW5jZSkKKyAgICAsIG1fY3VzdG9tQmVoYXZpb3IoTm9DdXN0 b21CZWhhdmlvcikKIHsKICNpZm5kZWYgTkRFQlVHCiAgICAgaWYgKG1fY2xpZW50KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCmluZGV4IGRm M2FlNTYyYmUzM2Y2MjliYzk5Mjg5NDE2MjUzMzUzZTQxNDM0MTguLmI0Njg5NzZkYTZjYTQ1Y2U2 MDAyYWM1NWFhOTQ1N2NlZTFkMWQ2N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgKQEAgLTQ0Myw2ICs0NDMsMTAgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgdm9pZCBzZXRDdXN0b21BcHBlYXJhbmNlKEN1c3RvbUFwcGVhcmFuY2UgY3Vz dG9tQXBwZWFyYW5jZSkgeyBtX2N1c3RvbUFwcGVhcmFuY2UgPSBjdXN0b21BcHBlYXJhbmNlOyB9 CiAgICAgQ3VzdG9tQXBwZWFyYW5jZSBjdXN0b21BcHBlYXJhbmNlKCkgY29uc3QgeyByZXR1cm4g bV9jdXN0b21BcHBlYXJhbmNlOyB9CiAKKyAgICBlbnVtIEN1c3RvbUJlaGF2aW9yIHsgTm9DdXN0 b21CZWhhdmlvciwgQ3VzdG9tQmVoYXZpb3JTY3JvbGxpbmcgfTsKKyAgICB2aXJ0dWFsIHZvaWQg c2V0Q3VzdG9tQmVoYXZpb3IoQ3VzdG9tQmVoYXZpb3IgY3VzdG9tQmVoYXZpb3IpIHsgbV9jdXN0 b21CZWhhdmlvciA9IGN1c3RvbUJlaGF2aW9yOyB9CisgICAgQ3VzdG9tQmVoYXZpb3IgY3VzdG9t QmVoYXZpb3IoKSBjb25zdCB7IHJldHVybiBtX2N1c3RvbUJlaGF2aW9yOyB9CisKICAgICAvLyB6 LXBvc2l0aW9uIGlzIHRoZSB6LWVxdWl2YWxlbnQgb2YgcG9zaXRpb24oKS4gSXQncyBvbmx5IHVz ZWQgZm9yIGRlYnVnZ2luZyBwdXJwb3Nlcy4KICAgICB2aXJ0dWFsIGZsb2F0IHpQb3NpdGlvbigp IGNvbnN0IHsgcmV0dXJuIG1felBvc2l0aW9uOyB9CiAgICAgdmlydHVhbCB2b2lkIHNldFpQb3Np dGlvbihmbG9hdCk7CkBAIC02MTEsNiArNjE1LDcgQEAgcHJvdGVjdGVkOgogCiAgICAgaW50IG1f cmVwYWludENvdW50OwogICAgIEN1c3RvbUFwcGVhcmFuY2UgbV9jdXN0b21BcHBlYXJhbmNlOwor ICAgIEN1c3RvbUJlaGF2aW9yIG1fY3VzdG9tQmVoYXZpb3I7CiB9OwogCiAjZGVmaW5lIEdSQVBI SUNTTEFZRVJfVFlQRV9DQVNUUyhUb1ZhbHVlVHlwZU5hbWUsIHByZWRpY2F0ZSkgXApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNB LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJD QS5jcHAKaW5kZXggYjJkOTJlMWM5MDA2M2M4Yjc2ZDQzNjQ2NjdhMzBjY2QxNjY1NTc1Yy4uZDNh MjhlNWNmNWYxYTY4MTQxMTRlYWM2NDg5YmI3MzQ5MzNjOGM3NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCkBA IC0xNDA5LDYgKzE0MDksOSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6Y29tbWl0TGF5ZXJDaGFu Z2VzQmVmb3JlU3VibGF5ZXJzKENvbW1pdFN0YXRlJiBjb21taXRTdGF0ZQogICAgIGlmIChtX3Vu Y29tbWl0dGVkQ2hhbmdlcyAmIEN1c3RvbUFwcGVhcmFuY2VDaGFuZ2VkKQogICAgICAgICB1cGRh dGVDdXN0b21BcHBlYXJhbmNlKCk7CiAKKyAgICBpZiAobV91bmNvbW1pdHRlZENoYW5nZXMgJiBD dXN0b21CZWhhdmlvckNoYW5nZWQpCisgICAgICAgIHVwZGF0ZUN1c3RvbUJlaGF2aW9yKCk7CisK ICAgICBpZiAobV91bmNvbW1pdHRlZENoYW5nZXMgJiBDaGlsZHJlbkNoYW5nZWQpIHsKICAgICAg ICAgdXBkYXRlU3VibGF5ZXJMaXN0KCk7CiAgICAgICAgIC8vIFN1YmxheWVycyBtYXkgc2V0IHRo aXMgZmxhZyBhZ2Fpbiwgc28gY2xlYXIgaXQgdG8gYXZvaWQgYWx3YXlzIHVwZGF0aW5nIHN1Ymxh eWVycyBpbiBjb21taXRMYXllckNoYW5nZXNBZnRlclN1YmxheWVycygpLgpAQCAtMjk1Miw2ICsy OTU1LDExIEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRhdGVDdXN0b21BcHBlYXJhbmNlKCkK ICAgICBtX2xheWVyLT51cGRhdGVDdXN0b21BcHBlYXJhbmNlKG1fY3VzdG9tQXBwZWFyYW5jZSk7 CiB9CiAKK3ZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRhdGVDdXN0b21CZWhhdmlvcigpCit7Cisg ICAgbV9sYXllci0+dXBkYXRlQ3VzdG9tQmVoYXZpb3IobV9jdXN0b21CZWhhdmlvcik7Cit9CisK IHZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRTaG93RGVidWdCb3JkZXIoYm9vbCBzaG93Qm9yZGVy KQogewogICAgIGlmIChzaG93Qm9yZGVyID09IG1fc2hvd0RlYnVnQm9yZGVyKQpAQCAtMzA1Myw2 ICszMDYxLDE1IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRDdXN0b21BcHBlYXJhbmNlKEN1 c3RvbUFwcGVhcmFuY2UgY3VzdG9tQXBwZWFyYW5jZSkKICAgICBub3RlTGF5ZXJQcm9wZXJ0eUNo YW5nZWQoQ3VzdG9tQXBwZWFyYW5jZUNoYW5nZWQpOwogfQogCit2b2lkIEdyYXBoaWNzTGF5ZXJD QTo6c2V0Q3VzdG9tQmVoYXZpb3IoQ3VzdG9tQmVoYXZpb3IgY3VzdG9tQmVoYXZpb3IpCit7Cisg ICAgaWYgKGN1c3RvbUJlaGF2aW9yID09IG1fY3VzdG9tQmVoYXZpb3IpCisgICAgICAgIHJldHVy bjsKKworICAgIEdyYXBoaWNzTGF5ZXI6OnNldEN1c3RvbUJlaGF2aW9yKGN1c3RvbUJlaGF2aW9y KTsKKyAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWQoQ3VzdG9tQmVoYXZpb3JDaGFuZ2VkKTsK K30KKwogYm9vbCBHcmFwaGljc0xheWVyQ0E6OnJlcXVpcmVzVGlsZWRMYXllcihmbG9hdCBwYWdl U2NhbGVGYWN0b3IpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2RyYXdzQ29udGVudCB8fCAhbV9hbGxv d1RpbGVkTGF5ZXIgfHwgbV9pc1BhZ2VUaWxlZEJhY2tpbmdMYXllcikKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKaW5kZXgg MTRjMGY4ZDdhN2M4MWQ1MGU4ZGVkM2U1YWFjODdhYzAyNTRmZGU4YS4uMmE0M2QxZmM1OGI1NDEw Y2Y4OTU4ZjMwNjA2ODg4N2JkZmQ3ZmIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKQEAgLTEzOCw2ICsxMzgsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldERlYnVnQm9yZGVyKGNvbnN0IENvbG9yJiwg ZmxvYXQgYm9yZGVyV2lkdGgpOwogCiAgICAgdmlydHVhbCB2b2lkIHNldEN1c3RvbUFwcGVhcmFu Y2UoQ3VzdG9tQXBwZWFyYW5jZSk7CisgICAgdmlydHVhbCB2b2lkIHNldEN1c3RvbUJlaGF2aW9y KEN1c3RvbUJlaGF2aW9yKTsKIAogICAgIHZpcnR1YWwgdm9pZCBsYXllckRpZERpc3BsYXkoUGxh dGZvcm1MYXllciopOwogCkBAIC0zODksNyArMzkwLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHVw ZGF0ZVRpbGVzKCk7CiAgICAgdm9pZCB1cGRhdGVDb250ZW50c1NjYWxlKGZsb2F0IHBhZ2VTY2Fs ZUZhY3Rvcik7CiAgICAgdm9pZCB1cGRhdGVDdXN0b21BcHBlYXJhbmNlKCk7Ci0gICAgCisgICAg dm9pZCB1cGRhdGVDdXN0b21CZWhhdmlvcigpOworCiAgICAgZW51bSBTdHJ1Y3R1cmFsTGF5ZXJQ dXJwb3NlIHsKICAgICAgICAgTm9TdHJ1Y3R1cmFsTGF5ZXIgPSAwLAogICAgICAgICBTdHJ1Y3R1 cmFsTGF5ZXJGb3JQcmVzZXJ2ZXMzRCwKQEAgLTQ0Nyw5ICs0NDksMTAgQEAgcHJpdmF0ZToKICAg ICAgICAgVGlsZXNBZGRlZCA9IDEgPCAyOSwKICAgICAgICAgRGVidWdJbmRpY2F0b3JzQ2hhbmdl ZCA9IDEgPDwgMzAsCiAgICAgICAgIEN1c3RvbUFwcGVhcmFuY2VDaGFuZ2VkID0gMSA8PCAzMSwK LSAgICAgICAgQmxlbmRNb2RlQ2hhbmdlZCAgICAgICAgPSAxIDw8IDMyCisgICAgICAgIEN1c3Rv bUJlaGF2aW9yQ2hhbmdlZCA9IDEgPDwgMzIsCisgICAgICAgIEJsZW5kTW9kZUNoYW5nZWQgPSAx IDw8IDMzCiAgICAgfTsKLSAgICB0eXBlZGVmIHVuc2lnbmVkIExheWVyQ2hhbmdlRmxhZ3M7Cisg ICAgdHlwZWRlZiB1aW50NjRfdCBMYXllckNoYW5nZUZsYWdzOwogICAgIGVudW0gU2NoZWR1bGVG bHVzaE9yTm90IHsgU2NoZWR1bGVGbHVzaCwgRG9udFNjaGVkdWxlRmx1c2ggfTsKICAgICB2b2lk IG5vdGVMYXllclByb3BlcnR5Q2hhbmdlZChMYXllckNoYW5nZUZsYWdzLCBTY2hlZHVsZUZsdXNo T3JOb3QgPSBTY2hlZHVsZUZsdXNoKTsKICAgICB2b2lkIG5vdGVTdWJsYXllcnNDaGFuZ2VkKFNj aGVkdWxlRmx1c2hPck5vdCA9IFNjaGVkdWxlRmx1c2gpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaAppbmRleCA1MTQzYzIw NGM3OTA1MmZkNzY4NmI0OTgxMDI2MjU1Y2E0NDVjOTRkLi44MWRiNzEyMTZiM2ZlNjExMWJiNjNj MzY3ZTgwM2EwMWRhNzBhNDU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaApAQCAtMTk3LDYgKzE5Nyw5IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2UgY3VzdG9tQXBw ZWFyYW5jZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3VzdG9tQXBwZWFy YW5jZShHcmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbmNlKSA9IDA7CiAKKyAgICB2aXJ0dWFs IEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUJlaGF2aW9yIGN1c3RvbUJlaGF2aW9yKCkgY29uc3QgPSAw OworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDdXN0b21CZWhhdmlvcihHcmFwaGljc0xheWVyOjpD dXN0b21CZWhhdmlvcikgPSAwOworCiAgICAgdmlydHVhbCBUaWxlZEJhY2tpbmcqIHRpbGVkQmFj a2luZygpID0gMDsKIAogI2lmIFBMQVRGT1JNKFdJTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMuaApp bmRleCBkNjcwZWU2MmU0MmU2MjRhZmE3NTgyMDg0MWNiN2I3ZDU1Yjc0NjIzLi5jNTJkZjIyZjY4 ZmU2MDhkNjUzY2IzZDY1N2RkMDg2ZGMzYzc2Y2NmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5o CkBAIC0xMzYsNiArMTM2LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgR3JhcGhpY3NMYXllcjo6 Q3VzdG9tQXBwZWFyYW5jZSBjdXN0b21BcHBlYXJhbmNlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1 cm4gbV9jdXN0b21BcHBlYXJhbmNlOyB9CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUN1c3RvbUFw cGVhcmFuY2UoR3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZSkgb3ZlcnJpZGU7CiAKKyAg ICB2aXJ0dWFsIEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUJlaGF2aW9yIGN1c3RvbUJlaGF2aW9yKCkg Y29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9jdXN0b21CZWhhdmlvcjsgfQorICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVDdXN0b21CZWhhdmlvcihHcmFwaGljc0xheWVyOjpDdXN0b21CZWhhdmlvcikg b3ZlcnJpZGUgeyB9CisKICAgICB2aXJ0dWFsIFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nKCkg b3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8UGxhdGZvcm1DQUxheWVyPiBjbG9u ZShQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVyKSBjb25zdCBvdmVycmlkZTsKQEAgLTE1Nyw2 ICsxNjAsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxOU09iamVjdD4gbV9kZWxlZ2F0ZTsK ICAgICBPd25QdHI8UGxhdGZvcm1DQUxheWVyTGlzdD4gbV9jdXN0b21TdWJsYXllcnM7CiAgICAg R3JhcGhpY3NMYXllcjo6Q3VzdG9tQXBwZWFyYW5jZSBtX2N1c3RvbUFwcGVhcmFuY2U7CisgICAg R3JhcGhpY3NMYXllcjo6Q3VzdG9tQmVoYXZpb3IgbV9jdXN0b21CZWhhdmlvcjsKIH07CiAKIFBM QVRGT1JNX0NBTEFZRVJfVFlQRV9DQVNUUyhQbGF0Zm9ybUNBTGF5ZXJNYWMsIGlzUGxhdGZvcm1D QUxheWVyTWFjKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQppbmRleCBjMjQyNzkwYjZjOTc4 ZDgwMGU5YjVlYzA5M2U5ZTUyNzdmN2MyYWRiLi42ODU2YTIyZjRjNDNmNTQyZTEwODgxNWFhYWNj ZWRhMGYzODQ3MDkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0KQEAgLTE2NSw2ICsxNjUs NyBAQCBzdGF0aWMgTlNTdHJpbmcgKnRvQ0FGaWx0ZXJUeXBlKFBsYXRmb3JtQ0FMYXllcjo6Rmls dGVyVHlwZSB0eXBlKQogUGxhdGZvcm1DQUxheWVyTWFjOjpQbGF0Zm9ybUNBTGF5ZXJNYWMoTGF5 ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZvcm1DQUxheWVyQ2xpZW50KiBvd25lcikKICAgICA6IFBs YXRmb3JtQ0FMYXllcihsYXllclR5cGUsIG93bmVyKQogICAgICwgbV9jdXN0b21BcHBlYXJhbmNl KEdyYXBoaWNzTGF5ZXI6Ok5vQ3VzdG9tQXBwZWFyYW5jZSkKKyAgICAsIG1fY3VzdG9tQmVoYXZp b3IoR3JhcGhpY3NMYXllcjo6Tm9DdXN0b21CZWhhdmlvcikKIHsKICAgICBDbGFzcyBsYXllckNs YXNzID0gTmlsOwogICAgIHN3aXRjaCAobGF5ZXJUeXBlKSB7CkBAIC0yMDUsNiArMjA2LDcgQEAg UGxhdGZvcm1DQUxheWVyTWFjOjpQbGF0Zm9ybUNBTGF5ZXJNYWMoTGF5ZXJUeXBlIGxheWVyVHlw ZSwgUGxhdGZvcm1DQUxheWVyQ2xpZW4KIFBsYXRmb3JtQ0FMYXllck1hYzo6UGxhdGZvcm1DQUxh eWVyTWFjKFBsYXRmb3JtTGF5ZXIqIGxheWVyLCBQbGF0Zm9ybUNBTGF5ZXJDbGllbnQqIG93bmVy KQogICAgIDogUGxhdGZvcm1DQUxheWVyKFtsYXllciBpc0tpbmRPZkNsYXNzOmdldEFWUGxheWVy TGF5ZXJDbGFzcygpXSA/IExheWVyVHlwZUFWUGxheWVyTGF5ZXIgOiBMYXllclR5cGVDdXN0b20s IG93bmVyKQogICAgICwgbV9jdXN0b21BcHBlYXJhbmNlKEdyYXBoaWNzTGF5ZXI6Ok5vQ3VzdG9t QXBwZWFyYW5jZSkKKyAgICAsIG1fY3VzdG9tQmVoYXZpb3IoR3JhcGhpY3NMYXllcjo6Tm9DdXN0 b21CZWhhdmlvcikKIHsKICAgICBtX2xheWVyID0gbGF5ZXI7CiAgICAgY29tbW9uSW5pdCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRl eCA1Y2RmNjM5MTBiNmZkYzdhMTkyZGUyZTRhMGNmZmUyOTk3ZTJlYTUyLi40Y2MyZDgxMTdlMWU5 ZTNmMDViYmMwNzkwZGFiMzQ3Y2ZjOGI3OGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtMTQzMSw3ICsxNDMxLDkgQEAgYm9vbCBS ZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZVNjcm9sbGluZ0xheWVycyhib29sIG5lZWRzU2Nyb2xs aW5nTGF5ZXJzKQogICAgICAgICBtX3Njcm9sbGluZ0xheWVyID0gY3JlYXRlR3JhcGhpY3NMYXll cigiU2Nyb2xsaW5nIGNvbnRhaW5lciIpOwogICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXRE cmF3c0NvbnRlbnQoZmFsc2UpOwogICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXRNYXNrc1Rv Qm91bmRzKHRydWUpOwotCisjaWYgUExBVEZPUk0oSU9TKQorICAgICAgICBtX3Njcm9sbGluZ0xh eWVyLT5zZXRDdXN0b21CZWhhdmlvcihHcmFwaGljc0xheWVyOjpDdXN0b21CZWhhdmlvclNjcm9s bGluZyk7CisjZW5kaWYKICAgICAgICAgLy8gSW5uZXIgbGF5ZXIgd2hpY2ggcmVuZGVycyB0aGUg Y29udGVudCB0aGF0IHNjcm9sbHMuCiAgICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllciA9 IGNyZWF0ZUdyYXBoaWNzTGF5ZXIoIlNjcm9sbGVkIENvbnRlbnRzIik7CiAgICAgICAgIG1fc2Ny b2xsaW5nQ29udGVudHNMYXllci0+c2V0RHJhd3NDb250ZW50KHRydWUpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oCmlu ZGV4IGYzNThhNTZhM2U5YTkxYWI4NTcxMzkwNTllMmZjYjQ2ZmVkNDM5NDMuLjIxOGI4ZDA2YTI0 MDg5MDYwYmZjYTE3YWNiYzE0OWJlNDM3MWE4ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgKQEAgLTc1LDcgKzc1 LDggQEAgcHVibGljOgogICAgICAgICBCYWNraW5nU3RvcmVDaGFuZ2VkID0gMSA8PCAyNCwKICAg ICAgICAgRmlsdGVyc0NoYW5nZWQgPSAxIDw8IDI1LAogICAgICAgICBFZGdlQW50aWFsaWFzaW5n TWFza0NoYW5nZWQgPSAxIDw8IDI2LAotICAgICAgICBDdXN0b21BcHBlYXJhbmNlQ2hhbmdlZCA9 IDEgPDwgMjcKKyAgICAgICAgQ3VzdG9tQXBwZWFyYW5jZUNoYW5nZWQgPSAxIDw8IDI3LAorICAg ICAgICBDdXN0b21CZWhhdmlvckNoYW5nZWQgPSAxIDw8IDI4CiAgICAgfTsKICAgICB0eXBlZGVm IHVuc2lnbmVkIExheWVyQ2hhbmdlOwogCkBAIC0xMjcsNiArMTI4LDcgQEAgcHVibGljOgogICAg ICAgICBXZWJDb3JlOjpDb2xvciBib3JkZXJDb2xvcjsKICAgICAgICAgdW5zaWduZWQgZWRnZUFu dGlhbGlhc2luZ01hc2s7CiAgICAgICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFw cGVhcmFuY2UgY3VzdG9tQXBwZWFyYW5jZTsKKyAgICAgICAgV2ViQ29yZTo6R3JhcGhpY3NMYXll cjo6Q3VzdG9tQmVoYXZpb3IgY3VzdG9tQmVoYXZpb3I7CiAgICAgICAgIFdlYkNvcmU6OlBsYXRm b3JtQ0FMYXllcjo6RmlsdGVyVHlwZSBtaW5pZmljYXRpb25GaWx0ZXI7CiAgICAgICAgIFdlYkNv cmU6OlBsYXRmb3JtQ0FMYXllcjo6RmlsdGVyVHlwZSBtYWduaWZpY2F0aW9uRmlsdGVyOwogICAg ICAgICBib29sIGhpZGRlbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMv UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFj L1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCmluZGV4IGQzY2E1ZWZmZDgyZWIwMDM4MGJj MDZjZWY5OTg2MzNjMzU2ZjgzMzUuLjkwN2EzODdjNDhhZDgzNmFhYzMyNzc0ZjNlZDEyYWEzMzk0 NjQ3MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVM YXllclRyZWVUcmFuc2FjdGlvbi5tbQpAQCAtODcsNiArODcsNyBAQCBSZW1vdGVMYXllclRyZWVU cmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjpMYXllclByb3BlcnRpZXMoKQogICAgICwgYm9y ZGVyQ29sb3IoQ29sb3I6OmJsYWNrKQogICAgICwgZWRnZUFudGlhbGlhc2luZ01hc2soa0NBTGF5 ZXJMZWZ0RWRnZSB8IGtDQUxheWVyUmlnaHRFZGdlIHwga0NBTGF5ZXJCb3R0b21FZGdlIHwga0NB TGF5ZXJUb3BFZGdlKQogICAgICwgY3VzdG9tQXBwZWFyYW5jZShHcmFwaGljc0xheWVyOjpOb0N1 c3RvbUFwcGVhcmFuY2UpCisgICAgLCBjdXN0b21CZWhhdmlvcihHcmFwaGljc0xheWVyOjpOb0N1 c3RvbUJlaGF2aW9yKQogICAgICwgbWluaWZpY2F0aW9uRmlsdGVyKFBsYXRmb3JtQ0FMYXllcjo6 RmlsdGVyVHlwZTo6TGluZWFyKQogICAgICwgbWFnbmlmaWNhdGlvbkZpbHRlcihQbGF0Zm9ybUNB TGF5ZXI6OkZpbHRlclR5cGU6OkxpbmVhcikKICAgICAsIGhpZGRlbihmYWxzZSkKQEAgLTExNiw2 ICsxMTcsNyBAQCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjpM YXllclByb3BlcnRpZXMoY29uc3QgTGF5ZXJQcm9wZXJ0aQogICAgICwgYm9yZGVyQ29sb3Iob3Ro ZXIuYm9yZGVyQ29sb3IpCiAgICAgLCBlZGdlQW50aWFsaWFzaW5nTWFzayhvdGhlci5lZGdlQW50 aWFsaWFzaW5nTWFzaykKICAgICAsIGN1c3RvbUFwcGVhcmFuY2Uob3RoZXIuY3VzdG9tQXBwZWFy YW5jZSkKKyAgICAsIGN1c3RvbUJlaGF2aW9yKG90aGVyLmN1c3RvbUJlaGF2aW9yKQogICAgICwg bWluaWZpY2F0aW9uRmlsdGVyKG90aGVyLm1pbmlmaWNhdGlvbkZpbHRlcikKICAgICAsIG1hZ25p ZmljYXRpb25GaWx0ZXIob3RoZXIubWFnbmlmaWNhdGlvbkZpbHRlcikKICAgICAsIGhpZGRlbihv dGhlci5oaWRkZW4pCkBAIC0yMjQsNiArMjI2LDkgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVUcmFu c2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGUK IAogICAgIGlmIChjaGFuZ2VkUHJvcGVydGllcyAmIEN1c3RvbUFwcGVhcmFuY2VDaGFuZ2VkKQog ICAgICAgICBlbmNvZGVyLmVuY29kZUVudW0oY3VzdG9tQXBwZWFyYW5jZSk7CisKKyAgICBpZiAo Y2hhbmdlZFByb3BlcnRpZXMgJiBDdXN0b21CZWhhdmlvckNoYW5nZWQpCisgICAgICAgIGVuY29k ZXIuZW5jb2RlRW51bShjdXN0b21CZWhhdmlvcik7CiB9CiAKIGJvb2wgUmVtb3RlTGF5ZXJUcmVl VHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVy JiBkZWNvZGVyLCBMYXllclByb3BlcnRpZXMmIHJlc3VsdCkKQEAgLTM4Nyw2ICszOTIsMTEgQEAg Ym9vbCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjpkZWNvZGUo SVBDOjpBcmd1bWVudERlY29kZXImIGQKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9 CiAKKyAgICBpZiAocmVzdWx0LmNoYW5nZWRQcm9wZXJ0aWVzICYgQ3VzdG9tQmVoYXZpb3JDaGFu Z2VkKSB7CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHJlc3VsdC5jdXN0b21CZWhh dmlvcikpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCiAgICAgcmV0dXJuIHRy dWU7CiB9CiAKQEAgLTgwNSw2ICs4MTUsOSBAQCBzdGF0aWMgdm9pZCBkdW1wQ2hhbmdlZExheWVy cyhSZW1vdGVMYXllclRyZWVUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVtb3RlTGF5ZXJUcgogICAg ICAgICBpZiAobGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb246OkN1c3RvbUFwcGVhcmFuY2VDaGFuZ2VkKQogICAgICAgICAgICAgZHVt cFByb3BlcnR5PEdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVhcmFuY2U+KHRzLCAiY3VzdG9tQXBw ZWFyYW5jZSIsIGxheWVyUHJvcGVydGllcy5jdXN0b21BcHBlYXJhbmNlKTsKIAorICAgICAgICBp ZiAobGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb246OkN1c3RvbUJlaGF2aW9yQ2hhbmdlZCkKKyAgICAgICAgICAgIGR1bXBQcm9wZXJ0 eTxHcmFwaGljc0xheWVyOjpDdXN0b21CZWhhdmlvcj4odHMsICJjdXN0b21CZWhhdmlvciIsIGxh eWVyUHJvcGVydGllcy5jdXN0b21CZWhhdmlvcik7CisKICAgICAgICAgdHMgPDwgIikiOwogCiAg ICAgICAgIHRzLmRlY3JlYXNlSW5kZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAK aW5kZXggNDljNjRmOGYxMjFmYzcxYjU4ZTc3Yjg0ODc3ZTc3ODc5MmVkZmJhZC4uNzY1OTY2NTc1 ZTViOTdjYTk3MzZkZjgwZmJkYTA3OTU3MWZjYmQzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVyUmVt b3RlLmNwcApAQCAtNTYzLDYgKzU2MywxNyBAQCB2b2lkIFBsYXRmb3JtQ0FMYXllclJlbW90ZTo6 dXBkYXRlQ3VzdG9tQXBwZWFyYW5jZShHcmFwaGljc0xheWVyOjpDdXN0b21BcHBlYXJhbgogICAg IG1fcHJvcGVydGllcy5ub3RlUHJvcGVydGllc0NoYW5nZWQoUmVtb3RlTGF5ZXJUcmVlVHJhbnNh Y3Rpb246OkN1c3RvbUFwcGVhcmFuY2VDaGFuZ2VkKTsKIH0KIAorR3JhcGhpY3NMYXllcjo6Q3Vz dG9tQmVoYXZpb3IgUGxhdGZvcm1DQUxheWVyUmVtb3RlOjpjdXN0b21CZWhhdmlvcigpIGNvbnN0 Cit7CisgICAgcmV0dXJuIG1fcHJvcGVydGllcy5jdXN0b21CZWhhdmlvcjsKK30KKwordm9pZCBQ bGF0Zm9ybUNBTGF5ZXJSZW1vdGU6OnVwZGF0ZUN1c3RvbUJlaGF2aW9yKEdyYXBoaWNzTGF5ZXI6 OkN1c3RvbUJlaGF2aW9yIGN1c3RvbUJlaGF2aW9yKQoreworICAgIG1fcHJvcGVydGllcy5jdXN0 b21CZWhhdmlvciA9IGN1c3RvbUJlaGF2aW9yOworICAgIG1fcHJvcGVydGllcy5ub3RlUHJvcGVy dGllc0NoYW5nZWQoUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkN1c3RvbUJlaGF2aW9yQ2hh bmdlZCk7Cit9CisKIFBhc3NSZWZQdHI8UGxhdGZvcm1DQUxheWVyPiBQbGF0Zm9ybUNBTGF5ZXJS ZW1vdGU6OmNyZWF0ZUNvbXBhdGlibGVMYXllcihQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZSBs YXllclR5cGUsIFBsYXRmb3JtQ0FMYXllckNsaWVudCogY2xpZW50KSBjb25zdAogewogICAgIHJl dHVybiBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU6OmNyZWF0ZShsYXllclR5cGUsIGNsaWVudCwgbV9j b250ZXh0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1BsYXRmb3JtQ0FMYXllclJlbW90ZS5oCmluZGV4IDE3ZDdhMTEyMGQ0NmRkNjM1 Yzc3YjZjZjEwMjY4YTUxNWIwOWY2ZTcuLmI3Mjg5ZjllODU4MTM4MTBkNmQ1MDFhMjQ2YjY5ZTc3 YzBmZjkzNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvUGxhdGZvcm1DQUxheWVyUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaApAQCAtMTM4LDYgKzEzOCw5IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFwcGVh cmFuY2UgY3VzdG9tQXBwZWFyYW5jZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVDdXN0b21BcHBlYXJhbmNlKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OkN1c3RvbUFw cGVhcmFuY2UpIG92ZXJyaWRlOwogCisgICAgdmlydHVhbCBXZWJDb3JlOjpHcmFwaGljc0xheWVy OjpDdXN0b21CZWhhdmlvciBjdXN0b21CZWhhdmlvcigpIGNvbnN0IG92ZXJyaWRlOworICAgIHZp cnR1YWwgdm9pZCB1cGRhdGVDdXN0b21CZWhhdmlvcihXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpD dXN0b21CZWhhdmlvcikgb3ZlcnJpZGU7CisKICAgICB2aXJ0dWFsIFdlYkNvcmU6OlRpbGVkQmFj a2luZyogdGlsZWRCYWNraW5nKCkgb3ZlcnJpZGUgeyByZXR1cm4gbnVsbHB0cjsgfQogCiAgICAg dmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OlBsYXRmb3JtQ0FMYXllcj4gY2xvbmUoV2ViQ29y ZTo6UGxhdGZvcm1DQUxheWVyQ2xpZW50KiBvd25lcikgY29uc3Qgb3ZlcnJpZGU7Cg==