126346 2013-12-31 11:49:37 -0800 Add a typedef for PlatformLayerID on GraphicsLayer, and migrate RemoteLayerTreeTransaction to use it 2014-01-01 10:31:22 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin commit-queue kondapallykalyan sam simon.fraser thorton oldest_to_newest 963533 0 simon.fraser 2013-12-31 11:49:37 -0800 Add a typedef for PlatformLayerID on GraphicsLayer, and migrate RemoteLayerTreeTransaction to use it 963534 1 220165 simon.fraser 2013-12-31 11:51:55 -0800 Created attachment 220165 Patch 963612 2 simon.fraser 2014-01-01 10:31:22 -0800 https://trac.webkit.org/r161192 220165 2013-12-31 11:51:55 -0800 2013-12-31 12:29:16 -0800 Patch bug-126346-20131231115154.patch text/plain 23647 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBmYzk4N2ExZTk4M2Ez NWEyZTY5ODY0YTQzZjQ1ZTIxMTBiNmY1Yy4uYTA1ODYzNWRjNzA4MTU1NGM0ZWI1MzZmNjFmNjk2 OWE1NTk1N2E3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTEyLTMxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIHR5cGVk ZWYgZm9yIFBsYXRmb3JtTGF5ZXJJRCBvbiBHcmFwaGljc0xheWVyLCBhbmQgbWlncmF0ZSBSZW1v dGVMYXllclRyZWVUcmFuc2FjdGlvbiB0byB1c2UgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjM0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW90ZSBzY3JvbGxpbmcgdHJlZSBjb2RlIGlzIHNv b24gZ29pbmcgdG8gdXNlIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllcklELAorICAg ICAgICBzbyBpdCBtYWtlcyBtb3JlIHNlbnNlIHRvIHB1dCB0aGlzIGxheWVySUQgdHlwZSBvbiBH cmFwaGljc0xheWVyIGFzCisgICAgICAgIEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRC4K KyAgICAgICAgCisgICAgICAgIEFsc28gYWRkIHNvbWUgdHlwZSBjYXN0IG1hY3JvcyBmb3IgUGxh dGZvcm1DQUxheWVyIGFuZCBzdWJjbGFzc2VzLCBhbmQgdXNlIHRoZW0KKyAgICAgICAgd2hlcmUg YXBwcm9wcmlhdGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6c2V0TmFtZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmg6CisgICAgICAgIChXZWJDb3Jl OjpQbGF0Zm9ybUNBTGF5ZXI6OmlzUGxhdGZvcm1DQUxheWVyTWFjKToKKyAgICAgICAgKFdlYkNv cmU6OlBsYXRmb3JtQ0FMYXllcjo6aXNQbGF0Zm9ybUNBTGF5ZXJSZW1vdGUpOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjpQbGF0Zm9ybUNBTGF5ZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMuaDoKKwogMjAxMy0xMi0z MSAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgT3V0LW9mLWxp bmUgUmVuZGVyU3R5bGUgc3Vic3RydWN0dXJlIGNvcHlpbmcgaGVscGVycy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCBjY2U1OTZkMjgwMmEyNjgxNGY4NDk3MDgzZWJmMTAyMjFlM2I1NzZiLi4wYzk3NDdlOTRjOWQx N2YxN2NjNTBlMTMzNjdmZmVhYzRmNjc1MjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAK KzIwMTMtMTItMzEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAg ICAgICAgQWRkIGEgdHlwZWRlZiBmb3IgUGxhdGZvcm1MYXllcklEIG9uIEdyYXBoaWNzTGF5ZXIs IGFuZCBtaWdyYXRlIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uIHRvIHVzZSBpdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MzQ2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW1vdGUg c2Nyb2xsaW5nIHRyZWUgY29kZSBpcyBzb29uIGdvaW5nIHRvIHVzZSBSZW1vdGVMYXllclRyZWVU cmFuc2FjdGlvbjo6TGF5ZXJJRCwKKyAgICAgICAgc28gaXQgbWFrZXMgbW9yZSBzZW5zZSB0byBw dXQgdGhpcyBsYXllcklEIHR5cGUgb24gR3JhcGhpY3NMYXllciBhcworICAgICAgICBHcmFwaGlj c0xheWVyOjpQbGF0Zm9ybUxheWVySUQuCisgICAgICAgIAorICAgICAgICBBbHNvIGFkZCBzb21l IHR5cGUgY2FzdCBtYWNyb3MgZm9yIFBsYXRmb3JtQ0FMYXllciBhbmQgc3ViY2xhc3NlcywgYW5k IHVzZSB0aGVtCisgICAgICAgIHdoZXJlIGFwcHJvcHJpYXRlLgorCisgICAgICAgICogU2hhcmVk L21hYy9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIuaDoKKyAgICAgICAgKiBTaGFyZWQv bWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpyb290TGF5ZXJJRCk6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpjaGFuZ2VkTGF5ZXJzKToKKyAgICAgICAgKFdlYktp dDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OmRlc3Ryb3llZExheWVycyk6CisgICAgICAg ICogU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbToKKyAgICAgICAgKFdl YktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OmRlY29kZSk6CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpzZXRSb290TGF5ZXJJRCk6CisgICAgICAg IChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpzZXREZXN0cm95ZWRMYXllcklE cyk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW06Om9wZXJhdG9y PDwpOgorICAgICAgICAoV2ViS2l0OjpkdW1wQ2hhbmdlZExheWVycyk6CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpkZXNjcmlwdGlvbik6CisgICAgICAgICog VUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lmg6CisgICAgICAgICogVUlQcm9jZXNz L21hYy9SZW1vdGVMYXllclRyZWVIb3N0Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXll clRyZWVIb3N0Ojpjb21taXQpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVIb3N0 OjpnZXRMYXllcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9HcmFwaGljc0xh eWVyQ0FSZW1vdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpHcmFwaGljc0xheWVyQ0FSZW1vdGU6 OnByaW1hcnlMYXllcklEKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBo aWNzTGF5ZXJDQVJlbW90ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxh dGZvcm1DQUxheWVyUmVtb3RlLmNwcDoKKyAgICAgICAgKGdlbmVyYXRlTGF5ZXJJRCk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUuaDoKKyAg ICAgICAgKFdlYktpdDo6UGxhdGZvcm1DQUxheWVyUmVtb3RlOjpsYXllcklEKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZUNvbnRleHQuaDoKKwogMjAx My0xMi0zMCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gTWFrZSB0aGUgb3V0cHV0IGRpcmVjdG9yeSBvZiBHT2JqZWN0IHVuaXQgdGVzdHMg YmluYXJpZXMgY29uc2lzdGVudCB3aXRoIHRoZSBDTWFrZSBidWlsZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCmluZGV4IDZiNjgxNDVlMTJj OWZmMzViNDMyZjVmYjZmM2E2YzY4MjZmMDIwMGEuLmZmOTUwODY5NTdlOGRjOTVmNjk1ZjEzODQ3 ZmExNDU3YWQ5ZDk4ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0xheWVyLmgKQEAgLTIyNiw2ICsyMjYsOCBAQCBjbGFzcyBHcmFwaGljc0xheWVy IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPEdyYXBoaWNzTGF5ZXI+IGNy ZWF0ZShHcmFwaGljc0xheWVyRmFjdG9yeSosIEdyYXBoaWNzTGF5ZXJDbGllbnQqKTsKICAgICAK KyAgICB0eXBlZGVmIHVpbnQ2NF90IFBsYXRmb3JtTGF5ZXJJRDsKKwogICAgIHZpcnR1YWwgfkdy YXBoaWNzTGF5ZXIoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBpbml0aWFsaXplKCkgeyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVy Q0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXll ckNBLmNwcAppbmRleCBjN2E4NzQzMWVmMzYyMTZjYTg3YWMxZGVjZTZjZmRmN2I5ZjczZGYwLi42 MTA0YjVkOGYzZjBiMmFiOTljOTE5OTI5ODNlMDc0NmEzZDE5ZDM1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAK QEAgLTM4OSw3ICszODksNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0TmFtZShjb25zdCBT dHJpbmcmIG5hbWUpCiB7CiAgICAgU3RyaW5nIGNhTGF5ZXJEZXNjcmlwdGlvbjsKIAotICAgIGlm ICghbV9sYXllci0+aXNSZW1vdGUoKSkKKyAgICBpZiAoIW1fbGF5ZXItPmlzUGxhdGZvcm1DQUxh eWVyUmVtb3RlKCkpCiAgICAgICAgIGNhTGF5ZXJEZXNjcmlwdGlvbiA9IFN0cmluZzo6Zm9ybWF0 KCJDQUxheWVyKCVwKSAiLCBtX2xheWVyLT5wbGF0Zm9ybUxheWVyKCkpOwogCiAgICAgU3RyaW5n IGxvbmdOYW1lID0gY2FMYXllckRlc2NyaXB0aW9uICsgU3RyaW5nOjpmb3JtYXQoIkdyYXBoaWNz TGF5ZXIoJXApICIsIHRoaXMpICsgbmFtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKaW5kZXggMzc1MTYxMDZjNjJmYmRj ZjhmNThiZjFkZWIzODBjZWRkY2MzMmRkNi4uM2FlY2RiYTIwYTI4NWNmZmVkODFkNjMzNzY2ZDlj ZmMxN2JkMzBkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvUGxhdGZvcm1DQUxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvUGxhdGZvcm1DQUxheWVyLmgKQEAgLTgwLDYgKzgwLDkgQEAgcHVibGljOgogCiAgICAg dmlydHVhbCB+UGxhdGZvcm1DQUxheWVyKCk7CiAKKyAgICB2aXJ0dWFsIGJvb2wgaXNQbGF0Zm9y bUNBTGF5ZXJNYWMoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBp c1BsYXRmb3JtQ0FMYXllclJlbW90ZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisKICAgICAv LyBUaGlzIGZ1bmN0aW9uIHBhc3NlcyB0aGUgbGF5ZXIgYXMgYSB2b2lkKiByYXRoZXIgdGhhbiBh IFBsYXRmb3JtTGF5ZXIgYmVjYXVzZSBQbGF0Zm9ybUxheWVyCiAgICAgLy8gaXMgZGVmaW5lZCBk aWZmZXJlbnRseSBmb3IgT2JqIEMgYW5kIEMrKy4gVGhpcyBhbGxvd3MgY2FsbGVycyBmcm9tIGJv dGggbGFuZ3VhZ2VzLgogICAgIHN0YXRpYyBQbGF0Zm9ybUNBTGF5ZXIqIHBsYXRmb3JtQ0FMYXll cih2b2lkKiBwbGF0Zm9ybUxheWVyKTsKQEAgLTk4LDcgKzEwMSw2IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNDaGFuZ2VkKCkgPSAwOwogCiAgICAgTGF5ZXJUeXBlIGxh eWVyVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5ZXJUeXBlOyB9Ci0gICAgdmlydHVhbCBib29s IGlzUmVtb3RlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIHZpcnR1YWwgUGxhdGZv cm1DQUxheWVyKiBzdXBlcmxheWVyKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCByZW1v dmVGcm9tU3VwZXJsYXllcigpID0gMDsKQEAgLTIxMSwxNiArMjEzLDE3IEBAIHByb3RlY3RlZDoK ICAgICBQbGF0Zm9ybUNBTGF5ZXIoTGF5ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZvcm1DQUxheWVy Q2xpZW50KiBvd25lcikKICAgICAgICAgOiBtX2xheWVyVHlwZShsYXllclR5cGUpCiAgICAgICAg ICwgbV9vd25lcihvd25lcikKLSAgICB7Ci0KLSAgICB9CisgICAgeyB9CiAKICAgICBMYXllclR5 cGUgbV9sYXllclR5cGU7CiAgICAgUmV0YWluUHRyPFBsYXRmb3JtTGF5ZXI+IG1fbGF5ZXI7CiAg ICAgUGxhdGZvcm1DQUxheWVyQ2xpZW50KiBtX293bmVyOwogfTsKIAotfQorI2RlZmluZSBQTEFU Rk9STV9DQUxBWUVSX1RZUEVfQ0FTVFMoVG9WYWx1ZVR5cGVOYW1lLCBwcmVkaWNhdGUpIFwKKyAg ICBUWVBFX0NBU1RTX0JBU0UoVG9WYWx1ZVR5cGVOYW1lLCBXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5 ZXIsIG9iamVjdCwgb2JqZWN0LT5wcmVkaWNhdGUsIG9iamVjdC5wcmVkaWNhdGUpCisKK30gLy8g bmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFj L1BsYXRmb3JtQ0FMYXllck1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5oCmluZGV4IDc4NDk0ZWRjNDRlYmVkMGYxYWU2NThl NzBlMzI5NTgzZTNjN2YzYjMuLjk4ZmY2MDI3MjQ5ZjBlOTc3OTdkNGQzOTc2M2JiNGRkZDc2NjYz NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9Q bGF0Zm9ybUNBTGF5ZXJNYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLmgKQEAgLTE0OCw2ICsxNDgsNyBAQCBwdWJsaWM6 CiAKIHByaXZhdGU6CiAgICAgUGxhdGZvcm1DQUxheWVyTWFjKExheWVyVHlwZSwgUGxhdGZvcm1M YXllciosIFBsYXRmb3JtQ0FMYXllckNsaWVudCogb3duZXIpOworICAgIHZpcnR1YWwgYm9vbCBp c1BsYXRmb3JtQ0FMYXllck1hYygpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KIAog ICAgIGJvb2wgcmVxdWlyZXNDdXN0b21BcHBlYXJhbmNlVXBkYXRlT25Cb3VuZHNDaGFuZ2UoKSBj b25zdDsKIApAQCAtMTU2LDYgKzE1Nyw4IEBAIHByaXZhdGU6CiAgICAgR3JhcGhpY3NMYXllcjo6 Q3VzdG9tQXBwZWFyYW5jZSBtX2N1c3RvbUFwcGVhcmFuY2U7CiB9OwogCitQTEFURk9STV9DQUxB WUVSX1RZUEVfQ0FTVFMoUGxhdGZvcm1DQUxheWVyTWFjLCBpc1BsYXRmb3JtQ0FMYXllck1hYygp KQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURf Q09NUE9TSVRJTkcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90 ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllci5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9S ZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIuaAppbmRleCA1ODA0ZGNhMTY0NjUzNDNlZjJh OWQyOGZhYTE0NzNjNmUwODAzYWRhLi42YWEwMjJiZTIyNzM0ZGRjOTMxMjFiZjQ3NDA0ZjIzYmFh MzM3OWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVy VHJlZVByb3BlcnR5QXBwbGllci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVt b3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyLmgKQEAgLTMzLDcgKzMzLDcgQEAgbmFtZXNwYWNl IFdlYktpdCB7CiAKIGNsYXNzIFJlbW90ZUxheWVyVHJlZVByb3BlcnR5QXBwbGllciB7CiBwdWJs aWM6Ci0gICAgdHlwZWRlZiBIYXNoTWFwPFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXll cklELCBDQUxheWVyICo+IFJlbGF0ZWRMYXllck1hcDsKKyAgICB0eXBlZGVmIEhhc2hNYXA8V2Vi Q29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklELCBDQUxheWVyICo+IFJlbGF0ZWRM YXllck1hcDsKICAgICBzdGF0aWMgdm9pZCBhcHBseVByb3BlcnRpZXNUb0xheWVyKENBTGF5ZXIg KiwgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllcywgUmVsYXRlZExh eWVyTWFwKTsKICAgICBzdGF0aWMgdm9pZCBkaXNhYmxlQWN0aW9uc0ZvckxheWVyKENBTGF5ZXIg Kik7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXll clRyZWVUcmFuc2FjdGlvbi5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXll clRyZWVUcmFuc2FjdGlvbi5oCmluZGV4IDI1MjMyNzQwODViYjgxZTQ0OGRlNWZjODkwNDZiNWRl OTQ0ZDQzNjIuLmViMzRhNGZhMjY5MGQ2ZjExODhkMmU4MzYxZGNlMmJhYzJkZGYyNzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5z YWN0aW9uLmgKQEAgLTQ3LDggKzQ3LDYgQEAgY2xhc3MgUGxhdGZvcm1DQUxheWVyUmVtb3RlOwog CiBjbGFzcyBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiB7CiBwdWJsaWM6Ci0gICAgdHlwZWRl ZiB1aW50NjRfdCBMYXllcklEOwotCiAgICAgZW51bSBMYXllckNoYW5nZSB7CiAgICAgICAgIE5v Q2hhbmdlID0gMCwKICAgICAgICAgTmFtZUNoYW5nZWQgPSAxIDw8IDEsCkBAIC04Niw3ICs4NCw3 IEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBlbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImKSBj b25zdDsKICAgICAgICAgc3RhdGljIGJvb2wgZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiwg TGF5ZXJDcmVhdGlvblByb3BlcnRpZXMmKTsKIAotICAgICAgICBMYXllcklEIGxheWVySUQ7Cisg ICAgICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCBsYXllcklEOwog ICAgICAgICBXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZSB0eXBlOwogCiAgICAg ICAgIHVpbnQzMl90IGhvc3RpbmdDb250ZXh0SUQ7CkBAIC0xMDgsNyArMTA2LDcgQEAgcHVibGlj OgogICAgICAgICBMYXllckNoYW5nZSBldmVyQ2hhbmdlZFByb3BlcnRpZXM7CiAKICAgICAgICAg U3RyaW5nIG5hbWU7Ci0gICAgICAgIFZlY3RvcjxMYXllcklEPiBjaGlsZHJlbjsKKyAgICAgICAg VmVjdG9yPFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRD4gY2hpbGRyZW47 CiAgICAgICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQzRCBwb3NpdGlvbjsKICAgICAgICAgV2ViQ29y ZTo6RmxvYXRTaXplIHNpemU7CiAgICAgICAgIFdlYkNvcmU6OkNvbG9yIGJhY2tncm91bmRDb2xv cjsKQEAgLTEyMyw3ICsxMjEsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgZG91YmxlU2lkZWQ7 CiAgICAgICAgIGJvb2wgbWFza3NUb0JvdW5kczsKICAgICAgICAgYm9vbCBvcGFxdWU7Ci0gICAg ICAgIExheWVySUQgbWFza0xheWVySUQ7CisgICAgICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6 OlBsYXRmb3JtTGF5ZXJJRCBtYXNrTGF5ZXJJRDsKICAgICAgICAgV2ViQ29yZTo6RmxvYXRSZWN0 IGNvbnRlbnRzUmVjdDsKICAgICAgICAgZmxvYXQgY29udGVudHNTY2FsZTsKICAgICAgICAgV2Vi Q29yZTo6UGxhdGZvcm1DQUxheWVyOjpGaWx0ZXJUeXBlIG1pbmlmaWNhdGlvbkZpbHRlcjsKQEAg LTE0MiwxMSArMTQwLDExIEBAIHB1YmxpYzoKICAgICB2b2lkIGVuY29kZShJUEM6OkFyZ3VtZW50 RW5jb2RlciYpIGNvbnN0OwogICAgIHN0YXRpYyBib29sIGRlY29kZShJUEM6OkFyZ3VtZW50RGVj b2RlciYsIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJik7CiAKLSAgICBMYXllcklEIHJvb3RM YXllcklEKCkgY29uc3QgeyByZXR1cm4gbV9yb290TGF5ZXJJRDsgfQotICAgIHZvaWQgc2V0Um9v dExheWVySUQoTGF5ZXJJRCByb290TGF5ZXJJRCk7CisgICAgV2ViQ29yZTo6R3JhcGhpY3NMYXll cjo6UGxhdGZvcm1MYXllcklEIHJvb3RMYXllcklEKCkgY29uc3QgeyByZXR1cm4gbV9yb290TGF5 ZXJJRDsgfQorICAgIHZvaWQgc2V0Um9vdExheWVySUQoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6 UGxhdGZvcm1MYXllcklEKTsKICAgICB2b2lkIGxheWVyUHJvcGVydGllc0NoYW5nZWQoUGxhdGZv cm1DQUxheWVyUmVtb3RlKiwgTGF5ZXJQcm9wZXJ0aWVzJik7CiAgICAgdm9pZCBzZXRDcmVhdGVk TGF5ZXJzKFZlY3RvcjxMYXllckNyZWF0aW9uUHJvcGVydGllcz4pOwotICAgIHZvaWQgc2V0RGVz dHJveWVkTGF5ZXJJRHMoVmVjdG9yPExheWVySUQ+KTsKKyAgICB2b2lkIHNldERlc3Ryb3llZExh eWVySURzKFZlY3RvcjxXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQ+KTsK IAogI2lmICFkZWZpbmVkKE5ERUJVRykgfHwgIUxPR19ESVNBQkxFRAogICAgIFdURjo6Q1N0cmlu ZyBkZXNjcmlwdGlvbigpIGNvbnN0OwpAQCAtMTU0LDE0ICsxNTIsMTQgQEAgcHVibGljOgogI2Vu ZGlmCiAKICAgICBWZWN0b3I8TGF5ZXJDcmVhdGlvblByb3BlcnRpZXM+IGNyZWF0ZWRMYXllcnMo KSBjb25zdCB7IHJldHVybiBtX2NyZWF0ZWRMYXllcnM7IH0KLSAgICBIYXNoTWFwPExheWVySUQs IExheWVyUHJvcGVydGllcz4gY2hhbmdlZExheWVycygpIGNvbnN0IHsgcmV0dXJuIG1fY2hhbmdl ZExheWVyUHJvcGVydGllczsgfQotICAgIFZlY3RvcjxMYXllcklEPiBkZXN0cm95ZWRMYXllcnMo KSBjb25zdCB7IHJldHVybiBtX2Rlc3Ryb3llZExheWVySURzOyB9CisgICAgSGFzaE1hcDxXZWJD b3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQsIExheWVyUHJvcGVydGllcz4gY2hh bmdlZExheWVycygpIGNvbnN0IHsgcmV0dXJuIG1fY2hhbmdlZExheWVyUHJvcGVydGllczsgfQor ICAgIFZlY3RvcjxXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQ+IGRlc3Ry b3llZExheWVycygpIGNvbnN0IHsgcmV0dXJuIG1fZGVzdHJveWVkTGF5ZXJJRHM7IH0KIAogcHJp dmF0ZToKLSAgICBMYXllcklEIG1fcm9vdExheWVySUQ7Ci0gICAgSGFzaE1hcDxMYXllcklELCBM YXllclByb3BlcnRpZXM+IG1fY2hhbmdlZExheWVyUHJvcGVydGllczsKKyAgICBXZWJDb3JlOjpH cmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQgbV9yb290TGF5ZXJJRDsKKyAgICBIYXNoTWFw PFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCwgTGF5ZXJQcm9wZXJ0aWVz PiBtX2NoYW5nZWRMYXllclByb3BlcnRpZXM7CiAgICAgVmVjdG9yPExheWVyQ3JlYXRpb25Qcm9w ZXJ0aWVzPiBtX2NyZWF0ZWRMYXllcnM7Ci0gICAgVmVjdG9yPExheWVySUQ+IG1fZGVzdHJveWVk TGF5ZXJJRHM7CisgICAgVmVjdG9yPFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5 ZXJJRD4gbV9kZXN0cm95ZWRMYXllcklEczsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFu c2FjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb24ubW0KaW5kZXggZGZiNzIwMDk0MjljN2Y1MDE0NTFkOTlhZGM2Y2U2YzQwMzhjODk4 Ny4uZDk5M2VkMDA2OWEzNGIzYzA3ZjM1NzBmZWJlZDBhYTk5MWQwZjBjZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9u Lm1tCkBAIC0zNTksNyArMzU5LDggQEAgYm9vbCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6 ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZW1vdGVMYXkKIAogICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fZGVzdHJveWVkTGF5ZXJJRHMpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgZm9yIChMYXllcklEIGxheWVySUQgOiByZXN1bHQubV9kZXN0cm95 ZWRMYXllcklEcykgeworCisgICAgZm9yIChhdXRvIGxheWVySUQgOiByZXN1bHQubV9kZXN0cm95 ZWRMYXllcklEcykgewogICAgICAgICBpZiAoIWxheWVySUQpCiAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfQpAQCAtMzY3LDcgKzM2OCw3IEBAIGJvb2wgUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb246OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgUmVtb3RlTGF5 CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OnNldFJvb3RMYXllcklEKExheWVySUQgcm9vdExheWVySUQpCit2b2lkIFJlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uOjpzZXRSb290TGF5ZXJJRChHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVy SUQgcm9vdExheWVySUQpCiB7CiAgICAgQVNTRVJUX0FSRyhyb290TGF5ZXJJRCwgcm9vdExheWVy SUQpOwogCkBAIC0zODQsNyArMzg1LDcgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv bjo6c2V0Q3JlYXRlZExheWVycyhWZWN0b3I8TGF5ZXJDcmVhdGlvblByb3BlcnRpZXMKICAgICBt X2NyZWF0ZWRMYXllcnMgPSBzdGQ6Om1vdmUoY3JlYXRlZExheWVycyk7CiB9CiAKLXZvaWQgUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OnNldERlc3Ryb3llZExheWVySURzKFZlY3RvcjxMYXll cklEPiBkZXN0cm95ZWRMYXllcklEcykKK3ZvaWQgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OnNldERlc3Ryb3llZExheWVySURzKFZlY3RvcjxHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVy SUQ+IGRlc3Ryb3llZExheWVySURzKQogewogICAgIG1fZGVzdHJveWVkTGF5ZXJJRHMgPSBzdGQ6 Om1vdmUoZGVzdHJveWVkTGF5ZXJJRHMpOwogfQpAQCAtNDA2LDcgKzQwNyw3IEBAIHB1YmxpYzoK ICAgICBSZW1vdGVMYXllclRyZWVUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KEZsb2F0UG9pbnQzRCk7 CiAgICAgUmVtb3RlTGF5ZXJUcmVlVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChDb2xvcik7CiAgICAg UmVtb3RlTGF5ZXJUcmVlVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChGbG9hdFJlY3QpOwotICAgIFJl bW90ZUxheWVyVHJlZVRleHRTdHJlYW0mIG9wZXJhdG9yPDwoY29uc3QgVmVjdG9yPFJlbW90ZUxh eWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllcklEPiYgbGF5ZXJzKTsKKyAgICBSZW1vdGVMYXllclRy ZWVUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpHcmFwaGljc0xh eWVyOjpQbGF0Zm9ybUxheWVySUQ+JiBsYXllcnMpOwogICAgIFJlbW90ZUxheWVyVHJlZVRleHRT dHJlYW0mIG9wZXJhdG9yPDwoY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYpOwogCiAgICAgdm9pZCBp bmNyZWFzZUluZGVudCgpIHsgKyttX2luZGVudDsgfQpAQCAtNTM3LDcgKzUzOCw3IEBAIFJlbW90 ZUxheWVyVHJlZVRleHRTdHJlYW0mIFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW06Om9wZXJhdG9y PDwoRmxvYXRSZWN0IHJlY3QpCiAgICAgcmV0dXJuIHRzOwogfQogCi1SZW1vdGVMYXllclRyZWVU ZXh0U3RyZWFtJiBSZW1vdGVMYXllclRyZWVUZXh0U3RyZWFtOjpvcGVyYXRvcjw8KGNvbnN0IFZl Y3RvcjxSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJJRD4mIGxheWVycykKK1JlbW90 ZUxheWVyVHJlZVRleHRTdHJlYW0mIFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW06Om9wZXJhdG9y PDwoY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRD4mIGxheWVycykK IHsKICAgICBSZW1vdGVMYXllclRyZWVUZXh0U3RyZWFtJiB0cyA9ICp0aGlzOwogCkBAIC01Njcs NyArNTY4LDcgQEAgc3RhdGljIHZvaWQgZHVtcFByb3BlcnR5KFJlbW90ZUxheWVyVHJlZVRleHRT dHJlYW0mIHRzLCBTdHJpbmcgbmFtZSwgVCB2YWx1ZSkKICAgICB0cy5kZWNyZWFzZUluZGVudCgp OwogfQogCi1zdGF0aWMgdm9pZCBkdW1wQ2hhbmdlZExheWVycyhSZW1vdGVMYXllclRyZWVUZXh0 U3RyZWFtJiB0cywgY29uc3QgSGFzaE1hcDxSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5 ZXJJRCwgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllcz4mIGNoYW5n ZWRMYXllclByb3BlcnRpZXMpCitzdGF0aWMgdm9pZCBkdW1wQ2hhbmdlZExheWVycyhSZW1vdGVM YXllclRyZWVUZXh0U3RyZWFtJiB0cywgY29uc3QgSGFzaE1hcDxHcmFwaGljc0xheWVyOjpQbGF0 Zm9ybUxheWVySUQsIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXM+ JiBjaGFuZ2VkTGF5ZXJQcm9wZXJ0aWVzKQogewogICAgIGlmIChjaGFuZ2VkTGF5ZXJQcm9wZXJ0 aWVzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtNTc3LDcgKzU3OCw3IEBAIHN0YXRp YyB2b2lkIGR1bXBDaGFuZ2VkTGF5ZXJzKFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW0mIHRzLCBj b25zdCBIYXNoTWFwPFJlbW90CiAgICAgdHMgPDwgIihjaGFuZ2VkLWxheWVycyI7CiAKICAgICAv LyBEdW1wIHRoZSBsYXllciBwcm9wZXJ0aWVzIHNvcnRlZCBieSBsYXllciBJRC4KLSAgICBWZWN0 b3I8UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVySUQ+IGxheWVySURzOworICAgIFZl Y3RvcjxHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQ+IGxheWVySURzOwogICAgIGNvcHlL ZXlzVG9WZWN0b3IoY2hhbmdlZExheWVyUHJvcGVydGllcywgbGF5ZXJJRHMpOwogICAgIHN0ZDo6 c29ydChsYXllcklEcy5iZWdpbigpLCBsYXllcklEcy5lbmQoKSk7CiAKQEAgLTU5Myw3ICs1OTQs NyBAQCBzdGF0aWMgdm9pZCBkdW1wQ2hhbmdlZExheWVycyhSZW1vdGVMYXllclRyZWVUZXh0U3Ry ZWFtJiB0cywgY29uc3QgSGFzaE1hcDxSZW1vdAogICAgICAgICAgICAgZHVtcFByb3BlcnR5PFN0 cmluZz4odHMsICJuYW1lIiwgbGF5ZXJQcm9wZXJ0aWVzLm5hbWUpOwogCiAgICAgICAgIGlmIChs YXllclByb3BlcnRpZXMuY2hhbmdlZFByb3BlcnRpZXMgJiBSZW1vdGVMYXllclRyZWVUcmFuc2Fj dGlvbjo6Q2hpbGRyZW5DaGFuZ2VkKQotICAgICAgICAgICAgZHVtcFByb3BlcnR5PFZlY3RvcjxS ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJJRD4+KHRzLCAiY2hpbGRyZW4iLCBsYXll clByb3BlcnRpZXMuY2hpbGRyZW4pOworICAgICAgICAgICAgZHVtcFByb3BlcnR5PFZlY3RvcjxH cmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQ+Pih0cywgImNoaWxkcmVuIiwgbGF5ZXJQcm9w ZXJ0aWVzLmNoaWxkcmVuKTsKIAogICAgICAgICBpZiAobGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQ cm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OlBvc2l0aW9uQ2hhbmdlZCkK ICAgICAgICAgICAgIGR1bXBQcm9wZXJ0eTxGbG9hdFBvaW50M0Q+KHRzLCAicG9zaXRpb24iLCBs YXllclByb3BlcnRpZXMucG9zaXRpb24pOwpAQCAtNjM4LDcgKzYzOSw3IEBAIHN0YXRpYyB2b2lk IGR1bXBDaGFuZ2VkTGF5ZXJzKFJlbW90ZUxheWVyVHJlZVRleHRTdHJlYW0mIHRzLCBjb25zdCBI YXNoTWFwPFJlbW90CiAgICAgICAgICAgICBkdW1wUHJvcGVydHk8Ym9vbD4odHMsICJvcGFxdWUi LCBsYXllclByb3BlcnRpZXMub3BhcXVlKTsKIAogICAgICAgICBpZiAobGF5ZXJQcm9wZXJ0aWVz LmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246Ok1hc2tMYXll ckNoYW5nZWQpCi0gICAgICAgICAgICBkdW1wUHJvcGVydHk8UmVtb3RlTGF5ZXJUcmVlVHJhbnNh Y3Rpb246OkxheWVySUQ+KHRzLCAibWFza0xheWVyIiwgbGF5ZXJQcm9wZXJ0aWVzLm1hc2tMYXll cklEKTsKKyAgICAgICAgICAgIGR1bXBQcm9wZXJ0eTxHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxh eWVySUQ+KHRzLCAibWFza0xheWVyIiwgbGF5ZXJQcm9wZXJ0aWVzLm1hc2tMYXllcklEKTsKIAog ICAgICAgICBpZiAobGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb246OkNvbnRlbnRzUmVjdENoYW5nZWQpCiAgICAgICAgICAgICBkdW1w UHJvcGVydHk8RmxvYXRSZWN0Pih0cywgImNvbnRlbnRzUmVjdCIsIGxheWVyUHJvcGVydGllcy5j b250ZW50c1JlY3QpOwpAQCAtNzQxLDcgKzc0Miw3IEBAIENTdHJpbmcgUmVtb3RlTGF5ZXJUcmVl VHJhbnNhY3Rpb246OmRlc2NyaXB0aW9uKCkgY29uc3QKICAgICBkdW1wQ2hhbmdlZExheWVycyh0 cywgbV9jaGFuZ2VkTGF5ZXJQcm9wZXJ0aWVzKTsKIAogICAgIGlmICghbV9kZXN0cm95ZWRMYXll cklEcy5pc0VtcHR5KCkpCi0gICAgICAgIGR1bXBQcm9wZXJ0eTxWZWN0b3I8UmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb246OkxheWVySUQ+Pih0cywgImRlc3Ryb3llZC1sYXllcnMiLCBtX2Rlc3Ry b3llZExheWVySURzKTsKKyAgICAgICAgZHVtcFByb3BlcnR5PFZlY3RvcjxHcmFwaGljc0xheWVy OjpQbGF0Zm9ybUxheWVySUQ+Pih0cywgImRlc3Ryb3llZC1sYXllcnMiLCBtX2Rlc3Ryb3llZExh eWVySURzKTsKIAogICAgIHRzIDw8ICIpXG4iOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5oCmluZGV4IGI1MTYwOGQzMzUwMjZmNGM3 ZmQxZDNkNGRkZWUwMjNkNjYxY2M1MzQuLmE0NzkwMThhZTZjYzdkMjA0MjI2NDJjZmU4MjNjNWUw OTNmZmMyZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3Rl TGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3Rl TGF5ZXJUcmVlSG9zdC5oCkBAIC01MCwxMyArNTAsMTMgQEAgcHJpdmF0ZToKICAgICAvLyBNZXNz YWdlIGhhbmRsZXJzLgogICAgIHZvaWQgY29tbWl0KGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5z YWN0aW9uJik7CiAKLSAgICBDQUxheWVyICpnZXRMYXllcihSZW1vdGVMYXllclRyZWVUcmFuc2Fj dGlvbjo6TGF5ZXJJRCk7CisgICAgQ0FMYXllciAqZ2V0TGF5ZXIoV2ViQ29yZTo6R3JhcGhpY3NM YXllcjo6UGxhdGZvcm1MYXllcklEKSBjb25zdDsKICAgICBDQUxheWVyICpjcmVhdGVMYXllcihS ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJDcmVhdGlvblByb3BlcnRpZXMpOwogCiAg ICAgV2ViUGFnZVByb3h5KiBtX3dlYlBhZ2VQcm94eTsKIAogICAgIENBTGF5ZXIgKm1fcm9vdExh eWVyOwotICAgIEhhc2hNYXA8UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVySUQsIFJl dGFpblB0cjxDQUxheWVyPj4gbV9sYXllcnM7CisgICAgSGFzaE1hcDxXZWJDb3JlOjpHcmFwaGlj c0xheWVyOjpQbGF0Zm9ybUxheWVySUQsIFJldGFpblB0cjxDQUxheWVyPj4gbV9sYXllcnM7CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbQppbmRleCA1NmJkYTAwNzMwN2QwMzI0MWFk ZWZmNDk3ZDRmOGRlMWMwOWM3OTUzLi44NzZlMWJjOTVlZDE2ODJlNWU1OWYxYTdkZDgyMGE4Y2Q4 N2MxMWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxh eWVyVHJlZUhvc3QubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVM YXllclRyZWVIb3N0Lm1tCkBAIC02OCw3ICs2OCw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlSG9z dDo6Y29tbWl0KGNvbnN0IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbikK ICAgICB9CiAKICAgICBmb3IgKGF1dG8gY2hhbmdlZExheWVyIDogdHJhbnNhY3Rpb24uY2hhbmdl ZExheWVycygpKSB7Ci0gICAgICAgIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllcklE IGxheWVySUQgPSBjaGFuZ2VkTGF5ZXIua2V5OworICAgICAgICBhdXRvIGxheWVySUQgPSBjaGFu Z2VkTGF5ZXIua2V5OwogICAgICAgICBjb25zdCBhdXRvJiBwcm9wZXJ0aWVzID0gY2hhbmdlZExh eWVyLnZhbHVlOwogCiAgICAgICAgIENBTGF5ZXIgKmxheWVyID0gZ2V0TGF5ZXIobGF5ZXJJRCk7 CkBAIC05MCw3ICs5MCw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlSG9zdDo6Y29tbWl0KGNvbnN0 IFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbikKICAgICAgICAgbV9sYXll cnMucmVtb3ZlKGRlc3Ryb3llZExheWVyKTsKIH0KIAotQ0FMYXllciAqUmVtb3RlTGF5ZXJUcmVl SG9zdDo6Z2V0TGF5ZXIoUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVySUQgbGF5ZXJJ RCkKK0NBTGF5ZXIgKlJlbW90ZUxheWVyVHJlZUhvc3Q6OmdldExheWVyKEdyYXBoaWNzTGF5ZXI6 OlBsYXRmb3JtTGF5ZXJJRCBsYXllcklEKSBjb25zdAogewogICAgIHJldHVybiBtX2xheWVycy5n ZXQobGF5ZXJJRCkuZ2V0KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL0dyYXBoaWNzTGF5ZXJDQVJlbW90ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBoaWNzTGF5ZXJDQVJlbW90ZS5jcHAKaW5kZXgg MGQ4MWYxN2NiY2JmYTFjMjJmOGRjNDA5M2FkNjNhYjRiNWI1OTg3OC4uMjg5Njg3M2YxZDdiNzIz YTllMDliYjliODUyNGYxZTU1NzBjODU0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9HcmFwaGljc0xheWVyQ0FSZW1vdGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvR3JhcGhpY3NMYXllckNBUmVtb3RlLmNw cApAQCAtMzgsNiArMzgsMTEgQEAgR3JhcGhpY3NMYXllckNBUmVtb3RlOjp+R3JhcGhpY3NMYXll ckNBUmVtb3RlKCkKIHsKIH0KIAorR3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIEdyYXBo aWNzTGF5ZXJDQVJlbW90ZTo6cHJpbWFyeUxheWVySUQoKSBjb25zdAoreworICAgIHJldHVybiB0 b1BsYXRmb3JtQ0FMYXllclJlbW90ZShwbGF0Zm9ybUNBTGF5ZXIoKSktPmxheWVySUQoKTsKK30K KwogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKIGJvb2wgR3JhcGhpY3NMYXllckNBUmVtb3RlOjpm aWx0ZXJzQ2FuQmVDb21wb3NpdGVkKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMpCiB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBo aWNzTGF5ZXJDQVJlbW90ZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9HcmFwaGljc0xheWVyQ0FSZW1vdGUuaAppbmRleCBmZWNjMDFmNDYwNmRlZjY2MGFkODE4NGJl Nzc0OGE1MjZkNTdlNzljLi5hYTZjNDZkZjIwMGY4YjcwMGVlODNhNjM5OWIyNWYzNjc0NjgyYjc0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL0dyYXBo aWNzTGF5ZXJDQVJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvR3JhcGhpY3NMYXllckNBUmVtb3RlLmgKQEAgLTQ0LDYgKzQ0LDggQEAgcHVibGljOgog ICAgIH0KIAogICAgIHZpcnR1YWwgfkdyYXBoaWNzTGF5ZXJDQVJlbW90ZSgpOworICAgIAorICAg IFBsYXRmb3JtTGF5ZXJJRCBwcmltYXJ5TGF5ZXJJRCgpIGNvbnN0OwogCiAjaWYgRU5BQkxFKENT U19GSUxURVJTKQogICAgIHZpcnR1YWwgYm9vbCBmaWx0ZXJzQ2FuQmVDb21wb3NpdGVkKGNvbnN0 IFdlYkNvcmU6OkZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMpIE9WRVJSSURFOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJS ZW1vdGUuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9y bUNBTGF5ZXJSZW1vdGUuY3BwCmluZGV4IGE3YjNmNDE4YTE0NDVlN2EzNWE3MmNmZTFlMGRlOWZl MGM1N2Q3MzguLjczYzkxZTlkZDk1MjRhNGU1NDFmYWE4NDRjMTk0MGIzMDU2MDIzMDMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxh eWVyUmVtb3RlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1BsYXRmb3JtQ0FMYXllclJlbW90ZS5jcHAKQEAgLTQ3LDE4ICs0NywxMiBAQAogdXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCi1zdGF0aWMgUmVtb3Rl TGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVySUQgZ2VuZXJhdGVMYXllcklEKCkKK3N0YXRpYyBX ZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQgZ2VuZXJhdGVMYXllcklEKCkK IHsKLSAgICBzdGF0aWMgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVySUQgbGF5ZXJJ RDsKKyAgICBzdGF0aWMgV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGxh eWVySUQ7CiAgICAgcmV0dXJuICsrbGF5ZXJJRDsKIH0KIAotc3RhdGljIFBsYXRmb3JtQ0FMYXll clJlbW90ZSogdG9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUoUGxhdGZvcm1DQUxheWVyKiBsYXllcikK LXsKLSAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTighbGF5ZXIgfHwgbGF5ZXIt PmlzUmVtb3RlKCkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxQbGF0Zm9ybUNBTGF5ZXJSZW1v dGUqPihsYXllcik7Ci19Ci0KIFBhc3NSZWZQdHI8UGxhdGZvcm1DQUxheWVyUmVtb3RlPiBQbGF0 Zm9ybUNBTGF5ZXJSZW1vdGU6OmNyZWF0ZShMYXllclR5cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUNB TGF5ZXJDbGllbnQqIG93bmVyLCBSZW1vdGVMYXllclRyZWVDb250ZXh0KiBjb250ZXh0KQogewog ICAgIFJlZlB0cjxQbGF0Zm9ybUNBTGF5ZXJSZW1vdGU+IGxheWVyOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUxheWVy UmVtb3RlLmgKaW5kZXggYWYzOTNiZTNiZjg0YjE0NzQ5YWE0MDczZTdhNTA5MGY4ZjI5YmU0OS4u MzU0NGI1MDRhYzQxZDY2ODIyZDY0YjNkZDQ0ZWE5MzAyY2Y2YjlmMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGUu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FM YXllclJlbW90ZS5oCkBAIC00NCw5ICs0NCw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgflBs YXRmb3JtQ0FMYXllclJlbW90ZSgpOwogCi0gICAgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OkxheWVySUQgbGF5ZXJJRCgpIHsgcmV0dXJuIG1fbGF5ZXJJRDsgfQotCi0gICAgdmlydHVhbCBi b29sIGlzUmVtb3RlKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQorICAgIFdlYkNv cmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCBsYXllcklEKCkgeyByZXR1cm4gbV9s YXllcklEOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgdXNlc1RpbGVkQmFja2luZ0xheWVyKCkgY29u c3QgT1ZFUlJJREUgeyByZXR1cm4gbGF5ZXJUeXBlKCkgPT0gTGF5ZXJUeXBlUGFnZVRpbGVkQmFj a2luZ0xheWVyIHx8IGxheWVyVHlwZSgpID09IExheWVyVHlwZVRpbGVkQmFja2luZ0xheWVyOyB9 CiAKQEAgLTE1NywxMiArMTU1LDEzIEBAIHByb3RlY3RlZDoKICAgICBQbGF0Zm9ybUNBTGF5ZXJS ZW1vdGUoV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyOjpMYXllclR5cGUsIFdlYkNvcmU6OlBsYXRm b3JtQ0FMYXllckNsaWVudCogb3duZXIsIFJlbW90ZUxheWVyVHJlZUNvbnRleHQqIGNvbnRleHQp OwogCiBwcml2YXRlOgorICAgIHZpcnR1YWwgYm9vbCBpc1BsYXRmb3JtQ0FMYXllclJlbW90ZSgp IGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdm9pZCBlbnN1cmVCYWNraW5n U3RvcmUoKTsKICAgICB2b2lkIHJlbW92ZVN1YmxheWVyKFBsYXRmb3JtQ0FMYXllclJlbW90ZSop OwogCiAgICAgYm9vbCByZXF1aXJlc0N1c3RvbUFwcGVhcmFuY2VVcGRhdGVPbkJvdW5kc0NoYW5n ZSgpIGNvbnN0OwogCi0gICAgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVySUQgbV9s YXllcklEOworICAgIGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJ RCBtX2xheWVySUQ7CiAgICAgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVy dGllcyBtX3Byb3BlcnRpZXM7CiAgICAgV2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyTGlzdCBtX2No aWxkcmVuOwogICAgIFBsYXRmb3JtQ0FMYXllclJlbW90ZSogbV9zdXBlcmxheWVyOwpAQCAtMTcy LDYgKzE3MSw4IEBAIHByaXZhdGU6CiAgICAgUmVtb3RlTGF5ZXJUcmVlQ29udGV4dCogbV9jb250 ZXh0OwogfTsKIAorUExBVEZPUk1fQ0FMQVlFUl9UWVBFX0NBU1RTKFBsYXRmb3JtQ0FMYXllclJl bW90ZSwgaXNQbGF0Zm9ybUNBTGF5ZXJSZW1vdGUoKSkKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CiAKICNlbmRpZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVyVHJlZUNvbnRl eHQuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJU cmVlQ29udGV4dC5oCmluZGV4IDNlNWUyY2M1MzgxZGNjMTk4OTRmYTJlYTFiOWZkMWZmNzg1ZWNl YmIuLmM5MWNjYjUyZWIyMzZmNDg5Y2I0NTdlNzA3YjIzYzIxZTllZmQyZWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlQ29u dGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3Rl TGF5ZXJUcmVlQ29udGV4dC5oCkBAIC03NCw3ICs3NCw3IEBAIHByaXZhdGU6CiAgICAgVmVjdG9y PFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqPiBtX291dE9mVHJlZUxheWVyczsKIAogICAgIFZlY3Rv cjxSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJDcmVhdGlvblByb3BlcnRpZXM+IG1f Y3JlYXRlZExheWVyczsKLSAgICBWZWN0b3I8UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246Okxh eWVySUQ+IG1fZGVzdHJveWVkTGF5ZXJzOworICAgIFZlY3RvcjxXZWJDb3JlOjpHcmFwaGljc0xh eWVyOjpQbGF0Zm9ybUxheWVySUQ+IG1fZGVzdHJveWVkTGF5ZXJzOwogCiAgICAgYm9vbCBtX2lz Rmx1c2hpbmdTdXNwZW5kZWQ7CiAgICAgYm9vbCBtX2hhc0RlZmVycmVkRmx1c2g7Cg==