134564 2014-07-02 14:56:59 -0700 Get rid of the HistoryItem encoding/decoding in WebCore 2014-07-02 15:05:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 1020057 0 andersca 2014-07-02 14:56:59 -0700 Get rid of the HistoryItem encoding/decoding in WebCore 1020060 1 234286 andersca 2014-07-02 15:03:07 -0700 Created attachment 234286 Patch 1020061 2 andersca 2014-07-02 15:05:11 -0700 Committed r170726: <http://trac.webkit.org/changeset/170726> 234286 2014-07-02 15:03:07 -0700 2014-07-02 15:04:38 -0700 Patch bug-134564-20140702150250.patch text/plain 14606 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTE3MjkwODk0MTQ5NWY3 MGMyZDdmN2MyMmJhOGQxNjc1NmJmYzI0OC4uNzljNDcxMjc5OTQ0MjA1Y2YwYmNlY2YwMGVkYmI0 NDQ4MDZkOWYyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA3LTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiB0 aGUgSGlzdG9yeUl0ZW0gZW5jb2RpbmcvZGVjb2RpbmcgaW4gV2ViQ29yZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTY0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAg ICAgICAgKiBoaXN0b3J5L0hpc3RvcnlJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhpc3Rv cnlJdGVtOjplbmNvZGVCYWNrRm9yd2FyZFRyZWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6ZW5jb2RlUmVjdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjplbmNvZGVTaXplKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjplbmNvZGVCYWNrRm9yd2Fy ZFRyZWVOb2RlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRlY29kZVJlY3Vyc2lvblN0 YWNrRWxlbWVudDo6RGVjb2RlUmVjdXJzaW9uU3RhY2tFbGVtZW50KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OmRlY29kZVJlY3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6ZGVj b2RlU2l6ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6ZGVjb2Rl QmFja0ZvcndhcmRUcmVlKTogRGVsZXRlZC4KKyAgICAgICAgKiBoaXN0b3J5L0hpc3RvcnlJdGVt Lmg6CisKIDIwMTQtMDctMDIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBbV2ViR0xdIEZpeCBjcmFzaCB3aGVuIGdsc2wgZXhwcmVzc2lvbnMg YXJlIHRvbyBjb21wbGV4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCBlYTE1Y2FmZjZmYWQ4YzAy Y2M4MjdiOTRmMjNkNWY4YjAyNWFjNjFkLi5kMDdkMjgxNTU2YmJjODIwMDVkNjY1NzdmYjQ4NjFl YzZhNmNiMzQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMTYzLDcgKzE2Myw2IEBAIF9fWk43 V2ViQ29yZTExSGlzdG9yeUl0ZW0xNnNldERvY3VtZW50U3RhdGVFUktOM1dURjZWZWN0b3JJTlMx XzZTdHJpbmdFTG0wRU5TMV8xCiBfX1pON1dlYkNvcmUxMUhpc3RvcnlJdGVtMTdzZXRBbHRlcm5h dGVUaXRsZUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTExSGlzdG9yeUl0ZW0yMHNldE9y aWdpbmFsVVJMU3RyaW5nRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMTFIaXN0b3J5SXRl bTIwc2V0VHJhbnNpZW50UHJvcGVydHlFUktOM1dURjZTdHJpbmdFUDExb2JqY19vYmplY3QKLV9f Wk43V2ViQ29yZTExSGlzdG9yeUl0ZW0yMWRlY29kZUJhY2tGb3J3YXJkVHJlZUVSS04zV1RGNlN0 cmluZ0VTNF9TNF9STlMxXzdEZWNvZGVyRQogX19aTjdXZWJDb3JlMTFIaXN0b3J5SXRlbThmb3Jt RGF0YUV2CiBfX1pON1dlYkNvcmUxMUhpc3RvcnlJdGVtOHNldFRpdGxlRVJLTjNXVEY2U3RyaW5n RQogX19aTjdXZWJDb3JlMTFIaXN0b3J5SXRlbUMxRVJLTjNXVEY2U3RyaW5nRVM0XwpAQCAtMTU4 OSw4ICsxNTg4LDYgQEAgX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0xN29yaWdpbmFsVVJMU3Ry aW5nRXYKIF9fWk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtMTljaGlsZEl0ZW1XaXRoVGFyZ2V0RVJL TjNXVEY2U3RyaW5nRQogX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0yMGdldFRyYW5zaWVudFBy b3BlcnR5RVJLTjNXVEY2U3RyaW5nRQogX19aTks3V2ViQ29yZTExSGlzdG9yeUl0ZW0yMGhhc0Nh Y2hlZFBhZ2VFeHBpcmVkRXYKLV9fWk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtMjFlbmNvZGVCYWNr Rm9yd2FyZFRyZWVFUk4zV1RGN0VuY29kZXJFCi1fX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTIx ZW5jb2RlQmFja0ZvcndhcmRUcmVlRVJOU18xMktleWVkRW5jb2RlckUKIF9fWk5LN1dlYkNvcmUx MUhpc3RvcnlJdGVtM3VybEV2CiBfX1pOSzdXZWJDb3JlMTFIaXN0b3J5SXRlbTRjb3B5RXYKIF9f Wk5LN1dlYkNvcmUxMUhpc3RvcnlJdGVtNXRpdGxlRXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0 b3J5SXRlbS5jcHAKaW5kZXggZWMxMzRjNWEwMGY2MGRhNjNjNzlkY2ZmNzY0NzBiMTFiMDFkZDM1 My4uMTRhMGExMzY0N2ZmOWEwMTM4YmI1ZmYzNzczMWI3NGU3ZTc5NjlmMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKQEAgLTQzLDggKzQzLDYgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1jb25zdCB1aW50MzJfdCBiYWNrRm9yd2FyZFRyZWVFbmNvZGluZ1ZlcnNp b24gPSAyOwotCiBzdGF0aWMgbG9uZyBsb25nIGdlbmVyYXRlU2VxdWVuY2VOdW1iZXIoKQogewog ICAgIC8vIEluaXRpYWxpemUgdG8gdGhlIGN1cnJlbnQgdGltZSB0byByZWR1Y2UgdGhlIGxpa2Vs aWhvb2Qgb2YgZ2VuZXJhdGluZwpAQCAtNTc2LDM1NCArNTc0LDYgQEAgdm9pZCBIaXN0b3J5SXRl bTo6c2V0UmVkaXJlY3RVUkxzKHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8U3RyaW5nPj4gcmVkaXJl Y3RVUkxzKQogICAgIG1fcmVkaXJlY3RVUkxzID0gc3RkOjptb3ZlKHJlZGlyZWN0VVJMcyk7CiB9 CiAKLXZvaWQgSGlzdG9yeUl0ZW06OmVuY29kZUJhY2tGb3J3YXJkVHJlZShFbmNvZGVyJiBlbmNv ZGVyKSBjb25zdAotewotICAgIGVuY29kZXIuZW5jb2RlVUludDMyKGJhY2tGb3J3YXJkVHJlZUVu Y29kaW5nVmVyc2lvbik7Ci0KLSAgICBlbmNvZGVCYWNrRm9yd2FyZFRyZWVOb2RlKGVuY29kZXIp OwotfQotCi12b2lkIEhpc3RvcnlJdGVtOjplbmNvZGVCYWNrRm9yd2FyZFRyZWUoS2V5ZWRFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAotewotICAgIGVuY29kZXIuZW5jb2RlVUludDMyKCJ2ZXJzaW9u IiwgYmFja0ZvcndhcmRUcmVlRW5jb2RpbmdWZXJzaW9uKTsKLQotICAgIGVuY29kZXIuZW5jb2Rl T2JqZWN0KCJyb290IiwgKnRoaXMsIFtdKEtleWVkRW5jb2RlciYgZW5jb2RlciwgY29uc3QgSGlz dG9yeUl0ZW0mIGl0ZW0pIHsKLSAgICAgICAgaXRlbS5lbmNvZGVCYWNrRm9yd2FyZFRyZWVOb2Rl KGVuY29kZXIpOwotICAgIH0pOwotfQotCi0jaWYgUExBVEZPUk0oSU9TKQotc3RhdGljIHZvaWQg ZW5jb2RlUmVjdChFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBGbG9hdFJlY3QmIGZsb2F0UmVjdCkK LXsKLSAgICBlbmNvZGVyLmVuY29kZUZsb2F0KGZsb2F0UmVjdC54KCkpOwotICAgIGVuY29kZXIu ZW5jb2RlRmxvYXQoZmxvYXRSZWN0LnkoKSk7Ci0gICAgZW5jb2Rlci5lbmNvZGVGbG9hdChmbG9h dFJlY3Qud2lkdGgoKSk7Ci0gICAgZW5jb2Rlci5lbmNvZGVGbG9hdChmbG9hdFJlY3QuaGVpZ2h0 KCkpOwotfQotCi1zdGF0aWMgdm9pZCBlbmNvZGVSZWN0KEVuY29kZXImIGVuY29kZXIsIGNvbnN0 IEludFJlY3QmIGludFJlY3QpCi17Ci0gICAgZW5jb2Rlci5lbmNvZGVJbnQzMihpbnRSZWN0Lngo KSk7Ci0gICAgZW5jb2Rlci5lbmNvZGVJbnQzMihpbnRSZWN0LnkoKSk7Ci0gICAgZW5jb2Rlci5l bmNvZGVJbnQzMihpbnRSZWN0LndpZHRoKCkpOwotICAgIGVuY29kZXIuZW5jb2RlSW50MzIoaW50 UmVjdC5oZWlnaHQoKSk7Ci19Ci0KLXN0YXRpYyB2b2lkIGVuY29kZVNpemUoRW5jb2RlciYgZW5j b2RlciwgY29uc3QgRmxvYXRTaXplJiBmbG9hdFNpemUpCi17Ci0gICAgZW5jb2Rlci5lbmNvZGVG bG9hdChmbG9hdFNpemUud2lkdGgoKSk7Ci0gICAgZW5jb2Rlci5lbmNvZGVGbG9hdChmbG9hdFNp emUuaGVpZ2h0KCkpOwotfQotCi1zdGF0aWMgdm9pZCBlbmNvZGVTaXplKEVuY29kZXImIGVuY29k ZXIsIGNvbnN0IEludFNpemUmIGludFNpemUpCi17Ci0gICAgZW5jb2Rlci5lbmNvZGVJbnQzMihp bnRTaXplLndpZHRoKCkpOwotICAgIGVuY29kZXIuZW5jb2RlSW50MzIoaW50U2l6ZS5oZWlnaHQo KSk7Ci19Ci0jZW5kaWYKLQotdm9pZCBIaXN0b3J5SXRlbTo6ZW5jb2RlQmFja0ZvcndhcmRUcmVl Tm9kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAotewotICAgIHNpemVfdCBzaXplID0gbV9jaGls ZHJlbi5zaXplKCk7Ci0gICAgZW5jb2Rlci5lbmNvZGVVSW50NjQoc2l6ZSk7Ci0gICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKLSAgICAgICAgY29uc3QgSGlzdG9yeUl0ZW0m IGNoaWxkID0gKm1fY2hpbGRyZW5baV07Ci0KLSAgICAgICAgZW5jb2Rlci5lbmNvZGVTdHJpbmco Y2hpbGQubV9vcmlnaW5hbFVSTFN0cmluZyk7Ci0KLSAgICAgICAgZW5jb2Rlci5lbmNvZGVTdHJp bmcoY2hpbGQubV91cmxTdHJpbmcpOwotCi0gICAgICAgIGNoaWxkLmVuY29kZUJhY2tGb3J3YXJk VHJlZU5vZGUoZW5jb2Rlcik7Ci0gICAgfQotCi0gICAgZW5jb2Rlci5lbmNvZGVJbnQ2NChtX2Rv Y3VtZW50U2VxdWVuY2VOdW1iZXIpOwotCi0gICAgc2l6ZSA9IG1fZG9jdW1lbnRTdGF0ZS5zaXpl KCk7Ci0gICAgZW5jb2Rlci5lbmNvZGVVSW50NjQoc2l6ZSk7Ci0gICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBzaXplOyArK2kpCi0gICAgICAgIGVuY29kZXIuZW5jb2RlU3RyaW5nKG1fZG9jdW1l bnRTdGF0ZVtpXSk7Ci0KLSAgICBlbmNvZGVyLmVuY29kZVN0cmluZyhtX2Zvcm1Db250ZW50VHlw ZSk7Ci0KLSAgICBlbmNvZGVyLmVuY29kZUJvb2wobV9mb3JtRGF0YSk7Ci0gICAgaWYgKG1fZm9y bURhdGEpCi0gICAgICAgIG1fZm9ybURhdGEtPmVuY29kZShlbmNvZGVyKTsKLQotICAgIGVuY29k ZXIuZW5jb2RlSW50NjQobV9pdGVtU2VxdWVuY2VOdW1iZXIpOwotCi0gICAgZW5jb2Rlci5lbmNv ZGVTdHJpbmcobV9yZWZlcnJlcik7Ci0KLSAgICBlbmNvZGVyLmVuY29kZUludDMyKG1fc2Nyb2xs UG9pbnQueCgpKTsKLSAgICBlbmNvZGVyLmVuY29kZUludDMyKG1fc2Nyb2xsUG9pbnQueSgpKTsK LSAgICAKLSAgICBlbmNvZGVyLmVuY29kZUZsb2F0KG1fcGFnZVNjYWxlRmFjdG9yKTsKLQotICAg IGVuY29kZXIuZW5jb2RlQm9vbChtX3N0YXRlT2JqZWN0KTsKLSAgICBpZiAobV9zdGF0ZU9iamVj dCkKLSAgICAgICAgZW5jb2Rlci5lbmNvZGVCeXRlcyhtX3N0YXRlT2JqZWN0LT5kYXRhKCkuZGF0 YSgpLCBtX3N0YXRlT2JqZWN0LT5kYXRhKCkuc2l6ZSgpKTsKLQotICAgIGVuY29kZXIuZW5jb2Rl U3RyaW5nKG1fdGFyZ2V0KTsKLQotI2lmIFBMQVRGT1JNKElPUykKLSAgICBlbmNvZGVSZWN0KGVu Y29kZXIsIG1fZXhwb3NlZENvbnRlbnRSZWN0KTsKLSAgICBlbmNvZGVSZWN0KGVuY29kZXIsIG1f dW5vYnNjdXJlZENvbnRlbnRSZWN0KTsKLSAgICBlbmNvZGVTaXplKGVuY29kZXIsIG1fbWluaW11 bUxheW91dFNpemVJblNjcm9sbFZpZXdDb29yZGluYXRlcyk7Ci0gICAgZW5jb2RlU2l6ZShlbmNv ZGVyLCBtX2NvbnRlbnRTaXplKTsKLSAgICBlbmNvZGVyLmVuY29kZUJvb2wobV9zY2FsZUlzSW5p dGlhbCk7Ci0jZW5kaWYKLX0KLQotdm9pZCBIaXN0b3J5SXRlbTo6ZW5jb2RlQmFja0ZvcndhcmRU cmVlTm9kZShLZXllZEVuY29kZXImIGVuY29kZXIpIGNvbnN0Ci17Ci0gICAgZW5jb2Rlci5lbmNv ZGVPYmplY3RzKCJjaGlsZHJlbiIsIG1fY2hpbGRyZW4uYmVnaW4oKSwgbV9jaGlsZHJlbi5lbmQo KSwgW10oS2V5ZWRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBSZWZQdHI8SGlzdG9yeUl0ZW0+JiBj aGlsZCkgewotICAgICAgICBlbmNvZGVyLmVuY29kZVN0cmluZygib3JpZ2luYWxVUkxTdHJpbmci LCBjaGlsZC0+bV9vcmlnaW5hbFVSTFN0cmluZyk7Ci0gICAgICAgIGVuY29kZXIuZW5jb2RlU3Ry aW5nKCJ1cmxTdHJpbmciLCBjaGlsZC0+bV91cmxTdHJpbmcpOwotCi0gICAgICAgIGNoaWxkLT5l bmNvZGVCYWNrRm9yd2FyZFRyZWVOb2RlKGVuY29kZXIpOwotICAgIH0pOwotCi0gICAgZW5jb2Rl ci5lbmNvZGVJbnQ2NCgiZG9jdW1lbnRTZXF1ZW5jZU51bWJlciIsIG1fZG9jdW1lbnRTZXF1ZW5j ZU51bWJlcik7Ci0KLSAgICBlbmNvZGVyLmVuY29kZU9iamVjdHMoImRvY3VtZW50U3RhdGUiLCBt X2RvY3VtZW50U3RhdGUuYmVnaW4oKSwgbV9kb2N1bWVudFN0YXRlLmVuZCgpLCBbXShLZXllZEVu Y29kZXImIGVuY29kZXIsIGNvbnN0IFN0cmluZyYgc3RyaW5nKSB7Ci0gICAgICAgIGVuY29kZXIu ZW5jb2RlU3RyaW5nKCJzdHJpbmciLCBzdHJpbmcpOwotICAgIH0pOwotCi0gICAgZW5jb2Rlci5l bmNvZGVTdHJpbmcoImZvcm1Db250ZW50VHlwZSIsIG1fZm9ybUNvbnRlbnRUeXBlKTsKLQotICAg IGVuY29kZXIuZW5jb2RlQ29uZGl0aW9uYWxPYmplY3QoImZvcm1EYXRhIiwgbV9mb3JtRGF0YS5n ZXQoKSwgW10oS2V5ZWRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBGb3JtRGF0YSYgZm9ybURhdGEp IHsKLSAgICAgICAgZm9ybURhdGEuZW5jb2RlKGVuY29kZXIpOwotICAgIH0pOwotCi0gICAgZW5j b2Rlci5lbmNvZGVJbnQ2NCgiaXRlbVNlcXVlbmNlTnVtYmVyIiwgbV9pdGVtU2VxdWVuY2VOdW1i ZXIpOwotCi0gICAgZW5jb2Rlci5lbmNvZGVTdHJpbmcoInJlZmVycmVyIiwgbV9yZWZlcnJlcik7 Ci0KLSAgICBlbmNvZGVyLmVuY29kZU9iamVjdCgic2Nyb2xsUG9pbnQiLCBtX3Njcm9sbFBvaW50 LCBbXShLZXllZEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb2ludCkg ewotICAgICAgICBlbmNvZGVyLmVuY29kZUludDMyKCJ4Iiwgc2Nyb2xsUG9pbnQueCgpKTsKLSAg ICAgICAgZW5jb2Rlci5lbmNvZGVJbnQzMigieSIsIHNjcm9sbFBvaW50LnkoKSk7Ci0gICAgfSk7 Ci0KLSAgICBlbmNvZGVyLmVuY29kZUZsb2F0KCJwYWdlU2NhbGVGYWN0b3IiLCBtX3BhZ2VTY2Fs ZUZhY3Rvcik7Ci0KLSAgICBlbmNvZGVyLmVuY29kZUNvbmRpdGlvbmFsT2JqZWN0KCJzdGF0ZU9i amVjdCIsIG1fc3RhdGVPYmplY3QuZ2V0KCksIFtdKEtleWVkRW5jb2RlciYgZW5jb2RlciwgY29u c3QgU2VyaWFsaXplZFNjcmlwdFZhbHVlJiBzdGF0ZU9iamVjdCkgewotICAgICAgICBlbmNvZGVy LmVuY29kZUJ5dGVzKCJkYXRhIiwgc3RhdGVPYmplY3QuZGF0YSgpLmRhdGEoKSwgc3RhdGVPYmpl Y3QuZGF0YSgpLnNpemUoKSk7Ci0gICAgfSk7Ci0KLSAgICBlbmNvZGVyLmVuY29kZVN0cmluZygi dGFyZ2V0IiwgbV90YXJnZXQpOwotfQotCi1zdHJ1Y3QgRGVjb2RlUmVjdXJzaW9uU3RhY2tFbGVt ZW50IHsKLSAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IG5vZGU7Ci0gICAgc2l6ZV90IGk7Ci0gICAg dWludDY0X3Qgc2l6ZTsKLQotICAgIERlY29kZVJlY3Vyc2lvblN0YWNrRWxlbWVudChQYXNzUmVm UHRyPEhpc3RvcnlJdGVtPiBub2RlLCBzaXplX3QgaSwgdWludDY0X3Qgc2l6ZSkKLSAgICAgICAg OiBub2RlKG5vZGUpCi0gICAgICAgICwgaShpKQotICAgICAgICAsIHNpemUoc2l6ZSkKLSAgICB7 Ci0gICAgfQotfTsKLQotI2lmIFBMQVRGT1JNKElPUykKLXN0YXRpYyBib29sIGRlY29kZVJlY3Qo RGVjb2RlciYgZGVjb2RlciwgRmxvYXRSZWN0JiBmbG9hdFJlY3QpCi17Ci0gICAgZmxvYXQgeDsK LSAgICBpZiAoIWRlY29kZXIuZGVjb2RlRmxvYXQoeCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsK LSAgICBmbG9hdCB5OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVGbG9hdCh5KSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIGZsb2F0IHdpZHRoOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVG bG9hdCh3aWR0aCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBmbG9hdCBoZWlnaHQ7Ci0g ICAgaWYgKCFkZWNvZGVyLmRlY29kZUZsb2F0KGhlaWdodCkpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICBmbG9hdFJlY3QgPSBGbG9hdFJlY3QoeCwgeSwgd2lkdGgsIGhlaWdodCk7Ci0gICAg cmV0dXJuIHRydWU7Ci19Ci0KLXN0YXRpYyBib29sIGRlY29kZVJlY3QoRGVjb2RlciYgZGVjb2Rl ciwgSW50UmVjdCYgaW50UmVjdCkKLXsKLSAgICBpbnQgeDsKLSAgICBpZiAoIWRlY29kZXIuZGVj b2RlSW50MzIoeCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpbnQgeTsKLSAgICBpZiAo IWRlY29kZXIuZGVjb2RlSW50MzIoeSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpbnQg d2lkdGg7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZUludDMyKHdpZHRoKSkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgIGludCBoZWlnaHQ7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZUludDMy KGhlaWdodCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpbnRSZWN0ID0gSW50UmVjdCh4 LCB5LCB3aWR0aCwgaGVpZ2h0KTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQotc3RhdGljIGJvb2wg ZGVjb2RlU2l6ZShEZWNvZGVyJiBkZWNvZGVyLCBGbG9hdFNpemUmIGZsb2F0U2l6ZSkKLXsKLSAg ICBmbG9hdCB3aWR0aDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlRmxvYXQod2lkdGgpKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgZmxvYXQgaGVpZ2h0OwotICAgIGlmICghZGVjb2Rlci5k ZWNvZGVGbG9hdChoZWlnaHQpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgZmxvYXRTaXpl ID0gRmxvYXRTaXplKHdpZHRoLCBoZWlnaHQpOwotICAgIHJldHVybiB0cnVlOwotfQotCi1zdGF0 aWMgYm9vbCBkZWNvZGVTaXplKERlY29kZXImIGRlY29kZXIsIEludFNpemUmIGludFNpemUpCi17 Ci0gICAgaW50IHdpZHRoOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVJbnQzMih3aWR0aCkpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpbnQgaGVpZ2h0OwotICAgIGlmICghZGVjb2Rlci5k ZWNvZGVJbnQzMihoZWlnaHQpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaW50U2l6ZSA9 IEludFNpemUod2lkdGgsIGhlaWdodCk7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0jZW5kaWYKLQot UGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4gSGlzdG9yeUl0ZW06OmRlY29kZUJhY2tGb3J3YXJkVHJl ZShjb25zdCBTdHJpbmcmIHRvcFVSTFN0cmluZywgY29uc3QgU3RyaW5nJiB0b3BUaXRsZSwgY29u c3QgU3RyaW5nJiB0b3BPcmlnaW5hbFVSTFN0cmluZywgRGVjb2RlciYgZGVjb2RlcikKLXsKLSAg ICAvLyBTaW5jZSB0aGUgZGF0YSBzdHJlYW0gaXMgbm90IHRydXN0ZWQsIHRoZSBkZWNvZGUgaGFz IHRvIGJlIG5vbi1yZWN1cnNpdmUuCi0gICAgLy8gV2UgZG9uJ3Qgd2FudCBiYWQgZGF0YSB0byBj YXVzZSBhIHN0YWNrIG92ZXJmbG93LgotCi0gICAgdWludDMyX3QgdmVyc2lvbjsKLSAgICBpZiAo IWRlY29kZXIuZGVjb2RlVUludDMyKHZlcnNpb24pKQotICAgICAgICByZXR1cm4gMDsKLSAgICBp ZiAodmVyc2lvbiAhPSBiYWNrRm9yd2FyZFRyZWVFbmNvZGluZ1ZlcnNpb24pCi0gICAgICAgIHJl dHVybiAwOwotCi0gICAgU3RyaW5nIHVybFN0cmluZyA9IHRvcFVSTFN0cmluZzsKLSAgICBTdHJp bmcgdGl0bGUgPSB0b3BUaXRsZTsKLSAgICBTdHJpbmcgb3JpZ2luYWxVUkxTdHJpbmcgPSB0b3BP cmlnaW5hbFVSTFN0cmluZzsKLQotICAgIFZlY3RvcjxEZWNvZGVSZWN1cnNpb25TdGFja0VsZW1l bnQsIDE2PiByZWN1cnNpb25TdGFjazsKLQotcmVjdXJzZToKLSAgICBSZWZQdHI8SGlzdG9yeUl0 ZW0+IG5vZGUgPSBjcmVhdGUodXJsU3RyaW5nLCB0aXRsZSk7Ci0KLSAgICBub2RlLT5zZXRPcmln aW5hbFVSTFN0cmluZyhvcmlnaW5hbFVSTFN0cmluZyk7Ci0KLSAgICB0aXRsZSA9IFN0cmluZygp OwotCi0gICAgdWludDY0X3Qgc2l6ZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlVUludDY0KHNp emUpKQotICAgICAgICByZXR1cm4gMDsKLSAgICBzaXplX3QgaTsKLSAgICBSZWZQdHI8SGlzdG9y eUl0ZW0+IGNoaWxkOwotICAgIGZvciAoaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKLSAgICAgICAg aWYgKCFkZWNvZGVyLmRlY29kZVN0cmluZyhvcmlnaW5hbFVSTFN0cmluZykpCi0gICAgICAgICAg ICByZXR1cm4gMDsKLQotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlU3RyaW5nKHVybFN0cmlu ZykpCi0gICAgICAgICAgICByZXR1cm4gMDsKLQotICAgICAgICByZWN1cnNpb25TdGFjay5hcHBl bmQoRGVjb2RlUmVjdXJzaW9uU3RhY2tFbGVtZW50KG5vZGUucmVsZWFzZSgpLCBpLCBzaXplKSk7 Ci0gICAgICAgIGdvdG8gcmVjdXJzZTsKLQotcmVzdW1lOgotICAgICAgICBub2RlLT5tX2NoaWxk cmVuLmFwcGVuZChjaGlsZC5yZWxlYXNlKCkpOwotICAgIH0KLQotICAgIGlmICghZGVjb2Rlci5k ZWNvZGVJbnQ2NChub2RlLT5tX2RvY3VtZW50U2VxdWVuY2VOdW1iZXIpKQotICAgICAgICByZXR1 cm4gMDsKLQotICAgIGlmICghZGVjb2Rlci5kZWNvZGVVSW50NjQoc2l6ZSkpCi0gICAgICAgIHJl dHVybiAwOwotICAgIGZvciAoaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKLSAgICAgICAgU3RyaW5n IHN0YXRlOwotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlU3RyaW5nKHN0YXRlKSkKLSAgICAg ICAgICAgIHJldHVybiAwOwotICAgICAgICBub2RlLT5tX2RvY3VtZW50U3RhdGUuYXBwZW5kKHN0 YXRlKTsKLSAgICB9Ci0KLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlU3RyaW5nKG5vZGUtPm1fZm9y bUNvbnRlbnRUeXBlKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBib29sIGhhc0Zvcm1EYXRh OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVCb29sKGhhc0Zvcm1EYXRhKSkKLSAgICAgICAgcmV0 dXJuIDA7Ci0gICAgaWYgKGhhc0Zvcm1EYXRhKSB7Ci0gICAgICAgIG5vZGUtPm1fZm9ybURhdGEg PSBGb3JtRGF0YTo6ZGVjb2RlKGRlY29kZXIpOwotICAgICAgICBpZiAoIW5vZGUtPm1fZm9ybURh dGEpCi0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICB9Ci0KLSAgICBpZiAoIWRlY29kZXIuZGVj b2RlSW50NjQobm9kZS0+bV9pdGVtU2VxdWVuY2VOdW1iZXIpKQotICAgICAgICByZXR1cm4gMDsK LQotICAgIGlmICghZGVjb2Rlci5kZWNvZGVTdHJpbmcobm9kZS0+bV9yZWZlcnJlcikpCi0gICAg ICAgIHJldHVybiAwOwotCi0gICAgaW50MzJfdCB4OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVJ bnQzMih4KSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgaW50MzJfdCB5OwotICAgIGlmICghZGVj b2Rlci5kZWNvZGVJbnQzMih5KSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgbm9kZS0+bV9zY3Jv bGxQb2ludCA9IEludFBvaW50KHgsIHkpOwotICAgIAotICAgIGlmICghZGVjb2Rlci5kZWNvZGVG bG9hdChub2RlLT5tX3BhZ2VTY2FsZUZhY3RvcikpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAg Ym9vbCBoYXNTdGF0ZU9iamVjdDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlQm9vbChoYXNTdGF0 ZU9iamVjdCkpCi0gICAgICAgIHJldHVybiAwOwotICAgIGlmIChoYXNTdGF0ZU9iamVjdCkgewot ICAgICAgICBWZWN0b3I8dWludDhfdD4gYnl0ZXM7Ci0gICAgICAgIGlmICghZGVjb2Rlci5kZWNv ZGVCeXRlcyhieXRlcykpCi0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgbm9kZS0+bV9z dGF0ZU9iamVjdCA9IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6YWRvcHQoYnl0ZXMpOwotICAgIH0K LQotICAgIGlmICghZGVjb2Rlci5kZWNvZGVTdHJpbmcobm9kZS0+bV90YXJnZXQpKQotICAgICAg ICByZXR1cm4gMDsKLQotI2lmIFBMQVRGT1JNKElPUykKLSAgICBpZiAoIWRlY29kZVJlY3QoZGVj b2Rlciwgbm9kZS0+bV9leHBvc2VkQ29udGVudFJlY3QpKQotICAgICAgICByZXR1cm4gbnVsbHB0 cjsKLSAgICBpZiAoIWRlY29kZVJlY3QoZGVjb2Rlciwgbm9kZS0+bV91bm9ic2N1cmVkQ29udGVu dFJlY3QpKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICBpZiAoIWRlY29kZVNpemUoZGVj b2Rlciwgbm9kZS0+bV9taW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKSkK LSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgaWYgKCFkZWNvZGVTaXplKGRlY29kZXIsIG5v ZGUtPm1fY29udGVudFNpemUpKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICBpZiAoIWRl Y29kZXIuZGVjb2RlQm9vbChub2RlLT5tX3NjYWxlSXNJbml0aWFsKSkKLSAgICAgICAgcmV0dXJu IG51bGxwdHI7Ci0jZW5kaWYKLQotICAgIC8vIFNpbXVsYXRlIHJlY3Vyc2lvbiB3aXRoIG91ciBv d24gc3RhY2suCi0gICAgaWYgKCFyZWN1cnNpb25TdGFjay5pc0VtcHR5KCkpIHsKLSAgICAgICAg RGVjb2RlUmVjdXJzaW9uU3RhY2tFbGVtZW50JiBlbGVtZW50ID0gcmVjdXJzaW9uU3RhY2subGFz dCgpOwotICAgICAgICBjaGlsZCA9IG5vZGUucmVsZWFzZSgpOwotICAgICAgICBub2RlID0gZWxl bWVudC5ub2RlLnJlbGVhc2UoKTsKLSAgICAgICAgaSA9IGVsZW1lbnQuaTsKLSAgICAgICAgc2l6 ZSA9IGVsZW1lbnQuc2l6ZTsKLSAgICAgICAgcmVjdXJzaW9uU3RhY2sucmVtb3ZlTGFzdCgpOwot ICAgICAgICBnb3RvIHJlc3VtZTsKLSAgICB9Ci0KLSAgICByZXR1cm4gbm9kZS5yZWxlYXNlKCk7 Ci19Ci0KLVBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IEhpc3RvcnlJdGVtOjpkZWNvZGVCYWNrRm9y d2FyZFRyZWUoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgS2V5 ZWREZWNvZGVyJiBkZWNvZGVyKQotewotICAgIHVpbnQzMl90IHZlcnNpb247Ci0gICAgaWYgKCFk ZWNvZGVyLmRlY29kZVVJbnQzMigidmVyc2lvbiIsIHZlcnNpb24pKQotICAgICAgICByZXR1cm4g bnVsbHB0cjsKLSAgICAKLSAgICBpZiAodmVyc2lvbiAhPSBiYWNrRm9yd2FyZFRyZWVFbmNvZGlu Z1ZlcnNpb24pCi0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgLy8gRklYTUU6IEltcGxl bWVudC4KLSAgICByZXR1cm4gbnVsbHB0cjsKLX0KLQogI2lmbmRlZiBOREVCVUcKIAogaW50IEhp c3RvcnlJdGVtOjpzaG93VHJlZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0hpc3RvcnlJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVt LmgKaW5kZXggNDlmYTQ3ODg4NDE2NWRmNDU5MTNhMTc4ZTk1YWUwNmRhOTA2MmY0Zi4uYWM3ODhk YWQyNTQ0YTk5OGNmNGFlYWI5MWU3YWNjMDU5NzE3MzI0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3Rvcnkv SGlzdG9yeUl0ZW0uaApAQCAtNTEsOCArNTEsNiBAQCBjbGFzcyBEb2N1bWVudDsKIGNsYXNzIEZv cm1EYXRhOwogY2xhc3MgSGlzdG9yeUl0ZW07CiBjbGFzcyBJbWFnZTsKLWNsYXNzIEtleWVkRGVj b2RlcjsKLWNsYXNzIEtleWVkRW5jb2RlcjsKIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKIGNsYXNz IFVSTDsKIApAQCAtODUsMTEgKzgzLDYgQEAgcHVibGljOgogICAgIC8vIFJlc2V0cyB0aGUgSGlz dG9yeUl0ZW0gdG8gaXRzIGluaXRpYWwgc3RhdGUsIGFzIHJldHVybmVkIGJ5IGNyZWF0ZSgpLgog ICAgIHZvaWQgcmVzZXQoKTsKICAgICAKLSAgICB2b2lkIGVuY29kZUJhY2tGb3J3YXJkVHJlZShF bmNvZGVyJikgY29uc3Q7Ci0gICAgdm9pZCBlbmNvZGVCYWNrRm9yd2FyZFRyZWUoS2V5ZWRFbmNv ZGVyJikgY29uc3Q7Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IGRlY29kZUJh Y2tGb3J3YXJkVHJlZShjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgU3RyaW5nJiB0aXRs ZSwgY29uc3QgU3RyaW5nJiBvcmlnaW5hbFVSTFN0cmluZywgRGVjb2RlciYpOwotICAgIHN0YXRp YyBQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPiBkZWNvZGVCYWNrRm9yd2FyZFRyZWUoY29uc3QgU3Ry aW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgb3JpZ2lu YWxVUkxTdHJpbmcsIEtleWVkRGVjb2RlciYpOwotCiAgICAgY29uc3QgU3RyaW5nJiBvcmlnaW5h bFVSTFN0cmluZygpIGNvbnN0OwogICAgIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKCkgY29uc3Q7 CiAgICAgY29uc3QgU3RyaW5nJiB0aXRsZSgpIGNvbnN0OwpAQCAtMjI0LDkgKzIxNyw2IEBAIHBy aXZhdGU6CiAKICAgICBIaXN0b3J5SXRlbSogZmluZFRhcmdldEl0ZW0oKTsKIAotICAgIHZvaWQg ZW5jb2RlQmFja0ZvcndhcmRUcmVlTm9kZShFbmNvZGVyJikgY29uc3Q7Ci0gICAgdm9pZCBlbmNv ZGVCYWNrRm9yd2FyZFRyZWVOb2RlKEtleWVkRW5jb2RlciYpIGNvbnN0OwotCiAgICAgU3RyaW5n IG1fdXJsU3RyaW5nOwogICAgIFN0cmluZyBtX29yaWdpbmFsVVJMU3RyaW5nOwogICAgIFN0cmlu ZyBtX3JlZmVycmVyOwo=