68214 2011-09-15 19:39:50 -0700 Re-name isRootLayer to isNonCompositedContent in LayerChromium 2011-10-11 16:50:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 shawnsingh shawnsingh enne jamesr nduca piman webkit.review.bot oldest_to_newest 468252 0 shawnsingh 2011-09-15 19:39:50 -0700 to help avoid confusion between several different layers that are all related to "root". This particular isRootLayer flag is only set by NonCompositedContentHost and actually refers to the non-composited content layer. 468278 1 107598 shawnsingh 2011-09-15 20:56:30 -0700 Created attachment 107598 Patch 468958 2 107598 webkit.review.bot 2011-09-16 18:13:53 -0700 Comment on attachment 107598 Patch Clearing flags on attachment: 107598 Committed r95348: <http://trac.webkit.org/changeset/95348> 468959 3 webkit.review.bot 2011-09-16 18:13:57 -0700 All reviewed patches have been landed. Closing bug. 107598 2011-09-15 20:56:30 -0700 2011-09-16 18:13:53 -0700 Patch bug-68214-20110915205629.patch text/plain 8833 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogOTUxODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmM1YWQ2MWIxODg0OThi MzIwZWU3YTkzMjgxZWFiMTRiZmYzYjFkLi5mZDEyZjJlZmVmMWE5MmJjNTM3YmMwOGRiZTg4NGQ1 YzdmMDU1YzU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDktMTUgIFNoYXdu IFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmUtbmFtZWQgaXNS b290TGF5ZXIgdG8gaXNOb25Db21wb3NpdGVkQ29udGVudCBiZWNhdXNlCisgICAgICAgIHRoYXQg aXMgd2hhdCB0aGUgZmxhZyBhY3R1YWxseSBtZWFucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ29kZSBjbGVhbnVwIHRvd2FyZHMgdW5pdCB0ZXN0aW5n LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllckNocm9taXVtOjpMYXllckNocm9taXVtKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8pOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAg KFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnNldElzTm9uQ29tcG9zaXRlZENvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1bTo6aXNOb25Db21wb3NpdGVkQ29udGVudCk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTm9uQ29tcG9zaXRlZENvbnRlbnRI b3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vbkNvbXBvc2l0ZWRDb250ZW50SG9zdDo6Tm9u Q29tcG9zaXRlZENvbnRlbnRIb3N0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRMYXll ckNocm9taXVtOjpzZXRMYXllclRyZWVIb3N0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVy SW1wbDo6Q0NMYXllckltcGwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDTGF5ZXJJbXBsLmg6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6c2V0SXNO b25Db21wb3NpdGVkQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVySW1wbDo6aXNO b25Db21wb3NpdGVkQ29udGVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NUaWxlZExheWVySW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ1RpbGVkTGF5 ZXJJbXBsOjpkcmF3KToKKwogMjAxMS0wOS0xNSAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBNYWtlIHN1cmUgdGhhdCB0aGUgQVJNIE5F T04gZmlsZXMgYnVpbGQgd2l0aCAtbWFybQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcAppbmRleCAzZTlk ZTBkYmNhZmFlMTU2M2U1MDY4MzljMTRhYzRkODRhMzk0ZmZhLi4xZDYxNjcwZmMyYTA2N2IzMDVj Mzc2YjgyM2RiOGIxYTBhNDI3ODQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcApAQCAtNzUsNyAr NzUsNyBAQCBMYXllckNocm9taXVtOjpMYXllckNocm9taXVtKENDTGF5ZXJEZWxlZ2F0ZSogZGVs ZWdhdGUpCiAgICAgLCBtX25lZWRzRGlzcGxheU9uQm91bmRzQ2hhbmdlKGZhbHNlKQogICAgICwg bV9kb3VibGVTaWRlZCh0cnVlKQogICAgICwgbV91c2VzTGF5ZXJTY2lzc29yKGZhbHNlKQotICAg ICwgbV9pc1Jvb3RMYXllcihmYWxzZSkKKyAgICAsIG1faXNOb25Db21wb3NpdGVkQ29udGVudChm YWxzZSkKICAgICAsIG1fcmVwbGljYUxheWVyKDApCiAgICAgLCBtX2RyYXdPcGFjaXR5KDApCiAg ICAgLCBtX3RhcmdldFJlbmRlclN1cmZhY2UoMCkKQEAgLTMyNCw3ICszMjQsNyBAQCB2b2lkIExh eWVyQ2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8oQ0NMYXllckltcGwqIGxheWVyKQogICAgIGxh eWVyLT5zZXREZWJ1Z0JvcmRlcldpZHRoKG1fZGVidWdCb3JkZXJXaWR0aCk7CiAgICAgbGF5ZXIt PnNldERvdWJsZVNpZGVkKG1fZG91YmxlU2lkZWQpOwogICAgIGxheWVyLT5zZXREcmF3c0NvbnRl bnQoZHJhd3NDb250ZW50KCkpOwotICAgIGxheWVyLT5zZXRJc1Jvb3RMYXllcihtX2lzUm9vdExh eWVyKTsKKyAgICBsYXllci0+c2V0SXNOb25Db21wb3NpdGVkQ29udGVudChtX2lzTm9uQ29tcG9z aXRlZENvbnRlbnQpOwogICAgIGxheWVyLT5zZXRNYXNrc1RvQm91bmRzKG1fbWFza3NUb0JvdW5k cyk7CiAgICAgbGF5ZXItPnNldE5hbWUobV9uYW1lKTsKICAgICBsYXllci0+c2V0T3BhY2l0eSht X29wYWNpdHkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDkwZGY2OGQ1ZGM5ZWJhYzkyODJmNzAz OTk1ZWJmMDUwOGVjYmU3OWEuLjViYjNkYmNiZmM0OTRjZjA4Nzg4YzM3ZjNkYWYwNWY5N2I0OGE1 NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyQ2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9MYXllckNocm9taXVtLmgKQEAgLTE1Nyw4ICsxNTcsOCBAQCBwdWJsaWM6CiAgICAg dm9pZCBzZXRVc2VzTGF5ZXJTY2lzc29yKGJvb2wgdXNlc0xheWVyU2Npc3NvcikgeyBtX3VzZXNM YXllclNjaXNzb3IgPSB1c2VzTGF5ZXJTY2lzc29yOyB9CiAgICAgYm9vbCB1c2VzTGF5ZXJTY2lz c29yKCkgY29uc3QgeyByZXR1cm4gbV91c2VzTGF5ZXJTY2lzc29yOyB9CiAKLSAgICB2b2lkIHNl dElzUm9vdExheWVyKGJvb2wgaXNSb290TGF5ZXIpIHsgbV9pc1Jvb3RMYXllciA9IGlzUm9vdExh eWVyOyB9Ci0gICAgYm9vbCBpc1Jvb3RMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1faXNSb290TGF5 ZXI7IH0KKyAgICB2b2lkIHNldElzTm9uQ29tcG9zaXRlZENvbnRlbnQoYm9vbCBpc05vbkNvbXBv c2l0ZWRDb250ZW50KSB7IG1faXNOb25Db21wb3NpdGVkQ29udGVudCA9IGlzTm9uQ29tcG9zaXRl ZENvbnRlbnQ7IH0KKyAgICBib29sIGlzTm9uQ29tcG9zaXRlZENvbnRlbnQoKSBjb25zdCB7IHJl dHVybiBtX2lzTm9uQ29tcG9zaXRlZENvbnRlbnQ7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBzZXRM YXllclRyZWVIb3N0KENDTGF5ZXJUcmVlSG9zdCopOwogCkBAIC0yODAsNyArMjgwLDcgQEAgcHJp dmF0ZToKICAgICBib29sIG1fbmVlZHNEaXNwbGF5T25Cb3VuZHNDaGFuZ2U7CiAgICAgYm9vbCBt X2RvdWJsZVNpZGVkOwogICAgIGJvb2wgbV91c2VzTGF5ZXJTY2lzc29yOwotICAgIGJvb2wgbV9p c1Jvb3RMYXllcjsKKyAgICBib29sIG1faXNOb25Db21wb3NpdGVkQ29udGVudDsKIAogICAgIFRy YW5zZm9ybWF0aW9uTWF0cml4IG1fdHJhbnNmb3JtOwogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4 IG1fc3VibGF5ZXJUcmFuc2Zvcm07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9Ob25Db21wb3NpdGVkQ29udGVudEhvc3QuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTm9uQ29tcG9zaXRlZENvbnRlbnRI b3N0LmNwcAppbmRleCBlODU0ZjM2YTc1ZWZhYzE2YWFhNGZmMmRlMTk4OGJmZDBhNzBlMGE0Li4x YzQ5MGIyZDU3MGI4MmZhNGYxMzFiMGE2ODIwMTI4M2Y4ZGQ2MTZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Ob25Db21wb3NpdGVkQ29udGVu dEhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L05vbkNvbXBvc2l0ZWRDb250ZW50SG9zdC5jcHAKQEAgLTQyLDcgKzQyLDcgQEAgTm9uQ29tcG9z aXRlZENvbnRlbnRIb3N0OjpOb25Db21wb3NpdGVkQ29udGVudEhvc3QoUGFzc093blB0cjxMYXll clBhaW50ZXJDaHJvbWkKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE5hbWUoIm5vbi1jb21wb3Np dGVkIGNvbnRlbnQiKTsKICNlbmRpZgogICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0RHJhd3NDb250 ZW50KHRydWUpOwotICAgIG1fZ3JhcGhpY3NMYXllci0+cGxhdGZvcm1MYXllcigpLT5zZXRJc1Jv b3RMYXllcih0cnVlKTsKKyAgICBtX2dyYXBoaWNzTGF5ZXItPnBsYXRmb3JtTGF5ZXIoKS0+c2V0 SXNOb25Db21wb3NpdGVkQ29udGVudCh0cnVlKTsKIH0KIAogTm9uQ29tcG9zaXRlZENvbnRlbnRI b3N0Ojp+Tm9uQ29tcG9zaXRlZENvbnRlbnRIb3N0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21p dW0uY3BwCmluZGV4IGI4YWQyMGE4NDkwZDJjOTM0MTM3NGI1NGEyZDYxZTliYjU5MWRjZmUuLjdh MzRhNmUyZTU3MzgxOTQ4ZTE4ZTkwMTFhMjQ5ZjVjM2NkOGE5MjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRM YXllckNocm9taXVtLmNwcApAQCAtMTQ4LDcgKzE0OCw3IEBAIHZvaWQgVGlsZWRMYXllckNocm9t aXVtOjpzZXRMYXllclRyZWVIb3N0KENDTGF5ZXJUcmVlSG9zdCogaG9zdCkKICAgICBtX3NhbXBs ZWRUZXhlbEZvcm1hdCA9IHRleHR1cmVVcGRhdGVyKCktPnNhbXBsZWRUZXhlbEZvcm1hdChtX3Rl eHR1cmVGb3JtYXQpOwogICAgIG1fdGlsZXIgPSBDQ0xheWVyVGlsaW5nRGF0YTo6Y3JlYXRlKAog ICAgICAgICBJbnRTaXplKGRlZmF1bHRUaWxlU2l6ZSwgZGVmYXVsdFRpbGVTaXplKSwKLSAgICAg ICAgaXNSb290TGF5ZXIoKSA/IENDTGF5ZXJUaWxpbmdEYXRhOjpOb0JvcmRlclRleGVscyA6IEND TGF5ZXJUaWxpbmdEYXRhOjpIYXNCb3JkZXJUZXhlbHMpOworICAgICAgICBpc05vbkNvbXBvc2l0 ZWRDb250ZW50KCkgPyBDQ0xheWVyVGlsaW5nRGF0YTo6Tm9Cb3JkZXJUZXhlbHMgOiBDQ0xheWVy VGlsaW5nRGF0YTo6SGFzQm9yZGVyVGV4ZWxzKTsKIH0KIAogdm9pZCBUaWxlZExheWVyQ2hyb21p dW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ0xheWVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVySW1wbC5jcHAKaW5kZXggODQ1NDA2NDM1Yjg3ZjIwM2QxNzcwOGRjNDc1 NDljNmJhNmU5YTJmNy4uZDg0ZDc4NTcyOWYwMjY2ODJlYTI0NGRhMDJmYzViNzIzMjJhYTZhOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NMYXllckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcApAQCAtNzAsNyArNzAsNyBAQCBDQ0xheWVySW1wbDo6 Q0NMYXllckltcGwoaW50IGlkKQogICAgICwgbV9vcGFjaXR5KDEuMCkKICAgICAsIG1fcHJlc2Vy dmVzM0QoZmFsc2UpCiAgICAgLCBtX3VzZXNMYXllclNjaXNzb3IoZmFsc2UpCi0gICAgLCBtX2lz Um9vdExheWVyKGZhbHNlKQorICAgICwgbV9pc05vbkNvbXBvc2l0ZWRDb250ZW50KGZhbHNlKQog ICAgICwgbV9kcmF3c0NvbnRlbnQoZmFsc2UpCiAgICAgLCBtX3RhcmdldFJlbmRlclN1cmZhY2Uo MCkKICAgICAsIG1fZHJhd0RlcHRoKDApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuaAppbmRleCBjYzM4MDUz ZGJkNTdhNjE4ZjkwYTkzYzYwOTg5Mzk5ZTgyZmVlZWFhLi4yN2M2ZjkwYjVmMmQxOTg1NWQwZWFk YTA2MTI1YjA5Y2U3NGNhMDFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmgKQEAgLTEwNCw4ICsxMDQs OCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRVc2VzTGF5ZXJTY2lzc29yKGJvb2wgdXNlc0xheWVy U2Npc3NvcikgeyBtX3VzZXNMYXllclNjaXNzb3IgPSB1c2VzTGF5ZXJTY2lzc29yOyB9CiAgICAg Ym9vbCB1c2VzTGF5ZXJTY2lzc29yKCkgY29uc3QgeyByZXR1cm4gbV91c2VzTGF5ZXJTY2lzc29y OyB9CiAKLSAgICB2b2lkIHNldElzUm9vdExheWVyKGJvb2wgaXNSb290TGF5ZXIpIHsgbV9pc1Jv b3RMYXllciA9IGlzUm9vdExheWVyOyB9Ci0gICAgYm9vbCBpc1Jvb3RMYXllcigpIGNvbnN0IHsg cmV0dXJuIG1faXNSb290TGF5ZXI7IH0KKyAgICB2b2lkIHNldElzTm9uQ29tcG9zaXRlZENvbnRl bnQoYm9vbCBpc05vbkNvbXBvc2l0ZWRDb250ZW50KSB7IG1faXNOb25Db21wb3NpdGVkQ29udGVu dCA9IGlzTm9uQ29tcG9zaXRlZENvbnRlbnQ7IH0KKyAgICBib29sIGlzTm9uQ29tcG9zaXRlZENv bnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2lzTm9uQ29tcG9zaXRlZENvbnRlbnQ7IH0KIAogICAg IHZvaWQgc2V0U3VibGF5ZXJUcmFuc2Zvcm0oY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHN1 YmxheWVyVHJhbnNmb3JtKSB7IG1fc3VibGF5ZXJUcmFuc2Zvcm0gPSBzdWJsYXllclRyYW5zZm9y bTsgfQogICAgIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBzdWJsYXllclRyYW5zZm9ybSgp IGNvbnN0IHsgcmV0dXJuIG1fc3VibGF5ZXJUcmFuc2Zvcm07IH0KQEAgLTIwMyw3ICsyMDMsNyBA QCBwcml2YXRlOgogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IG1fc3VibGF5ZXJUcmFuc2Zvcm07 CiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggbV90cmFuc2Zvcm07CiAgICAgYm9vbCBtX3VzZXNM YXllclNjaXNzb3I7Ci0gICAgYm9vbCBtX2lzUm9vdExheWVyOworICAgIGJvb2wgbV9pc05vbkNv bXBvc2l0ZWRDb250ZW50OwogCiAgICAgYm9vbCBtX2RyYXdzQ29udGVudDsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaWxlZExh eWVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ1RpbGVkTGF5ZXJJbXBsLmNwcAppbmRleCAxZjk2ZGFlYTExN2YxNzRiM2JhNmYyYTU4N2I0 MDJmODU1ZTkyZWI5Li5kODhhYWEwZmY3OGVkNTA2NzRhNmQzNzQ0Njc2MGViNzE1ZTg1NGY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q1RpbGVkTGF5ZXJJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ1RpbGVkTGF5ZXJJbXBsLmNwcApAQCAtMTIwLDcgKzEyMCw3IEBAIHZv aWQgQ0NUaWxlZExheWVySW1wbDo6ZHJhdyhMYXllclJlbmRlcmVyQ2hyb21pdW0qIGxheWVyUmVu ZGVyZXIpCiAgICAgICAgIGxheWVyUXVhZC5pbmZsYXRlQW50aUFsaWFzaW5nRGlzdGFuY2UoKTsK IAogICAgIEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0ID0gbGF5ZXJSZW5kZXJlci0+Y29udGV4 dCgpOwotICAgIGlmIChpc1Jvb3RMYXllcigpKSB7CisgICAgaWYgKGlzTm9uQ29tcG9zaXRlZENv bnRlbnQoKSkgewogICAgICAgICBjb250ZXh0LT5jb2xvck1hc2sodHJ1ZSwgdHJ1ZSwgdHJ1ZSwg ZmFsc2UpOwogICAgICAgICBHTEMoY29udGV4dCwgY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0Nv bnRleHQzRDo6QkxFTkQpKTsKICAgICB9CkBAIC0xNDgsNyArMTQ4LDcgQEAgdm9pZCBDQ1RpbGVk TGF5ZXJJbXBsOjpkcmF3KExheWVyUmVuZGVyZXJDaHJvbWl1bSogbGF5ZXJSZW5kZXJlcikKICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQogCi0gICAgaWYgKGlzUm9vdExheWVy KCkpIHsKKyAgICBpZiAoaXNOb25Db21wb3NpdGVkQ29udGVudCgpKSB7CiAgICAgICAgIGNvbnRl eHQtPmNvbG9yTWFzayh0cnVlLCB0cnVlLCB0cnVlLCB0cnVlKTsKICAgICAgICAgR0xDKGNvbnRl eHQsIGNvbnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6QkxFTkQpKTsKICAgICB9Cg==