90051 2012-06-26 23:53:17 -0700 Rename rareSVGData() to svgRareData() 2012-06-27 01:55:04 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken darin rniwa webkit.review.bot zimmermann oldest_to_newest 658400 0 haraken 2012-06-26 23:53:17 -0700 Since rareSVGData() returns SVGRareData, it would make sense to rename rareSVGData() to svgRareData(). Similarly, we can rename ensureRareSVGData() to ensureSVGRareData(), and hasRareSVGData() to hasSVGRareData(). c.f. bug 90050 is trying to introduce elementRareData() and ensureElementRareData(). 658401 1 149693 haraken 2012-06-26 23:54:44 -0700 Created attachment 149693 Patch 658434 2 149693 zimmermann 2012-06-27 01:08:59 -0700 Comment on attachment 149693 Patch Fine with me, rs=me. 658436 3 149693 haraken 2012-06-27 01:09:33 -0700 Comment on attachment 149693 Patch Thanks! 658463 4 149693 webkit.review.bot 2012-06-27 01:54:59 -0700 Comment on attachment 149693 Patch Clearing flags on attachment: 149693 Committed r121330: <http://trac.webkit.org/changeset/121330> 658464 5 webkit.review.bot 2012-06-27 01:55:04 -0700 All reviewed patches have been landed. Closing bug. 149693 2012-06-26 23:54:44 -0700 2012-06-27 01:54:59 -0700 Patch bug-90051-20120627155444.patch text/plain 14373 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWU2YTAwM2YzODM0NTZi NTAwNjU0ZTM0M2JkZWRkNjk2NjhjZjM1YS4uNmI2ZjczZTVkOWZhYjVlNjQ4ZGZlNGNlZmI0MzI1 NjJmMmQ2ZjEzZiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDEyLTA2LTI2ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgcmFyZVNW R0RhdGEoKSB0byBzdmdSYXJlRGF0YSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05MDA1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNpbmNlIHJhcmVTVkdEYXRhKCkgcmV0dXJucyBTVkdSYXJlRGF0YSwg aXQgd291bGQgbWFrZSBzZW5zZSB0bworICAgICAgICByZW5hbWUgcmFyZVNWR0RhdGEoKSB0byBz dmdSYXJlRGF0YSgpLiBTaW1pbGFybHksIHdlIGNhbiByZW5hbWUKKyAgICAgICAgZW5zdXJlUmFy ZVNWR0RhdGEoKSB0byBlbnN1cmVTVkdSYXJlRGF0YSgpLCBhbmQgaGFzUmFyZVNWR0RhdGEoKQor ICAgICAgICB0byBoYXNTVkdSYXJlRGF0YSgpLgorCisgICAgICAgIGMuZi4gYnVnIDkwMDUwIGlz IHRyeWluZyB0byBpbnRyb2R1Y2UgZWxlbWVudFJhcmVEYXRhKCkgYW5kCisgICAgICAgIGVuc3Vy ZUVsZW1lbnRSYXJlRGF0YSgpLgorCisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVo YXZpb3IuCisKKyAgICAgICAgKiBXZWJDb3JlLm9yZGVyOgorICAgICAgICAqIGRvbS9Ob2RlLmg6 CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpoYXNTVkdSYXJlRGF0YSk6CisgICAgICAgIChXZWJD b3JlOjpOb2RlOjpzZXRIYXNTVkdSYXJlRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpj bGVhckhhc1NWR1JhcmVEYXRhKToKKyAgICAgICAgKiBzdmcvU1ZHRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTVkdFbGVtZW50Ojp+U1ZHRWxlbWVudCk6CisgICAgICAgIChXZWJDb3Jl OjpTVkdFbGVtZW50Ojp3aWxsUmVjYWxjU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxl bWVudDo6c3ZnUmFyZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxlbWVudDo6ZW5zdXJl U1ZHUmFyZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxlbWVudDo6bWFwSW5zdGFuY2VU b0VsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxlbWVudDo6cmVtb3ZlSW5zdGFuY2VN YXBwaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0VsZW1lbnQ6Omluc3RhbmNlc0ZvckVsZW1l bnQpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxlbWVudDo6c2V0Q3Vyc29yRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpTVkdFbGVtZW50OjpjdXJzb3JFbGVtZW50UmVtb3ZlZCk6CisgICAg ICAgIChXZWJDb3JlOjpTVkdFbGVtZW50OjpzZXRDdXJzb3JJbWFnZVZhbHVlKToKKyAgICAgICAg KFdlYkNvcmU6OlNWR0VsZW1lbnQ6OmN1cnNvckltYWdlVmFsdWVSZW1vdmVkKToKKyAgICAgICAg KFdlYkNvcmU6OlNWR0VsZW1lbnQ6OmNvcnJlc3BvbmRpbmdFbGVtZW50KToKKyAgICAgICAgKFdl YkNvcmU6OlNWR0VsZW1lbnQ6OnNldENvcnJlc3BvbmRpbmdFbGVtZW50KToKKyAgICAgICAgKFdl YkNvcmU6OlNWR0VsZW1lbnQ6OmFuaW1hdGVkU01JTFN0eWxlUHJvcGVydGllcyk6CisgICAgICAg IChXZWJDb3JlOjpTVkdFbGVtZW50OjplbnN1cmVBbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMp OgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxlbWVudDo6c2V0VXNlT3ZlcnJpZGVDb21wdXRlZFN0 eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0VsZW1lbnQ6OmNvbXB1dGVkU3R5bGUpOgorICAg ICAgICAqIHN2Zy9TVkdFbGVtZW50Lmg6CisgICAgICAgIChTVkdFbGVtZW50KToKKyAgICAgICAg KiBzdmcvU1ZHU3R5bGVkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdTdHlsZWRF bGVtZW50OjppbnN0YW5jZVVwZGF0ZXNCbG9ja2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1N0 eWxlZEVsZW1lbnQ6OnNldEluc3RhbmNlVXBkYXRlc0Jsb2NrZWQpOgorICAgICAgICAoV2ViQ29y ZTo6U1ZHU3R5bGVkRWxlbWVudDo6aGFzUGVuZGluZ1Jlc291cmNlcyk6CisgICAgICAgIChXZWJD b3JlOjpTVkdTdHlsZWRFbGVtZW50OjpzZXRIYXNQZW5kaW5nUmVzb3VyY2VzKToKKyAgICAgICAg KFdlYkNvcmU6OlNWR1N0eWxlZEVsZW1lbnQ6OmNsZWFySGFzUGVuZGluZ1Jlc291cmNlc0lmUG9z c2libGUpOgorCiAyMDEyLTA2LTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgog CiAgICAgICAgIFN0b3AgY2FsbGluZyBub2RlKCkgYW5kIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0 KCkgaW4gY29tcGFyZVBvc2l0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5vcmRlciBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIKaW5kZXggYmJmNmEzZGQzZDdj ZGE4NmJjZGE4MDgwMjNiNWEyMGJjOGNkMzRlOS4uZjM2NTRlNTMwMGNhYzM5ZTZjNGI0YWFkYzMw N2I4YTIxMzBkOTRkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlcgor KysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVyCkBAIC0yODg4Nyw3ICsyODg4Nyw3IEBA IF9fWk43V2ViQ29yZTIzUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXJDMUVQTlNfMTZTVkdNYXJrZXJF bGVtZW50RQogX19aTjdXZWJDb3JlMTRTVkdSZW5kZXJTdHlsZTIwc2V0TWFya2VyRW5kUmVzb3Vy Y2VFUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUyNlN0eWxlSW5oZXJpdGVkUmVzb3VyY2VE YXRhQzFFUktTMF8KIF9fWk43V2ViQ29yZTE2U1ZHU3R5bGVkRWxlbWVudDIyc2V0SGFzUGVuZGlu Z1Jlc291cmNlc0ViCi1fX1pON1dlYkNvcmUxMFNWR0VsZW1lbnQxN2Vuc3VyZVJhcmVTVkdEYXRh RXYKK19fWk43V2ViQ29yZTEwU1ZHRWxlbWVudDE3ZW5zdXJlU1ZHUmFyZURhdGFFdgogX19aVGhu MTI4X05LN1dlYkNvcmUyM1JlbmRlclNWR1Jlc291cmNlTWFya2VyMTJyZXNvdXJjZVR5cGVFdgog X19aVGhuMTI4X043V2ViQ29yZTIzUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXIyNXJlbW92ZUFsbENs aWVudHNGcm9tQ2FjaGVFYgogX19aTks3V2ViQ29yZTI2U3R5bGVJbmhlcml0ZWRSZXNvdXJjZURh dGFlcUVSS1MwXwpAQCAtMjg5NjEsNyArMjg5NjEsNyBAQCBfX1pON1dlYkNvcmUxNFNWR1BhdGhF bGVtZW50MjVjcmVhdGVTVkdQYXRoU2VnQ2xvc2VQYXRoRU5TXzE0U1ZHUGF0aFNlZ1JvbGVFCiBf X1pOSzdXZWJDb3JlMTlTVkdQYXRoU2VnQ2xvc2VQYXRoMTFwYXRoU2VnVHlwZUV2CiBfX1pON1dl YkNvcmUxM2NyZWF0ZVdyYXBwZXJJTlNfMjFKU1NWR1BhdGhTZWdDbG9zZVBhdGhFTlNfMTlTVkdQ YXRoU2VnQ2xvc2VQYXRoRUVFUE5TXzEySlNET01XcmFwcGVyRVBOM0pTQzlFeGVjU3RhdGVFUE5T XzE3SlNET01HbG9iYWxPYmplY3RFUFQwXwogX19aTjdXZWJDb3JlMjFKU1NWR1BhdGhTZWdDbG9z ZVBhdGhDMUVQTjNKU0M5U3RydWN0dXJlRVBOU18xN0pTRE9NR2xvYmFsT2JqZWN0RU4zV1RGMTBQ YXNzUmVmUHRySU5TXzE5U1ZHUGF0aFNlZ0Nsb3NlUGF0aEVFRQotX19aTks3V2ViQ29yZTEwU1ZH RWxlbWVudDExcmFyZVNWR0RhdGFFdgorX19aTks3V2ViQ29yZTEwU1ZHRWxlbWVudDExc3ZnUmFy ZURhdGFFdgogX19aTks3V2ViQ29yZTE2U1ZHU3R5bGVkRWxlbWVudDE5aGFzUGVuZGluZ1Jlc291 cmNlc0V2CiBfX1pOM1dURjZWZWN0b3JJTlNfMTJBdG9taWNTdHJpbmdFTG0wRUUxNXJlc2VydmVD YXBhY2l0eUVtCiBfX1pOM1dURjlIYXNoVGFibGVJTlNfMTJBdG9taWNTdHJpbmdFU3Q0cGFpcklT MV9QTlNfN0hhc2hTZXRJUE43V2ViQ29yZTE2U1ZHU3R5bGVkRWxlbWVudEVOU183UHRySGFzaElT Nl9FRU5TXzEwSGFzaFRyYWl0c0lTNl9FRUVFRU5TXzE4UGFpckZpcnN0RXh0cmFjdG9ySVNEX0VF TlNfMTZBdG9taWNTdHJpbmdIYXNoRU5TXzE0UGFpckhhc2hUcmFpdHNJTlM5X0lTMV9FRU5TOV9J U0NfRUVFRVNJX0UzYWRkSVMxX1NDX05TXzE3SGFzaE1hcFRyYW5zbGF0b3JJU0RfU0tfU0dfRUVF RVMyX0lOU18xN0hhc2hUYWJsZUl0ZXJhdG9ySVMxX1NEX1NGX1NHX1NLX1NJX0VFYkVSS1RfUktU MF8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9Tb3VyY2UvV2ViQ29y ZS9kb20vTm9kZS5oCmluZGV4IGM5YzI2NzRkMjdjNWNjMWUzMDQ4ZjBmNTMwMzc3ZWMzNjFkNjkx YmEuLjhjNDc3YzA1ZGVhYWFmZjA3ZGQyNDFkNjQ1YWYyNWVlYmI4Nzg2MmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUu aApAQCAtODA4LDkgKzgwOCw5IEBAIHByb3RlY3RlZDoKICAgICBib29sIGlzU3luY2hyb25pemlu Z1NWR0F0dHJpYnV0ZXMoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKElzU3luY2hyb25pemluZ1NW R0F0dHJpYnV0ZXNGbGFnKTsgfQogICAgIHZvaWQgc2V0SXNTeW5jaHJvbml6aW5nU1ZHQXR0cmli dXRlcygpIGNvbnN0IHsgc2V0RmxhZyhJc1N5bmNocm9uaXppbmdTVkdBdHRyaWJ1dGVzRmxhZyk7 IH0KICAgICB2b2lkIGNsZWFySXNTeW5jaHJvbml6aW5nU1ZHQXR0cmlidXRlcygpIGNvbnN0IHsg Y2xlYXJGbGFnKElzU3luY2hyb25pemluZ1NWR0F0dHJpYnV0ZXNGbGFnKTsgfQotICAgIGJvb2wg aGFzUmFyZVNWR0RhdGEoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKEhhc1NWR1JhcmVEYXRhRmxh Zyk7IH0KLSAgICB2b2lkIHNldEhhc1JhcmVTVkdEYXRhKCkgeyBzZXRGbGFnKEhhc1NWR1JhcmVE YXRhRmxhZyk7IH0KLSAgICB2b2lkIGNsZWFySGFzUmFyZVNWR0RhdGEoKSB7IGNsZWFyRmxhZyhI YXNTVkdSYXJlRGF0YUZsYWcpOyB9CisgICAgYm9vbCBoYXNTVkdSYXJlRGF0YSgpIGNvbnN0IHsg cmV0dXJuIGdldEZsYWcoSGFzU1ZHUmFyZURhdGFGbGFnKTsgfQorICAgIHZvaWQgc2V0SGFzU1ZH UmFyZURhdGEoKSB7IHNldEZsYWcoSGFzU1ZHUmFyZURhdGFGbGFnKTsgfQorICAgIHZvaWQgY2xl YXJIYXNTVkdSYXJlRGF0YSgpIHsgY2xlYXJGbGFnKEhhc1NWR1JhcmVEYXRhRmxhZyk7IH0KICNl bmRpZgogCiAjaWYgRU5BQkxFKE1JQ1JPREFUQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApp bmRleCA4ZWRiYjY1YzZlZDZiNWE2MmRhYzVkMzA4ZjdmNDIyNGUyZjU3MzU1Li5jMWZmZTg1OGQ0 MzAxYmQ4ZDVmOTI1YjMxZTJmNzdmZmMyNGMwMWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQu Y3BwCkBAIC02MSw3ICs2MSw3IEBAIFBhc3NSZWZQdHI8U1ZHRWxlbWVudD4gU1ZHRWxlbWVudDo6 Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50CiAKIFNWR0VsZW1l bnQ6On5TVkdFbGVtZW50KCkKIHsKLSAgICBpZiAoIWhhc1JhcmVTVkdEYXRhKCkpCisgICAgaWYg KCFoYXNTVkdSYXJlRGF0YSgpKQogICAgICAgICBBU1NFUlQoIVNWR0VsZW1lbnRSYXJlRGF0YTo6 cmFyZURhdGFNYXAoKS5jb250YWlucyh0aGlzKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIFNWR0Vs ZW1lbnRSYXJlRGF0YTo6U1ZHRWxlbWVudFJhcmVEYXRhTWFwJiByYXJlRGF0YU1hcCA9IFNWR0Vs ZW1lbnRSYXJlRGF0YTo6cmFyZURhdGFNYXAoKTsKQEAgLTg0LDMwICs4NCwzMCBAQCBTVkdFbGVt ZW50Ojp+U1ZHRWxlbWVudCgpCiAKIGJvb2wgU1ZHRWxlbWVudDo6d2lsbFJlY2FsY1N0eWxlKFN0 eWxlQ2hhbmdlIGNoYW5nZSkKIHsKLSAgICBpZiAoIWhhc1JhcmVTVkdEYXRhKCkgfHwgc3R5bGVD aGFuZ2VUeXBlKCkgPT0gU3ludGhldGljU3R5bGVDaGFuZ2UpCisgICAgaWYgKCFoYXNTVkdSYXJl RGF0YSgpIHx8IHN0eWxlQ2hhbmdlVHlwZSgpID09IFN5bnRoZXRpY1N0eWxlQ2hhbmdlKQogICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICAvLyBJZiB0aGUgc3R5bGUgY2hhbmdlcyBiZWNhdXNlIG9m IGEgcmVndWxhciBwcm9wZXJ0eSBjaGFuZ2UgKG5vdCBpbmR1Y2VkIGJ5IFNNSUwgYW5pbWF0aW9u cyB0aGVtc2VsdmVzKQogICAgIC8vIHJlc2V0IHRoZSAiY29tcHV0ZWQgc3R5bGUgd2l0aG91dCBT TUlMIHN0eWxlIHByb3BlcnRpZXMiLCBzbyB0aGUgYmFzZSB2YWx1ZSBjaGFuZ2UgZ2V0cyByZWZs ZWN0ZWQuCiAgICAgaWYgKGNoYW5nZSA+IE5vQ2hhbmdlIHx8IG5lZWRzU3R5bGVSZWNhbGMoKSkK LSAgICAgICAgcmFyZVNWR0RhdGEoKS0+c2V0TmVlZHNPdmVycmlkZUNvbXB1dGVkU3R5bGVVcGRh dGUoKTsKKyAgICAgICAgc3ZnUmFyZURhdGEoKS0+c2V0TmVlZHNPdmVycmlkZUNvbXB1dGVkU3R5 bGVVcGRhdGUoKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotU1ZHRWxlbWVudFJhcmVEYXRhKiBT VkdFbGVtZW50OjpyYXJlU1ZHRGF0YSgpIGNvbnN0CitTVkdFbGVtZW50UmFyZURhdGEqIFNWR0Vs ZW1lbnQ6OnN2Z1JhcmVEYXRhKCkgY29uc3QKIHsKLSAgICBBU1NFUlQoaGFzUmFyZVNWR0RhdGEo KSk7CisgICAgQVNTRVJUKGhhc1NWR1JhcmVEYXRhKCkpOwogICAgIHJldHVybiBTVkdFbGVtZW50 UmFyZURhdGE6OnJhcmVEYXRhRnJvbU1hcCh0aGlzKTsKIH0KIAotU1ZHRWxlbWVudFJhcmVEYXRh KiBTVkdFbGVtZW50OjplbnN1cmVSYXJlU1ZHRGF0YSgpCitTVkdFbGVtZW50UmFyZURhdGEqIFNW R0VsZW1lbnQ6OmVuc3VyZVNWR1JhcmVEYXRhKCkKIHsKLSAgICBpZiAoaGFzUmFyZVNWR0RhdGEo KSkKLSAgICAgICAgcmV0dXJuIHJhcmVTVkdEYXRhKCk7CisgICAgaWYgKGhhc1NWR1JhcmVEYXRh KCkpCisgICAgICAgIHJldHVybiBzdmdSYXJlRGF0YSgpOwogCiAgICAgQVNTRVJUKCFTVkdFbGVt ZW50UmFyZURhdGE6OnJhcmVEYXRhTWFwKCkuY29udGFpbnModGhpcykpOwogICAgIFNWR0VsZW1l bnRSYXJlRGF0YSogZGF0YSA9IG5ldyBTVkdFbGVtZW50UmFyZURhdGE7CiAgICAgU1ZHRWxlbWVu dFJhcmVEYXRhOjpyYXJlRGF0YU1hcCgpLnNldCh0aGlzLCBkYXRhKTsKLSAgICBzZXRIYXNSYXJl U1ZHRGF0YSgpOworICAgIHNldEhhc1NWR1JhcmVEYXRhKCk7CiAgICAgcmV0dXJuIGRhdGE7CiB9 CiAKQEAgLTIyMCw3ICsyMjAsNyBAQCB2b2lkIFNWR0VsZW1lbnQ6Om1hcEluc3RhbmNlVG9FbGVt ZW50KFNWR0VsZW1lbnRJbnN0YW5jZSogaW5zdGFuY2UpCiB7CiAgICAgQVNTRVJUKGluc3RhbmNl KTsKIAotICAgIEhhc2hTZXQ8U1ZHRWxlbWVudEluc3RhbmNlKj4mIGluc3RhbmNlcyA9IGVuc3Vy ZVJhcmVTVkdEYXRhKCktPmVsZW1lbnRJbnN0YW5jZXMoKTsKKyAgICBIYXNoU2V0PFNWR0VsZW1l bnRJbnN0YW5jZSo+JiBpbnN0YW5jZXMgPSBlbnN1cmVTVkdSYXJlRGF0YSgpLT5lbGVtZW50SW5z dGFuY2VzKCk7CiAgICAgQVNTRVJUKCFpbnN0YW5jZXMuY29udGFpbnMoaW5zdGFuY2UpKTsKIAog ICAgIGluc3RhbmNlcy5hZGQoaW5zdGFuY2UpOwpAQCAtMjI5LDkgKzIyOSw5IEBAIHZvaWQgU1ZH RWxlbWVudDo6bWFwSW5zdGFuY2VUb0VsZW1lbnQoU1ZHRWxlbWVudEluc3RhbmNlKiBpbnN0YW5j ZSkKIHZvaWQgU1ZHRWxlbWVudDo6cmVtb3ZlSW5zdGFuY2VNYXBwaW5nKFNWR0VsZW1lbnRJbnN0 YW5jZSogaW5zdGFuY2UpCiB7CiAgICAgQVNTRVJUKGluc3RhbmNlKTsKLSAgICBBU1NFUlQoaGFz UmFyZVNWR0RhdGEoKSk7CisgICAgQVNTRVJUKGhhc1NWR1JhcmVEYXRhKCkpOwogCi0gICAgSGFz aFNldDxTVkdFbGVtZW50SW5zdGFuY2UqPiYgaW5zdGFuY2VzID0gcmFyZVNWR0RhdGEoKS0+ZWxl bWVudEluc3RhbmNlcygpOworICAgIEhhc2hTZXQ8U1ZHRWxlbWVudEluc3RhbmNlKj4mIGluc3Rh bmNlcyA9IHN2Z1JhcmVEYXRhKCktPmVsZW1lbnRJbnN0YW5jZXMoKTsKICAgICBBU1NFUlQoaW5z dGFuY2VzLmNvbnRhaW5zKGluc3RhbmNlKSk7CiAKICAgICBpbnN0YW5jZXMucmVtb3ZlKGluc3Rh bmNlKTsKQEAgLTIzOSwxMSArMjM5LDExIEBAIHZvaWQgU1ZHRWxlbWVudDo6cmVtb3ZlSW5zdGFu Y2VNYXBwaW5nKFNWR0VsZW1lbnRJbnN0YW5jZSogaW5zdGFuY2UpCiAKIGNvbnN0IEhhc2hTZXQ8 U1ZHRWxlbWVudEluc3RhbmNlKj4mIFNWR0VsZW1lbnQ6Omluc3RhbmNlc0ZvckVsZW1lbnQoKSBj b25zdAogewotICAgIGlmICghaGFzUmFyZVNWR0RhdGEoKSkgeworICAgIGlmICghaGFzU1ZHUmFy ZURhdGEoKSkgewogICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEhhc2hTZXQ8U1ZHRWxlbWVu dEluc3RhbmNlKj4sIGVtcHR5SW5zdGFuY2VzLCAoKSk7CiAgICAgICAgIHJldHVybiBlbXB0eUlu c3RhbmNlczsKICAgICB9Ci0gICAgcmV0dXJuIHJhcmVTVkdEYXRhKCktPmVsZW1lbnRJbnN0YW5j ZXMoKTsKKyAgICByZXR1cm4gc3ZnUmFyZURhdGEoKS0+ZWxlbWVudEluc3RhbmNlcygpOwogfQog CiBib29sIFNWR0VsZW1lbnQ6OmJvdW5kaW5nQm94KEZsb2F0UmVjdCYgcmVjdCwgU1ZHTG9jYXRh YmxlOjpTdHlsZVVwZGF0ZVN0cmF0ZWd5IHN0eWxlVXBkYXRlU3RyYXRlZ3kpCkBAIC0yNjEsNyAr MjYxLDcgQEAgYm9vbCBTVkdFbGVtZW50Ojpib3VuZGluZ0JveChGbG9hdFJlY3QmIHJlY3QsIFNW R0xvY2F0YWJsZTo6U3R5bGVVcGRhdGVTdHJhdGVneQogCiB2b2lkIFNWR0VsZW1lbnQ6OnNldEN1 cnNvckVsZW1lbnQoU1ZHQ3Vyc29yRWxlbWVudCogY3Vyc29yRWxlbWVudCkKIHsKLSAgICBTVkdF bGVtZW50UmFyZURhdGEqIHJhcmVEYXRhID0gZW5zdXJlUmFyZVNWR0RhdGEoKTsKKyAgICBTVkdF bGVtZW50UmFyZURhdGEqIHJhcmVEYXRhID0gZW5zdXJlU1ZHUmFyZURhdGEoKTsKICAgICBpZiAo U1ZHQ3Vyc29yRWxlbWVudCogb2xkQ3Vyc29yRWxlbWVudCA9IHJhcmVEYXRhLT5jdXJzb3JFbGVt ZW50KCkpIHsKICAgICAgICAgaWYgKGN1cnNvckVsZW1lbnQgPT0gb2xkQ3Vyc29yRWxlbWVudCkK ICAgICAgICAgICAgIHJldHVybjsKQEAgLTI3MiwxMyArMjcyLDEzIEBAIHZvaWQgU1ZHRWxlbWVu dDo6c2V0Q3Vyc29yRWxlbWVudChTVkdDdXJzb3JFbGVtZW50KiBjdXJzb3JFbGVtZW50KQogCiB2 b2lkIFNWR0VsZW1lbnQ6OmN1cnNvckVsZW1lbnRSZW1vdmVkKCkgCiB7Ci0gICAgQVNTRVJUKGhh c1JhcmVTVkdEYXRhKCkpOwotICAgIHJhcmVTVkdEYXRhKCktPnNldEN1cnNvckVsZW1lbnQoMCk7 CisgICAgQVNTRVJUKGhhc1NWR1JhcmVEYXRhKCkpOworICAgIHN2Z1JhcmVEYXRhKCktPnNldEN1 cnNvckVsZW1lbnQoMCk7CiB9CiAKIHZvaWQgU1ZHRWxlbWVudDo6c2V0Q3Vyc29ySW1hZ2VWYWx1 ZShDU1NDdXJzb3JJbWFnZVZhbHVlKiBjdXJzb3JJbWFnZVZhbHVlKQogewotICAgIFNWR0VsZW1l bnRSYXJlRGF0YSogcmFyZURhdGEgPSBlbnN1cmVSYXJlU1ZHRGF0YSgpOworICAgIFNWR0VsZW1l bnRSYXJlRGF0YSogcmFyZURhdGEgPSBlbnN1cmVTVkdSYXJlRGF0YSgpOwogICAgIGlmIChDU1ND dXJzb3JJbWFnZVZhbHVlKiBvbGRDdXJzb3JJbWFnZVZhbHVlID0gcmFyZURhdGEtPmN1cnNvcklt YWdlVmFsdWUoKSkgewogICAgICAgICBpZiAoY3Vyc29ySW1hZ2VWYWx1ZSA9PSBvbGRDdXJzb3JJ bWFnZVZhbHVlKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjg5LDE5ICsyODksMTkgQEAgdm9p ZCBTVkdFbGVtZW50OjpzZXRDdXJzb3JJbWFnZVZhbHVlKENTU0N1cnNvckltYWdlVmFsdWUqIGN1 cnNvckltYWdlVmFsdWUpCiAKIHZvaWQgU1ZHRWxlbWVudDo6Y3Vyc29ySW1hZ2VWYWx1ZVJlbW92 ZWQoKQogewotICAgIEFTU0VSVChoYXNSYXJlU1ZHRGF0YSgpKTsKLSAgICByYXJlU1ZHRGF0YSgp LT5zZXRDdXJzb3JJbWFnZVZhbHVlKDApOworICAgIEFTU0VSVChoYXNTVkdSYXJlRGF0YSgpKTsK KyAgICBzdmdSYXJlRGF0YSgpLT5zZXRDdXJzb3JJbWFnZVZhbHVlKDApOwogfQogCiBTVkdFbGVt ZW50KiBTVkdFbGVtZW50Ojpjb3JyZXNwb25kaW5nRWxlbWVudCgpCiB7Ci0gICAgQVNTRVJUKCFo YXNSYXJlU1ZHRGF0YSgpIHx8ICFyYXJlU1ZHRGF0YSgpLT5jb3JyZXNwb25kaW5nRWxlbWVudCgp IHx8IHNoYWRvd1Jvb3QoKSk7Ci0gICAgcmV0dXJuIGhhc1JhcmVTVkdEYXRhKCkgPyByYXJlU1ZH RGF0YSgpLT5jb3JyZXNwb25kaW5nRWxlbWVudCgpIDogMDsKKyAgICBBU1NFUlQoIWhhc1NWR1Jh cmVEYXRhKCkgfHwgIXN2Z1JhcmVEYXRhKCktPmNvcnJlc3BvbmRpbmdFbGVtZW50KCkgfHwgc2hh ZG93Um9vdCgpKTsKKyAgICByZXR1cm4gaGFzU1ZHUmFyZURhdGEoKSA/IHN2Z1JhcmVEYXRhKCkt PmNvcnJlc3BvbmRpbmdFbGVtZW50KCkgOiAwOwogfQogCiB2b2lkIFNWR0VsZW1lbnQ6OnNldENv cnJlc3BvbmRpbmdFbGVtZW50KFNWR0VsZW1lbnQqIGNvcnJlc3BvbmRpbmdFbGVtZW50KQogewot ICAgIGVuc3VyZVJhcmVTVkdEYXRhKCktPnNldENvcnJlc3BvbmRpbmdFbGVtZW50KGNvcnJlc3Bv bmRpbmdFbGVtZW50KTsKKyAgICBlbnN1cmVTVkdSYXJlRGF0YSgpLT5zZXRDb3JyZXNwb25kaW5n RWxlbWVudChjb3JyZXNwb25kaW5nRWxlbWVudCk7CiB9CiAKIHZvaWQgU1ZHRWxlbWVudDo6cGFy c2VBdHRyaWJ1dGUoY29uc3QgQXR0cmlidXRlJiBhdHRyaWJ1dGUpCkBAIC01OTEsMjUgKzU5MSwy NSBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBTVkdFbGVtZW50OjpjdXN0b21TdHlsZUZvclJl bmRlcmVyKCkKIAogU3R5bGVQcm9wZXJ0eVNldCogU1ZHRWxlbWVudDo6YW5pbWF0ZWRTTUlMU3R5 bGVQcm9wZXJ0aWVzKCkgY29uc3QKIHsKLSAgICBpZiAoaGFzUmFyZVNWR0RhdGEoKSkKLSAgICAg ICAgcmV0dXJuIHJhcmVTVkdEYXRhKCktPmFuaW1hdGVkU01JTFN0eWxlUHJvcGVydGllcygpOwor ICAgIGlmIChoYXNTVkdSYXJlRGF0YSgpKQorICAgICAgICByZXR1cm4gc3ZnUmFyZURhdGEoKS0+ YW5pbWF0ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzKCk7CiAgICAgcmV0dXJuIDA7CiB9CiAKIFN0eWxl UHJvcGVydHlTZXQqIFNWR0VsZW1lbnQ6OmVuc3VyZUFuaW1hdGVkU01JTFN0eWxlUHJvcGVydGll cygpCiB7Ci0gICAgcmV0dXJuIGVuc3VyZVJhcmVTVkdEYXRhKCktPmVuc3VyZUFuaW1hdGVkU01J TFN0eWxlUHJvcGVydGllcygpOworICAgIHJldHVybiBlbnN1cmVTVkdSYXJlRGF0YSgpLT5lbnN1 cmVBbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKTsKIH0KIAogdm9pZCBTVkdFbGVtZW50Ojpz ZXRVc2VPdmVycmlkZUNvbXB1dGVkU3R5bGUoYm9vbCB2YWx1ZSkKIHsKLSAgICBpZiAoaGFzUmFy ZVNWR0RhdGEoKSkKLSAgICAgICAgcmFyZVNWR0RhdGEoKS0+c2V0VXNlT3ZlcnJpZGVDb21wdXRl ZFN0eWxlKHZhbHVlKTsKKyAgICBpZiAoaGFzU1ZHUmFyZURhdGEoKSkKKyAgICAgICAgc3ZnUmFy ZURhdGEoKS0+c2V0VXNlT3ZlcnJpZGVDb21wdXRlZFN0eWxlKHZhbHVlKTsKIH0KIAogUmVuZGVy U3R5bGUqIFNWR0VsZW1lbnQ6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNw ZWNpZmllcikKIHsKLSAgICBpZiAoIWhhc1JhcmVTVkdEYXRhKCkgfHwgIXJhcmVTVkdEYXRhKCkt PnVzZU92ZXJyaWRlQ29tcHV0ZWRTdHlsZSgpKQorICAgIGlmICghaGFzU1ZHUmFyZURhdGEoKSB8 fCAhc3ZnUmFyZURhdGEoKS0+dXNlT3ZlcnJpZGVDb21wdXRlZFN0eWxlKCkpCiAgICAgICAgIHJl dHVybiBFbGVtZW50Ojpjb21wdXRlZFN0eWxlKHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIpOwogCiAg ICAgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlID0gMDsKQEAgLTYxOCw3ICs2MTgsNyBAQCBSZW5k ZXJTdHlsZSogU1ZHRWxlbWVudDo6Y29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50 U3BlY2lmaWVyKQogICAgICAgICAgICAgcGFyZW50U3R5bGUgPSByZW5kZXJlci0+c3R5bGUoKTsK ICAgICB9CiAKLSAgICByZXR1cm4gcmFyZVNWR0RhdGEoKS0+b3ZlcnJpZGVDb21wdXRlZFN0eWxl KHRoaXMsIHBhcmVudFN0eWxlKTsKKyAgICByZXR1cm4gc3ZnUmFyZURhdGEoKS0+b3ZlcnJpZGVD b21wdXRlZFN0eWxlKHRoaXMsIHBhcmVudFN0eWxlKTsKIH0KIAogI2lmbmRlZiBOREVCVUcKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHRWxlbWVudC5oCmluZGV4IGQzNDRmOWQxYTM3ZDY3ZDk5ZWUzMGQ1OWY5MjRlYzE5 NWY2NmRkNmQuLjQ3MDIzNWFlZjAyNThkZDVlMzk2ZTI4YjY1YTA3YjU1ZTEwMGUyYTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvc3ZnL1NWR0VsZW1lbnQuaApAQCAtMTI3LDggKzEyNyw4IEBAIHByb3RlY3RlZDoKICAgICAK ICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlZEZyb20oQ29udGFpbmVyTm9kZSopIE9WRVJSSURFOwog Ci0gICAgU1ZHRWxlbWVudFJhcmVEYXRhKiByYXJlU1ZHRGF0YSgpIGNvbnN0OwotICAgIFNWR0Vs ZW1lbnRSYXJlRGF0YSogZW5zdXJlUmFyZVNWR0RhdGEoKTsKKyAgICBTVkdFbGVtZW50UmFyZURh dGEqIHN2Z1JhcmVEYXRhKCkgY29uc3Q7CisgICAgU1ZHRWxlbWVudFJhcmVEYXRhKiBlbnN1cmVT VkdSYXJlRGF0YSgpOwogCiAgICAgdm9pZCByZXBvcnRBdHRyaWJ1dGVQYXJzaW5nRXJyb3IoU1ZH UGFyc2luZ0Vycm9yLCBjb25zdCBBdHRyaWJ1dGUmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvc3ZnL1NWR1N0eWxlZEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1N0 eWxlZEVsZW1lbnQuY3BwCmluZGV4IDdhZThmNTVlOTA0YzRiOGJhOWNjNTk1Mzk5ZjljN2MyZjZj OTI3M2YuLjdmMWU3ZWRiZDg0YjdjYTI4YzVjMzA2ZjgwNTRmMGMzMjYzNGYzNzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdTdHlsZWRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHU3R5bGVkRWxlbWVudC5jcHAKQEAgLTQyMywyOSArNDIzLDI5IEBAIFBh c3NSZWZQdHI8Q1NTVmFsdWU+IFNWR1N0eWxlZEVsZW1lbnQ6OmdldFByZXNlbnRhdGlvbkF0dHJp YnV0ZShjb25zdCBTdHJpbmcmIG5hCiAKIGJvb2wgU1ZHU3R5bGVkRWxlbWVudDo6aW5zdGFuY2VV cGRhdGVzQmxvY2tlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGhhc1JhcmVTVkdEYXRhKCkgJiYg cmFyZVNWR0RhdGEoKS0+aW5zdGFuY2VVcGRhdGVzQmxvY2tlZCgpOworICAgIHJldHVybiBoYXNT VkdSYXJlRGF0YSgpICYmIHN2Z1JhcmVEYXRhKCktPmluc3RhbmNlVXBkYXRlc0Jsb2NrZWQoKTsK IH0KIAogdm9pZCBTVkdTdHlsZWRFbGVtZW50OjpzZXRJbnN0YW5jZVVwZGF0ZXNCbG9ja2VkKGJv b2wgdmFsdWUpCiB7Ci0gICAgaWYgKGhhc1JhcmVTVkdEYXRhKCkpCi0gICAgICAgIHJhcmVTVkdE YXRhKCktPnNldEluc3RhbmNlVXBkYXRlc0Jsb2NrZWQodmFsdWUpOworICAgIGlmIChoYXNTVkdS YXJlRGF0YSgpKQorICAgICAgICBzdmdSYXJlRGF0YSgpLT5zZXRJbnN0YW5jZVVwZGF0ZXNCbG9j a2VkKHZhbHVlKTsKIH0KIAogYm9vbCBTVkdTdHlsZWRFbGVtZW50OjpoYXNQZW5kaW5nUmVzb3Vy Y2VzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gaGFzUmFyZVNWR0RhdGEoKSAmJiByYXJlU1ZHRGF0 YSgpLT5oYXNQZW5kaW5nUmVzb3VyY2VzKCk7CisgICAgcmV0dXJuIGhhc1NWR1JhcmVEYXRhKCkg JiYgc3ZnUmFyZURhdGEoKS0+aGFzUGVuZGluZ1Jlc291cmNlcygpOwogfQogCiB2b2lkIFNWR1N0 eWxlZEVsZW1lbnQ6OnNldEhhc1BlbmRpbmdSZXNvdXJjZXMoKQogewotICAgIGVuc3VyZVJhcmVT VkdEYXRhKCktPnNldEhhc1BlbmRpbmdSZXNvdXJjZXModHJ1ZSk7CisgICAgZW5zdXJlU1ZHUmFy ZURhdGEoKS0+c2V0SGFzUGVuZGluZ1Jlc291cmNlcyh0cnVlKTsKIH0KIAogdm9pZCBTVkdTdHls ZWRFbGVtZW50OjpjbGVhckhhc1BlbmRpbmdSZXNvdXJjZXNJZlBvc3NpYmxlKCkKIHsKICAgICBp ZiAoIWRvY3VtZW50KCktPmFjY2Vzc1NWR0V4dGVuc2lvbnMoKS0+aXNFbGVtZW50UGVuZGluZ1Jl c291cmNlcyh0aGlzKSkKLSAgICAgICAgZW5zdXJlUmFyZVNWR0RhdGEoKS0+c2V0SGFzUGVuZGlu Z1Jlc291cmNlcyhmYWxzZSk7CisgICAgICAgIGVuc3VyZVNWR1JhcmVEYXRhKCktPnNldEhhc1Bl bmRpbmdSZXNvdXJjZXMoZmFsc2UpOwogfQogCiBBZmZpbmVUcmFuc2Zvcm0gU1ZHU3R5bGVkRWxl bWVudDo6bG9jYWxDb29yZGluYXRlU3BhY2VUcmFuc2Zvcm0oU1ZHTG9jYXRhYmxlOjpDVE1TY29w ZSkgY29uc3QK