71580 2011-11-04 12:04:10 -0700 [chromium] Re-name the original scissorRect to clipRect 2011-11-04 15:16:45 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67341 1 shawnsingh shawnsingh enne jamesr nduca vangelis webkit.review.bot oldest_to_newest 496375 0 shawnsingh 2011-11-04 12:04:10 -0700 In layers and render surfaces of chromium, there is a scissorRect that is maintained for clipping/masking. It is only used for this purpose, and with upcoming scissor optimization, it is appropriate to re-name this original scissorRect to clipRect. 496449 1 113708 shawnsingh 2011-11-04 14:00:25 -0700 Created attachment 113708 Patch 496454 2 enne 2011-11-04 14:06:56 -0700 That unofficially looks good to me. I think this will definitely make it easier to differentiate the existing static clipping from the new scissoring feature. 496497 3 113708 webkit.review.bot 2011-11-04 15:16:41 -0700 Comment on attachment 113708 Patch Clearing flags on attachment: 113708 Committed r99327: <http://trac.webkit.org/changeset/99327> 496498 4 webkit.review.bot 2011-11-04 15:16:45 -0700 All reviewed patches have been landed. Closing bug. 113708 2011-11-04 14:00:25 -0700 2011-11-04 15:16:41 -0700 Patch bug-71580-20111104140024.patch text/plain 28095 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogOTkyNzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxZjI0NzczMTkzNDk2M2Vh ZGNkZTA2ZjMwMjMwMDlmOGE4NzQxYmJmLi45ZWUzNDgzZGM1NDlmZjJjNTNkMWZkNDFiZDFlOWM3 ZDE0ZjAzNDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYgQEAKKzIwMTEtMTEtMDQgIFNoYXdu IFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS ZS1uYW1lZCB0aGUgb3JpZ2luYWwgc2Npc3NvclJlY3QgdG8gY2xpcFJlY3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxNTgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhpc3RpbmcgdGVzdHMgYXJlIHVw ZGF0ZWQgYXBwcm9wcmlhdGVseTsgYW5kIG5vIG5ldyBiZWhhdmlvciBpcworICAgICAgICBpbnRy b2R1Y2VkIGJ5IHRoaXMgcGF0Y2guCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06 OkxheWVyQ2hyb21pdW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnNldFVzZXNM YXllckNsaXBwaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnVzZXNMYXll ckNsaXBwaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OmNsaXBSZWN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnNldENsaXBSZWN0KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzSW50ZXJu YWwpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXIp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JlbmRlclN1cmZhY2VDaHJv bWl1bS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3VyZmFjZUNocm9taXVtOjpjbGlwUmVj dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdXJmYWNlQ2hyb21pdW06OnNldENsaXBSZWN0 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6Q0NMYXllckltcGwpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmg6CisgICAgICAg IChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0VXNlc0xheWVyQ2xpcHBpbmcpOgorICAgICAgICAo V2ViQ29yZTo6Q0NMYXllckltcGw6OnVzZXNMYXllckNsaXBwaW5nKToKKyAgICAgICAgKFdlYkNv cmU6OkNDTGF5ZXJJbXBsOjpjbGlwUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1w bDo6c2V0Q2xpcFJlY3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3Q6 OnVwZGF0ZUxheWVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxheWVyU2hvdWxk QmVTa2lwcGVkKToKKyAgICAgICAgKFdlYkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5k VmlzaWJpbGl0eUludGVybmFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uaDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJU cmVlSG9zdENvbW1vbjo6Y2FsY3VsYXRlVmlzaWJsZUxheWVyUmVjdCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNDUmVuZGVyU3VyZmFjZTo6ZHJhdyk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmg6CisgICAgICAgIChXZWJDb3JlOjpD Q1JlbmRlclN1cmZhY2U6OnNldENsaXBSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNDUmVuZGVy U3VyZmFjZTo6Y2xpcFJlY3QpOgorCiAyMDExLTExLTA0ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBh cm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgQ01ha2UgYnVpbGQgZml4IGZv ciAhRU5BQkxFKFNRTF9EQVRBQkFTRSkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDFk ODk3NzM0NzQzYzBiMmQ0NGUwMjBlMWJiZTUxZmFlNTgwN2RhM2EuLjZkZDI0MjA0YmY3M2Q0YTQ2 ZjFlMjA3MTg1OTBmMzFjNjBmMTlkNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMTEtMTEtMDQgIFNoYXduIFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZS1uYW1lZCB0aGUgb3JpZ2luYWwgc2Npc3Nv clJlY3QgdG8gY2xpcFJlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTcxNTgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB0ZXN0cy9DQ0xheWVySW1wbFRlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VEVTVCk6CisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpURVNUKToKKyAgICAgICAgKiB0ZXN0cy9MYXllckNocm9taXVtVGVz dC5jcHA6CisKIDIwMTEtMTEtMDIgIFhpYW9tZWkgSmkgIDx4amlAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIEVuYWJsZSBjdHJsLWFycm93IG1vdmUgY3Vyc29yIGJ5IHdvcmQgaW4gdmlzdWFsIG9y ZGVyIGluIGNyLXdpbiBieSBjb21tYW5kIGxpbmUgZmxhZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAK aW5kZXggNmE2YTBlNzdjNDc0OTA5Y2EwMmI0NDgyZGZmNjAxNjBhYTExY2Y0OC4uMmJhMjhmOTk2 ZTA2MTRiZTYxZmE4MWNmOTQ4MDUxNzQzZTVkMTBiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAK QEAgLTY2LDcgKzY2LDcgQEAgTGF5ZXJDaHJvbWl1bTo6TGF5ZXJDaHJvbWl1bShDQ0xheWVyRGVs ZWdhdGUqIGRlbGVnYXRlKQogICAgICwgbV9tYXNrc1RvQm91bmRzKGZhbHNlKQogICAgICwgbV9v cGFxdWUoZmFsc2UpCiAgICAgLCBtX2RvdWJsZVNpZGVkKHRydWUpCi0gICAgLCBtX3VzZXNMYXll clNjaXNzb3IoZmFsc2UpCisgICAgLCBtX3VzZXNMYXllckNsaXBwaW5nKGZhbHNlKQogICAgICwg bV9pc05vbkNvbXBvc2l0ZWRDb250ZW50KGZhbHNlKQogICAgICwgbV9wcmVzZXJ2ZXMzRChmYWxz ZSkKICAgICAsIG1fcmVwbGljYUxheWVyKDApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKaW5kZXggYzdhZWNi ZTU4YTc3ZDMxOGRlZTY1NWQ1OTU0M2ZmZDAxODAzMzYxZS4uYmIwZWM2MjY1MDMzNjhmNDk5Yzk1 MzJkZDY5NDQ5Y2ViYTM3MGM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaApAQCAtMTQ0LDggKzE0NCw4 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFByZXNlcnZlczNEKGJvb2wgcHJlc2VydmUzRCkgeyBt X3ByZXNlcnZlczNEID0gcHJlc2VydmUzRDsgfQogICAgIGJvb2wgcHJlc2VydmVzM0QoKSBjb25z dCB7IHJldHVybiBtX3ByZXNlcnZlczNEOyB9CiAKLSAgICB2b2lkIHNldFVzZXNMYXllclNjaXNz b3IoYm9vbCB1c2VzTGF5ZXJTY2lzc29yKSB7IG1fdXNlc0xheWVyU2Npc3NvciA9IHVzZXNMYXll clNjaXNzb3I7IH0KLSAgICBib29sIHVzZXNMYXllclNjaXNzb3IoKSBjb25zdCB7IHJldHVybiBt X3VzZXNMYXllclNjaXNzb3I7IH0KKyAgICB2b2lkIHNldFVzZXNMYXllckNsaXBwaW5nKGJvb2wg dXNlc0xheWVyQ2xpcHBpbmcpIHsgbV91c2VzTGF5ZXJDbGlwcGluZyA9IHVzZXNMYXllckNsaXBw aW5nOyB9CisgICAgYm9vbCB1c2VzTGF5ZXJDbGlwcGluZygpIGNvbnN0IHsgcmV0dXJuIG1fdXNl c0xheWVyQ2xpcHBpbmc7IH0KIAogICAgIHZvaWQgc2V0SXNOb25Db21wb3NpdGVkQ29udGVudChi b29sIGlzTm9uQ29tcG9zaXRlZENvbnRlbnQpIHsgbV9pc05vbkNvbXBvc2l0ZWRDb250ZW50ID0g aXNOb25Db21wb3NpdGVkQ29udGVudDsgfQogICAgIGJvb2wgaXNOb25Db21wb3NpdGVkQ29udGVu dCgpIGNvbnN0IHsgcmV0dXJuIG1faXNOb25Db21wb3NpdGVkQ29udGVudDsgfQpAQCAtMTgzLDgg KzE4Myw4IEBAIHB1YmxpYzoKIAogICAgIGZsb2F0IGRyYXdPcGFjaXR5KCkgY29uc3QgeyByZXR1 cm4gbV9kcmF3T3BhY2l0eTsgfQogICAgIHZvaWQgc2V0RHJhd09wYWNpdHkoZmxvYXQgb3BhY2l0 eSkgeyBtX2RyYXdPcGFjaXR5ID0gb3BhY2l0eTsgfQotICAgIGNvbnN0IEludFJlY3QmIHNjaXNz b3JSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9zY2lzc29yUmVjdDsgfQotICAgIHZvaWQgc2V0U2Np c3NvclJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkgeyBtX3NjaXNzb3JSZWN0ID0gcmVjdDsgfQor ICAgIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9jbGlwUmVjdDsg fQorICAgIHZvaWQgc2V0Q2xpcFJlY3QoY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpIHsgbV9jbGlw UmVjdCA9IGNsaXBSZWN0OyB9CiAgICAgUmVuZGVyU3VyZmFjZUNocm9taXVtKiB0YXJnZXRSZW5k ZXJTdXJmYWNlKCkgY29uc3QgeyByZXR1cm4gbV90YXJnZXRSZW5kZXJTdXJmYWNlOyB9CiAgICAg dm9pZCBzZXRUYXJnZXRSZW5kZXJTdXJmYWNlKFJlbmRlclN1cmZhY2VDaHJvbWl1bSogc3VyZmFj ZSkgeyBtX3RhcmdldFJlbmRlclN1cmZhY2UgPSBzdXJmYWNlOyB9CiAgICAgY29uc3QgVHJhbnNm b3JtYXRpb25NYXRyaXgmIGRyYXdUcmFuc2Zvcm0oKSBjb25zdCB7IHJldHVybiBtX2RyYXdUcmFu c2Zvcm07IH0KQEAgLTI2Myw3ICsyNjMsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9tYXNrc1Rv Qm91bmRzOwogICAgIGJvb2wgbV9vcGFxdWU7CiAgICAgYm9vbCBtX2RvdWJsZVNpZGVkOwotICAg IGJvb2wgbV91c2VzTGF5ZXJTY2lzc29yOworICAgIGJvb2wgbV91c2VzTGF5ZXJDbGlwcGluZzsK ICAgICBib29sIG1faXNOb25Db21wb3NpdGVkQ29udGVudDsKICAgICBib29sIG1fcHJlc2VydmVz M0Q7CiAKQEAgLTI3Niw3ICsyNzYsNyBAQCBwcml2YXRlOgogICAgIC8vIFRyYW5zaWVudCBwcm9w ZXJ0aWVzLgogICAgIE93blB0cjxSZW5kZXJTdXJmYWNlQ2hyb21pdW0+IG1fcmVuZGVyU3VyZmFj ZTsKICAgICBmbG9hdCBtX2RyYXdPcGFjaXR5OwotICAgIEludFJlY3QgbV9zY2lzc29yUmVjdDsK KyAgICBJbnRSZWN0IG1fY2xpcFJlY3Q7CiAgICAgUmVuZGVyU3VyZmFjZUNocm9taXVtKiBtX3Rh cmdldFJlbmRlclN1cmZhY2U7CiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggbV9kcmF3VHJhbnNm b3JtOwogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fc2NyZWVuU3BhY2VUcmFuc2Zvcm07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCBiZWUyNmU2YzkxMWI0OTE1 ZGFjYzE2NmI3ZTIwYzc5YzgwZDAzNmM4Li5kZjI1NDM1NmJkYmQ2MWY4MmQ5MjFlOGU5YzBkY2Vl YzlhYTVlOGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTM1 Myw3ICszNTMsNyBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVyc0ludGVy bmFsKCkKICAgICAgICAgcm9vdERyYXdMYXllci0+Y3JlYXRlUmVuZGVyU3VyZmFjZSgpOwogICAg IHJvb3REcmF3TGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+c2V0Q29udGVudFJlY3QoSW50UmVjdChJ bnRQb2ludCgpLCB2aWV3cG9ydFNpemUoKSkpOwogCi0gICAgcm9vdERyYXdMYXllci0+c2V0U2Np c3NvclJlY3QoSW50UmVjdChJbnRQb2ludCgpLCB2aWV3cG9ydFNpemUoKSkpOworICAgIHJvb3RE cmF3TGF5ZXItPnNldENsaXBSZWN0KEludFJlY3QoSW50UG9pbnQoKSwgdmlld3BvcnRTaXplKCkp KTsKIAogICAgIENDTGF5ZXJMaXN0IHJlbmRlclN1cmZhY2VMYXllckxpc3Q7CiAgICAgcmVuZGVy U3VyZmFjZUxheWVyTGlzdC5hcHBlbmQocm9vdERyYXdMYXllcik7CkBAIC01ODIsOCArNTgyLDgg QEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdMYXllcihDQ0xheWVySW1wbCogbGF5 ZXIsIENDUmVuZGVyU3VyZmFjZSogdGFyZ2UKICAgICBpZiAodmlzaWJsZUxheWVyUmVjdC5pc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChsYXllci0+dXNlc0xheWVyU2Npc3Nv cigpKQotICAgICAgICBzZXRTY2lzc29yVG9SZWN0KGxheWVyLT5zY2lzc29yUmVjdCgpKTsKKyAg ICBpZiAobGF5ZXItPnVzZXNMYXllckNsaXBwaW5nKCkpCisgICAgICAgIHNldFNjaXNzb3JUb1Jl Y3QobGF5ZXItPmNsaXBSZWN0KCkpOwogICAgIGVsc2UKICAgICAgICAgR0xDKG1fY29udGV4dC5n ZXQoKSwgbV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1Qp KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vUmVuZGVyU3VyZmFjZUNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uaAppbmRleCA4YzJmYjY5OGE0NTNm ZWQ5YjE3ZDNhYzFmYWUzNWJmMDdhMDZkOThmLi45M2U4ZDg2YzY3MTcxYzI3N2VjMTc1YzYxOWRi ZTg4MGI3MmY0MThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uaApAQCAtNzIs OCArNzIsOCBAQCBwdWJsaWM6CiAgICAgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHJlcGxp Y2FEcmF3VHJhbnNmb3JtKCkgY29uc3QgeyByZXR1cm4gbV9yZXBsaWNhRHJhd1RyYW5zZm9ybTsg fQogICAgIHZvaWQgc2V0UmVwbGljYURyYXdUcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25N YXRyaXgmIHJlcGxpY2FEcmF3VHJhbnNmb3JtKSB7IG1fcmVwbGljYURyYXdUcmFuc2Zvcm0gPSBy ZXBsaWNhRHJhd1RyYW5zZm9ybTsgfQogCi0gICAgY29uc3QgSW50UmVjdCYgc2Npc3NvclJlY3Qo KSBjb25zdCB7IHJldHVybiBtX3NjaXNzb3JSZWN0OyB9Ci0gICAgdm9pZCBzZXRTY2lzc29yUmVj dChjb25zdCBJbnRSZWN0JiBzY2lzc29yUmVjdCkgeyBtX3NjaXNzb3JSZWN0ID0gc2Npc3NvclJl Y3Q7IH0KKyAgICBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xp cFJlY3Q7IH0KKyAgICB2b2lkIHNldENsaXBSZWN0KGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KSB7 IG1fY2xpcFJlY3QgPSBjbGlwUmVjdDsgfQogCiAgICAgYm9vbCBza2lwc0RyYXcoKSBjb25zdCB7 IHJldHVybiBtX3NraXBzRHJhdzsgfQogICAgIHZvaWQgc2V0U2tpcHNEcmF3KGJvb2wgc2tpcHNE cmF3KSB7IG1fc2tpcHNEcmF3ID0gc2tpcHNEcmF3OyB9CkBAIC05NCw3ICs5NCw3IEBAIHByaXZh dGU6CiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggbV9kcmF3VHJhbnNmb3JtOwogICAgIFRyYW5z Zm9ybWF0aW9uTWF0cml4IG1fcmVwbGljYURyYXdUcmFuc2Zvcm07CiAgICAgVHJhbnNmb3JtYXRp b25NYXRyaXggbV9vcmlnaW5UcmFuc2Zvcm07Ci0gICAgSW50UmVjdCBtX3NjaXNzb3JSZWN0Owor ICAgIEludFJlY3QgbV9jbGlwUmVjdDsKICAgICBWZWN0b3I8UmVmUHRyPExheWVyQ2hyb21pdW0+ ID4gbV9sYXllckxpc3Q7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5jcHAKaW5kZXggYjNhZjBm YmJmN2UwMmU3Zjc3Njc5N2Y4MWEzYmQ2MmYxNGY5YmQ2YS4uZjdiNDg0MTUyNmFiYmY0ZTllNjY3 Nzk5YjQzMzRkMGVlMzcxNjE5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcApAQCAtNDgsNyAr NDgsNyBAQCBDQ0xheWVySW1wbDo6Q0NMYXllckltcGwoaW50IGlkKQogICAgICwgbV9vcGFxdWUo ZmFsc2UpCiAgICAgLCBtX29wYWNpdHkoMS4wKQogICAgICwgbV9wcmVzZXJ2ZXMzRChmYWxzZSkK LSAgICAsIG1fdXNlc0xheWVyU2Npc3NvcihmYWxzZSkKKyAgICAsIG1fdXNlc0xheWVyQ2xpcHBp bmcoZmFsc2UpCiAgICAgLCBtX2lzTm9uQ29tcG9zaXRlZENvbnRlbnQoZmFsc2UpCiAgICAgLCBt X2RyYXdzQ29udGVudChmYWxzZSkKICAgICAsIG1fdGFyZ2V0UmVuZGVyU3VyZmFjZSgwKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJJbXBsLmgKaW5kZXggYzMyZTExN2I3YjVmZDlhMWY5ZTA1MTllOWM4YTllYWY3Y2Zi NTMwZC4uNDQ5MzhlNWUyZThiNjVmNjY1ZWFhNjIwYmQyYzNlOWYwMjk3ZDk5YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllcklt cGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVySW1wbC5oCkBAIC0xMDQsOCArMTA0LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0UHJl c2VydmVzM0QoYm9vbCk7CiAgICAgYm9vbCBwcmVzZXJ2ZXMzRCgpIGNvbnN0IHsgcmV0dXJuIG1f cHJlc2VydmVzM0Q7IH0KIAotICAgIHZvaWQgc2V0VXNlc0xheWVyU2Npc3Nvcihib29sIHVzZXNM YXllclNjaXNzb3IpIHsgbV91c2VzTGF5ZXJTY2lzc29yID0gdXNlc0xheWVyU2Npc3NvcjsgfQot ICAgIGJvb2wgdXNlc0xheWVyU2Npc3NvcigpIGNvbnN0IHsgcmV0dXJuIG1fdXNlc0xheWVyU2Np c3NvcjsgfQorICAgIHZvaWQgc2V0VXNlc0xheWVyQ2xpcHBpbmcoYm9vbCB1c2VzTGF5ZXJDbGlw cGluZykgeyBtX3VzZXNMYXllckNsaXBwaW5nID0gdXNlc0xheWVyQ2xpcHBpbmc7IH0KKyAgICBi b29sIHVzZXNMYXllckNsaXBwaW5nKCkgY29uc3QgeyByZXR1cm4gbV91c2VzTGF5ZXJDbGlwcGlu ZzsgfQogCiAgICAgdm9pZCBzZXRJc05vbkNvbXBvc2l0ZWRDb250ZW50KGJvb2wgaXNOb25Db21w b3NpdGVkQ29udGVudCkgeyBtX2lzTm9uQ29tcG9zaXRlZENvbnRlbnQgPSBpc05vbkNvbXBvc2l0 ZWRDb250ZW50OyB9CiAgICAgYm9vbCBpc05vbkNvbXBvc2l0ZWRDb250ZW50KCkgY29uc3QgeyBy ZXR1cm4gbV9pc05vbkNvbXBvc2l0ZWRDb250ZW50OyB9CkBAIC0xMzQsOCArMTM0LDggQEAgcHVi bGljOgogICAgIGZsb2F0IGRyYXdPcGFjaXR5KCkgY29uc3QgeyByZXR1cm4gbV9kcmF3T3BhY2l0 eTsgfQogICAgIHZvaWQgc2V0RHJhd09wYWNpdHkoZmxvYXQgb3BhY2l0eSkgeyBtX2RyYXdPcGFj aXR5ID0gb3BhY2l0eTsgfQogCi0gICAgY29uc3QgSW50UmVjdCYgc2Npc3NvclJlY3QoKSBjb25z dCB7IHJldHVybiBtX3NjaXNzb3JSZWN0OyB9Ci0gICAgdm9pZCBzZXRTY2lzc29yUmVjdChjb25z dCBJbnRSZWN0JiByZWN0KSB7IG1fc2Npc3NvclJlY3QgPSByZWN0OyB9CisgICAgY29uc3QgSW50 UmVjdCYgY2xpcFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2NsaXBSZWN0OyB9CisgICAgdm9pZCBz ZXRDbGlwUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KSB7IG1fY2xpcFJlY3QgPSByZWN0OyB9CiAg ICAgQ0NSZW5kZXJTdXJmYWNlKiB0YXJnZXRSZW5kZXJTdXJmYWNlKCkgY29uc3QgeyByZXR1cm4g bV90YXJnZXRSZW5kZXJTdXJmYWNlOyB9CiAgICAgdm9pZCBzZXRUYXJnZXRSZW5kZXJTdXJmYWNl KENDUmVuZGVyU3VyZmFjZSogc3VyZmFjZSkgeyBtX3RhcmdldFJlbmRlclN1cmZhY2UgPSBzdXJm YWNlOyB9CiAKQEAgLTIyOSw3ICsyMjksNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9wcmVzZXJ2 ZXMzRDsKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3N1YmxheWVyVHJhbnNmb3JtOwogICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fdHJhbnNmb3JtOwotICAgIGJvb2wgbV91c2VzTGF5ZXJT Y2lzc29yOworICAgIGJvb2wgbV91c2VzTGF5ZXJDbGlwcGluZzsKICAgICBib29sIG1faXNOb25D b21wb3NpdGVkQ29udGVudDsKIAogICAgIGJvb2wgbV9kcmF3c0NvbnRlbnQ7CkBAIC0yNjIsMTAg KzI2MiwxMCBAQCBwcml2YXRlOgogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fZHJhd1RyYW5z Zm9ybTsKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3NjcmVlblNwYWNlVHJhbnNmb3JtOwog Ci0gICAgLy8gVGhlIHNjaXNzb3IgcmVjdGFuZ2xlIHRoYXQgc2hvdWxkIGJlIHVzZWQgd2hlbiB0 aGlzIGxheWVyIGlzIGRyYXduLgorICAgIC8vIFRoZSByZWN0IHRoYXQgY29udHJpYnV0ZXMgdG8g dGhlIHNjaXNzb3Igd2hlbiB0aGlzIGxheWVyIGlzIGRyYXduLgogICAgIC8vIEluaGVyaXRlZCBi eSB0aGUgcGFyZW50IGxheWVyIGFuZCBmdXJ0aGVyIHJlc3RyaWN0ZWQgaWYgdGhpcyBsYXllciBt YXNrcwogICAgIC8vIHRvIGJvdW5kcy4KLSAgICBJbnRSZWN0IG1fc2Npc3NvclJlY3Q7CisgICAg SW50UmVjdCBtX2NsaXBSZWN0OwogCiAgICAgLy8gUmVuZGVyIHN1cmZhY2UgYXNzb2NpYXRlZCB3 aXRoIHRoaXMgbGF5ZXIuIFRoZSBsYXllciBhbmQgaXRzIGRlc2NlbmRhbnRzCiAgICAgLy8gd2ls bCByZW5kZXIgdG8gdGhpcyBzdXJmYWNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAK aW5kZXggMDQ2MWJkZjliN2MxOGUyNGE3ZTg5ZmM4OTc0YTNlYjZiNTlmMTI1YS4uYTkwOGNlOTIx YTZiYWViNGFiNDRiOTU1MDM0MmY5MjUxMjMyMjY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3QuY3BwCkBAIC0yOTMsOCArMjkzLDggQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnVwZGF0 ZUxheWVycyhMYXllckNocm9taXVtKiByb290TGF5ZXIpCiAgICAgICAgIHJvb3RMYXllci0+Y3Jl YXRlUmVuZGVyU3VyZmFjZSgpOwogICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5zZXRD b250ZW50UmVjdChJbnRSZWN0KEludFBvaW50KDAsIDApLCB2aWV3cG9ydFNpemUoKSkpOwogCi0g ICAgSW50UmVjdCByb290U2Npc3NvclJlY3QoSW50UG9pbnQoKSwgdmlld3BvcnRTaXplKCkpOwot ICAgIHJvb3RMYXllci0+c2V0U2Npc3NvclJlY3Qocm9vdFNjaXNzb3JSZWN0KTsKKyAgICBJbnRS ZWN0IHJvb3RDbGlwUmVjdChJbnRQb2ludCgpLCB2aWV3cG9ydFNpemUoKSk7CisgICAgcm9vdExh eWVyLT5zZXRDbGlwUmVjdChyb290Q2xpcFJlY3QpOwogCiAgICAgLy8gVGhpcyBhc3NlcnQgZmly ZXMgaWYgdXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyB3YXNuJ3QgY2FsbGVkIGFmdGVyCiAgICAg Ly8gdXBkYXRlTGF5ZXJzLiBPbmx5IG9uZSB1cGRhdGUgY2FuIGJlIHBlbmRpbmcgYXQgYW55IGdp dmVuIHRpbWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcAppbmRl eCAwNzAwOGUwMjkwYjI0NjY4NjJiMTU0NzZlZmIyODQxMTI5Y2QzNDljLi45NTg4NWI0MjNhMGE4 NDE2MDA1ODAzZDNmODAwNDc4ZmY5NjQwYmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdENvbW1vbi5jcHAKQEAgLTgwLDcgKzgwLDcgQEAgYm9vbCBsYXllclNob3VsZEJlU2tp cHBlZChMYXllclR5cGUqIGxheWVyKQogICAgIC8vICAgLSB0aGUgbGF5ZXIgaXMgbm90IGRvdWJs ZS1zaWRlZCwgYnV0IGl0cyBiYWNrIGZhY2UgaXMgdmlzaWJsZS4KICAgICAvLwogICAgIC8vIFNv bWUgYWRkaXRpb25hbCBjb25kaXRpb25zIG5lZWQgdG8gYmUgY29tcHV0ZWQgYXQgYSBsYXRlciBw b2ludCBhZnRlciB0aGUgcmVjdXJzaW9uIGlzIGZpbmlzaGVkLgotICAgIC8vICAgLSB0aGUgaW50 ZXJzZWN0aW9uIG9mIHJlbmRlciBzdXJmYWNlIGNvbnRlbnQgYW5kIGxheWVyIHNjaXNzb3IgaXMg ZW1wdHkKKyAgICAvLyAgIC0gdGhlIGludGVyc2VjdGlvbiBvZiByZW5kZXIgc3VyZmFjZSBjb250 ZW50IGFuZCBsYXllciBjbGlwUmVjdCBpcyBlbXB0eQogICAgIC8vICAgLSB0aGUgdmlzaWJsZUxh eWVyUmVjdCBpcyBlbXB0eQogCiAgICAgaWYgKCFsYXllci0+ZHJhd3NDb250ZW50KCkgfHwgIWxh eWVyLT5vcGFjaXR5KCkgfHwgbGF5ZXItPmJvdW5kcygpLmlzRW1wdHkoKSkKQEAgLTEwNCw3ICsx MDQsNyBAQCBib29sIGxheWVyU2hvdWxkQmVTa2lwcGVkKExheWVyVHlwZSogbGF5ZXIpCiB9CiAK IC8vIFJlY3Vyc2l2ZWx5IHdhbGtzIHRoZSBsYXllciB0cmVlIHN0YXJ0aW5nIGF0IHRoZSBnaXZl biBub2RlIGFuZCBjb21wdXRlcyBhbGwgdGhlCi0vLyBuZWNlc3NhcnkgdHJhbnNmb3JtYXRpb25z LCBzY2lzc29yIHJlY3RhbmdsZXMsIHJlbmRlciBzdXJmYWNlcywgZXRjLgorLy8gbmVjZXNzYXJ5 IHRyYW5zZm9ybWF0aW9ucywgY2xpcFJlY3RzLCByZW5kZXIgc3VyZmFjZXMsIGV0Yy4KIHRlbXBs YXRlPHR5cGVuYW1lIExheWVyVHlwZSwgdHlwZW5hbWUgUmVuZGVyU3VyZmFjZVR5cGUsIHR5cGVu YW1lIExheWVyU29ydGVyPgogc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNBbmRW aXNpYmlsaXR5SW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290TGF5ZXIs IGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBwYXJlbnRNYXRyaXgsIGNvbnN0IFRyYW5zZm9y bWF0aW9uTWF0cml4JiBmdWxsSGllcmFyY2h5TWF0cml4LCBWZWN0b3I8UmVmUHRyPExheWVyVHlw ZT4gPiYgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgVmVjdG9yPFJlZlB0cjxMYXllclR5cGU+ID4m IGxheWVyTGlzdCwgTGF5ZXJTb3J0ZXIqIGxheWVyU29ydGVyLCBpbnQgbWF4VGV4dHVyZVNpemUp CiB7CkBAIC0yMTQsNyArMjE0LDcgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9y bXNBbmRWaXNpYmlsaXR5SW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXIKICAgICBUcmFu c2Zvcm1hdGlvbk1hdHJpeCBuZXh0SGllcmFyY2h5TWF0cml4ID0gZnVsbEhpZXJhcmNoeU1hdHJp eDsKIAogICAgIC8vIEZJWE1FOiBUaGlzIHNlZW1zIGxpa2UgdGhlIHdyb25nIHBsYWNlIHRvIHNl dCB0aGlzCi0gICAgbGF5ZXItPnNldFVzZXNMYXllclNjaXNzb3IoZmFsc2UpOworICAgIGxheWVy LT5zZXRVc2VzTGF5ZXJDbGlwcGluZyhmYWxzZSk7CiAKICAgICAvLyBUaGUgbGF5ZXIgYW5kIGl0 cyBkZXNjZW5kYW50cyByZW5kZXIgb24gYSBuZXcgUmVuZGVyU3VyZmFjZSBpZiBhbnkgb2YKICAg ICAvLyB0aGVzZSBjb25kaXRpb25zIGhvbGQ6CkBAIC0yNTcsMTAgKzI1NywxMCBAQCBzdGF0aWMg dm9pZCBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0FuZFZpc2liaWxpdHlJbnRlcm5hbChMYXllclR5 cGUqIGxheWVyLCBMYXllcgogICAgICAgICAvLyBVcGRhdGUgdGhlIGFnZ3JlZ2F0ZSBoaWVyYXJj aHkgbWF0cml4IHRvIGluY2x1ZGUgdGhlIHRyYW5zZm9ybSBvZiB0aGUgbmV3bHkgY3JlYXRlZCBS ZW5kZXJTdXJmYWNlLgogICAgICAgICBuZXh0SGllcmFyY2h5TWF0cml4Lm11bHRpcGx5KGxheWVy T3JpZ2luVHJhbnNmb3JtKTsKIAotICAgICAgICAvLyBUaGUgcmVuZGVyIHN1cmZhY2Ugc2Npc3Nv ciByZWN0IGlzIHRoZSBzY2lzc29yIHJlY3QgdGhhdCBuZWVkcyB0bworICAgICAgICAvLyBUaGUg cmVuZGVyIHN1cmZhY2UgY2xpcFJlY3QgY29udHJpYnV0ZXMgdG8gdGhlIHNjaXNzb3IgcmVjdCB0 aGF0IG5lZWRzIHRvCiAgICAgICAgIC8vIGJlIGFwcGxpZWQgYmVmb3JlIGRyYXdpbmcgdGhlIHJl bmRlciBzdXJmYWNlIG9udG8gaXRzIGNvbnRhaW5pbmcKICAgICAgICAgLy8gc3VyZmFjZSBhbmQg aXMgdGhlcmVmb3JlIGV4cHJlc3NlZCBpbiB0aGUgcGFyZW50J3MgY29vcmRpbmF0ZSBzeXN0ZW0u Ci0gICAgICAgIHJlbmRlclN1cmZhY2UtPnNldFNjaXNzb3JSZWN0KGxheWVyLT5wYXJlbnQoKSA/ IGxheWVyLT5wYXJlbnQoKS0+c2Npc3NvclJlY3QoKSA6IGxheWVyLT5zY2lzc29yUmVjdCgpKTsK KyAgICAgICAgcmVuZGVyU3VyZmFjZS0+c2V0Q2xpcFJlY3QobGF5ZXItPnBhcmVudCgpID8gbGF5 ZXItPnBhcmVudCgpLT5jbGlwUmVjdCgpIDogbGF5ZXItPmNsaXBSZWN0KCkpOwogCiAgICAgICAg IHJlbmRlclN1cmZhY2UtPmNsZWFyTGF5ZXJMaXN0KCk7CiAKQEAgLTI4NCwxMCArMjg0LDEwIEBA IHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUludGVybmFs KExheWVyVHlwZSogbGF5ZXIsIExheWVyCiAgICAgICAgICAgICBpZiAobGF5ZXItPnBhcmVudCgp LT5wcmVzZXJ2ZXMzRCgpKQogICAgICAgICAgICAgICAgbGF5ZXItPnNldERyYXdPcGFjaXR5KGxh eWVyLT5kcmF3T3BhY2l0eSgpICogbGF5ZXItPnBhcmVudCgpLT5kcmF3T3BhY2l0eSgpKTsKIAot ICAgICAgICAgICAgLy8gTGF5ZXJzIGluaGVyaXQgdGhlIHNjaXNzb3IgcmVjdCBmcm9tIHRoZWly IHBhcmVudC4KLSAgICAgICAgICAgIGxheWVyLT5zZXRTY2lzc29yUmVjdChsYXllci0+cGFyZW50 KCktPnNjaXNzb3JSZWN0KCkpOwotICAgICAgICAgICAgaWYgKGxheWVyLT5wYXJlbnQoKS0+dXNl c0xheWVyU2Npc3NvcigpKQotICAgICAgICAgICAgICAgIGxheWVyLT5zZXRVc2VzTGF5ZXJTY2lz c29yKHRydWUpOworICAgICAgICAgICAgLy8gTGF5ZXJzIGluaGVyaXQgdGhlIGNsaXAgcmVjdCBm cm9tIHRoZWlyIHBhcmVudC4KKyAgICAgICAgICAgIGxheWVyLT5zZXRDbGlwUmVjdChsYXllci0+ cGFyZW50KCktPmNsaXBSZWN0KCkpOworICAgICAgICAgICAgaWYgKGxheWVyLT5wYXJlbnQoKS0+ dXNlc0xheWVyQ2xpcHBpbmcoKSkKKyAgICAgICAgICAgICAgICBsYXllci0+c2V0VXNlc0xheWVy Q2xpcHBpbmcodHJ1ZSk7CiAKICAgICAgICAgICAgIGxheWVyLT5zZXRUYXJnZXRSZW5kZXJTdXJm YWNlKGxheWVyLT5wYXJlbnQoKS0+dGFyZ2V0UmVuZGVyU3VyZmFjZSgpKTsKICAgICAgICAgfQpA QCAtMjk2LDEwICsyOTYsMTAgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNB bmRWaXNpYmlsaXR5SW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXIKICAgICAgICAgICAg IGxheWVyLT5jbGVhclJlbmRlclN1cmZhY2UoKTsKIAogICAgICAgICBpZiAobGF5ZXItPm1hc2tz VG9Cb3VuZHMoKSkgewotICAgICAgICAgICAgSW50UmVjdCBzY2lzc29yID0gdHJhbnNmb3JtZWRM YXllclJlY3Q7Ci0gICAgICAgICAgICBzY2lzc29yLmludGVyc2VjdChsYXllci0+c2Npc3NvclJl Y3QoKSk7Ci0gICAgICAgICAgICBsYXllci0+c2V0U2Npc3NvclJlY3Qoc2Npc3Nvcik7Ci0gICAg ICAgICAgICBsYXllci0+c2V0VXNlc0xheWVyU2Npc3Nvcih0cnVlKTsKKyAgICAgICAgICAgIElu dFJlY3QgY2xpcFJlY3QgPSB0cmFuc2Zvcm1lZExheWVyUmVjdDsKKyAgICAgICAgICAgIGNsaXBS ZWN0LmludGVyc2VjdChsYXllci0+Y2xpcFJlY3QoKSk7CisgICAgICAgICAgICBsYXllci0+c2V0 Q2xpcFJlY3QoY2xpcFJlY3QpOworICAgICAgICAgICAgbGF5ZXItPnNldFVzZXNMYXllckNsaXBw aW5nKHRydWUpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0zMjEsOCArMzIxLDggQEAgc3RhdGlj IHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNBbmRWaXNpYmlsaXR5SW50ZXJuYWwoTGF5ZXJU eXBlKiBsYXllciwgTGF5ZXIKICAgICAvLyBSZW5kZXJTdXJmYWNlIHRoZSBsYXllciBkcmF3cyBp bnRvLgogICAgIGlmIChsYXllci0+ZHJhd3NDb250ZW50KCkpIHsKICAgICAgICAgSW50UmVjdCBk cmF3YWJsZUNvbnRlbnRSZWN0ID0gdHJhbnNmb3JtZWRMYXllclJlY3Q7Ci0gICAgICAgIGlmIChs YXllci0+dXNlc0xheWVyU2Npc3NvcigpKQotICAgICAgICAgICAgZHJhd2FibGVDb250ZW50UmVj dC5pbnRlcnNlY3QobGF5ZXItPnNjaXNzb3JSZWN0KCkpOworICAgICAgICBpZiAobGF5ZXItPnVz ZXNMYXllckNsaXBwaW5nKCkpCisgICAgICAgICAgICBkcmF3YWJsZUNvbnRlbnRSZWN0LmludGVy c2VjdChsYXllci0+Y2xpcFJlY3QoKSk7CiAgICAgICAgIGxheWVyLT5zZXREcmF3YWJsZUNvbnRl bnRSZWN0KGRyYXdhYmxlQ29udGVudFJlY3QpOwogICAgIH0gZWxzZQogICAgICAgICBsYXllci0+ c2V0RHJhd2FibGVDb250ZW50UmVjdChJbnRSZWN0KCkpOwpAQCAtMzg4LDkgKzM4OCw5IEBAIHN0 YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUludGVybmFsKExh eWVyVHlwZSogbGF5ZXIsIExheWVyCiAgICAgICAgIC8vIERvbid0IGNsaXAgaWYgdGhlIGxheWVy IGlzIHJlZmxlY3RlZCBhcyB0aGUgcmVmbGVjdGlvbiBzaG91bGRuJ3QgYmUKICAgICAgICAgLy8g Y2xpcHBlZC4KICAgICAgICAgaWYgKCFsYXllci0+cmVwbGljYUxheWVyKCkpIHsKLSAgICAgICAg ICAgIGlmICghcmVuZGVyU3VyZmFjZS0+c2Npc3NvclJlY3QoKS5pc0VtcHR5KCkgJiYgIWNsaXBw ZWRDb250ZW50UmVjdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICBJbnRSZWN0IHN1cmZh Y2VTY2lzc29yUmVjdCA9IENDTGF5ZXJUcmVlSG9zdENvbW1vbjo6Y2FsY3VsYXRlVmlzaWJsZVJl Y3QocmVuZGVyU3VyZmFjZS0+c2Npc3NvclJlY3QoKSwgY2xpcHBlZENvbnRlbnRSZWN0LCByZW5k ZXJTdXJmYWNlLT5vcmlnaW5UcmFuc2Zvcm0oKSk7Ci0gICAgICAgICAgICAgICAgY2xpcHBlZENv bnRlbnRSZWN0LmludGVyc2VjdChzdXJmYWNlU2Npc3NvclJlY3QpOworICAgICAgICAgICAgaWYg KCFyZW5kZXJTdXJmYWNlLT5jbGlwUmVjdCgpLmlzRW1wdHkoKSAmJiAhY2xpcHBlZENvbnRlbnRS ZWN0LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIEludFJlY3Qgc3VyZmFjZUNsaXBSZWN0 ID0gQ0NMYXllclRyZWVIb3N0Q29tbW9uOjpjYWxjdWxhdGVWaXNpYmxlUmVjdChyZW5kZXJTdXJm YWNlLT5jbGlwUmVjdCgpLCBjbGlwcGVkQ29udGVudFJlY3QsIHJlbmRlclN1cmZhY2UtPm9yaWdp blRyYW5zZm9ybSgpKTsKKyAgICAgICAgICAgICAgICBjbGlwcGVkQ29udGVudFJlY3QuaW50ZXJz ZWN0KHN1cmZhY2VDbGlwUmVjdCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBGbG9hdFBv aW50IGNsaXBwZWRTdXJmYWNlQ2VudGVyID0gRmxvYXRSZWN0KGNsaXBwZWRDb250ZW50UmVjdCku Y2VudGVyKCk7CiAgICAgICAgICAgICBjZW50ZXJPZmZzZXREdWVUb0NsaXBwaW5nID0gY2xpcHBl ZFN1cmZhY2VDZW50ZXIgLSBzdXJmYWNlQ2VudGVyOwpAQCAtNDA3LDggKzQwNyw4IEBAIHN0YXRp YyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zQW5kVmlzaWJpbGl0eUludGVybmFsKExheWVy VHlwZSogbGF5ZXIsIExheWVyCiAgICAgICAgIHJlbmRlclN1cmZhY2UtPnNldENvbnRlbnRSZWN0 KGNsaXBwZWRDb250ZW50UmVjdCk7CiAKICAgICAgICAgLy8gU2luY2UgdGhlIGxheWVyIHN0YXJ0 cyBhIG5ldyByZW5kZXIgc3VyZmFjZSB3ZSBuZWVkIHRvIGFkanVzdCBpdHMKLSAgICAgICAgLy8g c2Npc3NvciByZWN0IHRvIGJlIGV4cHJlc3NlZCBpbiB0aGUgbmV3IHN1cmZhY2UncyBjb29yZGlu YXRlIHN5c3RlbS4KLSAgICAgICAgbGF5ZXItPnNldFNjaXNzb3JSZWN0KGxheWVyLT5kcmF3YWJs ZUNvbnRlbnRSZWN0KCkpOworICAgICAgICAvLyBjbGlwUmVjdCB0byBiZSBleHByZXNzZWQgaW4g dGhlIG5ldyBzdXJmYWNlJ3MgY29vcmRpbmF0ZSBzeXN0ZW0uCisgICAgICAgIGxheWVyLT5zZXRD bGlwUmVjdChsYXllci0+ZHJhd2FibGVDb250ZW50UmVjdCgpKTsKIAogICAgICAgICAvLyBBZGp1 c3QgdGhlIG9yaWdpbiBvZiB0aGUgdHJhbnNmb3JtIHRvIGJlIHRoZSBjZW50ZXIgb2YgdGhlIHJl bmRlciBzdXJmYWNlLgogICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBkcmF3VHJhbnNmb3Jt ID0gcmVuZGVyU3VyZmFjZS0+b3JpZ2luVHJhbnNmb3JtKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RDb21t b24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdENvbW1vbi5oCmluZGV4IGU0ZDQ5NjM3NDE4Yjc5YjMwZWMwYzMwZDFmYjBmM2Jk YTIxNjM1NWEuLjZhYTBkMGMwYjdmZjU2YjRhN2I0ZTI2OGRiYWZiZDUzOGNkMWM0NzkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdENvbW1vbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5oCkBAIC01OSw4ICs1OSw4IEBAIElu dFJlY3QgQ0NMYXllclRyZWVIb3N0Q29tbW9uOjpjYWxjdWxhdGVWaXNpYmxlTGF5ZXJSZWN0KExh eWVyVHlwZSogbGF5ZXIpCiAgICAgQVNTRVJUKGxheWVyLT50YXJnZXRSZW5kZXJTdXJmYWNlKCkp OwogICAgIEludFJlY3QgdGFyZ2V0U3VyZmFjZVJlY3QgPSBsYXllci0+dGFyZ2V0UmVuZGVyU3Vy ZmFjZSgpLT5jb250ZW50UmVjdCgpOwogCi0gICAgaWYgKGxheWVyLT51c2VzTGF5ZXJTY2lzc29y KCkpCi0gICAgICAgIHRhcmdldFN1cmZhY2VSZWN0LmludGVyc2VjdChsYXllci0+c2Npc3NvclJl Y3QoKSk7CisgICAgaWYgKGxheWVyLT51c2VzTGF5ZXJDbGlwcGluZygpKQorICAgICAgICB0YXJn ZXRTdXJmYWNlUmVjdC5pbnRlcnNlY3QobGF5ZXItPmNsaXBSZWN0KCkpOwogCiAgICAgaWYgKHRh cmdldFN1cmZhY2VSZWN0LmlzRW1wdHkoKSB8fCBsYXllci0+Y29udGVudEJvdW5kcygpLmlzRW1w dHkoKSkKICAgICAgICAgcmV0dXJuIHRhcmdldFN1cmZhY2VSZWN0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVu ZGVyU3VyZmFjZS5jcHAKaW5kZXggMzI3M2JlZjczODVhNzc1ZWYyZTFmMzRmNGViMDdlYjJjZjBj MGVjMS4uNDdhNzYzMTBiZWJjMTg0ZDgzOGRhYmEzOWIzM2EwNmZmMmZiZjVjZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJT dXJmYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ1JlbmRlclN1cmZhY2UuY3BwCkBAIC0xMTIsOCArMTEyLDggQEAgdm9pZCBDQ1JlbmRl clN1cmZhY2U6OmRyYXcoTGF5ZXJSZW5kZXJlckNocm9taXVtKiBsYXllclJlbmRlcmVyLCBjb25z dCBJbnRSZWN0JikKICAgICBpZiAoIW1fbWFza0xheWVyICYmIG1fb3duaW5nTGF5ZXItPnJlcGxp Y2FMYXllcigpKQogICAgICAgICByZXBsaWNhTWFza0xheWVyID0gbV9vd25pbmdMYXllci0+cmVw bGljYUxheWVyKCktPm1hc2tMYXllcigpOwogCi0gICAgaWYgKG1fb3duaW5nTGF5ZXItPnBhcmVu dCgpICYmIG1fb3duaW5nTGF5ZXItPnBhcmVudCgpLT51c2VzTGF5ZXJTY2lzc29yKCkpCi0gICAg ICAgIGxheWVyUmVuZGVyZXItPnNldFNjaXNzb3JUb1JlY3QobV9zY2lzc29yUmVjdCk7CisgICAg aWYgKG1fb3duaW5nTGF5ZXItPnBhcmVudCgpICYmIG1fb3duaW5nTGF5ZXItPnBhcmVudCgpLT51 c2VzTGF5ZXJDbGlwcGluZygpKQorICAgICAgICBsYXllclJlbmRlcmVyLT5zZXRTY2lzc29yVG9S ZWN0KG1fY2xpcFJlY3QpOwogICAgIGVsc2UKICAgICAgICAgR0xDKGxheWVyUmVuZGVyZXItPmNv bnRleHQoKSwgbGF5ZXJSZW5kZXJlci0+Y29udGV4dCgpLT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4 dDNEOjpTQ0lTU09SX1RFU1QpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuaAppbmRleCA4 MDQ4ZTliOTVhNWUxOTE3N2U1NTFmYmEzMmRkYTBmNzZhODJjNzRkLi5kODIzYTY2OTZjYmQ4OTRm MzYxZTc3ZGJjYzI3NDg5M2ViMzEwODNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuaApA QCAtNzUsOCArNzUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRPcmlnaW5UcmFuc2Zvcm0oY29u c3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG9yaWdpblRyYW5zZm9ybSkgeyBtX29yaWdpblRyYW5z Zm9ybSA9IG9yaWdpblRyYW5zZm9ybTsgfQogICAgIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4 JiBvcmlnaW5UcmFuc2Zvcm0oKSBjb25zdCB7IHJldHVybiBtX29yaWdpblRyYW5zZm9ybTsgfQog Ci0gICAgdm9pZCBzZXRTY2lzc29yUmVjdChjb25zdCBJbnRSZWN0JiBzY2lzc29yUmVjdCkgeyBt X3NjaXNzb3JSZWN0ID0gc2Npc3NvclJlY3Q7IH0KLSAgICBjb25zdCBJbnRSZWN0JiBzY2lzc29y UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Npc3NvclJlY3Q7IH0KKyAgICB2b2lkIHNldENsaXBS ZWN0KGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KSB7IG1fY2xpcFJlY3QgPSBjbGlwUmVjdDsgfQor ICAgIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9jbGlwUmVjdDsg fQogCiAgICAgdm9pZCBzZXRDb250ZW50UmVjdChjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkg eyBtX2NvbnRlbnRSZWN0ID0gY29udGVudFJlY3Q7IH0KICAgICBjb25zdCBJbnRSZWN0JiBjb250 ZW50UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFJlY3Q7IH0KQEAgLTExMyw3ICsxMTMs NyBAQCBwcml2YXRlOgogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fZHJhd1RyYW5zZm9ybTsK ICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3JlcGxpY2FEcmF3VHJhbnNmb3JtOwogICAgIFRy YW5zZm9ybWF0aW9uTWF0cml4IG1fb3JpZ2luVHJhbnNmb3JtOwotICAgIEludFJlY3QgbV9zY2lz c29yUmVjdDsKKyAgICBJbnRSZWN0IG1fY2xpcFJlY3Q7CiAgICAgVmVjdG9yPFJlZlB0cjxDQ0xh eWVySW1wbD4gPiBtX2xheWVyTGlzdDsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vdGVzdHMvQ0NMYXllckltcGxUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ0NMYXllckltcGxUZXN0LmNwcAppbmRleCAyZjI2ODZhNDFmODI4MjM3ZDAwMWQ1 YjBkNDE4YmZkZTEzYzA5ODdjLi42MDgyMjZjM2RkMWE0ODEzMjhmM2JkMTk2ZmRiMjNiZGU2Y2Mx YmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJJbXBs VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVySW1wbFRl c3QuY3BwCkBAIC0xNTYsOCArMTU2LDggQEAgVEVTVChDQ0xheWVySW1wbFRlc3QsIHZlcmlmeUxh eWVyQ2hhbmdlc0FyZVRyYWNrZWRQcm9wZXJseSkKIAogICAgIC8vIFRoZXNlIHByb3BlcnRpZXMg YXJlIGludGVybmFsLCBhbmQgc2hvdWxkIG5vdCBiZSBjb25zaWRlcmVkICJjaGFuZ2UiIHdoZW4g dGhleSBhcmUgdXNlZC4KICAgICBFWEVDVVRFX0FORF9WRVJJRllfU1VCVFJFRV9ESURfTk9UX0NI QU5HRShyb290LT5zZXRJc05vbkNvbXBvc2l0ZWRDb250ZW50KHRydWUpKTsKLSAgICBFWEVDVVRF X0FORF9WRVJJRllfU1VCVFJFRV9ESURfTk9UX0NIQU5HRShyb290LT5zZXRTY2lzc29yUmVjdChh cmJpdHJhcnlJbnRSZWN0KSk7Ci0gICAgRVhFQ1VURV9BTkRfVkVSSUZZX1NVQlRSRUVfRElEX05P VF9DSEFOR0Uocm9vdC0+c2V0VXNlc0xheWVyU2Npc3Nvcih0cnVlKSk7CisgICAgRVhFQ1VURV9B TkRfVkVSSUZZX1NVQlRSRUVfRElEX05PVF9DSEFOR0Uocm9vdC0+c2V0Q2xpcFJlY3QoYXJiaXRy YXJ5SW50UmVjdCkpOworICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9TVUJUUkVFX0RJRF9OT1RfQ0hB TkdFKHJvb3QtPnNldFVzZXNMYXllckNsaXBwaW5nKHRydWUpKTsKICAgICBFWEVDVVRFX0FORF9W RVJJRllfU1VCVFJFRV9ESURfTk9UX0NIQU5HRShyb290LT5zZXREcmF3T3BhY2l0eShhcmJpdHJh cnlOdW1iZXIpKTsKICAgICBFWEVDVVRFX0FORF9WRVJJRllfU1VCVFJFRV9ESURfTk9UX0NIQU5H RShyb290LT5zZXRUYXJnZXRSZW5kZXJTdXJmYWNlKDApKTsKICAgICBFWEVDVVRFX0FORF9WRVJJ RllfU1VCVFJFRV9ESURfTk9UX0NIQU5HRShyb290LT5zZXREcmF3VHJhbnNmb3JtKGFyYml0cmFy eVRyYW5zZm9ybSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9D Q0xheWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5jcHAKaW5kZXggMDM2NDY5NjJiYTk3MTJhNDFi YjgxMzY5YTU5ZDk5Mzk1MzJiMDNlMS4uYmQ1YTc0OWI3NzJmZDM5OWZhYThjN2RmODdjNDU1ODQ2 YjgwMDdjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVy VHJlZUhvc3RDb21tb25UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L0NDTGF5ZXJUcmVlSG9zdENvbW1vblRlc3QuY3BwCkBAIC0zMjMsNyArMzIzLDcgQEAgVEVTVChD Q0xheWVyVHJlZUhvc3RDb21tb25UZXN0LCB2ZXJpZnlUcmFuc2Zvcm1zRm9yU2luZ2xlUmVuZGVy U3VyZmFjZSkKICAgICBWRVJJRllfTUFUUklYX0FMTU9TVF9FUVVBTChjaGlsZFRyYW5zbGF0aW9u VG9DZW50ZXIsIGNoaWxkLT5kcmF3VHJhbnNmb3JtKCkpOwogICAgIFZFUklGWV9NQVRSSVhfQUxN T1NUX0VRVUFMKHBhcmVudENvbXBvc2l0ZVRyYW5zZm9ybSwgY2hpbGQtPnNjcmVlblNwYWNlVHJh bnNmb3JtKCkpOwogCi0gICAgLy8gV2l0aG91dCBjbGlwcGluZyBhbmQgc2Npc3NvcmluZywgdGhl IG9yaWdpbiB0cmFuc2Zvcm0gYW5kIGRyYXcgdHJhbnNmb3JtIChpbiB0aGlzIHBhcnRpY3VsYXIg Y2FzZSkgc2hvdWxkIGJlIHRoZSBzYW1lLgorICAgIC8vIFdpdGhvdXQgY2xpcHBpbmcsIHRoZSBv cmlnaW4gdHJhbnNmb3JtIGFuZCBkcmF3IHRyYW5zZm9ybSAoaW4gdGhpcyBwYXJ0aWN1bGFyIGNh c2UpIHNob3VsZCBiZSB0aGUgc2FtZS4KICAgICBWRVJJRllfTUFUUklYX0FMTU9TVF9FUVVBTChw YXJlbnRDb21wb3NpdGVUcmFuc2Zvcm0sIGNoaWxkLT50YXJnZXRSZW5kZXJTdXJmYWNlKCktPm9y aWdpblRyYW5zZm9ybSgpKTsKICAgICBWRVJJRllfTUFUUklYX0FMTU9TVF9FUVVBTChwYXJlbnRD b21wb3NpdGVUcmFuc2Zvcm0sIGNoaWxkLT50YXJnZXRSZW5kZXJTdXJmYWNlKCktPmRyYXdUcmFu c2Zvcm0oKSk7CiAKQEAgLTQ3NCwxMiArNDc0LDEyIEBAIFRFU1QoQ0NMYXllclRyZWVIb3N0Q29t bW9uVGVzdCwgdmVyaWZ5VHJhbnNmb3Jtc0ZvclJlbmRlclN1cmZhY2VIaWVyYXJjaHkpCiAvLyBG SVhNRToKIC8vIGNvbnRpbnVlIHdvcmtpbmcgb24gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY4OTQyCiAvLyAgLSBhZGQgYSB0ZXN0IHRvIHZlcmlmeSBjbGlwcGluZyB0 aGF0IGNoYW5nZXMgdGhlICJjZW50ZXIgcG9pbnQiCi0vLyAgLSBhZGQgYSBjYXNlIHRoYXQgY2hl Y2tzIGlmIGEgcmVuZGVyIHN1cmZhY2UncyBkcmF3VHJhbnNmb3JtIGlzIGNvbXB1dGVkIGNvcnJl Y3RseS4gRm9yIHRoZSBnZW5lcmFsIGNhc2UsIGFuZCBmb3Igc3BlY2lhbCBjYXNlcyB3aGVuIGNs aXBwaW5nL3NjaXNzb3JpbmcuCisvLyAgLSBhZGQgYSBjYXNlIHRoYXQgY2hlY2tzIGlmIGEgcmVu ZGVyIHN1cmZhY2UncyBkcmF3VHJhbnNmb3JtIGlzIGNvbXB1dGVkIGNvcnJlY3RseS4gRm9yIHRo ZSBnZW5lcmFsIGNhc2UsIGFuZCBmb3Igc3BlY2lhbCBjYXNlcyB3aGVuIGNsaXBwaW5nLgogLy8g IC0gYWRkIGEgY2FzZSB0aGF0IGNoZWNrcyBpZiBhIHJlbmRlciBzdXJmYWNlJ3MgcmVwbGljYVRy YW5zZm9ybSBpcyBjb21wdXRlZCBjb3JyZWN0bHkuCiAvLyAgLSB0ZXN0IGFsbCB0aGUgY29uZGl0 aW9ucyB1bmRlciB3aGljaCByZW5kZXIgc3VyZmFjZXMgYXJlIGNyZWF0ZWQKIC8vICAtIGlmIHBv c3NpYmxlLCB0ZXN0IGFsbCBjb25kaXRpb25zIHVuZGVyIHdoaWNoIHJlbmRlciBzdXJmYWNlcyBh cmUgbm90IGNyZWF0ZWQKIC8vICAtIHZlcmlmeSB0aGF0IHRoZSBsYXllciBsaXN0cyBvZiByZW5k ZXIgc3VyZmFjZXMgYXJlIGNvcnJlY3QsIHZlcmlmeSB0aGF0ICJ0YXJnZXRSZW5kZXJTdXJmYWNl IiB2YWx1ZXMgZm9yIGVhY2ggbGF5ZXIgYXJlIGNvcnJlY3QuCi0vLyAgLSB0ZXN0IHRoZSBjb21w dXRhdGlvbiBvZiBzY2lzc29yIHJlY3RzIGFuZCBjb250ZW50IHJlY3RzCisvLyAgLSB0ZXN0IHRo ZSBjb21wdXRhdGlvbiBvZiBjbGlwIHJlY3RzIGFuZCBjb250ZW50IHJlY3RzCiAvLyAgLSB0ZXN0 IHRoZSBzcGVjaWFsIGNhc2VzIGZvciBtYXNrIGxheWVycyBhbmQgcmVwbGljYSBsYXllcnMKIC8v ICAtIHRlc3QgdGhlIG90aGVyIGZ1bmN0aW9ucyBpbiBDQ0xheWVyVHJlZUhvc3RDb21tb24KIC8v CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xheWVyQ2hyb21pdW1U ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTGF5ZXJDaHJvbWl1bVRlc3Qu Y3BwCmluZGV4IGI1ZTI2ZTVlN2MzODNiZjY5ODIwNmM3MGI2NjE0YzQ5OTg0YTUyN2MuLmM0Mzdm OGFjZTBhMDE0YjEwNWUzN2ZkZTcwMTUwZjBkNjhjZjk0NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvTGF5ZXJDaHJvbWl1bVRlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvTGF5ZXJDaHJvbWl1bVRlc3QuY3BwCkBAIC02MjIsMTEgKzYy MiwxMSBAQCBURVNUX0YoTGF5ZXJDaHJvbWl1bVRlc3QsIGNoZWNrUHJvcGVydHlDaGFuZ2VDYXVz ZXNDb3JyZWN0QmVoYXZpb3IpCiAgICAgRVhFQ1VURV9BTkRfVkVSSUZZX05PVElGWV9TWU5DX0JF SEFWSU9SKG1vY2tEZWxlZ2F0ZSwgMCwgdGVzdExheWVyLT5zZXROYW1lKCJUZXN0IExheWVyIikp OwogICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9OT1RJRllfU1lOQ19CRUhBVklPUihtb2NrRGVsZWdh dGUsIDAsIHRlc3RMYXllci0+c2V0VmlzaWJsZUxheWVyUmVjdChJbnRSZWN0KDAsIDAsIDQwLCA1 MCkpKTsKICAgICBFWEVDVVRFX0FORF9WRVJJRllfTk9USUZZX1NZTkNfQkVIQVZJT1IobW9ja0Rl bGVnYXRlLCAwLCB0ZXN0TGF5ZXItPnNldFNjcm9sbFBvc2l0aW9uKEludFBvaW50KDEwLCAxMCkp KTsKLSAgICBFWEVDVVRFX0FORF9WRVJJRllfTk9USUZZX1NZTkNfQkVIQVZJT1IobW9ja0RlbGVn YXRlLCAwLCB0ZXN0TGF5ZXItPnNldFVzZXNMYXllclNjaXNzb3IodHJ1ZSkpOworICAgIEVYRUNV VEVfQU5EX1ZFUklGWV9OT1RJRllfU1lOQ19CRUhBVklPUihtb2NrRGVsZWdhdGUsIDAsIHRlc3RM YXllci0+c2V0VXNlc0xheWVyQ2xpcHBpbmcodHJ1ZSkpOwogICAgIEVYRUNVVEVfQU5EX1ZFUklG WV9OT1RJRllfU1lOQ19CRUhBVklPUihtb2NrRGVsZWdhdGUsIDAsIHRlc3RMYXllci0+c2V0SXNO b25Db21wb3NpdGVkQ29udGVudCh0cnVlKSk7CiAgICAgRVhFQ1VURV9BTkRfVkVSSUZZX05PVElG WV9TWU5DX0JFSEFWSU9SKG1vY2tEZWxlZ2F0ZSwgMCwgdGVzdExheWVyLT5zZXRSZXBsaWNhTGF5 ZXIoZHVtbXlMYXllci5nZXQoKSkpOwogICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9OT1RJRllfU1lO Q19CRUhBVklPUihtb2NrRGVsZWdhdGUsIDAsIHRlc3RMYXllci0+c2V0RHJhd09wYWNpdHkoMC41 ZikpOwotICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9OT1RJRllfU1lOQ19CRUhBVklPUihtb2NrRGVs ZWdhdGUsIDAsIHRlc3RMYXllci0+c2V0U2Npc3NvclJlY3QoSW50UmVjdCgzLCAzLCA4LCA4KSkp OworICAgIEVYRUNVVEVfQU5EX1ZFUklGWV9OT1RJRllfU1lOQ19CRUhBVklPUihtb2NrRGVsZWdh dGUsIDAsIHRlc3RMYXllci0+c2V0Q2xpcFJlY3QoSW50UmVjdCgzLCAzLCA4LCA4KSkpOwogICAg IEVYRUNVVEVfQU5EX1ZFUklGWV9OT1RJRllfU1lOQ19CRUhBVklPUihtb2NrRGVsZWdhdGUsIDAs IHRlc3RMYXllci0+c2V0VGFyZ2V0UmVuZGVyU3VyZmFjZSgwKSk7CiAgICAgRVhFQ1VURV9BTkRf VkVSSUZZX05PVElGWV9TWU5DX0JFSEFWSU9SKG1vY2tEZWxlZ2F0ZSwgMCwgdGVzdExheWVyLT5z ZXREcmF3VHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4KCkpKTsKICAgICBFWEVDVVRFX0FO RF9WRVJJRllfTk9USUZZX1NZTkNfQkVIQVZJT1IobW9ja0RlbGVnYXRlLCAwLCB0ZXN0TGF5ZXIt PnNldFNjcmVlblNwYWNlVHJhbnNmb3JtKFRyYW5zZm9ybWF0aW9uTWF0cml4KCkpKTsK