109752 2013-02-13 14:49:44 -0800 Stronger ElementData pointer typing. 2013-02-13 17:09:40 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109505 1 kling kling cmarcelo dglazkov kling koivisto ojan.autocc webkit.review.bot oldest_to_newest 832374 0 kling 2013-02-13 14:49:44 -0800 We should use specific ShareableElementData*/UniqueElementData* pointers more. 832375 1 188190 kling 2013-02-13 14:50:59 -0800 Created attachment 188190 Patch 832385 2 koivisto 2013-02-13 14:58:40 -0800 r=me 832500 3 188190 webkit.review.bot 2013-02-13 16:34:00 -0800 Comment on attachment 188190 Patch Attachment 188190 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16530359 832563 4 kling 2013-02-13 17:09:40 -0800 Committed r142826: <http://trac.webkit.org/changeset/142826> 188190 2013-02-13 14:50:59 -0800 2013-02-13 16:34:00 -0800 Patch bug-109752.diff text/plain 13478 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYzUyYWI4Li42NTI1MjYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEg QEAKIDIwMTMtMDItMTMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIFN0cm9uZ2VyIEVsZW1lbnREYXRhIHBvaW50ZXIgdHlwaW5nLgorICAgICAgICA8aHR0cDov L3dlYmtpdC5vcmcvYi8xMDk3NTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIFNoYXJlYWJsZUVsZW1lbnREYXRhL1VuaXF1ZUVsZW1lbnREYXRh IHBvaW50ZXJzIGluc3RlYWQgb2YgZ2VuZXJpYyBFbGVtZW50RGF0YSBwb2ludGVycworICAgICAg ICB3aGVyZSBwb3NzaWJsZS4gTW92ZWQgc29tZSBtZXRob2RzIGZyb20gYmFzZSBjbGFzcyBpbnRv IGxlYWYgY2xhc3NlcyB0aGF0IGRvbid0IG1ha2Ugc2Vuc2UKKyAgICAgICAgZm9yIGJvdGggY2xh c3Nlcy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudFNoYXJlZE9iamVjdFBvb2wuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2hhcmVhYmxlRWxlbWVudERhdGFDYWNoZUVudHJ5OjpTaGFyZWFibGVF bGVtZW50RGF0YUNhY2hlRW50cnkpOgorICAgICAgICAoU2hhcmVhYmxlRWxlbWVudERhdGFDYWNo ZUVudHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50U2hhcmVkT2JqZWN0UG9vbDo6Y2Fj aGVkU2hhcmVhYmxlRWxlbWVudERhdGFXaXRoQXR0cmlidXRlcyk6CisgICAgICAgICogZG9tL0Rv Y3VtZW50U2hhcmVkT2JqZWN0UG9vbC5oOgorICAgICAgICAoRG9jdW1lbnRTaGFyZWRPYmplY3RQ b29sKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVt ZW50OjpwYXJzZXJTZXRBdHRyaWJ1dGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNl dEF0dHJpYnV0ZU5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6cmVtb3ZlQXR0cmli dXRlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Y2xvbmVBdHRyaWJ1dGVz RnJvbUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Y3JlYXRlVW5pcXVlRWxl bWVudERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6U2hhcmVhYmxlRWxlbWVudERhdGE6OmNyZWF0 ZVdpdGhBdHRyaWJ1dGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlVuaXF1ZUVsZW1lbnREYXRhOjpj cmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudERhdGE6Om1ha2VVbmlxdWVDb3B5KToK KyAgICAgICAgKFdlYkNvcmU6OlVuaXF1ZUVsZW1lbnREYXRhOjptYWtlU2hhcmVhYmxlQ29weSk6 CisgICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKEVsZW1lbnREYXRhKToKKyAgICAg ICAgKFNoYXJlYWJsZUVsZW1lbnREYXRhKToKKyAgICAgICAgKFVuaXF1ZUVsZW1lbnREYXRhKToK KyAgICAgICAgKEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6ZW5zdXJlVW5p cXVlRWxlbWVudERhdGEpOgorICAgICAgICAqIGRvbS9TdHlsZWRFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlZEVsZW1lbnQ6OnJlYnVpbGRQcmVzZW50YXRpb25BdHRyaWJ1dGVT dHlsZSk6CisKKzIwMTMtMDItMTMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgor CiAgICAgICAgIEJldHRlciBuYW1lcyBmb3IgRWxlbWVudEF0dHJpYnV0ZURhdGEgJiBzdWJjbGFz c2VzLgogICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xMDk1Mjk+CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudFNoYXJlZE9iamVjdFBvb2wuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50U2hhcmVkT2JqZWN0UG9vbC5jcHAKaW5kZXggMGFmNjMwYy4u MDMwMTAwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U2hhcmVkT2Jq ZWN0UG9vbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U2hhcmVkT2JqZWN0 UG9vbC5jcHAKQEAgLTU3LDE2ICs1NywxNiBAQCBwcml2YXRlOgogCiBjbGFzcyBTaGFyZWFibGVF bGVtZW50RGF0YUNhY2hlRW50cnkgewogcHVibGljOgotICAgIFNoYXJlYWJsZUVsZW1lbnREYXRh Q2FjaGVFbnRyeShjb25zdCBTaGFyZWFibGVFbGVtZW50RGF0YUNhY2hlS2V5JiBrLCBQYXNzUmVm UHRyPEVsZW1lbnREYXRhPiB2KQorICAgIFNoYXJlYWJsZUVsZW1lbnREYXRhQ2FjaGVFbnRyeShj b25zdCBTaGFyZWFibGVFbGVtZW50RGF0YUNhY2hlS2V5JiBrLCBQYXNzUmVmUHRyPFNoYXJlYWJs ZUVsZW1lbnREYXRhPiB2KQogICAgICAgICA6IGtleShrKQogICAgICAgICAsIHZhbHVlKHYpCiAg ICAgeyB9CiAKICAgICBTaGFyZWFibGVFbGVtZW50RGF0YUNhY2hlS2V5IGtleTsKLSAgICBSZWZQ dHI8RWxlbWVudERhdGE+IHZhbHVlOworICAgIFJlZlB0cjxTaGFyZWFibGVFbGVtZW50RGF0YT4g dmFsdWU7CiB9OwogCi1QYXNzUmVmUHRyPEVsZW1lbnREYXRhPiBEb2N1bWVudFNoYXJlZE9iamVj dFBvb2w6OmNhY2hlZFNoYXJlYWJsZUVsZW1lbnREYXRhV2l0aEF0dHJpYnV0ZXMoY29uc3QgVmVj dG9yPEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZXMpCitQYXNzUmVmUHRyPFNoYXJlYWJsZUVsZW1lbnRE YXRhPiBEb2N1bWVudFNoYXJlZE9iamVjdFBvb2w6OmNhY2hlZFNoYXJlYWJsZUVsZW1lbnREYXRh V2l0aEF0dHJpYnV0ZXMoY29uc3QgVmVjdG9yPEF0dHJpYnV0ZT4mIGF0dHJpYnV0ZXMpCiB7CiAg ICAgQVNTRVJUKCFhdHRyaWJ1dGVzLmlzRW1wdHkoKSk7CiAKQEAgLTc3LDExICs3NywxMSBAQCBQ YXNzUmVmUHRyPEVsZW1lbnREYXRhPiBEb2N1bWVudFNoYXJlZE9iamVjdFBvb2w6OmNhY2hlZFNo YXJlYWJsZUVsZW1lbnREYXRhV2l0aAogICAgIGlmIChjYWNoZUl0ZXJhdG9yLT52YWx1ZSAmJiBj YWNoZUl0ZXJhdG9yLT52YWx1ZS0+a2V5ICE9IGNhY2hlS2V5KQogICAgICAgICBjYWNoZUhhc2gg PSAwOwogCi0gICAgUmVmUHRyPEVsZW1lbnREYXRhPiBlbGVtZW50RGF0YTsKKyAgICBSZWZQdHI8 U2hhcmVhYmxlRWxlbWVudERhdGE+IGVsZW1lbnREYXRhOwogICAgIGlmIChjYWNoZUhhc2ggJiYg Y2FjaGVJdGVyYXRvci0+dmFsdWUpCiAgICAgICAgIGVsZW1lbnREYXRhID0gY2FjaGVJdGVyYXRv ci0+dmFsdWUtPnZhbHVlOwogICAgIGVsc2UKLSAgICAgICAgZWxlbWVudERhdGEgPSBFbGVtZW50 RGF0YTo6Y3JlYXRlU2hhcmVhYmxlV2l0aEF0dHJpYnV0ZXMoYXR0cmlidXRlcyk7CisgICAgICAg IGVsZW1lbnREYXRhID0gU2hhcmVhYmxlRWxlbWVudERhdGE6OmNyZWF0ZVdpdGhBdHRyaWJ1dGVz KGF0dHJpYnV0ZXMpOwogCiAgICAgaWYgKCFjYWNoZUhhc2ggfHwgY2FjaGVJdGVyYXRvci0+dmFs dWUpCiAgICAgICAgIHJldHVybiBlbGVtZW50RGF0YS5yZWxlYXNlKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTaGFyZWRPYmplY3RQb29sLmggYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnRTaGFyZWRPYmplY3RQb29sLmgKaW5kZXggMGVmMDU2Yy4uYTNiMjRk NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U2hhcmVkT2JqZWN0UG9v bC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudFNoYXJlZE9iamVjdFBvb2wuaApA QCAtMzQsNyArMzQsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBBdHRyaWJ1dGU7 Ci1jbGFzcyBFbGVtZW50RGF0YTsKK2NsYXNzIFNoYXJlYWJsZUVsZW1lbnREYXRhOwogY2xhc3Mg U2hhcmVhYmxlRWxlbWVudERhdGFDYWNoZUVudHJ5OwogCiBjbGFzcyBEb2N1bWVudFNoYXJlZE9i amVjdFBvb2wgewpAQCAtNDIsNyArNDIsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25Q dHI8RG9jdW1lbnRTaGFyZWRPYmplY3RQb29sPiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFB0cihu ZXcgRG9jdW1lbnRTaGFyZWRPYmplY3RQb29sKTsgfQogICAgIH5Eb2N1bWVudFNoYXJlZE9iamVj dFBvb2woKTsKIAotICAgIFBhc3NSZWZQdHI8RWxlbWVudERhdGE+IGNhY2hlZFNoYXJlYWJsZUVs ZW1lbnREYXRhV2l0aEF0dHJpYnV0ZXMoY29uc3QgVmVjdG9yPEF0dHJpYnV0ZT4mKTsKKyAgICBQ YXNzUmVmUHRyPFNoYXJlYWJsZUVsZW1lbnREYXRhPiBjYWNoZWRTaGFyZWFibGVFbGVtZW50RGF0 YVdpdGhBdHRyaWJ1dGVzKGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGU+Jik7CiAKIHByaXZhdGU6CiAg ICAgRG9jdW1lbnRTaGFyZWRPYmplY3RQb29sKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXgg Yzc1MjcxYy4uOGQyMTUzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMTAyMiw3ICsxMDIy LDcgQEAgdm9pZCBFbGVtZW50OjpwYXJzZXJTZXRBdHRyaWJ1dGVzKGNvbnN0IFZlY3RvcjxBdHRy aWJ1dGU+JiBhdHRyaWJ1dGVWZWN0b3IsIEZyYWcKICAgICBpZiAoZG9jdW1lbnQoKSAmJiBkb2N1 bWVudCgpLT5zaGFyZWRPYmplY3RQb29sKCkpCiAgICAgICAgIG1fZWxlbWVudERhdGEgPSBkb2N1 bWVudCgpLT5zaGFyZWRPYmplY3RQb29sKCktPmNhY2hlZFNoYXJlYWJsZUVsZW1lbnREYXRhV2l0 aEF0dHJpYnV0ZXMoZmlsdGVyZWRBdHRyaWJ1dGVzKTsKICAgICBlbHNlCi0gICAgICAgIG1fZWxl bWVudERhdGEgPSBFbGVtZW50RGF0YTo6Y3JlYXRlU2hhcmVhYmxlV2l0aEF0dHJpYnV0ZXMoZmls dGVyZWRBdHRyaWJ1dGVzKTsKKyAgICAgICAgbV9lbGVtZW50RGF0YSA9IFNoYXJlYWJsZUVsZW1l bnREYXRhOjpjcmVhdGVXaXRoQXR0cmlidXRlcyhmaWx0ZXJlZEF0dHJpYnV0ZXMpOwogCiAgICAg Ly8gSXRlcmF0ZSBvdmVyIHRoZSBzZXQgb2YgYXR0cmlidXRlcyB3ZSBhbHJlYWR5IGhhdmUgb24g dGhlIHN0YWNrIGluIGNhc2UKICAgICAvLyBhdHRyaWJ1dGVDaGFuZ2VkIG11dGF0ZXMgbV9lbGVt ZW50RGF0YS4KQEAgLTE2ODcsNyArMTY4Nyw3IEBAIFBhc3NSZWZQdHI8QXR0cj4gRWxlbWVudDo6 c2V0QXR0cmlidXRlTm9kZShBdHRyKiBhdHRyTm9kZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiAgICAg fQogCiAgICAgdXBkYXRlSW52YWxpZEF0dHJpYnV0ZXMoKTsKLSAgICBFbGVtZW50RGF0YSogZWxl bWVudERhdGEgPSBlbnN1cmVVbmlxdWVFbGVtZW50RGF0YSgpOworICAgIFVuaXF1ZUVsZW1lbnRE YXRhKiBlbGVtZW50RGF0YSA9IGVuc3VyZVVuaXF1ZUVsZW1lbnREYXRhKCk7CiAKICAgICBzaXpl X3QgaW5kZXggPSBlbGVtZW50RGF0YS0+Z2V0QXR0cmlidXRlSXRlbUluZGV4KGF0dHJOb2RlLT5x dWFsaWZpZWROYW1lKCkpOwogICAgIGlmIChpbmRleCAhPSBub3RGb3VuZCkgewpAQCAtMTc2NSw3 ICsxNzY1LDcgQEAgdm9pZCBFbGVtZW50OjpyZW1vdmVBdHRyaWJ1dGVJbnRlcm5hbChzaXplX3Qg aW5kZXgsIFN5bmNocm9uaXphdGlvbk9mTGF6eUF0dHJpYnUKIHsKICAgICBBU1NFUlRfV0lUSF9T RUNVUklUWV9JTVBMSUNBVElPTihpbmRleCA8IGF0dHJpYnV0ZUNvdW50KCkpOwogCi0gICAgRWxl bWVudERhdGEqIGVsZW1lbnREYXRhID0gZW5zdXJlVW5pcXVlRWxlbWVudERhdGEoKTsKKyAgICBV bmlxdWVFbGVtZW50RGF0YSogZWxlbWVudERhdGEgPSBlbnN1cmVVbmlxdWVFbGVtZW50RGF0YSgp OwogCiAgICAgUXVhbGlmaWVkTmFtZSBuYW1lID0gZWxlbWVudERhdGEtPmF0dHJpYnV0ZUl0ZW0o aW5kZXgpLT5uYW1lKCk7CiAgICAgQXRvbWljU3RyaW5nIHZhbHVlQmVpbmdSZW1vdmVkID0gZWxl bWVudERhdGEtPmF0dHJpYnV0ZUl0ZW0oaW5kZXgpLT52YWx1ZSgpOwpAQCAtMjc2Nyw3ICsyNzY3 LDcgQEAgdm9pZCBFbGVtZW50OjpjbG9uZUF0dHJpYnV0ZXNGcm9tRWxlbWVudChjb25zdCBFbGVt ZW50JiBvdGhlcikKICAgICBpZiAob3RoZXIubV9lbGVtZW50RGF0YS0+aXNVbmlxdWUoKQogICAg ICAgICAmJiAhb3RoZXIubV9lbGVtZW50RGF0YS0+cHJlc2VudGF0aW9uQXR0cmlidXRlU3R5bGUo KQogICAgICAgICAmJiAoIW90aGVyLm1fZWxlbWVudERhdGEtPmlubGluZVN0eWxlKCkgfHwgIW90 aGVyLm1fZWxlbWVudERhdGEtPmlubGluZVN0eWxlKCktPmhhc0NTU09NV3JhcHBlcigpKSkKLSAg ICAgICAgY29uc3RfY2FzdDxFbGVtZW50Jj4ob3RoZXIpLm1fZWxlbWVudERhdGEgPSBvdGhlci5t X2VsZW1lbnREYXRhLT5tYWtlU2hhcmVhYmxlQ29weSgpOworICAgICAgICBjb25zdF9jYXN0PEVs ZW1lbnQmPihvdGhlcikubV9lbGVtZW50RGF0YSA9IHN0YXRpY19jYXN0PGNvbnN0IFVuaXF1ZUVs ZW1lbnREYXRhKj4ob3RoZXIubV9lbGVtZW50RGF0YS5nZXQoKSktPm1ha2VTaGFyZWFibGVDb3B5 KCk7CiAKICAgICBpZiAoIW90aGVyLm1fZWxlbWVudERhdGEtPmlzVW5pcXVlKCkpCiAgICAgICAg IG1fZWxlbWVudERhdGEgPSBvdGhlci5tX2VsZW1lbnREYXRhOwpAQCAtMjc4OSw5ICsyNzg5LDEx IEBAIHZvaWQgRWxlbWVudDo6Y2xvbmVEYXRhRnJvbUVsZW1lbnQoY29uc3QgRWxlbWVudCYgb3Ro ZXIpCiB2b2lkIEVsZW1lbnQ6OmNyZWF0ZVVuaXF1ZUVsZW1lbnREYXRhKCkKIHsKICAgICBpZiAo IW1fZWxlbWVudERhdGEpCi0gICAgICAgIG1fZWxlbWVudERhdGEgPSBFbGVtZW50RGF0YTo6Y3Jl YXRlVW5pcXVlKCk7Ci0gICAgZWxzZQotICAgICAgICBtX2VsZW1lbnREYXRhID0gbV9lbGVtZW50 RGF0YS0+bWFrZVVuaXF1ZUNvcHkoKTsKKyAgICAgICAgbV9lbGVtZW50RGF0YSA9IFVuaXF1ZUVs ZW1lbnREYXRhOjpjcmVhdGUoKTsKKyAgICBlbHNlIHsKKyAgICAgICAgQVNTRVJUKG1fZWxlbWVu dERhdGEtPmlzU2hhcmVhYmxlKCkpOworICAgICAgICBtX2VsZW1lbnREYXRhID0gc3RhdGljX2Nh c3Q8U2hhcmVhYmxlRWxlbWVudERhdGEqPihtX2VsZW1lbnREYXRhLmdldCgpKS0+bWFrZVVuaXF1 ZUNvcHkoKTsKKyAgICB9CiB9CiAKIHZvaWQgRWxlbWVudDo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVt b3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKQEAgLTI4NjQsMTMgKzI4NjYs MTMgQEAgc3RhdGljIHNpemVfdCBzaXplRm9yU2hhcmVhYmxlRWxlbWVudERhdGFXaXRoQXR0cmli dXRlQ291bnQodW5zaWduZWQgY291bnQpCiAgICAgcmV0dXJuIHNpemVvZihTaGFyZWFibGVFbGVt ZW50RGF0YSkgLSBzaXplb2Yodm9pZCopICsgc2l6ZW9mKEF0dHJpYnV0ZSkgKiBjb3VudDsKIH0K IAotUGFzc1JlZlB0cjxFbGVtZW50RGF0YT4gRWxlbWVudERhdGE6OmNyZWF0ZVNoYXJlYWJsZVdp dGhBdHRyaWJ1dGVzKGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGU+JiBhdHRyaWJ1dGVzKQorUGFzc1Jl ZlB0cjxTaGFyZWFibGVFbGVtZW50RGF0YT4gU2hhcmVhYmxlRWxlbWVudERhdGE6OmNyZWF0ZVdp dGhBdHRyaWJ1dGVzKGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGU+JiBhdHRyaWJ1dGVzKQogewogICAg IHZvaWQqIHNsb3QgPSBXVEY6OmZhc3RNYWxsb2Moc2l6ZUZvclNoYXJlYWJsZUVsZW1lbnREYXRh V2l0aEF0dHJpYnV0ZUNvdW50KGF0dHJpYnV0ZXMuc2l6ZSgpKSk7CiAgICAgcmV0dXJuIGFkb3B0 UmVmKG5ldyAoc2xvdCkgU2hhcmVhYmxlRWxlbWVudERhdGEoYXR0cmlidXRlcykpOwogfQogCi1Q YXNzUmVmUHRyPEVsZW1lbnREYXRhPiBFbGVtZW50RGF0YTo6Y3JlYXRlVW5pcXVlKCkKK1Bhc3NS ZWZQdHI8VW5pcXVlRWxlbWVudERhdGE+IFVuaXF1ZUVsZW1lbnREYXRhOjpjcmVhdGUoKQogewog ICAgIHJldHVybiBhZG9wdFJlZihuZXcgVW5pcXVlRWxlbWVudERhdGEpOwogfQpAQCAtMjk0MCwy NCArMjk0MiwxNyBAQCBVbmlxdWVFbGVtZW50RGF0YTo6VW5pcXVlRWxlbWVudERhdGEoY29uc3Qg U2hhcmVhYmxlRWxlbWVudERhdGEmIG90aGVyKQogICAgICAgICBtX2F0dHJpYnV0ZVZlY3Rvci51 bmNoZWNrZWRBcHBlbmQob3RoZXIuaW1tdXRhYmxlQXR0cmlidXRlQXJyYXkoKVtpXSk7CiB9CiAK LVBhc3NSZWZQdHI8RWxlbWVudERhdGE+IEVsZW1lbnREYXRhOjptYWtlVW5pcXVlQ29weSgpIGNv bnN0CitQYXNzUmVmUHRyPFVuaXF1ZUVsZW1lbnREYXRhPiBFbGVtZW50RGF0YTo6bWFrZVVuaXF1 ZUNvcHkoKSBjb25zdAogewogICAgIGlmIChpc1VuaXF1ZSgpKQogICAgICAgICByZXR1cm4gYWRv cHRSZWYobmV3IFVuaXF1ZUVsZW1lbnREYXRhKHN0YXRpY19jYXN0PGNvbnN0IFVuaXF1ZUVsZW1l bnREYXRhJj4oKnRoaXMpKSk7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBVbmlxdWVFbGVtZW50 RGF0YShzdGF0aWNfY2FzdDxjb25zdCBTaGFyZWFibGVFbGVtZW50RGF0YSY+KCp0aGlzKSkpOwog fQogCi1QYXNzUmVmUHRyPEVsZW1lbnREYXRhPiBFbGVtZW50RGF0YTo6bWFrZVNoYXJlYWJsZUNv cHkoKSBjb25zdAorUGFzc1JlZlB0cjxTaGFyZWFibGVFbGVtZW50RGF0YT4gVW5pcXVlRWxlbWVu dERhdGE6Om1ha2VTaGFyZWFibGVDb3B5KCkgY29uc3QKIHsKLSAgICBBU1NFUlQoaXNVbmlxdWUo KSk7CiAgICAgdm9pZCogc2xvdCA9IFdURjo6ZmFzdE1hbGxvYyhzaXplRm9yU2hhcmVhYmxlRWxl bWVudERhdGFXaXRoQXR0cmlidXRlQ291bnQobXV0YWJsZUF0dHJpYnV0ZVZlY3RvcigpLnNpemUo KSkpOwotICAgIHJldHVybiBhZG9wdFJlZihuZXcgKHNsb3QpIFNoYXJlYWJsZUVsZW1lbnREYXRh KHN0YXRpY19jYXN0PGNvbnN0IFVuaXF1ZUVsZW1lbnREYXRhJj4oKnRoaXMpKSk7Ci19Ci0KLXZv aWQgRWxlbWVudERhdGE6OnNldFByZXNlbnRhdGlvbkF0dHJpYnV0ZVN0eWxlKFBhc3NSZWZQdHI8 U3R5bGVQcm9wZXJ0eVNldD4gc3R5bGUpIGNvbnN0Ci17Ci0gICAgQVNTRVJUKG1faXNVbmlxdWUp OwotICAgIHN0YXRpY19jYXN0PGNvbnN0IFVuaXF1ZUVsZW1lbnREYXRhKj4odGhpcyktPm1fcHJl c2VudGF0aW9uQXR0cmlidXRlU3R5bGUgPSBzdHlsZTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3 IChzbG90KSBTaGFyZWFibGVFbGVtZW50RGF0YSgqdGhpcykpOwogfQogCiB2b2lkIEVsZW1lbnRE YXRhOjphZGRBdHRyaWJ1dGUoY29uc3QgQXR0cmlidXRlJiBhdHRyaWJ1dGUpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1l bnQuaAppbmRleCBjODA2N2E1Li4yZmE0MzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTU1LDkg KzU1LDYgQEAgY2xhc3MgU3R5bGVQcm9wZXJ0eVNldDsKIGNsYXNzIEVsZW1lbnREYXRhIDogcHVi bGljIFJlZkNvdW50ZWQ8RWxlbWVudERhdGE+IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRF RDsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxFbGVtZW50RGF0YT4gY3JlYXRlVW5p cXVlKCk7Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8RWxlbWVudERhdGE+IGNyZWF0ZVNoYXJlYWJs ZVdpdGhBdHRyaWJ1dGVzKGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGU+Jik7Ci0KICAgICAvLyBPdmVy cmlkZSBSZWZDb3VudGVkJ3MgZGVyZWYoKSB0byBlbnN1cmUgb3BlcmF0b3IgZGVsZXRlIGlzIGNh bGxlZCBvbgogICAgIC8vIHRoZSBhcHByb3ByaWF0ZSBzdWJjbGFzcyB0eXBlLgogICAgIHZvaWQg ZGVyZWYoKTsKQEAgLTcyLDcgKzY5LDYgQEAgcHVibGljOgogICAgIGNvbnN0IFN0eWxlUHJvcGVy dHlTZXQqIGlubGluZVN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVTdHlsZS5nZXQoKTsg fQogCiAgICAgY29uc3QgU3R5bGVQcm9wZXJ0eVNldCogcHJlc2VudGF0aW9uQXR0cmlidXRlU3R5 bGUoKSBjb25zdDsKLSAgICB2b2lkIHNldFByZXNlbnRhdGlvbkF0dHJpYnV0ZVN0eWxlKFBhc3NS ZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4pIGNvbnN0OwogCiAgICAgc2l6ZV90IGxlbmd0aCgpIGNv bnN0OwogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuICFsZW5ndGgoKTsgfQpAQCAt MTI4LDggKzEyNCw3IEBAIHByaXZhdGU6CiAgICAgY29uc3QgQXR0cmlidXRlKiBnZXRBdHRyaWJ1 dGVJdGVtKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgYm9vbCBzaG91bGRJZ25vcmVBdHRyaWJ1 dGVDYXNlKSBjb25zdDsKICAgICBzaXplX3QgZ2V0QXR0cmlidXRlSXRlbUluZGV4U2xvd0Nhc2Uo Y29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBib29sIHNob3VsZElnbm9yZUF0dHJpYnV0ZUNhc2Up IGNvbnN0OwogCi0gICAgUGFzc1JlZlB0cjxFbGVtZW50RGF0YT4gbWFrZVVuaXF1ZUNvcHkoKSBj b25zdDsKLSAgICBQYXNzUmVmUHRyPEVsZW1lbnREYXRhPiBtYWtlU2hhcmVhYmxlQ29weSgpIGNv bnN0OworICAgIFBhc3NSZWZQdHI8VW5pcXVlRWxlbWVudERhdGE+IG1ha2VVbmlxdWVDb3B5KCkg Y29uc3Q7CiAKICAgICBWZWN0b3I8QXR0cmlidXRlLCA0PiYgbXV0YWJsZUF0dHJpYnV0ZVZlY3Rv cigpOwogICAgIGNvbnN0IFZlY3RvcjxBdHRyaWJ1dGUsIDQ+JiBtdXRhYmxlQXR0cmlidXRlVmVj dG9yKCkgY29uc3Q7CkBAIC0xMzcsOCArMTMyLDEwIEBAIHByaXZhdGU6CiAKIGNsYXNzIFNoYXJl YWJsZUVsZW1lbnREYXRhIDogcHVibGljIEVsZW1lbnREYXRhIHsKIHB1YmxpYzoKLSAgICBTaGFy ZWFibGVFbGVtZW50RGF0YShjb25zdCBWZWN0b3I8QXR0cmlidXRlPiYpOwotICAgIFNoYXJlYWJs ZUVsZW1lbnREYXRhKGNvbnN0IFVuaXF1ZUVsZW1lbnREYXRhJik7CisgICAgc3RhdGljIFBhc3NS ZWZQdHI8U2hhcmVhYmxlRWxlbWVudERhdGE+IGNyZWF0ZVdpdGhBdHRyaWJ1dGVzKGNvbnN0IFZl Y3RvcjxBdHRyaWJ1dGU+Jik7CisKKyAgICBleHBsaWNpdCBTaGFyZWFibGVFbGVtZW50RGF0YShj b25zdCBWZWN0b3I8QXR0cmlidXRlPiYpOworICAgIGV4cGxpY2l0IFNoYXJlYWJsZUVsZW1lbnRE YXRhKGNvbnN0IFVuaXF1ZUVsZW1lbnREYXRhJik7CiAgICAgflNoYXJlYWJsZUVsZW1lbnREYXRh KCk7CiAKICAgICB2b2lkKiBtX2F0dHJpYnV0ZUFycmF5OwpAQCAtMTQ2LDkgKzE0MywxMiBAQCBw dWJsaWM6CiAKIGNsYXNzIFVuaXF1ZUVsZW1lbnREYXRhIDogcHVibGljIEVsZW1lbnREYXRhIHsK IHB1YmxpYzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxVbmlxdWVFbGVtZW50RGF0YT4gY3JlYXRl KCk7CisgICAgUGFzc1JlZlB0cjxTaGFyZWFibGVFbGVtZW50RGF0YT4gbWFrZVNoYXJlYWJsZUNv cHkoKSBjb25zdDsKKwogICAgIFVuaXF1ZUVsZW1lbnREYXRhKCk7Ci0gICAgVW5pcXVlRWxlbWVu dERhdGEoY29uc3QgU2hhcmVhYmxlRWxlbWVudERhdGEmKTsKLSAgICBVbmlxdWVFbGVtZW50RGF0 YShjb25zdCBVbmlxdWVFbGVtZW50RGF0YSYpOworICAgIGV4cGxpY2l0IFVuaXF1ZUVsZW1lbnRE YXRhKGNvbnN0IFNoYXJlYWJsZUVsZW1lbnREYXRhJik7CisgICAgZXhwbGljaXQgVW5pcXVlRWxl bWVudERhdGEoY29uc3QgVW5pcXVlRWxlbWVudERhdGEmKTsKIAogICAgIG11dGFibGUgUmVmUHRy PFN0eWxlUHJvcGVydHlTZXQ+IG1fcHJlc2VudGF0aW9uQXR0cmlidXRlU3R5bGU7CiAgICAgVmVj dG9yPEF0dHJpYnV0ZSwgND4gbV9hdHRyaWJ1dGVWZWN0b3I7CkBAIC0zNzIsOSArMzcyLDkgQEAg cHVibGljOgogICAgIHZvaWQgcGFyc2VyU2V0QXR0cmlidXRlcyhjb25zdCBWZWN0b3I8QXR0cmli dXRlPiYsIEZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbik7CiAKICAgICBjb25zdCBFbGVtZW50 RGF0YSogZWxlbWVudERhdGEoKSBjb25zdCB7IHJldHVybiBtX2VsZW1lbnREYXRhLmdldCgpOyB9 Ci0gICAgRWxlbWVudERhdGEqIGVuc3VyZVVuaXF1ZUVsZW1lbnREYXRhKCk7CiAgICAgY29uc3Qg RWxlbWVudERhdGEqIGVsZW1lbnREYXRhV2l0aFN5bmNocm9uaXplZEF0dHJpYnV0ZXMoKSBjb25z dDsKICAgICBjb25zdCBFbGVtZW50RGF0YSogZW5zdXJlRWxlbWVudERhdGFXaXRoU3luY2hyb25p emVkQXR0cmlidXRlcygpIGNvbnN0OworICAgIFVuaXF1ZUVsZW1lbnREYXRhKiBlbnN1cmVVbmlx dWVFbGVtZW50RGF0YSgpOwogCiAgICAgLy8gQ2xvbmVzIGF0dHJpYnV0ZXMgb25seS4KICAgICB2 b2lkIGNsb25lQXR0cmlidXRlc0Zyb21FbGVtZW50KGNvbnN0IEVsZW1lbnQmKTsKQEAgLTkzNCwx MSArOTM0LDExIEBAIGlubGluZSBib29sIEVsZW1lbnQ6Omhhc0NsYXNzKCkgY29uc3QKICAgICBy ZXR1cm4gZWxlbWVudERhdGEoKSAmJiBlbGVtZW50RGF0YSgpLT5oYXNDbGFzcygpOwogfQogCi1p bmxpbmUgRWxlbWVudERhdGEqIEVsZW1lbnQ6OmVuc3VyZVVuaXF1ZUVsZW1lbnREYXRhKCkKK2lu bGluZSBVbmlxdWVFbGVtZW50RGF0YSogRWxlbWVudDo6ZW5zdXJlVW5pcXVlRWxlbWVudERhdGEo KQogewogICAgIGlmICghZWxlbWVudERhdGEoKSB8fCAhZWxlbWVudERhdGEoKS0+aXNVbmlxdWUo KSkKICAgICAgICAgY3JlYXRlVW5pcXVlRWxlbWVudERhdGEoKTsKLSAgICByZXR1cm4gbV9lbGVt ZW50RGF0YS5nZXQoKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VW5pcXVlRWxlbWVudERhdGEq PihtX2VsZW1lbnREYXRhLmdldCgpKTsKIH0KIAogLy8gUHV0IGhlcmUgdG8gbWFrZSB0aGVtIGlu bGluZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAppbmRleCA5ZWRiMzllLi5iNmJi YWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3BwCkBAIC0zNDEsMTAgKzM0MSwx MCBAQCB2b2lkIFN0eWxlZEVsZW1lbnQ6OnJlYnVpbGRQcmVzZW50YXRpb25BdHRyaWJ1dGVTdHls ZSgpCiAgICAgfQogCiAgICAgLy8gU2hhcmVhYmxlRWxlbWVudERhdGEgZG9lc24ndCBzdG9yZSBw cmVzZW50YXRpb24gYXR0cmlidXRlIHN0eWxlLCBzbyBtYWtlIHN1cmUgd2UgaGF2ZSBhIFVuaXF1 ZUVsZW1lbnREYXRhLgotICAgIEVsZW1lbnREYXRhKiBlbGVtZW50RGF0YSA9IGVuc3VyZVVuaXF1 ZUVsZW1lbnREYXRhKCk7CisgICAgVW5pcXVlRWxlbWVudERhdGEqIGVsZW1lbnREYXRhID0gZW5z dXJlVW5pcXVlRWxlbWVudERhdGEoKTsKIAogICAgIGVsZW1lbnREYXRhLT5tX3ByZXNlbnRhdGlv bkF0dHJpYnV0ZVN0eWxlSXNEaXJ0eSA9IGZhbHNlOwotICAgIGVsZW1lbnREYXRhLT5zZXRQcmVz ZW50YXRpb25BdHRyaWJ1dGVTdHlsZShzdHlsZS0+aXNFbXB0eSgpID8gMCA6IHN0eWxlKTsKKyAg ICBlbGVtZW50RGF0YS0+bV9wcmVzZW50YXRpb25BdHRyaWJ1dGVTdHlsZSA9IHN0eWxlLT5pc0Vt cHR5KCkgPyAwIDogc3R5bGU7CiAKICAgICBpZiAoIWNhY2hlSGFzaCB8fCBjYWNoZUl0ZXJhdG9y LT52YWx1ZSkKICAgICAgICAgcmV0dXJuOwo=