41204 2010-06-25 02:43:09 -0700 Split up isSVGText() in isSVGText() / isSVGInlineText() 2010-06-25 03:59:53 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zimmermann zimmermann abarth eric webkit.review.bot oldest_to_newest 242909 0 zimmermann 2010-06-25 02:43:09 -0700 We're currently using a dangerous way to differentiate between RenderSVGText / RenderSVGInlineText. We should better introduce a seperated isSVGInlineText(), to avoid confusion, and to be consistent with all other isFoo() functions. (isFoo() means can be casted to RenderFoo, everywhere else) 242910 1 59748 zimmermann 2010-06-25 02:45:13 -0700 Created attachment 59748 Initial patch 242914 2 59750 zimmermann 2010-06-25 02:54:40 -0700 Created attachment 59750 Updated patch Uploaded the wrong patch :( The second one is correct. 242919 3 zimmermann 2010-06-25 03:05:03 -0700 Landed in r61844. 242937 4 webkit.review.bot 2010-06-25 03:59:53 -0700 http://trac.webkit.org/changeset/61844 might have broken GTK Linux 64-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/61843 http://trac.webkit.org/changeset/61844 http://trac.webkit.org/changeset/61845 59748 2010-06-25 02:45:13 -0700 2010-06-25 02:54:40 -0700 Initial patch FixSVGInlineText.diff text/plain 5101 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTg0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDYtMjUgIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJt YW5uQHJpbS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3BsaXQgdXAgaXNTVkdUZXh0KCkgaW4gaXNTVkdUZXh0KCkgLyBpc1NWR0lubGluZVRl eHQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEy MDQKKworICAgICAgICBJbnRyb2R1Y2UgaXNTVkdJbmxpbmVUZXh0KCksIHRvIHByb3ZpZGUgYSBz YWZlIG1lY2hhbmlzbSB0byBkaWZmZXJlbnRpYXRlIGJldHdlZW4gUmVuZGVyU1ZHVGV4dCAvIFJl bmRlclNWR0lubGluZVRleHQuCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LCB0 aHVzIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmRldGVybWluZVN0YXJ0 UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkUHJlc2VydmVOZXdsaW5lKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2Jq ZWN0Ojppc1NWR0lubGluZVRleHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJTVkdJbmxp bmVUZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdJbmxpbmVUZXh0Ojppc1NWR0lu bGluZVRleHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRleHQ6OnNldFRleHRJbnRlcm5hbCk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRyZWVBc1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGUpOgorCiAy MDEwLTA2LTI1ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUBwYXJvZ2EuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0xpbmVMYXlvdXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrTGluZUxheW91dC5jcHAJKHJldmlzaW9uIDYxNzU5KQorKysgV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxMiw3 ICsxMDEyLDcgQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2s6OmRldGVybWluZVN0YQogICAg IH0gZWxzZSB7CiAgICAgICAgIGJvb2wgbHRyID0gc3R5bGUoKS0+ZGlyZWN0aW9uKCkgPT0gTFRS CiAgICAgI2lmIEVOQUJMRShTVkcpICAgCi0gICAgICAgICAgICB8fCAoc3R5bGUoKS0+dW5pY29k ZUJpZGkoKSA9PSBVQk5vcm1hbCAmJiBpc1NWR1RleHQoKSkKKyAgICAgICAgICAgIHx8IChzdHls ZSgpLT51bmljb2RlQmlkaSgpID09IFVCTm9ybWFsICYmIGlzU1ZHSW5saW5lVGV4dCgpKQogICAg ICNlbmRpZgogICAgICAgICAgICAgOwogCkBAIC0xMTYxLDcgKzExNjEsNyBAQCBzdGF0aWMgaW5s aW5lIGJvb2wgc2hvdWxkQ29sbGFwc2VXaGl0ZVNwCiBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxk UHJlc2VydmVOZXdsaW5lKFJlbmRlck9iamVjdCogb2JqZWN0KQogewogI2lmIEVOQUJMRShTVkcp Ci0gICAgaWYgKG9iamVjdC0+aXNTVkdUZXh0KCkpCisgICAgaWYgKG9iamVjdC0+aXNTVkdJbmxp bmVUZXh0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCkBAIC0xNDEzLDcgKzE0 MTMsNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lCiAgICAgICAg IGF1dG9XcmFwV2FzRXZlclRydWVPbkxpbmUgPSBhdXRvV3JhcFdhc0V2ZXJUcnVlT25MaW5lIHx8 IGF1dG9XcmFwOwogCiAjaWYgRU5BQkxFKFNWRykKLSAgICAgICAgYm9vbCBwcmVzZXJ2ZU5ld2xp bmUgPSBvLT5pc1NWR1RleHQoKSA/IGZhbHNlIDogUmVuZGVyU3R5bGU6OnByZXNlcnZlTmV3bGlu ZShjdXJyV1MpOworICAgICAgICBib29sIHByZXNlcnZlTmV3bGluZSA9IG8tPmlzU1ZHSW5saW5l VGV4dCgpID8gZmFsc2UgOiBSZW5kZXJTdHlsZTo6cHJlc2VydmVOZXdsaW5lKGN1cnJXUyk7CiAj ZWxzZQogICAgICAgICBib29sIHByZXNlcnZlTmV3bGluZSA9IFJlbmRlclN0eWxlOjpwcmVzZXJ2 ZU5ld2xpbmUoY3VycldTKTsKICNlbmRpZgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJ KHJldmlzaW9uIDYxNzU5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdv cmtpbmcgY29weSkKQEAgLTM0MSw2ICszNDEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IGlzU1ZHSGlkZGVuQ29udGFpbmVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0 dWFsIGJvb2wgaXNSZW5kZXJQYXRoKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0 dWFsIGJvb2wgaXNTVkdUZXh0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFs IGJvb2wgaXNTVkdJbmxpbmVUZXh0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0 dWFsIGJvb2wgaXNTVkdJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVh bCBib29sIGlzU1ZHRm9yZWlnbk9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAg dmlydHVhbCBib29sIGlzU1ZHUmVzb3VyY2VDb250YWluZXIoKSBjb25zdCB7IHJldHVybiBmYWxz ZTsgfQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNWR0lubGluZVRleHQuaAkocmV2aXNp b24gNjE3NTkpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdJbmxpbmVUZXh0LmgJKHdv cmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIEZsb2F0 UmVjdCBvYmplY3RCb3VuZGluZ0JveCgpIGNvbnN0IHsgcmV0dXJuIEZsb2F0UmVjdCgpOyB9CiAK ICAgICB2aXJ0dWFsIGJvb2wgcmVxdWlyZXNMYXllcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 Ci0gICAgdmlydHVhbCBib29sIGlzU1ZHVGV4dCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKyAg ICB2aXJ0dWFsIGJvb2wgaXNTVkdJbmxpbmVUZXh0KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQog CiAgICAgdmlydHVhbCBJbnRSZWN0IGxvY2FsQ2FyZXRSZWN0KElubGluZUJveCosIGludCBjYXJl dE9mZnNldCwgaW50KiBleHRyYVdpZHRoVG9FbmRPZkxpbmUgPSAwKTsKIApJbmRleDogV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHAJKHJldmlzaW9uIDYxNzU5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNTEsNyArMTA1MSw3IEBAIHZvaWQg UmVuZGVyVGV4dDo6c2V0VGV4dEludGVybmFsKFBhc3NSZWYKICAgICBBU1NFUlQobV90ZXh0KTsK IAogI2lmIEVOQUJMRShTVkcpCi0gICAgaWYgKGlzU1ZHVGV4dCgpKSB7CisgICAgaWYgKGlzU1ZH SW5saW5lVGV4dCgpKSB7CiAgICAgICAgIGlmIChzdHlsZSgpICYmIHN0eWxlKCktPndoaXRlU3Bh Y2UoKSA9PSBQUkUpIHsKICAgICAgICAgICAgIC8vIFNwZWM6IFdoZW4geG1sOnNwYWNlPSJwcmVz ZXJ2ZSIsIHRoZSBTVkcgdXNlciBhZ2VudCB3aWxsIGRvIHRoZSBmb2xsb3dpbmcgdXNpbmcgYQog ICAgICAgICAgICAgLy8gY29weSBvZiB0aGUgb3JpZ2luYWwgY2hhcmFjdGVyIGRhdGEgY29udGVu dC4gSXQgd2lsbCBjb252ZXJ0IGFsbCBuZXdsaW5lIGFuZCB0YWIKSW5kZXg6IFdlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCShyZXZpc2lvbiA2MTc1OSkKKysrIFdlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTYsMTAgKzQx NiwxMSBAQCB2b2lkIHdyaXRlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPCiAgICAgICAg IHJldHVybjsKICAgICB9CiAgICAgaWYgKG8uaXNTVkdUZXh0KCkpIHsKLSAgICAgICAgaWYgKCFv LmlzVGV4dCgpKQotICAgICAgICAgICAgd3JpdGVTVkdUZXh0KHRzLCAqdG9SZW5kZXJCbG9jaygm byksIGluZGVudCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHdyaXRlU1ZHSW5saW5lVGV4 dCh0cywgKnRvUmVuZGVyVGV4dCgmbyksIGluZGVudCk7CisgICAgICAgIHdyaXRlU1ZHVGV4dCh0 cywgKnRvUmVuZGVyQmxvY2soJm8pLCBpbmRlbnQpOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIGlmIChvLmlzU1ZHSW5saW5lVGV4dCgpKSB7CisgICAgICAgIHdyaXRlU1ZHSW5saW5lVGV4 dCh0cywgKnRvUmVuZGVyVGV4dCgmbyksIGluZGVudCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAgICAgaWYgKG8uaXNTVkdJbWFnZSgpKSB7Cg== 59750 2010-06-25 02:54:40 -0700 2010-06-25 03:02:03 -0700 Updated patch FixSVGInlineText.diff text/plain 4972 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTg0MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDYtMjUgIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJt YW5uQHJpbS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3BsaXQgdXAgaXNTVkdUZXh0KCkgaW4gaXNTVkdUZXh0KCkgLyBpc1NWR0lubGluZVRl eHQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEy MDQKKworICAgICAgICBJbnRyb2R1Y2UgaXNTVkdJbmxpbmVUZXh0KCksIHRvIHByb3ZpZGUgYSBz YWZlIG1lY2hhbmlzbSB0byBkaWZmZXJlbnRpYXRlIGJldHdlZW4gUmVuZGVyU1ZHVGV4dCAvIFJl bmRlclNWR0lubGluZVRleHQuCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LCB0 aHVzIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkUHJlc2VydmVOZXdsaW5lKTogcy9p c1NWR1RleHQvaXNTVkdJbmxpbmVUZXh0LworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OmZpbmROZXh0TGluZUJyZWFrKTogRGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9i amVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojppc1NWR0lubGluZVRleHQp OiBSZXR1cm4gZmFsc2UsIGJ5IGRlZmF1bHQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNW R0lubGluZVRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR0lubGluZVRleHQ6Omlz U1ZHSW5saW5lVGV4dCk6IFJldHVybiB0cnVlIGhlcmUsIGRvbid0IHJldHVybiB0cnVlIGFueW1v cmUgZm9yIGlzU1ZHVGV4dCgpLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OnNldFRleHRJbnRlcm5hbCk6IHMvaXNTVkdU ZXh0L2lzU1ZHSW5saW5lVGV4dC8KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4 dC5jcHA6IFJlbW92ZSBoYWNrLCBub3cgdGhhdCB3ZSBjYW4gcHJvcGVybHkgZGlmZmVyZW50aWF0 ZSBiZXR3ZWVuIFJlbmRlclNWR1RleHQgLyBSZW5kZXJTVkdJbmxpbmVUZXh0LgorICAgICAgICAo V2ViQ29yZTo6d3JpdGUpOgorCiAyMDEwLTA2LTI1ICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29t cGFueTEwMC5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAkocmV2aXNpb24gNjE3 NTkpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTYxLDcgKzExNjEsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxk Q29sbGFwc2VXaGl0ZVNwCiBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkUHJlc2VydmVOZXdsaW5l KFJlbmRlck9iamVjdCogb2JqZWN0KQogewogI2lmIEVOQUJMRShTVkcpCi0gICAgaWYgKG9iamVj dC0+aXNTVkdUZXh0KCkpCisgICAgaWYgKG9iamVjdC0+aXNTVkdJbmxpbmVUZXh0KCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCkBAIC0xNDEzLDcgKzE0MTMsNyBAQCBJbmxpbmVJ dGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lCiAgICAgICAgIGF1dG9XcmFwV2FzRXZl clRydWVPbkxpbmUgPSBhdXRvV3JhcFdhc0V2ZXJUcnVlT25MaW5lIHx8IGF1dG9XcmFwOwogCiAj aWYgRU5BQkxFKFNWRykKLSAgICAgICAgYm9vbCBwcmVzZXJ2ZU5ld2xpbmUgPSBvLT5pc1NWR1Rl eHQoKSA/IGZhbHNlIDogUmVuZGVyU3R5bGU6OnByZXNlcnZlTmV3bGluZShjdXJyV1MpOworICAg ICAgICBib29sIHByZXNlcnZlTmV3bGluZSA9IG8tPmlzU1ZHSW5saW5lVGV4dCgpID8gZmFsc2Ug OiBSZW5kZXJTdHlsZTo6cHJlc2VydmVOZXdsaW5lKGN1cnJXUyk7CiAjZWxzZQogICAgICAgICBi b29sIHByZXNlcnZlTmV3bGluZSA9IFJlbmRlclN0eWxlOjpwcmVzZXJ2ZU5ld2xpbmUoY3VycldT KTsKICNlbmRpZgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDYxNzU5 KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAg LTM0MSw2ICszNDEsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzU1ZHSGlkZGVuQ29u dGFpbmVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNSZW5k ZXJQYXRoKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTVkdU ZXh0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNTVkdJbmxp bmVUZXh0KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTVkdJ bWFnZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzU1ZHRm9y ZWlnbk9iamVjdCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlz U1ZHUmVzb3VyY2VDb250YWluZXIoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQpJbmRleDogV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclNWR0lubGluZVRleHQuaAkocmV2aXNpb24gNjE3NTkpCisrKyBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTVkdJbmxpbmVUZXh0LmgJKHdvcmtpbmcgY29weSkKQEAg LTQ0LDcgKzQ0LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIEZsb2F0UmVjdCBvYmplY3RCb3Vu ZGluZ0JveCgpIGNvbnN0IHsgcmV0dXJuIEZsb2F0UmVjdCgpOyB9CiAKICAgICB2aXJ0dWFsIGJv b2wgcmVxdWlyZXNMYXllcigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBi b29sIGlzU1ZHVGV4dCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wg aXNTVkdJbmxpbmVUZXh0KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgdmlydHVhbCBJ bnRSZWN0IGxvY2FsQ2FyZXRSZWN0KElubGluZUJveCosIGludCBjYXJldE9mZnNldCwgaW50KiBl eHRyYVdpZHRoVG9FbmRPZkxpbmUgPSAwKTsKIApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5j cHAJKHJldmlzaW9uIDYxNzU5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTEwNTEsNyArMTA1MSw3IEBAIHZvaWQgUmVuZGVyVGV4dDo6c2V0 VGV4dEludGVybmFsKFBhc3NSZWYKICAgICBBU1NFUlQobV90ZXh0KTsKIAogI2lmIEVOQUJMRShT VkcpCi0gICAgaWYgKGlzU1ZHVGV4dCgpKSB7CisgICAgaWYgKGlzU1ZHSW5saW5lVGV4dCgpKSB7 CiAgICAgICAgIGlmIChzdHlsZSgpICYmIHN0eWxlKCktPndoaXRlU3BhY2UoKSA9PSBQUkUpIHsK ICAgICAgICAgICAgIC8vIFNwZWM6IFdoZW4geG1sOnNwYWNlPSJwcmVzZXJ2ZSIsIHRoZSBTVkcg dXNlciBhZ2VudCB3aWxsIGRvIHRoZSBmb2xsb3dpbmcgdXNpbmcgYQogICAgICAgICAgICAgLy8g Y29weSBvZiB0aGUgb3JpZ2luYWwgY2hhcmFjdGVyIGRhdGEgY29udGVudC4gSXQgd2lsbCBjb252 ZXJ0IGFsbCBuZXdsaW5lIGFuZCB0YWIKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRy ZWVBc1RleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVB c1RleHQuY3BwCShyZXZpc2lvbiA2MTc1OSkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRy ZWVBc1RleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTYsMTAgKzQxNiwxMSBAQCB2b2lkIHdy aXRlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAgICAgaWYgKG8uaXNTVkdUZXh0KCkpIHsKLSAgICAgICAgaWYgKCFvLmlzVGV4dCgpKQotICAg ICAgICAgICAgd3JpdGVTVkdUZXh0KHRzLCAqdG9SZW5kZXJCbG9jaygmbyksIGluZGVudCk7Ci0g ICAgICAgIGVsc2UKLSAgICAgICAgICAgIHdyaXRlU1ZHSW5saW5lVGV4dCh0cywgKnRvUmVuZGVy VGV4dCgmbyksIGluZGVudCk7CisgICAgICAgIHdyaXRlU1ZHVGV4dCh0cywgKnRvUmVuZGVyQmxv Y2soJm8pLCBpbmRlbnQpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGlmIChvLmlzU1ZH SW5saW5lVGV4dCgpKSB7CisgICAgICAgIHdyaXRlU1ZHSW5saW5lVGV4dCh0cywgKnRvUmVuZGVy VGV4dCgmbyksIGluZGVudCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKG8uaXNT VkdJbWFnZSgpKSB7Cg==