135837 2014-08-12 05:45:43 -0700 Remove isInCanvasSubtree bit 2014-08-12 13:38:25 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned aboxhall apinheiro cfleizach cmarcelo commit-queue dmazzoni esprehn+autocc gyuyoung.kim jcraig jdiggs kangil.han mario samuel_white oldest_to_newest 1028501 0 koivisto 2014-08-12 05:45:43 -0700 This seems like an unnecessary optimization. 1028504 1 236443 koivisto 2014-08-12 05:55:23 -0700 Created attachment 236443 patch 1028582 2 236443 kling 2014-08-12 13:14:26 -0700 Comment on attachment 236443 patch r=me. This seemed a bit overkill indeed. 1028586 3 koivisto 2014-08-12 13:38:25 -0700 https://trac.webkit.org/r172487 236443 2014-08-12 05:55:23 -0700 2014-08-12 13:14:25 -0700 patch remove-incanvassubtree.patch text/plain 9945 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjQ0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTA4LTEyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgaXNJbkNhbnZhc1N1 YnRyZWUgYml0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzU4MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgbG9naWMgdG8gdXBkYXRlIHRoaXMgYml0IGlzIGluIGEgd3JvbmcgcGxhY2UgYW5kIGl0 IGlzIG5vdCBjbGVhciBpdCBkb2VzIAorICAgICAgICB0aGUgcmlnaHQgdGhpbmcgaW4gYWxsIGNh c2VzLiBBbHNvIHRoZSBvcHRpbWl6YXRpb24gZG9lc24ndCBzZWVtIG5lY2Vzc2FyeSwKKyAgICAg ICAgdGhlIGZvY3VzIGNvZGUgaXMgbm90IHRoYXQgaG90LgorCisgICAgICAgICogYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6 OmdldE9yQ3JlYXRlKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpFbGVtZW50Ojppc0ZvY3VzYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpj bGVhclN0eWxlRGVyaXZlZERhdGFCZWZvcmVEZXRhY2hpbmdSZW5kZXJlcik6CisgICAgICAgIChX ZWJDb3JlOjpFbGVtZW50OjpzZXRJc0luQ2FudmFzU3VidHJlZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpFbGVtZW50Ojppc0luQ2FudmFzU3VidHJlZSk6IERlbGV0ZWQuCisgICAgICAg ICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKiBkb20vRWxlbWVudFJhcmVEYXRhLmg6CisgICAg ICAgIChXZWJDb3JlOjpFbGVtZW50UmFyZURhdGE6OkVsZW1lbnRSYXJlRGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpFbGVtZW50UmFyZURhdGE6OmlzSW5DYW52YXNTdWJ0cmVlKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRSYXJlRGF0YTo6c2V0SXNJbkNhbnZhc1N1YnRyZWUp OiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvSFRNTEFuY2hvckVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTEFuY2hvckVsZW1lbnQ6OmlzS2V5Ym9hcmRGb2N1c2FibGUpOgorICAg ICAgICAqIGh0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TENhbnZhc0VsZW1lbnQ6OkhUTUxDYW52YXNFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxDYW52YXNFbGVtZW50Ojp3aWxsQXR0YWNoUmVuZGVyZXJzKTogRGVsZXRlZC4KKyAgICAgICAg KiBodG1sL0hUTUxDYW52YXNFbGVtZW50Lmg6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZl VHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6YXR0YWNoUmVuZGVyVHJlZSk6CisK IDIwMTQtMDgtMTIgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIERvbnQgYWxsb2NhdGUgR0NvbmQgaW4gVmlkZW9TaW5rR1N0cmVhbWVyLmNwcCBkeW5hbWlj YWxseS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmNwcAkocmV2aXNpb24gMTcyMzk0KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsOSArNTgsMTEgQEAKICNp bmNsdWRlICJBY2Nlc3NpYmlsaXR5VGFibGVSb3cuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgog I2luY2x1ZGUgIkVkaXRvci5oIgorI2luY2x1ZGUgIkVsZW1lbnRJdGVyYXRvci5oIgogI2luY2x1 ZGUgIkZvY3VzQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiSFRN TEFyZWFFbGVtZW50LmgiCisjaW5jbHVkZSAiSFRNTENhbnZhc0VsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MSW1hZ2VFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTElucHV0RWxlbWVudC5oIgogI2lu Y2x1ZGUgIkhUTUxMYWJlbEVsZW1lbnQuaCIKQEAgLTM3OSw3ICszODEsNyBAQCBBY2Nlc3NpYmls aXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpnZXRPCiAgICAgCiAgICAgLy8gSXQncyBvbmx5IGFs bG93ZWQgdG8gY3JlYXRlIGFuIEFjY2Vzc2liaWxpdHlPYmplY3QgZnJvbSBhIE5vZGUgaWYgaXQn cyBpbiBhIGNhbnZhcyBzdWJ0cmVlLgogICAgIC8vIE9yIGlmIGl0J3MgYSBoaWRkZW4gZWxlbWVu dCwgYnV0IHdlIHN0aWxsIHdhbnQgdG8gZXhwb3NlIGl0IGJlY2F1c2Ugb2Ygb3RoZXIgQVJJQSBh dHRyaWJ1dGVzLgotICAgIGJvb2wgaW5DYW52YXNTdWJ0cmVlID0gbm9kZS0+cGFyZW50RWxlbWVu dCgpLT5pc0luQ2FudmFzU3VidHJlZSgpOworICAgIGJvb2wgaW5DYW52YXNTdWJ0cmVlID0gbGlu ZWFnZU9mVHlwZTxIVE1MQ2FudmFzRWxlbWVudD4oKm5vZGUtPnBhcmVudEVsZW1lbnQoKSkuZmly c3QoKTsKICAgICBib29sIGlzSGlkZGVuID0gIW5vZGUtPnJlbmRlcmVyKCkgJiYgaXNOb2RlQXJp YVZpc2libGUobm9kZSk7CiAKICAgICBib29sIGluc2lkZU1ldGVyRWxlbWVudCA9IGZhbHNlOwpJ bmRleDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkocmV2aXNpb24gMTcyNDA5KQorKysgU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzQsMTggKzQzNCwxNSBA QCBib29sIEVsZW1lbnQ6OmlzRm9jdXNhYmxlKCkgY29uc3QKICAgICBpZiAoIWluRG9jdW1lbnQo KSB8fCAhc3VwcG9ydHNGb2N1cygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAvLyBF bGVtZW50cyBpbiBjYW52YXMgZmFsbGJhY2sgY29udGVudCBhcmUgbm90IHJlbmRlcmVkLCBidXQg dGhleSBhcmUgYWxsb3dlZCB0byBiZQotICAgIC8vIGZvY3VzYWJsZSBhcyBsb25nIGFzIHRoZWly IGNhbnZhcyBpcyBkaXNwbGF5ZWQgYW5kIHZpc2libGUuCi0gICAgaWYgKGlzSW5DYW52YXNTdWJ0 cmVlKCkpIHsKLSAgICAgICAgQVNTRVJUKGxpbmVhZ2VPZlR5cGU8SFRNTENhbnZhc0VsZW1lbnQ+ KCp0aGlzKS5maXJzdCgpKTsKLSAgICAgICAgYXV0byYgY2FudmFzID0gKmxpbmVhZ2VPZlR5cGU8 SFRNTENhbnZhc0VsZW1lbnQ+KCp0aGlzKS5maXJzdCgpOwotICAgICAgICByZXR1cm4gY2FudmFz LnJlbmRlcmVyKCkgJiYgY2FudmFzLnJlbmRlcmVyKCktPnN0eWxlKCkudmlzaWJpbGl0eSgpID09 IFZJU0lCTEU7Ci0gICAgfQotCiAgICAgaWYgKCFyZW5kZXJlcigpKSB7CiAgICAgICAgIC8vIElm IHRoZSBub2RlIGlzIGluIGEgZGlzcGxheTpub25lIHRyZWUgaXQgbWlnaHQgc2F5IGl0IG5lZWRz IHN0eWxlIHJlY2FsYyBidXQKICAgICAgICAgLy8gdGhlIHdob2xlIGRvY3VtZW50IGlzIGFjdHVh bGx5IHVwIHRvIGRhdGUuCiAgICAgICAgIEFTU0VSVCghbmVlZHNTdHlsZVJlY2FsYygpIHx8ICFk b2N1bWVudCgpLmNoaWxkTmVlZHNTdHlsZVJlY2FsYygpKTsKKworICAgICAgICAvLyBFbGVtZW50 cyBpbiBjYW52YXMgZmFsbGJhY2sgY29udGVudCBhcmUgbm90IHJlbmRlcmVkLCBidXQgdGhleSBh cmUgYWxsb3dlZCB0byBiZQorICAgICAgICAvLyBmb2N1c2FibGUgYXMgbG9uZyBhcyB0aGVpciBj YW52YXMgaXMgZGlzcGxheWVkIGFuZCB2aXNpYmxlLgorICAgICAgICBpZiAoYXV0byogY2FudmFz ID0gYW5jZXN0b3JzT2ZUeXBlPEhUTUxDYW52YXNFbGVtZW50PigqdGhpcykuZmlyc3QoKSkKKyAg ICAgICAgICAgIHJldHVybiBjYW52YXMtPnJlbmRlcmVyKCkgJiYgY2FudmFzLT5yZW5kZXJlcigp LT5zdHlsZSgpLnZpc2liaWxpdHkoKSA9PSBWSVNJQkxFOwogICAgIH0KIAogICAgIC8vIEZJWE1F OiBFdmVuIGlmIHdlIGFyZSBub3QgdmlzaWJsZSwgd2UgbWlnaHQgaGF2ZSBhIGNoaWxkIHRoYXQg aXMgdmlzaWJsZS4KQEAgLTIyMTIsMTYgKzIyMDksNiBAQCB1bnNpZ25lZCBFbGVtZW50OjpyYXJl RGF0YUNoaWxkSW5kZXgoKSBjCiAgICAgcmV0dXJuIGVsZW1lbnRSYXJlRGF0YSgpLT5jaGlsZElu ZGV4KCk7CiB9CiAKLXZvaWQgRWxlbWVudDo6c2V0SXNJbkNhbnZhc1N1YnRyZWUoYm9vbCBpc0lu Q2FudmFzU3VidHJlZSkKLXsKLSAgICBlbnN1cmVFbGVtZW50UmFyZURhdGEoKS5zZXRJc0luQ2Fu dmFzU3VidHJlZShpc0luQ2FudmFzU3VidHJlZSk7Ci19Ci0KLWJvb2wgRWxlbWVudDo6aXNJbkNh bnZhc1N1YnRyZWUoKSBjb25zdAotewotICAgIHJldHVybiBoYXNSYXJlRGF0YSgpICYmIGVsZW1l bnRSYXJlRGF0YSgpLT5pc0luQ2FudmFzU3VidHJlZSgpOwotfQotCiB2b2lkIEVsZW1lbnQ6OnNl dFJlZ2lvbk92ZXJzZXRTdGF0ZShSZWdpb25PdmVyc2V0U3RhdGUgc3RhdGUpCiB7CiAgICAgZW5z dXJlRWxlbWVudFJhcmVEYXRhKCkuc2V0UmVnaW9uT3ZlcnNldFN0YXRlKHN0YXRlKTsKQEAgLTI4 OTAsNyArMjg3Nyw2IEBAIHZvaWQgRWxlbWVudDo6Y2xlYXJTdHlsZURlcml2ZWREYXRhQmVmb3IK ICAgICBpZiAoIWhhc1JhcmVEYXRhKCkpCiAgICAgICAgIHJldHVybjsKICAgICBFbGVtZW50UmFy ZURhdGEqIGRhdGEgPSBlbGVtZW50UmFyZURhdGEoKTsKLSAgICBkYXRhLT5zZXRJc0luQ2FudmFz U3VidHJlZShmYWxzZSk7CiAgICAgZGF0YS0+cmVzZXRDb21wdXRlZFN0eWxlKCk7CiAgICAgZGF0 YS0+cmVzZXREeW5hbWljUmVzdHlsZU9ic2VydmF0aW9ucygpOwogfQpJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRWxl bWVudC5oCShyZXZpc2lvbiAxNzI0MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5o CSh3b3JraW5nIGNvcHkpCkBAIC0zODIsOSArMzgyLDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 Q2hpbGRyZW5BZmZlY3RlZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXMoKTsKICAgICB2b2lkIHNl dENoaWxkSW5kZXgodW5zaWduZWQpOwogCi0gICAgdm9pZCBzZXRJc0luQ2FudmFzU3VidHJlZShi b29sKTsKLSAgICBib29sIGlzSW5DYW52YXNTdWJ0cmVlKCkgY29uc3Q7Ci0KICAgICB2b2lkIHNl dFJlZ2lvbk92ZXJzZXRTdGF0ZShSZWdpb25PdmVyc2V0U3RhdGUpOwogICAgIFJlZ2lvbk92ZXJz ZXRTdGF0ZSByZWdpb25PdmVyc2V0U3RhdGUoKSBjb25zdDsKIApJbmRleDogU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnRSYXJlRGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50UmFyZURhdGEuaAkocmV2aXNpb24gMTcyMzk0KQorKysgU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnRSYXJlRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MCw5ICs2MCw2IEBAIHB1 YmxpYzoKICAgICBib29sIHN0eWxlQWZmZWN0ZWRCeUVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9z dHlsZUFmZmVjdGVkQnlFbXB0eTsgfQogICAgIHZvaWQgc2V0U3R5bGVBZmZlY3RlZEJ5RW1wdHko Ym9vbCB2YWx1ZSkgeyBtX3N0eWxlQWZmZWN0ZWRCeUVtcHR5ID0gdmFsdWU7IH0KIAotICAgIGJv b2wgaXNJbkNhbnZhc1N1YnRyZWUoKSBjb25zdCB7IHJldHVybiBtX2lzSW5DYW52YXNTdWJ0cmVl OyB9Ci0gICAgdm9pZCBzZXRJc0luQ2FudmFzU3VidHJlZShib29sIHZhbHVlKSB7IG1faXNJbkNh bnZhc1N1YnRyZWUgPSB2YWx1ZTsgfQotCiAgICAgUmVnaW9uT3ZlcnNldFN0YXRlIHJlZ2lvbk92 ZXJzZXRTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVnaW9uT3ZlcnNldFN0YXRlOyB9CiAgICAg dm9pZCBzZXRSZWdpb25PdmVyc2V0U3RhdGUoUmVnaW9uT3ZlcnNldFN0YXRlIHN0YXRlKSB7IG1f cmVnaW9uT3ZlcnNldFN0YXRlID0gc3RhdGU7IH0KIApAQCAtMTI0LDcgKzEyMSw2IEBAIHByaXZh dGU6CiAgICAgdW5zaWduZWQgbV90YWJJbmRleFdhc1NldEV4cGxpY2l0bHkgOiAxOwogICAgIHVu c2lnbmVkIG1fbmVlZHNGb2N1c0FwcGVhcmFuY2VVcGRhdGVTb29uQWZ0ZXJBdHRhY2ggOiAxOwog ICAgIHVuc2lnbmVkIG1fc3R5bGVBZmZlY3RlZEJ5RW1wdHkgOiAxOwotICAgIHVuc2lnbmVkIG1f aXNJbkNhbnZhc1N1YnRyZWUgOiAxOwogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICB1 bnNpZ25lZCBtX2NvbnRhaW5zRnVsbFNjcmVlbkVsZW1lbnQgOiAxOwogI2VuZGlmCkBAIC0xNjks NyArMTY1LDYgQEAgaW5saW5lIEVsZW1lbnRSYXJlRGF0YTo6RWxlbWVudFJhcmVEYXRhKAogICAg ICwgbV90YWJJbmRleFdhc1NldEV4cGxpY2l0bHkoZmFsc2UpCiAgICAgLCBtX25lZWRzRm9jdXNB cHBlYXJhbmNlVXBkYXRlU29vbkFmdGVyQXR0YWNoKGZhbHNlKQogICAgICwgbV9zdHlsZUFmZmVj dGVkQnlFbXB0eShmYWxzZSkKLSAgICAsIG1faXNJbkNhbnZhc1N1YnRyZWUoZmFsc2UpCiAjaWYg RU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgICwgbV9jb250YWluc0Z1bGxTY3JlZW5FbGVtZW50 KGZhbHNlKQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVt ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVt ZW50LmNwcAkocmV2aXNpb24gMTcyMzk0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQW5j aG9yRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKIAogI2luY2x1 ZGUgIkF0dHJpYnV0ZS5oIgogI2luY2x1ZGUgIkROUy5oIgorI2luY2x1ZGUgIkVsZW1lbnRJdGVy YXRvci5oIgogI2luY2x1ZGUgIkV2ZW50SGFuZGxlci5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMu aCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAtMzMsNiArMzQsNyBAQAogI2luY2x1ZGUgIkZyYW1l TG9hZGVyQ2xpZW50LmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJUeXBlcy5oIgogI2luY2x1ZGUg IkZyYW1lU2VsZWN0aW9uLmgiCisjaW5jbHVkZSAiSFRNTENhbnZhc0VsZW1lbnQuaCIKICNpbmNs dWRlICJIVE1MSW1hZ2VFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTFBhcnNlcklkaW9tcy5oIgog I2luY2x1ZGUgIktleWJvYXJkRXZlbnQuaCIKQEAgLTE0Miw3ICsxNDQsNyBAQCBib29sIEhUTUxB bmNob3JFbGVtZW50Ojppc0tleWJvYXJkRm9jdXNhCiAgICAgaWYgKCFkb2N1bWVudCgpLmZyYW1l KCktPmV2ZW50SGFuZGxlcigpLnRhYnNUb0xpbmtzKGV2ZW50KSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgaWYgKGlzSW5DYW52YXNTdWJ0cmVlKCkpCisgICAgaWYgKCFyZW5kZXJlcigp ICYmIGFuY2VzdG9yc09mVHlwZTxIVE1MQ2FudmFzRWxlbWVudD4oKnRoaXMpLmZpcnN0KCkpCiAg ICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIGhhc05vbkVtcHR5Qm94KHJlbmRlckJv eE1vZGVsT2JqZWN0KCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxl bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxl bWVudC5jcHAJKHJldmlzaW9uIDE3MjM5NCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENh bnZhc0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NSw3ICs4NSw2IEBAIEhUTUxDYW52 YXNFbGVtZW50OjpIVE1MQ2FudmFzRWxlbWVudChjb24KICAgICAsIG1fZGlkQ2xlYXJJbWFnZUJ1 ZmZlcihmYWxzZSkKIHsKICAgICBBU1NFUlQoaGFzVGFnTmFtZShjYW52YXNUYWcpKTsKLSAgICBz ZXRIYXNDdXN0b21TdHlsZVJlc29sdmVDYWxsYmFja3MoKTsKIH0KIAogUGFzc1JlZlB0cjxIVE1M Q2FudmFzRWxlbWVudD4gSFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCYgZG9jdW1l bnQpCkBAIC0xMjUsMTEgKzEyNCw2IEBAIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBIVE1MQ2Fu dmFzRWxlbWUKICAgICByZXR1cm4gSFRNTEVsZW1lbnQ6OmNyZWF0ZUVsZW1lbnRSZW5kZXJlcihX VEY6Om1vdmUoc3R5bGUpKTsKIH0KIAotdm9pZCBIVE1MQ2FudmFzRWxlbWVudDo6d2lsbEF0dGFj aFJlbmRlcmVycygpCi17Ci0gICAgc2V0SXNJbkNhbnZhc1N1YnRyZWUodHJ1ZSk7Ci19Ci0KIGJv b2wgSFRNTENhbnZhc0VsZW1lbnQ6OmNhbkNvbnRhaW5SYW5nZUVuZFBvaW50KCkgY29uc3QKIHsK ICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNF bGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxl bWVudC5oCShyZXZpc2lvbiAxNzIzOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Miw3ICsxNDIsNiBAQCBwcml2YXRlOgog CiAgICAgdmlydHVhbCB2b2lkIHBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBj b25zdCBBdG9taWNTdHJpbmcmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFJlbmRlclB0cjxSZW5k ZXJFbGVtZW50PiBjcmVhdGVFbGVtZW50UmVuZGVyZXIoUGFzc1JlZjxSZW5kZXJTdHlsZT4pIG92 ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCB3aWxsQXR0YWNoUmVuZGVyZXJzKCkgb3ZlcnJpZGU7 CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuQ29udGFpblJhbmdlRW5kUG9pbnQoKSBjb25zdCBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgY2FuU3RhcnRTZWxlY3Rpb24oKSBjb25zdCBvdmVycmlk ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCShyZXZp c2lvbiAxNzI0MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTg3LDkgKzU4Nyw2IEBAIHN0YXRpYyB2b2lkIGF0dGFjaFJl bmRlclRyZWUoRWxlbWVudCYgY3UKIAogICAgIGNyZWF0ZVJlbmRlcmVySWZOZWVkZWQoY3VycmVu dCwgaW5oZXJpdGVkU3R5bGUsIHJlbmRlclRyZWVQb3NpdGlvbiwgcmVzb2x2ZWRTdHlsZSk7CiAK LSAgICBpZiAoY3VycmVudC5wYXJlbnRFbGVtZW50KCkgJiYgY3VycmVudC5wYXJlbnRFbGVtZW50 KCktPmlzSW5DYW52YXNTdWJ0cmVlKCkpCi0gICAgICAgIGN1cnJlbnQuc2V0SXNJbkNhbnZhc1N1 YnRyZWUodHJ1ZSk7Ci0KICAgICBTdHlsZVJlc29sdmVyUGFyZW50UHVzaGVyIHBhcmVudFB1c2hl cigmY3VycmVudCk7CiAKICAgICBSZW5kZXJUcmVlUG9zaXRpb24gY2hpbGRSZW5kZXJUcmVlUG9z aXRpb24oY3VycmVudC5yZW5kZXJlcigpKTsK