105196 2012-12-17 10:50:03 -0800 TextAutosizing - Adjust the lowest common ancestor of the cluster's text nodes after the width of the first estimation is found. 2016-09-19 15:13:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 103627 84186 1 avayvod avayvod benjamin dbates eric johnme ojan.autocc webkit.review.bot oldest_to_newest 792846 0 avayvod 2012-12-17 10:50:03 -0800 TextAutosizing - Adjust the lowest common ancestor of the cluster's text nodes after the width of the first estimation is found. 792856 1 179770 avayvod 2012-12-17 10:58:54 -0800 Created attachment 179770 Patch 792859 2 avayvod 2012-12-17 11:01:58 -0800 This patch depends on the patch for bug 103627 801267 3 181502 avayvod 2013-01-07 06:49:46 -0800 Created attachment 181502 Patch 864353 4 johnme 2013-03-27 03:24:43 -0700 Update: the code seems good, and in theory it makes the algorithm more correct. However when we tested it on the Alexa 1000 homepages, it made barely any difference in practice. Hence Anton and I decided to put this patch on hold for now to avoid introducing unnecessary code complexity. 1001407 5 181502 bjonesbe 2014-04-16 17:02:29 -0700 Comment on attachment 181502 Patch Cleaning up old review flags. Given the most recent comment on this one, I don't think this is still looking for a review. 1231360 6 dbates 2016-09-19 15:13:00 -0700 Marking this bug Resolved WontFix because the TEXT_AUTOSIZING feature was removed in <https://trac.webkit.org/changeset/206119> (bug #162167). See bug 84186, comment 32 for more details. 179770 2012-12-17 10:58:54 -0800 2013-01-07 06:49:44 -0800 Patch bug-105196-20121217185612.patch text/plain 10807 avayvod U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvVGV4dEF1dG9zaXplci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4 dEF1dG9zaXplci5jcHAKaW5kZXggNTk0M2FjNDQwMmFhYmQxNDNjMzA5ZTIxMTk2YjJhYjE3ZGFi OTUzNS4uOWM3ZTUxNDNhMjQ2ODEyYWQ0YzE5MzEyMDI2NTRiMWE4NDFmMTFmNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVyLmNwcApAQCAtMzI2LDY2ICszMjYsMTE2 IEBAIFJlbmRlck9iamVjdCogVGV4dEF1dG9zaXplcjo6bmV4dEluUHJlT3JkZXJTa2lwcGluZ0Rl c2NlbmRhbnRzT2ZDb250YWluZXJzKGNvbnN0CiAgICAgcmV0dXJuIDA7CiB9CiAKLWNvbnN0IFJl bmRlckJsb2NrKiBUZXh0QXV0b3NpemVyOjpmaW5kRGVlcGVzdEJsb2NrQ29udGFpbmluZ0FsbFRl eHQoY29uc3QgUmVuZGVyQmxvY2sqIGNsdXN0ZXIpCitjb25zdCBSZW5kZXJPYmplY3QqIFRleHRB dXRvc2l6ZXI6Om5leHRJblByZU9yZGVyU2tpcHBpbmdDbHVzdGVycyhUcmF2ZXJzYWxEaXJlY3Rp b24gZGlyZWN0aW9uLCBjb25zdCBSZW5kZXJPYmplY3QqIGN1cnJlbnQsIGNvbnN0IFJlbmRlck9i amVjdCogc3RheVdpdGhpbiwgY29uc3QgUmVuZGVyQmxvY2sqIGJsb2NrQ29udGFpbmluZ0FsbFRl eHQpCiB7Ci0gICAgc2l6ZV90IGZpcnN0RGVwdGggPSAwOwotICAgIGNvbnN0IFJlbmRlck9iamVj dCogZmlyc3RUZXh0TGVhZiA9IGZpbmRGaXJzdFRleHRMZWFmTm90SW5DbHVzdGVyKGNsdXN0ZXIs IGZpcnN0RGVwdGgsIEZpcnN0VG9MYXN0KTsKLSAgICBpZiAoIWZpcnN0VGV4dExlYWYpCi0gICAg ICAgIHJldHVybiBjbHVzdGVyOworICAgIGlmIChjdXJyZW50ID09IHN0YXlXaXRoaW4gfHwgIWlz QXV0b3NpemluZ0NsdXN0ZXIoY3VycmVudCwgYmxvY2tDb250YWluaW5nQWxsVGV4dCkpCisgICAg ICAgIGZvciAoY29uc3QgUmVuZGVyT2JqZWN0KiBjaGlsZCA9IG9iamVjdEZpcnN0Q2hpbGQoZGly ZWN0aW9uLCBjdXJyZW50KTsgY2hpbGQ7IGNoaWxkID0gb2JqZWN0TmV4dFNpYmxpbmcoZGlyZWN0 aW9uLCBjaGlsZCkpCisgICAgICAgICAgICBpZiAoIWlzQXV0b3NpemluZ0NsdXN0ZXIoY2hpbGQs IGJsb2NrQ29udGFpbmluZ0FsbFRleHQpKQorICAgICAgICAgICAgICAgIHJldHVybiBjaGlsZDsK IAotICAgIHNpemVfdCBsYXN0RGVwdGggPSAwOwotICAgIGNvbnN0IFJlbmRlck9iamVjdCogbGFz dFRleHRMZWFmID0gZmluZEZpcnN0VGV4dExlYWZOb3RJbkNsdXN0ZXIoY2x1c3RlciwgbGFzdERl cHRoLCBMYXN0VG9GaXJzdCk7Ci0gICAgQVNTRVJUKGxhc3RUZXh0TGVhZik7Ci0KLSAgICAvLyBF cXVhbGl6ZSB0aGUgZGVwdGhzIGlmIG5lY2Vzc2FyeS4gT25seSBvbmUgb2YgdGhlIHdoaWxlIGxv b3BzIGJlbG93IHdpbGwgZ2V0IGV4ZWN1dGVkLgotICAgIGNvbnN0IFJlbmRlck9iamVjdCogZmly c3ROb2RlID0gZmlyc3RUZXh0TGVhZjsKLSAgICBjb25zdCBSZW5kZXJPYmplY3QqIGxhc3ROb2Rl ID0gbGFzdFRleHRMZWFmOwotICAgIHdoaWxlIChmaXJzdERlcHRoID4gbGFzdERlcHRoKSB7Ci0g ICAgICAgIGZpcnN0Tm9kZSA9IGZpcnN0Tm9kZS0+cGFyZW50KCk7Ci0gICAgICAgIC0tZmlyc3RE ZXB0aDsKLSAgICB9Ci0gICAgd2hpbGUgKGxhc3REZXB0aCA+IGZpcnN0RGVwdGgpIHsKLSAgICAg ICAgbGFzdE5vZGUgPSBsYXN0Tm9kZS0+cGFyZW50KCk7Ci0gICAgICAgIC0tbGFzdERlcHRoOwor ICAgIGZvciAoY29uc3QgUmVuZGVyT2JqZWN0KiBhbmNlc3RvciA9IGN1cnJlbnQ7IGFuY2VzdG9y OyBhbmNlc3RvciA9IGFuY2VzdG9yLT5wYXJlbnQoKSkgeworICAgICAgICBpZiAoYW5jZXN0b3Ig PT0gc3RheVdpdGhpbikKKyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICBmb3IgKGNvbnN0 IFJlbmRlck9iamVjdCogc2libGluZyA9IG9iamVjdE5leHRTaWJsaW5nKGRpcmVjdGlvbiwgYW5j ZXN0b3IpOyBzaWJsaW5nOyBzaWJsaW5nID0gb2JqZWN0TmV4dFNpYmxpbmcoZGlyZWN0aW9uLCBz aWJsaW5nKSkKKyAgICAgICAgICAgIGlmICghaXNBdXRvc2l6aW5nQ2x1c3RlcihzaWJsaW5nLCBi bG9ja0NvbnRhaW5pbmdBbGxUZXh0KSkKKyAgICAgICAgICAgICAgICByZXR1cm4gc2libGluZzsK ICAgICB9CiAKLSAgICAvLyBHbyB1cCBmcm9tIGJvdGggbm9kZXMgdW50aWwgdGhlIHBhcmVudCBp cyB0aGUgc2FtZS4gQm90aCBwb2ludGVycyB3aWxsIHBvaW50IHRvIHRoZSBMQ0EgdGhlbi4KLSAg ICB3aGlsZSAoZmlyc3ROb2RlICE9IGxhc3ROb2RlKSB7Ci0gICAgICAgIGZpcnN0Tm9kZSA9IGZp cnN0Tm9kZS0+cGFyZW50KCk7Ci0gICAgICAgIGxhc3ROb2RlID0gbGFzdE5vZGUtPnBhcmVudCgp OworICAgIHJldHVybiAwOworfQorCitjb25zdCBSZW5kZXJCbG9jayogVGV4dEF1dG9zaXplcjo6 ZmluZERlZXBlc3RCbG9ja0NvbnRhaW5pbmdBbGxUZXh0KGNvbnN0IFJlbmRlckJsb2NrKiBjbHVz dGVyKQoreworICAgIFJlbmRlck9iamVjdHMgZmlyc3RQYXRoKDEsIGNsdXN0ZXIpOworICAgIGdl dE5leHRUZXh0TGVhZkluUHJlT3JkZXJTa2lwcGluZ0NsdXN0ZXJzKEZpcnN0VG9MYXN0LCBmaXJz dFBhdGgsIDApOworICAgIGlmIChmaXJzdFBhdGguaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4g Y2x1c3RlcjsKKworICAgIFJlbmRlck9iamVjdHMgbGFzdFBhdGgoMSwgY2x1c3Rlcik7CisgICAg Z2V0TmV4dFRleHRMZWFmSW5QcmVPcmRlclNraXBwaW5nQ2x1c3RlcnMoTGFzdFRvRmlyc3QsIGxh c3RQYXRoLCAwKTsKKyAgICBBU1NFUlQoIWxhc3RQYXRoLmlzRW1wdHkoKSk7CisKKyAgICBjb25z dCBSZW5kZXJCbG9jayogYmxvY2tDb250YWluaW5nQWxsVGV4dCA9IDA7CisgICAgd2hpbGUgKCFi bG9ja0NvbnRhaW5pbmdBbGxUZXh0KSB7CisgICAgICAgIHNpemVfdCBtaW5TaXplID0gc3RkOjpt aW4oZmlyc3RQYXRoLnNpemUoKSwgbGFzdFBhdGguc2l6ZSgpKTsKKyAgICAgICAgc2l6ZV90IGZp cnN0Tm90RXF1YWxJbmRleCA9IDE7CisgICAgICAgIHdoaWxlIChmaXJzdE5vdEVxdWFsSW5kZXgg PCBtaW5TaXplICYmIGZpcnN0UGF0aFtmaXJzdE5vdEVxdWFsSW5kZXhdID09IGxhc3RQYXRoW2Zp cnN0Tm90RXF1YWxJbmRleF0pCisgICAgICAgICAgICBmaXJzdE5vdEVxdWFsSW5kZXgrKzsKKwor ICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QqIGxvd2VzdENvbW1vbkFuY2VzdG9yID0gZmlyc3RQ YXRoW2ZpcnN0Tm90RXF1YWxJbmRleCAtIDFdOworICAgICAgICBpZiAobG93ZXN0Q29tbW9uQW5j ZXN0b3ItPmlzUmVuZGVyQmxvY2soKSkKKyAgICAgICAgICAgIGJsb2NrQ29udGFpbmluZ0FsbFRl eHQgPSB0b1JlbmRlckJsb2NrKGxvd2VzdENvbW1vbkFuY2VzdG9yKTsKKyAgICAgICAgZWxzZQor ICAgICAgICAgICAgYmxvY2tDb250YWluaW5nQWxsVGV4dCA9IGxvd2VzdENvbW1vbkFuY2VzdG9y LT5jb250YWluaW5nQmxvY2soKTsKKyAgICAgICAgQVNTRVJUKGJsb2NrQ29udGFpbmluZ0FsbFRl eHQtPmlzRGVzY2VuZGFudE9mKGNsdXN0ZXIpKTsKKworICAgICAgICAvLyBDaGVjayBpZiBhbnkg b2YgdGhlIHRleHQgbGVhZnMnIHBhcmVudHMgYXJlIGdvaW5nIHRvIGJlIGNsdXN0ZXJzIGR1ZSB0 byBiZWluZyB3aWRlciB0aGFuIHRoZSBibG9jayBqdXN0IGZvdW5kLgorICAgICAgICAvLyBJZiBz bywgc2VhcmNoIGZvciB0aGUgdGV4dCBsZWFmcyBhZ2FpbiBzdGFydGluZyBmcm9tIHRoZSBuZXh0 IHNpYmxpbmcgb2YgdGhlIGZvdW5kIGNsdXN0ZXIuCisgICAgICAgIGJvb2wgZmlyc3RUZXh0TGVh ZkludmFsaWRhdGVkID0gYWRqdXN0Rmlyc3RUZXh0TGVhZklmSW5DbHVzdGVyKEZpcnN0VG9MYXN0 LCBmaXJzdFBhdGgsIGZpcnN0Tm90RXF1YWxJbmRleCwgYmxvY2tDb250YWluaW5nQWxsVGV4dCk7 CisgICAgICAgIGJvb2wgbGFzdFRleHRMZWFmSW52YWxpZGF0ZWQgPSBhZGp1c3RGaXJzdFRleHRM ZWFmSWZJbkNsdXN0ZXIoTGFzdFRvRmlyc3QsIGxhc3RQYXRoLCBmaXJzdE5vdEVxdWFsSW5kZXgs IGJsb2NrQ29udGFpbmluZ0FsbFRleHQpOworICAgICAgICBpZiAoZmlyc3RUZXh0TGVhZkludmFs aWRhdGVkIHx8IGxhc3RUZXh0TGVhZkludmFsaWRhdGVkKSB7CisgICAgICAgICAgICBpZiAoZmly c3RQYXRoLmlzRW1wdHkoKSB8fCBsYXN0UGF0aC5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAg cmV0dXJuIGNsdXN0ZXI7CisgICAgICAgICAgICBibG9ja0NvbnRhaW5pbmdBbGxUZXh0ID0gMDsK KyAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChmaXJzdE5vZGUtPmlzUmVuZGVyQmxvY2soKSkK LSAgICAgICAgcmV0dXJuIHRvUmVuZGVyQmxvY2soZmlyc3ROb2RlKTsKKyAgICByZXR1cm4gYmxv Y2tDb250YWluaW5nQWxsVGV4dDsKK30KIAotICAgIC8vIGNvbnRhaW5pbmdCbG9jaygpIHNob3Vs ZCBuZXZlciBsZWF2ZSB0aGUgY2x1c3Rlciwgc2luY2UgaXQgb25seSBza2lwcyBhbmNlc3RvcnMg d2hlbiBmaW5kaW5nIHRoZQotICAgIC8vIGNvbnRhaW5lciBvZiBwb3NpdGlvbjphYnNvbHV0ZS9m aXhlZCBibG9ja3MsIGFuZCB0aG9zZSBjYW5ub3QgZXhpc3QgYmV0d2VlbiBhIGNsdXN0ZXIgYW5k IGl0cyB0ZXh0Ci0gICAgLy8gbm9kZXMgbG93ZXN0IGNvbW1vbiBhbmNlc3RvciBhcyBpc0F1dG9z aXppbmdDbHVzdGVyIHdvdWxkIGhhdmUgbWFkZSB0aGVtIGludG8gdGhlaXIgb3duIGluZGVwZW5k ZW50Ci0gICAgLy8gY2x1c3Rlci4KLSAgICBSZW5kZXJCbG9jayogY29udGFpbmluZ0Jsb2NrID0g Zmlyc3ROb2RlLT5jb250YWluaW5nQmxvY2soKTsKLSAgICBBU1NFUlQoY29udGFpbmluZ0Jsb2Nr LT5pc0Rlc2NlbmRhbnRPZihjbHVzdGVyKSk7Cit2b2lkIFRleHRBdXRvc2l6ZXI6OmdldE5leHRU ZXh0TGVhZkluUHJlT3JkZXJTa2lwcGluZ0NsdXN0ZXJzKFRyYXZlcnNhbERpcmVjdGlvbiBkaXJl Y3Rpb24sIFJlbmRlck9iamVjdHMmIHBhdGgsIGNvbnN0IFJlbmRlckJsb2NrKiBibG9ja0NvbnRh aW5pbmdBbGxUZXh0KQoreworICAgIEFTU0VSVCghcGF0aC5pc0VtcHR5KCkpOworCisgICAgY29u c3QgUmVuZGVyT2JqZWN0KiBjdXJyZW50ID0gcGF0aC5sYXN0KCk7CisgICAgY29uc3QgUmVuZGVy T2JqZWN0KiBzdGF5V2l0aGluID0gcGF0aC5maXJzdCgpOworICAgIGNvbnN0IFJlbmRlck9iamVj dCogbmV4dCA9IGN1cnJlbnQ7CisgICAgZm9yICg7OykgeworICAgICAgICBuZXh0ID0gbmV4dElu UHJlT3JkZXJTa2lwcGluZ0NsdXN0ZXJzKGRpcmVjdGlvbiwgbmV4dCwgc3RheVdpdGhpbiwgYmxv Y2tDb250YWluaW5nQWxsVGV4dCk7CisgICAgICAgIGlmICghbmV4dCkKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBpZiAobmV4dC0+aXNUZXh0KCkpIHsKKyAgICAgICAgICAgIFJlbmRlck9i amVjdHMgbmV4dFBhdGg7CisgICAgICAgICAgICB3aGlsZSAobmV4dCAhPSBzdGF5V2l0aGluKSB7 CisgICAgICAgICAgICAgICAgbmV4dFBhdGguYXBwZW5kKG5leHQpOworICAgICAgICAgICAgICAg IG5leHQgPSBuZXh0LT5wYXJlbnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIG5leHRQ YXRoLmFwcGVuZChzdGF5V2l0aGluKTsKKyAgICAgICAgICAgIG5leHRQYXRoLnJldmVyc2UoKTsK IAotICAgIHJldHVybiBjb250YWluaW5nQmxvY2s7CisgICAgICAgICAgICBwYXRoLnN3YXAobmV4 dFBhdGgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQorICAgIHBhdGgu Y2xlYXIoKTsKIH0KIAotY29uc3QgUmVuZGVyT2JqZWN0KiBUZXh0QXV0b3NpemVyOjpmaW5kRmly c3RUZXh0TGVhZk5vdEluQ2x1c3Rlcihjb25zdCBSZW5kZXJPYmplY3QqIHBhcmVudCwgc2l6ZV90 JiBkZXB0aCwgVHJhdmVyc2FsRGlyZWN0aW9uIGRpcmVjdGlvbikKK2Jvb2wgVGV4dEF1dG9zaXpl cjo6YWRqdXN0Rmlyc3RUZXh0TGVhZklmSW5DbHVzdGVyKFRyYXZlcnNhbERpcmVjdGlvbiBkaXJl Y3Rpb24sIFJlbmRlck9iamVjdHMmIHBhdGgsIHNpemVfdCBzdGFydEZyb20sIGNvbnN0IFJlbmRl ckJsb2NrKiBibG9ja0NvbnRhaW5pbmdBbGxUZXh0KQogewotICAgIGlmIChwYXJlbnQtPmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuIHBhcmVudC0+aXNUZXh0KCkgPyBwYXJlbnQgOiAwOwotCi0g ICAgKytkZXB0aDsKLSAgICBjb25zdCBSZW5kZXJPYmplY3QqIGNoaWxkID0gKGRpcmVjdGlvbiA9 PSBGaXJzdFRvTGFzdCkgPyBwYXJlbnQtPmZpcnN0Q2hpbGQoKSA6IHBhcmVudC0+bGFzdENoaWxk KCk7Ci0gICAgd2hpbGUgKGNoaWxkKSB7Ci0gICAgICAgIGlmICghaXNBdXRvc2l6aW5nQ2x1c3Rl cihjaGlsZCwgMCkpIHsKLSAgICAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCogbGVhZiA9IGZp bmRGaXJzdFRleHRMZWFmTm90SW5DbHVzdGVyKGNoaWxkLCBkZXB0aCwgZGlyZWN0aW9uKTsKLSAg ICAgICAgICAgIGlmIChsZWFmKQotICAgICAgICAgICAgICAgIHJldHVybiBsZWFmOworICAgIHNp emVfdCBjbHVzdGVySW5kZXggPSBwYXRoLnNpemUoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gc3Rh cnRGcm9tOyBpIDwgcGF0aC5zaXplKCk7ICsraSkgeworICAgICAgICBpZiAoaXNBdXRvc2l6aW5n Q2x1c3RlcihwYXRoW2ldLCBibG9ja0NvbnRhaW5pbmdBbGxUZXh0KSkgeworICAgICAgICAgICAg Y2x1c3RlckluZGV4ID0gaTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAg IGNoaWxkID0gKGRpcmVjdGlvbiA9PSBGaXJzdFRvTGFzdCkgPyBjaGlsZC0+bmV4dFNpYmxpbmco KSA6IGNoaWxkLT5wcmV2aW91c1NpYmxpbmcoKTsKICAgICB9Ci0gICAgLS1kZXB0aDsKIAotICAg IHJldHVybiAwOworICAgIGlmIChjbHVzdGVySW5kZXggPT0gcGF0aC5zaXplKCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIHBhdGgucmVtb3ZlKGNsdXN0ZXJJbmRleCArIDEsIHBhdGgu c2l6ZSgpIC0gKGNsdXN0ZXJJbmRleCArIDEpKTsKKyAgICBnZXROZXh0VGV4dExlYWZJblByZU9y ZGVyU2tpcHBpbmdDbHVzdGVycyhkaXJlY3Rpb24sIHBhdGgsIGJsb2NrQ29udGFpbmluZ0FsbFRl eHQpOworICAgIHJldHVybiB0cnVlOworfQorCitjb25zdCBSZW5kZXJPYmplY3QqIFRleHRBdXRv c2l6ZXI6Om9iamVjdEZpcnN0Q2hpbGQoVHJhdmVyc2FsRGlyZWN0aW9uIGRpcmVjdGlvbiwgY29u c3QgUmVuZGVyT2JqZWN0KiBvYmplY3QpCit7CisgICAgcmV0dXJuIChkaXJlY3Rpb24gPT0gRmly c3RUb0xhc3QpID8gb2JqZWN0LT5maXJzdENoaWxkKCkgOiBvYmplY3QtPmxhc3RDaGlsZCgpOwor fQorCitjb25zdCBSZW5kZXJPYmplY3QqIFRleHRBdXRvc2l6ZXI6Om9iamVjdE5leHRTaWJsaW5n KFRyYXZlcnNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0 KQoreworICAgIHJldHVybiAoZGlyZWN0aW9uID09IEZpcnN0VG9MYXN0KSA/IG9iamVjdC0+bmV4 dFNpYmxpbmcoKSA6IG9iamVjdC0+cHJldmlvdXNTaWJsaW5nKCk7CiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0 b3NpemVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5oCmluZGV4 IDYwZjZjODFlOGQ1ODM2MjRjMzEyM2M1Y2JiMGRhYjMxNGVkNDliMWQuLjQ2Yzg4MGNkMTkzMTVi YjU1NmM1MTY3MWQ1ZWQ1OTMyYTkwNWZkOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9UZXh0QXV0b3NpemVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Rl eHRBdXRvc2l6ZXIuaApAQCAtMzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSA8d3RmL05vbmNvcHlh YmxlLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYvVmVjdG9y Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNTIsNiArNTMsNyBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIGZsb2F0IGNvbXB1dGVBdXRvc2l6ZWRGb250U2l6ZShmbG9hdCBzcGVjaWZpZWRT aXplLCBmbG9hdCBtdWx0aXBsaWVyKTsKIAogcHJpdmF0ZToKKyAgICB0eXBlZGVmIFZlY3Rvcjxj b25zdCBSZW5kZXJPYmplY3QqPiBSZW5kZXJPYmplY3RzOwogICAgIGVudW0gVHJhdmVyc2FsRGly ZWN0aW9uIHsKICAgICAgICAgRmlyc3RUb0xhc3QsCiAgICAgICAgIExhc3RUb0ZpcnN0CkBAIC04 MCwxMiArODIsMjggQEAgcHJpdmF0ZToKICAgICAvLyBVc2UgdG8gdHJhdmVyc2UgdGhlIHRyZWUg b2YgZGVzY2VuZGFudHMsIGV4Y2x1ZGluZyBkZXNjZW5kYW50cyBvZiBjb250YWluZXJzIChidXQg cmV0dXJuaW5nIHRoZSBjb250YWluZXJzIHRoZW1zZWx2ZXMpLgogICAgIHN0YXRpYyBSZW5kZXJP YmplY3QqIG5leHRJblByZU9yZGVyU2tpcHBpbmdEZXNjZW5kYW50c09mQ29udGFpbmVycyhjb25z dCBSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3QqIHN0YXlXaXRoaW4pOwogCisgICAg Ly8gVXNlIHRvIHRyYXZlcnNlIHRoZSB0cmVlIG9mIGRlc2NlbmRhbnRzLCBleGNsdWRpbmcgY2x1 c3RlcnMgYW5kIHRoZWlyIGRlc2NlbmRhbnRzICh0aGUgY3VycmVudCBvYmplY3QgYW5kIHxzdGF5 V2l0aGlufAorICAgIC8vIGNhbiBiZSBhIGNsdXN0ZXIpLgorICAgIHN0YXRpYyBjb25zdCBSZW5k ZXJPYmplY3QqIG5leHRJblByZU9yZGVyU2tpcHBpbmdDbHVzdGVycyhUcmF2ZXJzYWxEaXJlY3Rp b24sIGNvbnN0IFJlbmRlck9iamVjdCosIGNvbnN0IFJlbmRlck9iamVjdCogc3RheVdpdGhpbiwg Y29uc3QgUmVuZGVyQmxvY2sqIGJsb2NrQ29udGFpbmluZ0FsbFRleHQpOworCiAgICAgLy8gSWYg dGhlcmUgYXJlIGFueSBkZXNjZW5kYW50IHRleHQgbm9kZXMgb2YgdGhlIGdpdmVuIGNsdXN0ZXIg dGhhdCBhcmUgbm90IGRlc2NlbmRhbnRzIG9mIGFueSBkZXNjZW5kYW50IGNsdXN0ZXIsCiAgICAg Ly8gcmV0dXJucyB0aGUgbG93ZXN0IGNvbW1vbiBhbmNlc3RvciBvZiB0aGVzZSB0ZXh0IG5vZGVz LiBPdGhlcndpc2UsIHJldHVybnMgdGhlIGNsdXN0ZXIgaXRzZWxmLgogICAgIHN0YXRpYyBjb25z dCBSZW5kZXJCbG9jayogZmluZERlZXBlc3RCbG9ja0NvbnRhaW5pbmdBbGxUZXh0KGNvbnN0IFJl bmRlckJsb2NrKiBjbHVzdGVyKTsKIAotICAgIC8vIFJldHVybnMgdGhlIGZpcnN0IHRleHQgbGVh ZiBpbiB0aGUgZ2l2ZW4gZGlyZWN0aW9uIGFuZCBpdHMgZGVwdGggc3RhcnRpbmcgZnJvbSB0aGUg Z2l2ZW4gcGFyZW50LgotICAgIHN0YXRpYyBjb25zdCBSZW5kZXJPYmplY3QqIGZpbmRGaXJzdFRl eHRMZWFmTm90SW5DbHVzdGVyKGNvbnN0IFJlbmRlck9iamVjdCogcGFyZW50LCBzaXplX3QmIGRl cHRoLCBUcmF2ZXJzYWxEaXJlY3Rpb24pOworICAgIC8vIFRyYXZlcnNlcyB0aGUgdHJlZSBzdGFy dGluZyBmcm9tIHRoZSBsYXN0IG5vZGUgaW4gdGhlIHBhdGggdXNpbmcgbmV4dEluUHJlT3JkZXJT a2lwcGluZ0NsdXN0ZXJzKCkgd2hpbGUgc3RheWluZyB3aXRoaW4KKyAgICAvLyB0aGUgZmlyc3Qg bm9kZSBpbiB0aGUgcGF0aC4gUmV0dXJucyB0aGUgZnVsbCBwYXRoIGZyb20gdGhlIGZpcnN0IG5v ZGUgb2YgdGhlIHBhdGggdG8gdGhlIHRleHQgbGVhZiBmb3VuZCBvciBhbiBlbXB0eSBwYXRoCisg ICAgLy8gaWYgdGhlIHNlYXJjaCBmYWlsZWQuCisgICAgc3RhdGljIHZvaWQgZ2V0TmV4dFRleHRM ZWFmSW5QcmVPcmRlclNraXBwaW5nQ2x1c3RlcnMoVHJhdmVyc2FsRGlyZWN0aW9uLCBSZW5kZXJP YmplY3RzJiBwYXRoLCBjb25zdCBSZW5kZXJCbG9jayogYmxvY2tDb250YWluaW5nQWxsVGV4dCk7 CisKKyAgICAvLyBDaGVja3MgaWYgdGhlcmUgaXMgYW4gYXV0b3NpemluZyBjbHVzdGVyIGluIHRo ZSBnaXZlbiBwYXRoIGJldHdlZW4gdGhlIGdpdmVuIGluZGV4IGFuZCB0aGUgbGFzdCBlbGVtZW50 IGluIHRoZSBwYXRoLgorICAgIC8vIElmIG5vIGNsdXN0ZXIgaXMgZm91bmQsIHRoaXMgcmV0dXJu cyBmYWxzZS4gT3RoZXJ3aXNlLCBpdCByZW1vdmVzIHRoZSBmb3VuZCBjbHVzdGVyIGFuZCBhbGwg c3Vic2VxdWVudCBub2RlcyBmcm9tIHRoZQorICAgIC8vIHBhdGgsIHRoZW4gY29udGludWVzIHRy YXZlcnNpbmcgdGhlIHRyZWUgdG8gZmluZCB0aGUgbmV4dCB0ZXh0IGxlYWYgaW4gdGhlIGdpdmVu IGRpcmVjdGlvbiwgYW5kIGZpbmFsbHkgcmV0dXJucyB0cnVlLgorICAgIHN0YXRpYyBib29sIGFk anVzdEZpcnN0VGV4dExlYWZJZkluQ2x1c3RlcihUcmF2ZXJzYWxEaXJlY3Rpb24sIFJlbmRlck9i amVjdHMmIHBhdGgsIHNpemVfdCBzdGFydEZyb20sIGNvbnN0IFJlbmRlckJsb2NrKiBibG9ja0Nv bnRhaW5pbmdBbGxUZXh0KTsKKworICAgIC8vIFJldHVybnMgdGhlIGZpcnN0IG9yIHRoZSBsYXN0 IGNoaWxkIG9mIHRoZSBvYmplY3QgZGVwZW5kaW5nIG9uIHRoZSBzcGVjaWZpZWQgZGlyZWN0aW9u LgorICAgIHN0YXRpYyBjb25zdCBSZW5kZXJPYmplY3QqIG9iamVjdEZpcnN0Q2hpbGQoVHJhdmVy c2FsRGlyZWN0aW9uLCBjb25zdCBSZW5kZXJPYmplY3QqKTsKKyAgICAvLyBSZXR1cm5zIHRoZSBu ZXh0IG9yIHRoZSBwcmV2aW91cyBzaWJsaW5nIG9mIHRoZSBvYmplY3QgZGVwZW5kaW5nIG9uIHRo ZSBzcGVjaWZpZWQgZGlyZWN0aW9uLgorICAgIHN0YXRpYyBjb25zdCBSZW5kZXJPYmplY3QqIG9i amVjdE5leHRTaWJsaW5nKFRyYXZlcnNhbERpcmVjdGlvbiwgY29uc3QgUmVuZGVyT2JqZWN0Kik7 CiAKICAgICBEb2N1bWVudCogbV9kb2N1bWVudDsKIH07Cg== 181502 2013-01-07 06:49:46 -0800 2014-04-16 17:02:28 -0700 Patch bug-105196-20130107144651.patch text/plain 19640 avayvod U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4ODc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU5YTQ3YjNlNjI2YzA0 MzMxZmNhMWE1MDhlODMxMzliOTdiMjYxMi4uMWVkNzk0ZGVmODY2ZjQwYjcxNzA1YzkzN2QzNjUy OTYyNjI3YTM3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDEzLTAxLTA3ICBBbnRv biBWYXl2b2QgIDxhdmF5dm9kQGNocm9taXVtLm9yZz4KKworICAgICAgICBUZXh0QXV0b3Npemlu ZyAtIEFkanVzdCB0aGUgbG93ZXN0IGNvbW1vbiBhbmNlc3RvciBvZiB0aGUgY2x1c3RlcidzIHRl eHQgbm9kZXMKKyAgICAgICAgYWZ0ZXIgdGhlIHdpZHRoIG9mIHRoZSBmaXJzdCBlc3RpbWF0aW9u IGlzIGZvdW5kLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDUxOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGVyZSdzIGFuIGludGVyZGVwZW5kZW5jeSBiZXR3ZWVuIGRlZmluaXRpb25zIG9mIGFu IGF1dG9zaXppbmcgY2x1c3RlciBhbmQgdGhlIGxvd2VzdCBjb21tb24gYW5jZXN0b3IKKyAgICAg ICAgb2YgdGhlIGNsdXN0ZXIncyB0ZXh0IG5vZGVzLiBUaGUgdGV4dCBub2RlcyB0aGF0IGFyZSBk ZXNjZW5kYW50cyBvZiBhbnkgZGVzY2VuZGFudCBhdXRvc2l6aW5nIGNsdXN0ZXIKKyAgICAgICAg bXVzdCBiZSBza2lwcGVkIHdoZW4gbG9va2luZyBmb3IgdGhlIGxvd2VzdCBjb21tb24gYW5jZXN0 b3IuIEhvd2V2ZXIsIHRoZSB3aWR0aCBvZiB0aGUgbG93ZXN0IGNvbW1vbgorICAgICAgICBhbmNl c3RvciBtYXkgZGV0ZXJtaW5lIHRoZSBjbHVzdGVyJ3MgZGVzY2VuZGFudCBhcyBhIGNsdXN0ZXIu IFRvIGhhbmRsZSBzdWNoIGRlcGVuZGVuY3kgY29ycmVjdGx5LCBtdWx0aXBsZQorICAgICAgICBp dGVyYXRpb25zIG9mIHRoZSBMQ0Egc2VhcmNoIG1heSBiZSBuZWNlc3NhcnkuCisKKyAgICAgICAg VGVzdDogZmFzdC90ZXh0LWF1dG9zaXppbmcvbGNhLWFkanVzdGVkLmh0bWwKKworICAgICAgICAq IHJlbmRlcmluZy9UZXh0QXV0b3NpemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRBdXRv c2l6ZXI6OnByb2Nlc3NTdWJ0cmVlKTogUGFzc2VzIGEgbnVsbCBwb2ludGVyIGZvciB0aGUgcm9v dCBjbHVzdGVyLgorICAgICAgICAoV2ViQ29yZTo6VGV4dEF1dG9zaXplcjo6aXNBdXRvc2l6aW5n Q2x1c3Rlcik6IFJlbmRlck9iamVjdC12ZXJzaW9uIGFjY291bnRzIGZvciB0aGUgTENBJ3Mgd2lk dGguCisgICAgICAgIChXZWJDb3JlOjpUZXh0QXV0b3NpemVyOjpuZXh0SW5QcmVPcmRlclNraXBw aW5nQ2x1c3RlcnMpOgorCisgICAgICAgICAgICBUcmF2ZXJzZXMgdGhlIHRyZWUgaW4tb3JkZXIg ZnJvbSB0aGUgY3VycmVudCBwb3NpdGlvbiBpbiB0aGUgZ2l2ZW4gZGlyZWN0aW9uIHVudGlsIGl0 IGZpbmRzIGEgbm9kZSB0aGF0CisgICAgICAgICAgICBkb2Vzbid0IGJlbG9uZyB0byBhbnkgZGVz Y2VuZGFudCBhdXRvc2l6aW5nIGNsdXN0ZXIuCisKKyAgICAgICAgKFdlYkNvcmU6OlRleHRBdXRv c2l6ZXI6OmZpbmREZWVwZXN0QmxvY2tDb250YWluaW5nQWxsVGV4dCk6CisKKyAgICAgICAgICAg IENoZWNrcyB0aGUgcGF0aHMgdG8gdGhlIHRleHQgbGVhZnMgZm9yIGF1dG9zaXppbmcgY2x1c3Rl cnMuIElmIGZvdW5kLCBhZGp1c3RzIHRoZSB0ZXh0IGxlYWZzIGFuZCByZXBlYXRzCisgICAgICAg ICAgICB0aGUgc2VhcmNoIGZvciB0aGUgTENBLgorCisgICAgICAgIChXZWJDb3JlOjpUZXh0QXV0 b3NpemVyOjpnZXROZXh0VGV4dExlYWZJblByZU9yZGVyU2tpcHBpbmdDbHVzdGVycyk6CisKKyAg ICAgICAgICAgIFJldHVybnMgdGhlIG5leHQgaW4tb3JkZXIgdGV4dCBsZWFmIG9mIHRoZSBnaXZl biBjbHVzdGVyIHRoYXQgZG9lc24ndCBiZWxvbmcgdG8gYW55IGRlc2NlbmRhbnQgY2x1c3Rlci4K KworICAgICAgICAoV2ViQ29yZTo6VGV4dEF1dG9zaXplcjo6YWRqdXN0Rmlyc3RUZXh0TGVhZklm SW5DbHVzdGVyKToKKworICAgICAgICAgICAgQ2hlY2tzIGlmIHRoZSBnaXZlbiB0ZXh0IGxlYWYg aXMgYSBkZXNjZW5kYW50IG9mIGEgY2x1c3RlciBkZXNjZW5kYW50IHRvIHRoZSBvbmUgYmVpbmcg Y3VycmVudGx5IHByb2Nlc3NlZC4KKyAgICAgICAgICAgIElmIHNvLCBmaW5kcyB0aGUgbmV4dCB0 ZXh0IGxlYWYgdGhhdCBpcyBub3QgYSBkZXNjZW5kYW50IG9mIGFueSBzdWNoIGNsdXN0ZXIuCisK KyAgICAgICAgKFdlYkNvcmU6OlRleHRBdXRvc2l6ZXI6Om9iamVjdEZpcnN0Q2hpbGQpOiBSZXR1 cm5zIHRoZSBmaXJzdCBjaGlsZCBvZiB0aGUgZ2l2ZW4gbm9kZSBpbiB0aGUgZ2l2ZW4gZGlyZWN0 aW9uLgorICAgICAgICAoV2ViQ29yZTo6VGV4dEF1dG9zaXplcjo6b2JqZWN0TmV4dFNpYmxpbmcp OiBSZXR1cm5zIHRoZSBuZXh0IHNpYmxpbmcgb2YgdGhlIGdpdmVuIG5vZGUgaW4gdGhlIGdpdmVu IGRpcmVjdGlvbi4KKwogMjAxMy0wMS0wNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICBDaHJvbWl1bSB3aW5kb3dzIGNvbXBpbGUgZmFpbHMgYmVjYXVzZSBvZiB0 aGUgYXNzZXJ0aW9uIGluIE5vZGVSYXJlRGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Rl eHRBdXRvc2l6ZXIuY3BwCmluZGV4IDk3ZTJkMTg0ZDgyYjhlZjAyNmExZDhmMDY4NmM4NmQ5Njcx ZDQ0ZmQuLmIzZDVlNzRhNTExM2ExY2NmOGU4YTdhNmY2NGI0MzUyOWQ1M2IyMWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5jcHAKQEAgLTEwMyw3ICsxMDMsNyBA QCBib29sIFRleHRBdXRvc2l6ZXI6OnByb2Nlc3NTdWJ0cmVlKFJlbmRlck9iamVjdCogbGF5b3V0 Um9vdCkKICAgICAgICAgY29udGFpbmVyID0gY29udGFpbmVyLT5jb250YWluaW5nQmxvY2soKTsK IAogICAgIFJlbmRlckJsb2NrKiBjbHVzdGVyID0gY29udGFpbmVyOwotICAgIHdoaWxlIChjbHVz dGVyICYmICFpc0F1dG9zaXppbmdDbHVzdGVyKGNsdXN0ZXIpKQorICAgIHdoaWxlIChjbHVzdGVy ICYmICFpc0F1dG9zaXppbmdDbHVzdGVyKGNsdXN0ZXIsIDApKQogICAgICAgICBjbHVzdGVyID0g Y2x1c3Rlci0+Y29udGFpbmluZ0Jsb2NrKCk7CiAKICAgICBwcm9jZXNzQ2x1c3RlcihjbHVzdGVy LCBjb250YWluZXIsIGxheW91dFJvb3QsIHdpbmRvd0luZm8pOwpAQCAtMjU5LDkgKzI1OSw5IEBA IGJvb2wgVGV4dEF1dG9zaXplcjo6aXNBdXRvc2l6aW5nQ2x1c3Rlcihjb25zdCBSZW5kZXJCbG9j ayogcmVuZGVyZXIsIGNvbnN0IFJlbmRlCiAgICAgLy8gY29udGFpbmVycywgYW5kIHByb2JhYmx5 IGZsZXhib3hlcy4uLgogfQogCi1ib29sIFRleHRBdXRvc2l6ZXI6OmlzQXV0b3NpemluZ0NsdXN0 ZXIoY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplY3QpCitib29sIFRleHRBdXRvc2l6ZXI6OmlzQXV0 b3NpemluZ0NsdXN0ZXIoY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFJlbmRlckJs b2NrKiBwYXJlbnRCbG9ja0NvbnRhaW5pbmdBbGxUZXh0KQogewotICAgIHJldHVybiBpc0F1dG9z aXppbmdDb250YWluZXIob2JqZWN0KSAmJiBpc0F1dG9zaXppbmdDbHVzdGVyKHRvUmVuZGVyQmxv Y2sob2JqZWN0KSwgMCk7CisgICAgcmV0dXJuIGlzQXV0b3NpemluZ0NvbnRhaW5lcihvYmplY3Qp ICYmIGlzQXV0b3NpemluZ0NsdXN0ZXIodG9SZW5kZXJCbG9jayhvYmplY3QpLCBwYXJlbnRCbG9j a0NvbnRhaW5pbmdBbGxUZXh0KTsKIH0KIAogYm9vbCBUZXh0QXV0b3NpemVyOjpjb250YWluZXJT aG91bGRCZUF1dG9zaXplZChjb25zdCBSZW5kZXJCbG9jayogY29udGFpbmVyKQpAQCAtMzY4LDY2 ICszNjgsMTE2IEBAIFJlbmRlck9iamVjdCogVGV4dEF1dG9zaXplcjo6bmV4dEluUHJlT3JkZXJT a2lwcGluZ0Rlc2NlbmRhbnRzT2ZDb250YWluZXJzKGNvbnN0CiAgICAgcmV0dXJuIDA7CiB9CiAK LWNvbnN0IFJlbmRlckJsb2NrKiBUZXh0QXV0b3NpemVyOjpmaW5kRGVlcGVzdEJsb2NrQ29udGFp bmluZ0FsbFRleHQoY29uc3QgUmVuZGVyQmxvY2sqIGNsdXN0ZXIpCitjb25zdCBSZW5kZXJPYmpl Y3QqIFRleHRBdXRvc2l6ZXI6Om5leHRJblByZU9yZGVyU2tpcHBpbmdDbHVzdGVycyhUcmF2ZXJz YWxEaXJlY3Rpb24gZGlyZWN0aW9uLCBjb25zdCBSZW5kZXJPYmplY3QqIGN1cnJlbnQsIGNvbnN0 IFJlbmRlck9iamVjdCogc3RheVdpdGhpbiwgY29uc3QgUmVuZGVyQmxvY2sqIGJsb2NrQ29udGFp bmluZ0FsbFRleHQpCiB7Ci0gICAgc2l6ZV90IGZpcnN0RGVwdGggPSAwOwotICAgIGNvbnN0IFJl bmRlck9iamVjdCogZmlyc3RUZXh0TGVhZiA9IGZpbmRGaXJzdFRleHRMZWFmTm90SW5DbHVzdGVy KGNsdXN0ZXIsIGZpcnN0RGVwdGgsIEZpcnN0VG9MYXN0KTsKLSAgICBpZiAoIWZpcnN0VGV4dExl YWYpCi0gICAgICAgIHJldHVybiBjbHVzdGVyOworICAgIGlmIChjdXJyZW50ID09IHN0YXlXaXRo aW4gfHwgIWlzQXV0b3NpemluZ0NsdXN0ZXIoY3VycmVudCwgYmxvY2tDb250YWluaW5nQWxsVGV4 dCkpCisgICAgICAgIGZvciAoY29uc3QgUmVuZGVyT2JqZWN0KiBjaGlsZCA9IG9iamVjdEZpcnN0 Q2hpbGQoZGlyZWN0aW9uLCBjdXJyZW50KTsgY2hpbGQ7IGNoaWxkID0gb2JqZWN0TmV4dFNpYmxp bmcoZGlyZWN0aW9uLCBjaGlsZCkpCisgICAgICAgICAgICBpZiAoIWlzQXV0b3NpemluZ0NsdXN0 ZXIoY2hpbGQsIGJsb2NrQ29udGFpbmluZ0FsbFRleHQpKQorICAgICAgICAgICAgICAgIHJldHVy biBjaGlsZDsKIAotICAgIHNpemVfdCBsYXN0RGVwdGggPSAwOwotICAgIGNvbnN0IFJlbmRlck9i amVjdCogbGFzdFRleHRMZWFmID0gZmluZEZpcnN0VGV4dExlYWZOb3RJbkNsdXN0ZXIoY2x1c3Rl ciwgbGFzdERlcHRoLCBMYXN0VG9GaXJzdCk7Ci0gICAgQVNTRVJUKGxhc3RUZXh0TGVhZik7Ci0K LSAgICAvLyBFcXVhbGl6ZSB0aGUgZGVwdGhzIGlmIG5lY2Vzc2FyeS4gT25seSBvbmUgb2YgdGhl IHdoaWxlIGxvb3BzIGJlbG93IHdpbGwgZ2V0IGV4ZWN1dGVkLgotICAgIGNvbnN0IFJlbmRlck9i amVjdCogZmlyc3ROb2RlID0gZmlyc3RUZXh0TGVhZjsKLSAgICBjb25zdCBSZW5kZXJPYmplY3Qq IGxhc3ROb2RlID0gbGFzdFRleHRMZWFmOwotICAgIHdoaWxlIChmaXJzdERlcHRoID4gbGFzdERl cHRoKSB7Ci0gICAgICAgIGZpcnN0Tm9kZSA9IGZpcnN0Tm9kZS0+cGFyZW50KCk7Ci0gICAgICAg IC0tZmlyc3REZXB0aDsKLSAgICB9Ci0gICAgd2hpbGUgKGxhc3REZXB0aCA+IGZpcnN0RGVwdGgp IHsKLSAgICAgICAgbGFzdE5vZGUgPSBsYXN0Tm9kZS0+cGFyZW50KCk7Ci0gICAgICAgIC0tbGFz dERlcHRoOworICAgIGZvciAoY29uc3QgUmVuZGVyT2JqZWN0KiBhbmNlc3RvciA9IGN1cnJlbnQ7 IGFuY2VzdG9yOyBhbmNlc3RvciA9IGFuY2VzdG9yLT5wYXJlbnQoKSkgeworICAgICAgICBpZiAo YW5jZXN0b3IgPT0gc3RheVdpdGhpbikKKyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICBm b3IgKGNvbnN0IFJlbmRlck9iamVjdCogc2libGluZyA9IG9iamVjdE5leHRTaWJsaW5nKGRpcmVj dGlvbiwgYW5jZXN0b3IpOyBzaWJsaW5nOyBzaWJsaW5nID0gb2JqZWN0TmV4dFNpYmxpbmcoZGly ZWN0aW9uLCBzaWJsaW5nKSkKKyAgICAgICAgICAgIGlmICghaXNBdXRvc2l6aW5nQ2x1c3Rlcihz aWJsaW5nLCBibG9ja0NvbnRhaW5pbmdBbGxUZXh0KSkKKyAgICAgICAgICAgICAgICByZXR1cm4g c2libGluZzsKICAgICB9CiAKLSAgICAvLyBHbyB1cCBmcm9tIGJvdGggbm9kZXMgdW50aWwgdGhl IHBhcmVudCBpcyB0aGUgc2FtZS4gQm90aCBwb2ludGVycyB3aWxsIHBvaW50IHRvIHRoZSBMQ0Eg dGhlbi4KLSAgICB3aGlsZSAoZmlyc3ROb2RlICE9IGxhc3ROb2RlKSB7Ci0gICAgICAgIGZpcnN0 Tm9kZSA9IGZpcnN0Tm9kZS0+cGFyZW50KCk7Ci0gICAgICAgIGxhc3ROb2RlID0gbGFzdE5vZGUt PnBhcmVudCgpOworICAgIHJldHVybiAwOworfQorCitjb25zdCBSZW5kZXJCbG9jayogVGV4dEF1 dG9zaXplcjo6ZmluZERlZXBlc3RCbG9ja0NvbnRhaW5pbmdBbGxUZXh0KGNvbnN0IFJlbmRlckJs b2NrKiBjbHVzdGVyKQoreworICAgIFJlbmRlck9iamVjdHMgZmlyc3RQYXRoKDEsIGNsdXN0ZXIp OworICAgIGdldE5leHRUZXh0TGVhZkluUHJlT3JkZXJTa2lwcGluZ0NsdXN0ZXJzKEZpcnN0VG9M YXN0LCBmaXJzdFBhdGgsIDApOworICAgIGlmIChmaXJzdFBhdGguaXNFbXB0eSgpKQorICAgICAg ICByZXR1cm4gY2x1c3RlcjsKKworICAgIFJlbmRlck9iamVjdHMgbGFzdFBhdGgoMSwgY2x1c3Rl cik7CisgICAgZ2V0TmV4dFRleHRMZWFmSW5QcmVPcmRlclNraXBwaW5nQ2x1c3RlcnMoTGFzdFRv Rmlyc3QsIGxhc3RQYXRoLCAwKTsKKyAgICBBU1NFUlQoIWxhc3RQYXRoLmlzRW1wdHkoKSk7CisK KyAgICBjb25zdCBSZW5kZXJCbG9jayogYmxvY2tDb250YWluaW5nQWxsVGV4dCA9IDA7CisgICAg d2hpbGUgKCFibG9ja0NvbnRhaW5pbmdBbGxUZXh0KSB7CisgICAgICAgIHNpemVfdCBtaW5TaXpl ID0gc3RkOjptaW4oZmlyc3RQYXRoLnNpemUoKSwgbGFzdFBhdGguc2l6ZSgpKTsKKyAgICAgICAg c2l6ZV90IGZpcnN0Tm90RXF1YWxJbmRleCA9IDE7CisgICAgICAgIHdoaWxlIChmaXJzdE5vdEVx dWFsSW5kZXggPCBtaW5TaXplICYmIGZpcnN0UGF0aFtmaXJzdE5vdEVxdWFsSW5kZXhdID09IGxh c3RQYXRoW2ZpcnN0Tm90RXF1YWxJbmRleF0pCisgICAgICAgICAgICBmaXJzdE5vdEVxdWFsSW5k ZXgrKzsKKworICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QqIGxvd2VzdENvbW1vbkFuY2VzdG9y ID0gZmlyc3RQYXRoW2ZpcnN0Tm90RXF1YWxJbmRleCAtIDFdOworICAgICAgICBpZiAobG93ZXN0 Q29tbW9uQW5jZXN0b3ItPmlzUmVuZGVyQmxvY2soKSkKKyAgICAgICAgICAgIGJsb2NrQ29udGFp bmluZ0FsbFRleHQgPSB0b1JlbmRlckJsb2NrKGxvd2VzdENvbW1vbkFuY2VzdG9yKTsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgYmxvY2tDb250YWluaW5nQWxsVGV4dCA9IGxvd2VzdENvbW1v bkFuY2VzdG9yLT5jb250YWluaW5nQmxvY2soKTsKKyAgICAgICAgQVNTRVJUKGJsb2NrQ29udGFp bmluZ0FsbFRleHQtPmlzRGVzY2VuZGFudE9mKGNsdXN0ZXIpKTsKKworICAgICAgICAvLyBDaGVj ayBpZiBhbnkgb2YgdGhlIHRleHQgbGVhZnMnIHBhcmVudHMgYXJlIGdvaW5nIHRvIGJlIGNsdXN0 ZXJzIGR1ZSB0byBiZWluZyB3aWRlciB0aGFuIHRoZSBibG9jayBqdXN0IGZvdW5kLgorICAgICAg ICAvLyBJZiBzbywgc2VhcmNoIGZvciB0aGUgdGV4dCBsZWFmcyBhZ2FpbiBzdGFydGluZyBmcm9t IHRoZSBuZXh0IHNpYmxpbmcgb2YgdGhlIGZvdW5kIGNsdXN0ZXIuCisgICAgICAgIGJvb2wgZmly c3RUZXh0TGVhZkludmFsaWRhdGVkID0gYWRqdXN0Rmlyc3RUZXh0TGVhZklmSW5DbHVzdGVyKEZp cnN0VG9MYXN0LCBmaXJzdFBhdGgsIGZpcnN0Tm90RXF1YWxJbmRleCwgYmxvY2tDb250YWluaW5n QWxsVGV4dCk7CisgICAgICAgIGJvb2wgbGFzdFRleHRMZWFmSW52YWxpZGF0ZWQgPSBhZGp1c3RG aXJzdFRleHRMZWFmSWZJbkNsdXN0ZXIoTGFzdFRvRmlyc3QsIGxhc3RQYXRoLCBmaXJzdE5vdEVx dWFsSW5kZXgsIGJsb2NrQ29udGFpbmluZ0FsbFRleHQpOworICAgICAgICBpZiAoZmlyc3RUZXh0 TGVhZkludmFsaWRhdGVkIHx8IGxhc3RUZXh0TGVhZkludmFsaWRhdGVkKSB7CisgICAgICAgICAg ICBpZiAoZmlyc3RQYXRoLmlzRW1wdHkoKSB8fCBsYXN0UGF0aC5pc0VtcHR5KCkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGNsdXN0ZXI7CisgICAgICAgICAgICBibG9ja0NvbnRhaW5pbmdBbGxU ZXh0ID0gMDsKKyAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChmaXJzdE5vZGUtPmlzUmVuZGVy QmxvY2soKSkKLSAgICAgICAgcmV0dXJuIHRvUmVuZGVyQmxvY2soZmlyc3ROb2RlKTsKKyAgICBy ZXR1cm4gYmxvY2tDb250YWluaW5nQWxsVGV4dDsKK30KIAotICAgIC8vIGNvbnRhaW5pbmdCbG9j aygpIHNob3VsZCBuZXZlciBsZWF2ZSB0aGUgY2x1c3Rlciwgc2luY2UgaXQgb25seSBza2lwcyBh bmNlc3RvcnMgd2hlbiBmaW5kaW5nIHRoZQotICAgIC8vIGNvbnRhaW5lciBvZiBwb3NpdGlvbjph YnNvbHV0ZS9maXhlZCBibG9ja3MsIGFuZCB0aG9zZSBjYW5ub3QgZXhpc3QgYmV0d2VlbiBhIGNs dXN0ZXIgYW5kIGl0cyB0ZXh0Ci0gICAgLy8gbm9kZXMgbG93ZXN0IGNvbW1vbiBhbmNlc3RvciBh cyBpc0F1dG9zaXppbmdDbHVzdGVyIHdvdWxkIGhhdmUgbWFkZSB0aGVtIGludG8gdGhlaXIgb3du IGluZGVwZW5kZW50Ci0gICAgLy8gY2x1c3Rlci4KLSAgICBSZW5kZXJCbG9jayogY29udGFpbmlu Z0Jsb2NrID0gZmlyc3ROb2RlLT5jb250YWluaW5nQmxvY2soKTsKLSAgICBBU1NFUlQoY29udGFp bmluZ0Jsb2NrLT5pc0Rlc2NlbmRhbnRPZihjbHVzdGVyKSk7Cit2b2lkIFRleHRBdXRvc2l6ZXI6 OmdldE5leHRUZXh0TGVhZkluUHJlT3JkZXJTa2lwcGluZ0NsdXN0ZXJzKFRyYXZlcnNhbERpcmVj dGlvbiBkaXJlY3Rpb24sIFJlbmRlck9iamVjdHMmIHBhdGgsIGNvbnN0IFJlbmRlckJsb2NrKiBi bG9ja0NvbnRhaW5pbmdBbGxUZXh0KQoreworICAgIEFTU0VSVCghcGF0aC5pc0VtcHR5KCkpOwor CisgICAgY29uc3QgUmVuZGVyT2JqZWN0KiBjdXJyZW50ID0gcGF0aC5sYXN0KCk7CisgICAgY29u c3QgUmVuZGVyT2JqZWN0KiBzdGF5V2l0aGluID0gcGF0aC5maXJzdCgpOworICAgIGNvbnN0IFJl bmRlck9iamVjdCogbmV4dCA9IGN1cnJlbnQ7CisgICAgZm9yICg7OykgeworICAgICAgICBuZXh0 ID0gbmV4dEluUHJlT3JkZXJTa2lwcGluZ0NsdXN0ZXJzKGRpcmVjdGlvbiwgbmV4dCwgc3RheVdp dGhpbiwgYmxvY2tDb250YWluaW5nQWxsVGV4dCk7CisgICAgICAgIGlmICghbmV4dCkKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBpZiAobmV4dC0+aXNUZXh0KCkpIHsKKyAgICAgICAgICAg IFJlbmRlck9iamVjdHMgbmV4dFBhdGg7CisgICAgICAgICAgICB3aGlsZSAobmV4dCAhPSBzdGF5 V2l0aGluKSB7CisgICAgICAgICAgICAgICAgbmV4dFBhdGguYXBwZW5kKG5leHQpOworICAgICAg ICAgICAgICAgIG5leHQgPSBuZXh0LT5wYXJlbnQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIG5leHRQYXRoLmFwcGVuZChzdGF5V2l0aGluKTsKKyAgICAgICAgICAgIG5leHRQYXRoLnJl dmVyc2UoKTsKIAotICAgIHJldHVybiBjb250YWluaW5nQmxvY2s7CisgICAgICAgICAgICBwYXRo LnN3YXAobmV4dFBhdGgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQor ICAgIHBhdGguY2xlYXIoKTsKIH0KIAotY29uc3QgUmVuZGVyT2JqZWN0KiBUZXh0QXV0b3NpemVy OjpmaW5kRmlyc3RUZXh0TGVhZk5vdEluQ2x1c3Rlcihjb25zdCBSZW5kZXJPYmplY3QqIHBhcmVu dCwgc2l6ZV90JiBkZXB0aCwgVHJhdmVyc2FsRGlyZWN0aW9uIGRpcmVjdGlvbikKK2Jvb2wgVGV4 dEF1dG9zaXplcjo6YWRqdXN0Rmlyc3RUZXh0TGVhZklmSW5DbHVzdGVyKFRyYXZlcnNhbERpcmVj dGlvbiBkaXJlY3Rpb24sIFJlbmRlck9iamVjdHMmIHBhdGgsIHNpemVfdCBzdGFydEZyb20sIGNv bnN0IFJlbmRlckJsb2NrKiBibG9ja0NvbnRhaW5pbmdBbGxUZXh0KQogewotICAgIGlmIChwYXJl bnQtPmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIHBhcmVudC0+aXNUZXh0KCkgPyBwYXJlbnQg OiAwOwotCi0gICAgKytkZXB0aDsKLSAgICBjb25zdCBSZW5kZXJPYmplY3QqIGNoaWxkID0gKGRp cmVjdGlvbiA9PSBGaXJzdFRvTGFzdCkgPyBwYXJlbnQtPmZpcnN0Q2hpbGQoKSA6IHBhcmVudC0+ bGFzdENoaWxkKCk7Ci0gICAgd2hpbGUgKGNoaWxkKSB7Ci0gICAgICAgIGlmICghaXNBdXRvc2l6 aW5nQ2x1c3RlcihjaGlsZCkpIHsKLSAgICAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCogbGVh ZiA9IGZpbmRGaXJzdFRleHRMZWFmTm90SW5DbHVzdGVyKGNoaWxkLCBkZXB0aCwgZGlyZWN0aW9u KTsKLSAgICAgICAgICAgIGlmIChsZWFmKQotICAgICAgICAgICAgICAgIHJldHVybiBsZWFmOwor ICAgIHNpemVfdCBjbHVzdGVySW5kZXggPSBwYXRoLnNpemUoKTsKKyAgICBmb3IgKHNpemVfdCBp ID0gc3RhcnRGcm9tOyBpIDwgcGF0aC5zaXplKCk7ICsraSkgeworICAgICAgICBpZiAoaXNBdXRv c2l6aW5nQ2x1c3RlcihwYXRoW2ldLCBibG9ja0NvbnRhaW5pbmdBbGxUZXh0KSkgeworICAgICAg ICAgICAgY2x1c3RlckluZGV4ID0gaTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0g ICAgICAgIGNoaWxkID0gKGRpcmVjdGlvbiA9PSBGaXJzdFRvTGFzdCkgPyBjaGlsZC0+bmV4dFNp YmxpbmcoKSA6IGNoaWxkLT5wcmV2aW91c1NpYmxpbmcoKTsKICAgICB9Ci0gICAgLS1kZXB0aDsK IAotICAgIHJldHVybiAwOworICAgIGlmIChjbHVzdGVySW5kZXggPT0gcGF0aC5zaXplKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHBhdGgucmVtb3ZlKGNsdXN0ZXJJbmRleCArIDEs IHBhdGguc2l6ZSgpIC0gKGNsdXN0ZXJJbmRleCArIDEpKTsKKyAgICBnZXROZXh0VGV4dExlYWZJ blByZU9yZGVyU2tpcHBpbmdDbHVzdGVycyhkaXJlY3Rpb24sIHBhdGgsIGJsb2NrQ29udGFpbmlu Z0FsbFRleHQpOworICAgIHJldHVybiB0cnVlOworfQorCitjb25zdCBSZW5kZXJPYmplY3QqIFRl eHRBdXRvc2l6ZXI6Om9iamVjdEZpcnN0Q2hpbGQoVHJhdmVyc2FsRGlyZWN0aW9uIGRpcmVjdGlv biwgY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplY3QpCit7CisgICAgcmV0dXJuIChkaXJlY3Rpb24g PT0gRmlyc3RUb0xhc3QpID8gb2JqZWN0LT5maXJzdENoaWxkKCkgOiBvYmplY3QtPmxhc3RDaGls ZCgpOworfQorCitjb25zdCBSZW5kZXJPYmplY3QqIFRleHRBdXRvc2l6ZXI6Om9iamVjdE5leHRT aWJsaW5nKFRyYXZlcnNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIGNvbnN0IFJlbmRlck9iamVjdCog b2JqZWN0KQoreworICAgIHJldHVybiAoZGlyZWN0aW9uID09IEZpcnN0VG9MYXN0KSA/IG9iamVj dC0+bmV4dFNpYmxpbmcoKSA6IG9iamVjdC0+cHJldmlvdXNTaWJsaW5nKCk7CiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0QXV0b3NpemVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5o CmluZGV4IDE2OGEyODViOTU4YTk0OGU4OGFiNjAwZTBiMTczZDA5NTgyMjk0NjAuLmU2YTVlNWM0 NTU2MmViNTk5ZTlkMDgyZGY1ZjRhMDBkZGI5MjI2ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1RleHRBdXRvc2l6ZXIuaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkhUTUxOYW1l cy5oIgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzT3du UHRyLmg+CisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK QEAgLTUzLDYgKzU0LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBmbG9hdCBjb21wdXRlQXV0b3Np emVkRm9udFNpemUoZmxvYXQgc3BlY2lmaWVkU2l6ZSwgZmxvYXQgbXVsdGlwbGllcik7CiAKIHBy aXZhdGU6CisgICAgdHlwZWRlZiBWZWN0b3I8Y29uc3QgUmVuZGVyT2JqZWN0Kj4gUmVuZGVyT2Jq ZWN0czsKICAgICBlbnVtIFRyYXZlcnNhbERpcmVjdGlvbiB7CiAgICAgICAgIEZpcnN0VG9MYXN0 LAogICAgICAgICBMYXN0VG9GaXJzdApAQCAtNjcsNyArNjksNyBAQCBwcml2YXRlOgogCiAgICAg c3RhdGljIGJvb2wgaXNBdXRvc2l6aW5nQ29udGFpbmVyKGNvbnN0IFJlbmRlck9iamVjdCopOwog ICAgIHN0YXRpYyBib29sIGlzQXV0b3NpemluZ0NsdXN0ZXIoY29uc3QgUmVuZGVyQmxvY2sqLCBj b25zdCBSZW5kZXJCbG9jayogcGFyZW50QmxvY2tDb250YWluaW5nQWxsVGV4dCk7Ci0gICAgc3Rh dGljIGJvb2wgaXNBdXRvc2l6aW5nQ2x1c3Rlcihjb25zdCBSZW5kZXJPYmplY3QqKTsKKyAgICBz dGF0aWMgYm9vbCBpc0F1dG9zaXppbmdDbHVzdGVyKGNvbnN0IFJlbmRlck9iamVjdCosIGNvbnN0 IFJlbmRlckJsb2NrKiBwYXJlbnRCbG9ja0NvbnRhaW5pbmdBbGxUZXh0KTsKIAogICAgIHN0YXRp YyBib29sIGNvbnRhaW5lclNob3VsZEJlQXV0b3NpemVkKGNvbnN0IFJlbmRlckJsb2NrKiBjb250 YWluZXIpOwogICAgIHN0YXRpYyBib29sIGNvbnRhaW5lckNvbnRhaW5zT25lT2ZUYWdzKGNvbnN0 IFJlbmRlckJsb2NrKiBjbHVzdGVyLCBjb25zdCBWZWN0b3I8UXVhbGlmaWVkTmFtZT4mIHRhZ3Mp OwpAQCAtNzgsMTEgKzgwLDI4IEBAIHByaXZhdGU6CiAgICAgLy8gVXNlIHRvIHRyYXZlcnNlIHRo ZSB0cmVlIG9mIGRlc2NlbmRhbnRzLCBleGNsdWRpbmcgZGVzY2VuZGFudHMgb2YgY29udGFpbmVy cyAoYnV0IHJldHVybmluZyB0aGUgY29udGFpbmVycyB0aGVtc2VsdmVzKS4KICAgICBzdGF0aWMg UmVuZGVyT2JqZWN0KiBuZXh0SW5QcmVPcmRlclNraXBwaW5nRGVzY2VuZGFudHNPZkNvbnRhaW5l cnMoY29uc3QgUmVuZGVyT2JqZWN0KiwgY29uc3QgUmVuZGVyT2JqZWN0KiBzdGF5V2l0aGluKTsK IAorICAgIC8vIFVzZSB0byB0cmF2ZXJzZSB0aGUgdHJlZSBvZiBkZXNjZW5kYW50cywgZXhjbHVk aW5nIGNsdXN0ZXJzIGFuZCB0aGVpciBkZXNjZW5kYW50cyAodGhlIGN1cnJlbnQgb2JqZWN0IGFu ZCB8c3RheVdpdGhpbnwKKyAgICAvLyBjYW4gYmUgYSBjbHVzdGVyKS4KKyAgICBzdGF0aWMgY29u c3QgUmVuZGVyT2JqZWN0KiBuZXh0SW5QcmVPcmRlclNraXBwaW5nQ2x1c3RlcnMoVHJhdmVyc2Fs RGlyZWN0aW9uLCBjb25zdCBSZW5kZXJPYmplY3QqLCBjb25zdCBSZW5kZXJPYmplY3QqIHN0YXlX aXRoaW4sIGNvbnN0IFJlbmRlckJsb2NrKiBibG9ja0NvbnRhaW5pbmdBbGxUZXh0KTsKKworICAg IC8vIElmIHRoZXJlIGFyZSBhbnkgZGVzY2VuZGFudCB0ZXh0IG5vZGVzIG9mIHRoZSBnaXZlbiBj bHVzdGVyIHRoYXQgYXJlIG5vdCBkZXNjZW5kYW50cyBvZiBhbnkgZGVzY2VuZGFudCBjbHVzdGVy LAorICAgIC8vIHJldHVybnMgdGhlIGxvd2VzdCBjb21tb24gYW5jZXN0b3Igb2YgdGhlc2UgdGV4 dCBub2Rlcy4gT3RoZXJ3aXNlLCByZXR1cm5zIHRoZSBjbHVzdGVyIGl0c2VsZi4KICAgICBzdGF0 aWMgY29uc3QgUmVuZGVyQmxvY2sqIGZpbmREZWVwZXN0QmxvY2tDb250YWluaW5nQWxsVGV4dChj b25zdCBSZW5kZXJCbG9jayogY2x1c3Rlcik7CiAKLSAgICAvLyBEZXBlbmRpbmcgb24gdGhlIHRy YXZlcnNhbCBkaXJlY3Rpb24gc3BlY2lmaWVkLCBmaW5kcyB0aGUgZmlyc3Qgb3IgdGhlIGxhc3Qg bGVhZiB0ZXh0IG5vZGUgY2hpbGQgdGhhdCBkb2Vzbid0Ci0gICAgLy8gYmVsb25nIHRvIGFueSBj bHVzdGVyLgotICAgIHN0YXRpYyBjb25zdCBSZW5kZXJPYmplY3QqIGZpbmRGaXJzdFRleHRMZWFm Tm90SW5DbHVzdGVyKGNvbnN0IFJlbmRlck9iamVjdCosIHNpemVfdCYgZGVwdGgsIFRyYXZlcnNh bERpcmVjdGlvbik7CisgICAgLy8gVHJhdmVyc2VzIHRoZSB0cmVlIHN0YXJ0aW5nIGZyb20gdGhl IGxhc3Qgbm9kZSBpbiB0aGUgcGF0aCB1c2luZyBuZXh0SW5QcmVPcmRlclNraXBwaW5nQ2x1c3Rl cnMoKSB3aGlsZSBzdGF5aW5nIHdpdGhpbgorICAgIC8vIHRoZSBmaXJzdCBub2RlIGluIHRoZSBw YXRoLiBSZXR1cm5zIHRoZSBmdWxsIHBhdGggZnJvbSB0aGUgZmlyc3Qgbm9kZSBvZiB0aGUgcGF0 aCB0byB0aGUgdGV4dCBsZWFmIGZvdW5kIG9yIGFuIGVtcHR5IHBhdGgKKyAgICAvLyBpZiB0aGUg c2VhcmNoIGZhaWxlZC4KKyAgICBzdGF0aWMgdm9pZCBnZXROZXh0VGV4dExlYWZJblByZU9yZGVy U2tpcHBpbmdDbHVzdGVycyhUcmF2ZXJzYWxEaXJlY3Rpb24sIFJlbmRlck9iamVjdHMmIHBhdGgs IGNvbnN0IFJlbmRlckJsb2NrKiBibG9ja0NvbnRhaW5pbmdBbGxUZXh0KTsKKworICAgIC8vIENo ZWNrcyBpZiB0aGVyZSBpcyBhbiBhdXRvc2l6aW5nIGNsdXN0ZXIgaW4gdGhlIGdpdmVuIHBhdGgg YmV0d2VlbiB0aGUgZ2l2ZW4gaW5kZXggYW5kIHRoZSBsYXN0IGVsZW1lbnQgaW4gdGhlIHBhdGgu CisgICAgLy8gSWYgbm8gY2x1c3RlciBpcyBmb3VuZCwgdGhpcyByZXR1cm5zIGZhbHNlLiBPdGhl cndpc2UsIGl0IHJlbW92ZXMgdGhlIGZvdW5kIGNsdXN0ZXIgYW5kIGFsbCBzdWJzZXF1ZW50IG5v ZGVzIGZyb20gdGhlCisgICAgLy8gcGF0aCwgdGhlbiBjb250aW51ZXMgdHJhdmVyc2luZyB0aGUg dHJlZSB0byBmaW5kIHRoZSBuZXh0IHRleHQgbGVhZiBpbiB0aGUgZ2l2ZW4gZGlyZWN0aW9uLCBh bmQgZmluYWxseSByZXR1cm5zIHRydWUuCisgICAgc3RhdGljIGJvb2wgYWRqdXN0Rmlyc3RUZXh0 TGVhZklmSW5DbHVzdGVyKFRyYXZlcnNhbERpcmVjdGlvbiwgUmVuZGVyT2JqZWN0cyYgcGF0aCwg c2l6ZV90IHN0YXJ0RnJvbSwgY29uc3QgUmVuZGVyQmxvY2sqIGJsb2NrQ29udGFpbmluZ0FsbFRl eHQpOworCisgICAgLy8gUmV0dXJucyB0aGUgZmlyc3Qgb3IgdGhlIGxhc3QgY2hpbGQgb2YgdGhl IG9iamVjdCBkZXBlbmRpbmcgb24gdGhlIHNwZWNpZmllZCBkaXJlY3Rpb24uCisgICAgc3RhdGlj IGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0Rmlyc3RDaGlsZChUcmF2ZXJzYWxEaXJlY3Rpb24s IGNvbnN0IFJlbmRlck9iamVjdCopOworICAgIC8vIFJldHVybnMgdGhlIG5leHQgb3IgdGhlIHBy ZXZpb3VzIHNpYmxpbmcgb2YgdGhlIG9iamVjdCBkZXBlbmRpbmcgb24gdGhlIHNwZWNpZmllZCBk aXJlY3Rpb24uCisgICAgc3RhdGljIGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0TmV4dFNpYmxp bmcoVHJhdmVyc2FsRGlyZWN0aW9uLCBjb25zdCBSZW5kZXJPYmplY3QqKTsKIAogICAgIERvY3Vt ZW50KiBtX2RvY3VtZW50OwogfTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5ZDY5ODk4ZjUzZmQ3ZjkzODhmN2M4MTZjNDhj OWEyNjk1MzAwZTMxLi42NTRiZWIxNjExMzNlNmJlMjE5ZmZjMjczYjkwZDI4YzZmZWYzYTQ4IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMDEtMDcgIEFudG9uIFZheXZvZCAgPGF2YXl2b2RA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFRleHRBdXRvc2l6aW5nIC0gQWRqdXN0IHRoZSBsb3dl c3QgY29tbW9uIGFuY2VzdG9yIG9mIHRoZSBjbHVzdGVyJ3MgdGV4dCBub2RlcyBhZnRlciB0aGUg d2lkdGggb2YgdGhlIGZpcnN0IGVzdGltYXRpb24gaXMgZm91bmQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUxOTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0cyB0aGF0IHRoZSBsb3dlc3QgY29t bW9uIGFuY2VzdG9yIG9mIHRoZSBjbHVzdGVyJ3MgdGV4dCBub2RlcyBpcyBhZGp1c3RlZCBpZiB0 aGVyZSdyZSBzb21lCisgICAgICAgIHVuZXhwZWN0ZWQgY2x1c3RlcnMgYmVsb3cgdGhlIExDQS4K KworICAgICAgICAqIGZhc3QvdGV4dC1hdXRvc2l6aW5nL2xjYS1hZGp1c3RlZC1leHBlY3RlZC5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQtYXV0b3NpemluZy9sY2EtYWRqdXN0ZWQu aHRtbDogQWRkZWQuCisKIDIwMTMtMDEtMDQgIFRlcnJ5IEFuZGVyc29uICA8dGRhbmRlcnNvbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmcuIFRlc3QgaXMgZmxh a3kgb24gTGludXggYW5kIE1hYy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC1h dXRvc2l6aW5nL2xjYS1hZGp1c3RlZC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90 ZXh0LWF1dG9zaXppbmcvbGNhLWFkanVzdGVkLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTNm OTBhZjZlMDg1ZDhmZjUyYWUyYWQ0OTc4NGM0ZmUyYzVjZmQ1MQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvdGV4dC1hdXRvc2l6aW5nL2xjYS1hZGp1c3RlZC1leHBlY3RlZC5o dG1sCkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKwor PG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPTgwMCI+Cis8c3R5bGU+CitodG1s IHsgZm9udC1zaXplOiAxNnB4OyB9Citib2R5IHsgd2lkdGg6IDYwMHB4OyBvdmVyZmxvdy15OiBo aWRkZW47IH0KKzwvc3R5bGU+CisKKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IHN0eWxlPSJ3aWR0 aDogNDAwcHg7IGZvbnQtc2l6ZTogMS4yNXJlbSI+CisgICAgVGhpcyBub2RlIGJlY29tZXMgdGhl IGxvd2VzdCBjb21tb24gYW5jZXN0b3Igb2YgdGhlIHJvb3QgY2x1c3RlcidzIHRleHQgbm9kZXMg c2luY2UgdGhlIG5vZGUgYmVsb3cgaXMgYSBjbHVzdGVyIGFuZCB0aGVyZWZvcmUgd2UgZG9uJ3Qg ZXhjbHVkZSBpdCBmcm9tIHRoZSB0ZXh0IG5vZGVzIHNldC4gVGhpcyB0ZXh0IHNob3VsZCBiZSBh dXRvc2l6ZWQgdG8ganVzdCAyMHB4IGNvbXB1dGVkIGZvbnQgc2l6ZSAoMTYgKiA0MDAvMzIwKS4K KzwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDgwMHB4OyBmb250LXNpemU6IDIuNXJlbSI+Cisg ICAgVGhpcyBub2RlIGJlY29tZXMgYSBjbHVzdGVyIHNpbmNlIGl0J3Mgd2lkZXIgdGhhbiB0aGUg b3JpZ2luYWwgbG93ZXN0IGNvbW1vbiBhbmNlc3RvciBvZiB0aGUgcm9vdCBjbHVzdGVyJ3MgdGV4 dCBub2Rlcy4gU28gdGhpcyB0ZXh0IHNob3VsZCBiZSBhdXRvc2l6ZWQgdG8gNDBweCBjb21wdXRl ZCBmb250IHNpemUgKDE2ICogODAwLzMyMCkuPGJyPgorICAgIExvcmVtIGlwc3VtIGRvbG9yIHNp dCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0ZW1w b3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gVXQgZW5pbSBh ZCBtaW5pbSB2ZW5pYW0sIHF1aXMgbm9zdHJ1ZCBleGVyY2l0YXRpb24gdWxsYW1jbyBsYWJvcmlz IG5pc2kgdXQgYWxpcXVpcCBleCBlYSBjb21tb2RvIGNvbnNlcXVhdC4gRHVpcyBhdXRlIGlydXJl IGRvbG9yIGluIHJlcHJlaGVuZGVyaXQgaW4gdm9sdXB0YXRlIHZlbGl0IGVzc2UgY2lsbHVtIGRv bG9yZSBldSBmdWdpYXQgbnVsbGEgcGFyaWF0dXIuIEV4Y2VwdGV1ciBzaW50IG9jY2FlY2F0IGN1 cGlkYXRhdCBub24gcHJvaWRlbnQsIHN1bnQgaW4gY3VscGEgcXVpIG9mZmljaWEgZGVzZXJ1bnQg bW9sbGl0IGFuaW0gaWQgZXN0IGxhYm9ydW0uCis8L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgor CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQtYXV0b3NpemluZy9sY2EtYWRqdXN0 ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC1hdXRvc2l6aW5nL2xjYS1hZGp1c3RlZC5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjEyY2QxYThhYzU2ZmQ2NjUxODRiNjQ2YzVlMmZhY2Q3MzRiNDZkNWYK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQtYXV0b3NpemluZy9sY2Et YWRqdXN0ZWQuaHRtbApAQCAtMCwwICsxLDMzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGhlYWQ+CisKKzxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD04MDAiPgorPHN0 eWxlPgoraHRtbCB7IGZvbnQtc2l6ZTogMTZweDsgfQorYm9keSB7IHdpZHRoOiA2MDBweDsgb3Zl cmZsb3cteTogaGlkZGVuOyB9Cis8L3N0eWxlPgorCis8c2NyaXB0PgoraWYgKHdpbmRvdy5pbnRl cm5hbHMpIHsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldFRleHRBdXRvc2l6aW5n RW5hYmxlZCh0cnVlKTsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldFRleHRBdXRv c2l6aW5nV2luZG93U2l6ZU92ZXJyaWRlKDMyMCwgNDgwKTsKK30gZWxzZSBpZiAod2luZG93LmNv bnNvbGUgJiYgY29uc29sZS53YXJuKSB7CisgICAgY29uc29sZS53YXJuKCJUaGlzIHRlc3QgZGVw ZW5kcyBvbiB0aGUgVGV4dCBBdXRvc2l6aW5nIHNldHRpbmcgYmVpbmcgdHJ1ZSwgc28gcnVuIGl0 IGluIER1bXBSZW5kZXJUcmVlLCBvciBtYW51YWxseSBlbmFibGUgVGV4dCBBdXRvc2l6aW5nLCBh bmQgZWl0aGVyIHVzZSBhIG1vYmlsZSBkZXZpY2Ugd2l0aCAzMjBweCBkZXZpY2Utd2lkdGggKGxp a2UgTmV4dXMgUyBvciBpUGhvbmUpLCBvciBkZWZpbmUgSEFDS19GT1JDRV9URVhUX0FVVE9TSVpJ TkdfT05fREVTS1RPUC4iKTsKK30KKzwvc2NyaXB0PgorCis8L2hlYWQ+Cis8Ym9keT4KKworPGRp diBzdHlsZT0id2lkdGg6IDQwMHB4Ij4KKyAgICBUaGlzIG5vZGUgYmVjb21lcyB0aGUgbG93ZXN0 IGNvbW1vbiBhbmNlc3RvciBvZiB0aGUgcm9vdCBjbHVzdGVyJ3MgdGV4dCBub2RlcyBzaW5jZSB0 aGUgbm9kZSBiZWxvdyBpcyBhIGNsdXN0ZXIgYW5kIHRoZXJlZm9yZSB3ZSBkb24ndCBleGNsdWRl IGl0IGZyb20gdGhlIHRleHQgbm9kZXMgc2V0LiBUaGlzIHRleHQgc2hvdWxkIGJlIGF1dG9zaXpl ZCB0byBqdXN0IDIwcHggY29tcHV0ZWQgZm9udCBzaXplICgxNiAqIDQwMC8zMjApLgorPC9kaXY+ Cis8ZGl2IHN0eWxlPSJ3aWR0aDogODAwcHgiPgorICAgIFRoaXMgbm9kZSBiZWNvbWVzIGEgY2x1 c3RlciBzaW5jZSBpdCdzIHdpZGVyIHRoYW4gdGhlIG9yaWdpbmFsIGxvd2VzdCBjb21tb24gYW5j ZXN0b3Igb2YgdGhlIHJvb3QgY2x1c3RlcidzIHRleHQgbm9kZXMuIFNvIHRoaXMgdGV4dCBzaG91 bGQgYmUgYXV0b3NpemVkIHRvIDQwcHggY29tcHV0ZWQgZm9udCBzaXplICgxNiAqIDgwMC8zMjAp Ljxicj4KKyAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlz aWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0 IGRvbG9yZSBtYWduYSBhbGlxdWEuIFV0IGVuaW0gYWQgbWluaW0gdmVuaWFtLCBxdWlzIG5vc3Ry dWQgZXhlcmNpdGF0aW9uIHVsbGFtY28gbGFib3JpcyBuaXNpIHV0IGFsaXF1aXAgZXggZWEgY29t bW9kbyBjb25zZXF1YXQuIER1aXMgYXV0ZSBpcnVyZSBkb2xvciBpbiByZXByZWhlbmRlcml0IGlu IHZvbHVwdGF0ZSB2ZWxpdCBlc3NlIGNpbGx1bSBkb2xvcmUgZXUgZnVnaWF0IG51bGxhIHBhcmlh dHVyLiBFeGNlcHRldXIgc2ludCBvY2NhZWNhdCBjdXBpZGF0YXQgbm9uIHByb2lkZW50LCBzdW50 IGluIGN1bHBhIHF1aSBvZmZpY2lhIGRlc2VydW50IG1vbGxpdCBhbmltIGlkIGVzdCBsYWJvcnVt LgorPC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4KKwo=