151930 2015-12-06 20:32:06 -0800 Show more information about SVG renderers in showLayerTree() output 2015-12-06 22:28:08 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue oldest_to_newest 1146743 0 simon.fraser 2015-12-06 20:32:06 -0800 Show more information about SVG renderers in showLayerTree() output 1146744 1 266748 simon.fraser 2015-12-06 20:35:24 -0800 Created attachment 266748 Patch 1146760 2 266748 commit-queue 2015-12-06 22:28:06 -0800 Comment on attachment 266748 Patch Clearing flags on attachment: 266748 Committed r193614: <http://trac.webkit.org/changeset/193614> 1146761 3 commit-queue 2015-12-06 22:28:08 -0800 All reviewed patches have been landed. Closing bug. 266748 2015-12-06 20:35:24 -0800 2015-12-06 22:28:06 -0800 Patch bug-151930-20151206203455.patch text/plain 22776 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTc1NTA4OWNiYmEyNTY4 MWU4YWE4YjkzM2RiYTRlZTJjMjkyYmVhNi4uYWFjNDY0MTc5ZWIxNTljZGM5ZWY2ODVmZWY2MTU5 Yzk5MzYyYjE2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE1LTEyLTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNob3cgbW9yZSBp bmZvcm1hdGlvbiBhYm91dCBTVkcgcmVuZGVyZXJzIGluIHNob3dMYXllclRyZWUoKSBvdXRwdXQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTkzMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAg SW4gc2hvd0xheWVyVHJlZSgpIG91dHB1dCwgZm9yIFNWRyByZW5kZXJlcnMgc2hvdzoKKyAgICAg ICAgLSB2aXN1YWwgYW5kIGxheW91dCBvdmVyZmxvdywgZm9yIGJveGVzCisgICAgICAgIC0gZnJh bWUgcmVjdCwgZm9yIGJveGVzCisgICAgICAgIC0gbGF5b3V0IHN0YXRlCisgICAgICAgIC0gY2xh c3MgYW5kIGlkCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6c2hvd0xheWVyVHJlZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRy ZWVBc1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUFzVGV4dDo6d3JpdGVS ZW5kZXJPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVEZWJ1Z0luZm8pOiBOZXcgZnVu Y3Rpb24gdG8gc2hhcmUgZHVtcGluZyB3aXRoIHN2ZyBvdXRwdXQuCisgICAgICAgIChXZWJDb3Jl Ojp3cml0ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuaDoKKyAgICAg ICAgKiByZW5kZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6d3JpdGVQb3NpdGlvbkFuZFN0eWxlKTogU2hvdyB0aGUgZnJhbWVSZWN0IGZvciBib3hl cyAoZS5nLiBSZW5kZXJTVkdSb290KS4KKyAgICAgICAgTXVjaCBtb3JlIHVzZWZ1bCB0aGF0IHNo b3dpbmcgdGhlIGNsaXBwZWRPdmVyZmxvd1JlY3QuCisgICAgICAgIChXZWJDb3JlOjp3cml0ZVN0 YW5kYXJkUHJlZml4KToKKyAgICAgICAgKFdlYkNvcmU6OndyaXRlQ2hpbGRyZW4pOgorICAgICAg ICAoV2ViQ29yZTo6d3JpdGVTVkdSZXNvdXJjZUNvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3Jl Ojp3cml0ZVNWR0NvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjp3cml0ZSk6CisgICAgICAg IChXZWJDb3JlOjp3cml0ZVNWR1RleHQpOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVTVkdJbmxp bmVUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OndyaXRlU1ZHSW1hZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6d3JpdGVTVkdHcmFkaWVudFN0b3ApOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVSZXNv dXJjZXMpOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I8PCk6IERlbGV0ZWQuCisgICAgICAg ICogcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0Lmg6CisKIDIwMTUtMTEtMzAgIEpp ZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBBbWF6b24uY29tIEFk ZGl0aW9uYWwgSW5mb3JtYXRpb24gbGlua3MgYXJlbid0IGNsaWNrYWJsZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMGU4OTVkOTRlY2M2NDI3Zjc4OTA4ZGIx NjYxNTUyNDE1YjJjZTFmNi4uNDhiNzE1ZGY4YzY2ZWM4Yjc2MGQ3MjUwNWEyY2IyZmU3MDkxNDQ4 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC03MDcwLDcg KzcwNzAsNyBAQCB2b2lkIHNob3dMYXllclRyZWUoY29uc3QgV2ViQ29yZTo6UmVuZGVyTGF5ZXIq IGxheWVyKQogICAgIGlmICghbGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIFdURjo6U3Ry aW5nIG91dHB1dCA9IGV4dGVybmFsUmVwcmVzZW50YXRpb24oJmxheWVyLT5yZW5kZXJlcigpLmZy YW1lKCksIFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dBbGxMYXllcnMgfCBXZWJDb3JlOjpSZW5k ZXJBc1RleHRTaG93TGF5ZXJOZXN0aW5nIHwgV2ViQ29yZTo6UmVuZGVyQXNUZXh0U2hvd0NvbXBv c2l0ZWRMYXllcnMgfCBXZWJDb3JlOjpSZW5kZXJBc1RleHRTaG93QWRkcmVzc2VzIHwgV2ViQ29y ZTo6UmVuZGVyQXNUZXh0U2hvd0lEQW5kQ2xhc3MgfCBXZWJDb3JlOjpSZW5kZXJBc1RleHREb250 VXBkYXRlTGF5b3V0IHwgV2ViQ29yZTo6UmVuZGVyQXNUZXh0U2hvd0xheW91dFN0YXRlIHwgV2Vi Q29yZTo6UmVuZGVyQXNUZXh0U2hvd092ZXJmbG93KTsKKyAgICBXVEY6OlN0cmluZyBvdXRwdXQg PSBleHRlcm5hbFJlcHJlc2VudGF0aW9uKCZsYXllci0+cmVuZGVyZXIoKS5mcmFtZSgpLCBXZWJD b3JlOjpSZW5kZXJBc1RleHRTaG93QWxsTGF5ZXJzIHwgV2ViQ29yZTo6UmVuZGVyQXNUZXh0U2hv d0xheWVyTmVzdGluZyB8IFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dDb21wb3NpdGVkTGF5ZXJz IHwgV2ViQ29yZTo6UmVuZGVyQXNUZXh0U2hvd0FkZHJlc3NlcyB8IFdlYkNvcmU6OlJlbmRlckFz VGV4dFNob3dJREFuZENsYXNzIHwgV2ViQ29yZTo6UmVuZGVyQXNUZXh0RG9udFVwZGF0ZUxheW91 dCB8IFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dMYXlvdXRTdGF0ZSB8IFdlYkNvcmU6OlJlbmRl ckFzVGV4dFNob3dPdmVyZmxvdyB8IFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dTVkdHZW9tZXRy eSk7CiAgICAgZnByaW50ZihzdGRlcnIsICIlc1xuIiwgb3V0cHV0LnV0ZjgoKS5kYXRhKCkpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKaW5k ZXggZGQ1YzBlNDk4YzlkNjczZDNiNDJhODRkYTkwYTE4ZTlhYzBlYzVhNC4uYzk4OGNlNmZhZjZl M2U5ZGQ1NWJiYmIwMmRkNWFkMTI4OWM4MTkwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcApAQCAtNjcsNiArNjcsNyBAQAogI2luY2x1ZGUgIlNo YWRvd1Jvb3QuaCIKICNpbmNsdWRlICJTaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaCIKICNpbmNs dWRlICJTdHlsZVByb3BlcnRpZXMuaCIKKyNpbmNsdWRlICJUZXh0U3RyZWFtLmgiCiAjaW5jbHVk ZSA8d3RmL0hleE51bWJlci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3 dGYvdW5pY29kZS9DaGFyYWN0ZXJOYW1lcy5oPgpAQCAtMzkzLDggKzM5NCwxMyBAQCB2b2lkIFJl bmRlclRyZWVBc1RleHQ6OndyaXRlUmVuZGVyT2JqZWN0KFRleHRTdHJlYW0mIHRzLCBjb25zdCBS ZW5kZXJPYmplY3QmIG8sCiAgICAgICAgIH0KICAgICB9CiAgICAgCisgICAgd3JpdGVEZWJ1Z0lu Zm8odHMsIG8sIGJlaGF2aW9yKTsKK30KKwordm9pZCB3cml0ZURlYnVnSW5mbyhUZXh0U3RyZWFt JiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QsIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJl aGF2aW9yKQorewogICAgIGlmIChiZWhhdmlvciAmIFJlbmRlckFzVGV4dFNob3dJREFuZENsYXNz KSB7Ci0gICAgICAgIGlmIChFbGVtZW50KiBlbGVtZW50ID0gaXM8RWxlbWVudD4oby5ub2RlKCkp ID8gZG93bmNhc3Q8RWxlbWVudD4oby5ub2RlKCkpIDogbnVsbHB0cikgeworICAgICAgICBpZiAo RWxlbWVudCogZWxlbWVudCA9IGlzPEVsZW1lbnQ+KG9iamVjdC5ub2RlKCkpID8gZG93bmNhc3Q8 RWxlbWVudD4ob2JqZWN0Lm5vZGUoKSkgOiBudWxscHRyKSB7CiAgICAgICAgICAgICBpZiAoZWxl bWVudC0+aGFzSUQoKSkKICAgICAgICAgICAgICAgICB0cyA8PCAiIGlkPVwiIiArIGVsZW1lbnQt PmdldElkQXR0cmlidXRlKCkgKyAiXCIiOwogCkBAIC00MDksMzMgKzQxNSwzMyBAQCB2b2lkIFJl bmRlclRyZWVBc1RleHQ6OndyaXRlUmVuZGVyT2JqZWN0KFRleHRTdHJlYW0mIHRzLCBjb25zdCBS ZW5kZXJPYmplY3QmIG8sCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Ci0gICAgCisK ICAgICBpZiAoYmVoYXZpb3IgJiBSZW5kZXJBc1RleHRTaG93TGF5b3V0U3RhdGUpIHsKLSAgICAg ICAgYm9vbCBuZWVkc0xheW91dCA9IG8uc2VsZk5lZWRzTGF5b3V0KCkgfHwgby5uZWVkc1Bvc2l0 aW9uZWRNb3ZlbWVudExheW91dCgpIHx8IG8ucG9zQ2hpbGROZWVkc0xheW91dCgpIHx8IG8ubm9y bWFsQ2hpbGROZWVkc0xheW91dCgpOworICAgICAgICBib29sIG5lZWRzTGF5b3V0ID0gb2JqZWN0 LnNlbGZOZWVkc0xheW91dCgpIHx8IG9iamVjdC5uZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91 dCgpIHx8IG9iamVjdC5wb3NDaGlsZE5lZWRzTGF5b3V0KCkgfHwgb2JqZWN0Lm5vcm1hbENoaWxk TmVlZHNMYXlvdXQoKTsKICAgICAgICAgaWYgKG5lZWRzTGF5b3V0KQogICAgICAgICAgICAgdHMg PDwgIiAobmVlZHMgbGF5b3V0OiI7CiAgICAgICAgIAogICAgICAgICBib29sIGhhdmVQcmV2aW91 cyA9IGZhbHNlOwotICAgICAgICBpZiAoby5zZWxmTmVlZHNMYXlvdXQoKSkgeworICAgICAgICBp ZiAob2JqZWN0LnNlbGZOZWVkc0xheW91dCgpKSB7CiAgICAgICAgICAgICB0cyA8PCAiIHNlbGYi OwogICAgICAgICAgICAgaGF2ZVByZXZpb3VzID0gdHJ1ZTsKICAgICAgICAgfQogCi0gICAgICAg IGlmIChvLm5lZWRzUG9zaXRpb25lZE1vdmVtZW50TGF5b3V0KCkpIHsKKyAgICAgICAgaWYgKG9i amVjdC5uZWVkc1Bvc2l0aW9uZWRNb3ZlbWVudExheW91dCgpKSB7CiAgICAgICAgICAgICBpZiAo aGF2ZVByZXZpb3VzKQogICAgICAgICAgICAgICAgIHRzIDw8ICIsIjsKICAgICAgICAgICAgIGhh dmVQcmV2aW91cyA9IHRydWU7CiAgICAgICAgICAgICB0cyA8PCAiIHBvc2l0aW9uZWQgbW92ZW1l bnQiOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKG8ubm9ybWFsQ2hpbGROZWVkc0xheW91dCgp KSB7CisgICAgICAgIGlmIChvYmplY3Qubm9ybWFsQ2hpbGROZWVkc0xheW91dCgpKSB7CiAgICAg ICAgICAgICBpZiAoaGF2ZVByZXZpb3VzKQogICAgICAgICAgICAgICAgIHRzIDw8ICIsIjsKICAg ICAgICAgICAgIGhhdmVQcmV2aW91cyA9IHRydWU7CiAgICAgICAgICAgICB0cyA8PCAiIGNoaWxk IjsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChvLnBvc0NoaWxkTmVlZHNMYXlvdXQoKSkgewor ICAgICAgICBpZiAob2JqZWN0LnBvc0NoaWxkTmVlZHNMYXlvdXQoKSkgewogICAgICAgICAgICAg aWYgKGhhdmVQcmV2aW91cykKICAgICAgICAgICAgICAgICB0cyA8PCAiLCI7CiAgICAgICAgICAg ICB0cyA8PCAiIHBvc2l0aW9uZWQgY2hpbGQiOwpAQCAtNDQ0LDkgKzQ1MCw5IEBAIHZvaWQgUmVu ZGVyVHJlZUFzVGV4dDo6d3JpdGVSZW5kZXJPYmplY3QoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJl bmRlck9iamVjdCYgbywKICAgICAgICAgaWYgKG5lZWRzTGF5b3V0KQogICAgICAgICAgICAgdHMg PDwgIikiOwogICAgIH0KLSAgICAKLSAgICBpZiAoYmVoYXZpb3IgJiBSZW5kZXJBc1RleHRTaG93 T3ZlcmZsb3cgJiYgaXM8UmVuZGVyQm94PihvKSkgewotICAgICAgICBjb25zdCBhdXRvJiBib3gg PSBkb3duY2FzdDxSZW5kZXJCb3g+KG8pOworCisgICAgaWYgKGJlaGF2aW9yICYgUmVuZGVyQXNU ZXh0U2hvd092ZXJmbG93ICYmIGlzPFJlbmRlckJveD4ob2JqZWN0KSkgeworICAgICAgICBjb25z dCBhdXRvJiBib3ggPSBkb3duY2FzdDxSZW5kZXJCb3g+KG9iamVjdCk7CiAgICAgICAgIGlmIChi b3guaGFzUmVuZGVyT3ZlcmZsb3coKSkgewogICAgICAgICAgICAgTGF5b3V0UmVjdCBsYXlvdXRP dmVyZmxvdyA9IGJveC5sYXlvdXRPdmVyZmxvd1JlY3QoKTsKICAgICAgICAgICAgIHRzIDw8ICIg KGxheW91dCBvdmVyZmxvdyAiIDw8IGxheW91dE92ZXJmbG93LngoKS50b0ludCgpIDw8ICIsIiA8 PCBsYXlvdXRPdmVyZmxvdy55KCkudG9JbnQoKSA8PCAiICIgPDwgbGF5b3V0T3ZlcmZsb3cud2lk dGgoKS50b0ludCgpIDw8ICJ4IiA8PCBsYXlvdXRPdmVyZmxvdy5oZWlnaHQoKS50b0ludCgpIDw8 ICIpIjsKQEAgLTUwMiwzNSArNTA4LDM1IEBAIHN0YXRpYyB2b2lkIHdyaXRlU2ltcGxlTGluZShU ZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyVGV4dCYgbywgY29uc3QgRmxvYXRSZWN0CiB2b2lk IHdyaXRlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG8sIGludCBpbmRlbnQs IFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yKQogewogICAgIGlmIChpczxSZW5kZXJTVkdT aGFwZT4obykpIHsKLSAgICAgICAgd3JpdGUodHMsIGRvd25jYXN0PFJlbmRlclNWR1NoYXBlPihv KSwgaW5kZW50KTsKKyAgICAgICAgd3JpdGUodHMsIGRvd25jYXN0PFJlbmRlclNWR1NoYXBlPihv KSwgaW5kZW50LCBiZWhhdmlvcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKGlz PFJlbmRlclNWR0dyYWRpZW50U3RvcD4obykpIHsKLSAgICAgICAgd3JpdGVTVkdHcmFkaWVudFN0 b3AodHMsIGRvd25jYXN0PFJlbmRlclNWR0dyYWRpZW50U3RvcD4obyksIGluZGVudCk7CisgICAg ICAgIHdyaXRlU1ZHR3JhZGllbnRTdG9wKHRzLCBkb3duY2FzdDxSZW5kZXJTVkdHcmFkaWVudFN0 b3A+KG8pLCBpbmRlbnQsIGJlaGF2aW9yKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBp ZiAoaXM8UmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXI+KG8pKSB7Ci0gICAgICAgIHdyaXRlU1ZH UmVzb3VyY2VDb250YWluZXIodHMsIGRvd25jYXN0PFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVy PihvKSwgaW5kZW50KTsKKyAgICAgICAgd3JpdGVTVkdSZXNvdXJjZUNvbnRhaW5lcih0cywgZG93 bmNhc3Q8UmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXI+KG8pLCBpbmRlbnQsIGJlaGF2aW9yKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoaXM8UmVuZGVyU1ZHQ29udGFpbmVyPihv KSkgewotICAgICAgICB3cml0ZVNWR0NvbnRhaW5lcih0cywgZG93bmNhc3Q8UmVuZGVyU1ZHQ29u dGFpbmVyPihvKSwgaW5kZW50KTsKKyAgICAgICAgd3JpdGVTVkdDb250YWluZXIodHMsIGRvd25j YXN0PFJlbmRlclNWR0NvbnRhaW5lcj4obyksIGluZGVudCwgYmVoYXZpb3IpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogICAgIGlmIChpczxSZW5kZXJTVkdSb290PihvKSkgewotICAgICAgICB3 cml0ZSh0cywgZG93bmNhc3Q8UmVuZGVyU1ZHUm9vdD4obyksIGluZGVudCk7CisgICAgICAgIHdy aXRlKHRzLCBkb3duY2FzdDxSZW5kZXJTVkdSb290PihvKSwgaW5kZW50LCBiZWhhdmlvcik7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKGlzPFJlbmRlclNWR1RleHQ+KG8pKSB7Ci0g ICAgICAgIHdyaXRlU1ZHVGV4dCh0cywgZG93bmNhc3Q8UmVuZGVyU1ZHVGV4dD4obyksIGluZGVu dCk7CisgICAgICAgIHdyaXRlU1ZHVGV4dCh0cywgZG93bmNhc3Q8UmVuZGVyU1ZHVGV4dD4obyks IGluZGVudCwgYmVoYXZpb3IpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmIChpczxS ZW5kZXJTVkdJbmxpbmVUZXh0PihvKSkgewotICAgICAgICB3cml0ZVNWR0lubGluZVRleHQodHMs IGRvd25jYXN0PFJlbmRlclNWR0lubGluZVRleHQ+KG8pLCBpbmRlbnQpOworICAgICAgICB3cml0 ZVNWR0lubGluZVRleHQodHMsIGRvd25jYXN0PFJlbmRlclNWR0lubGluZVRleHQ+KG8pLCBpbmRl bnQsIGJlaGF2aW9yKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoaXM8UmVuZGVy U1ZHSW1hZ2U+KG8pKSB7Ci0gICAgICAgIHdyaXRlU1ZHSW1hZ2UodHMsIGRvd25jYXN0PFJlbmRl clNWR0ltYWdlPihvKSwgaW5kZW50KTsKKyAgICAgICAgd3JpdGVTVkdJbWFnZSh0cywgZG93bmNh c3Q8UmVuZGVyU1ZHSW1hZ2U+KG8pLCBpbmRlbnQsIGJlaGF2aW9yKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRy ZWVBc1RleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmgK aW5kZXggODk5MmY1ZWE3ZjY1MTkwNWFlZGMzMmMzYzM2ZGQ3MDg3OTJmYWVjNC4uNTQ2OThmNTUw NDE4NjNmMDcxZjUyNGY0NjllNjYxNDUwNWQ1YWM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5oCkBAIC0zNiwxNiArMzYsMTcgQEAgY2xhc3MgUmVuZGVy T2JqZWN0OwogY2xhc3MgVGV4dFN0cmVhbTsKIAogZW51bSBSZW5kZXJBc1RleHRCZWhhdmlvckZs YWdzIHsKLSAgICBSZW5kZXJBc1RleHRCZWhhdmlvck5vcm1hbCA9IDAsCi0gICAgUmVuZGVyQXNU ZXh0U2hvd0FsbExheWVycyA9IDEgPDwgMCwgLy8gRHVtcCBhbGwgbGF5ZXJzLCBub3QganVzdCB0 aG9zZSB0aGF0IHdvdWxkIHBhaW50LgotICAgIFJlbmRlckFzVGV4dFNob3dMYXllck5lc3Rpbmcg PSAxIDw8IDEsIC8vIEFubm90YXRlIHRoZSBsYXllciBsaXN0cy4KLSAgICBSZW5kZXJBc1RleHRT aG93Q29tcG9zaXRlZExheWVycyA9IDEgPDwgMiwgLy8gU2hvdyB3aGljaCBsYXllcnMgYXJlIGNv bXBvc2l0ZWQuCi0gICAgUmVuZGVyQXNUZXh0U2hvd0FkZHJlc3NlcyA9IDEgPDwgMywgLy8gU2hv dyBsYXllciBhbmQgcmVuZGVyZXIgYWRkcmVzc2VzLgotICAgIFJlbmRlckFzVGV4dFNob3dJREFu ZENsYXNzID0gMSA8PCA0LCAvLyBTaG93IGlkIGFuZCBjbGFzcyBhdHRyaWJ1dGVzCi0gICAgUmVu ZGVyQXNUZXh0UHJpbnRpbmdNb2RlID0gMSA8PCA1LCAvLyBEdW1wIHRoZSB0cmVlIGluIHByaW50 aW5nIG1vZGUuCi0gICAgUmVuZGVyQXNUZXh0RG9udFVwZGF0ZUxheW91dCA9IDEgPDwgNiwgLy8g RG9uJ3QgdXBkYXRlIGxheW91dCwgdG8gbWFrZSBpdCBzYWZlIHRvIGNhbGwgc2hvd0xheWVyVHJl ZSgpIGZyb20gdGhlIGRlYnVnZ2VyIGluc2lkZSBsYXlvdXQgb3IgcGFpbnRpbmcgY29kZS4KLSAg ICBSZW5kZXJBc1RleHRTaG93TGF5b3V0U3RhdGUgPSAxIDw8IDcsIC8vIFByaW50IHRoZSB2YXJp b3VzICduZWVkcyBsYXlvdXQnIGJpdHMgb24gcmVuZGVyZXJzLgotICAgIFJlbmRlckFzVGV4dFNo b3dPdmVyZmxvdyA9IDEgPDwgOCAvLyBQcmludCBsYXlvdXQgYW5kIHZpc3VhbCBvdmVyZmxvdy4K KyAgICBSZW5kZXJBc1RleHRCZWhhdmlvck5vcm1hbCAgICAgICAgICA9IDAsCisgICAgUmVuZGVy QXNUZXh0U2hvd0FsbExheWVycyAgICAgICAgICAgPSAxIDw8IDAsIC8vIER1bXAgYWxsIGxheWVy cywgbm90IGp1c3QgdGhvc2UgdGhhdCB3b3VsZCBwYWludC4KKyAgICBSZW5kZXJBc1RleHRTaG93 TGF5ZXJOZXN0aW5nICAgICAgICA9IDEgPDwgMSwgLy8gQW5ub3RhdGUgdGhlIGxheWVyIGxpc3Rz LgorICAgIFJlbmRlckFzVGV4dFNob3dDb21wb3NpdGVkTGF5ZXJzICAgID0gMSA8PCAyLCAvLyBT aG93IHdoaWNoIGxheWVycyBhcmUgY29tcG9zaXRlZC4KKyAgICBSZW5kZXJBc1RleHRTaG93QWRk cmVzc2VzICAgICAgICAgICA9IDEgPDwgMywgLy8gU2hvdyBsYXllciBhbmQgcmVuZGVyZXIgYWRk cmVzc2VzLgorICAgIFJlbmRlckFzVGV4dFNob3dJREFuZENsYXNzICAgICAgICAgID0gMSA8PCA0 LCAvLyBTaG93IGlkIGFuZCBjbGFzcyBhdHRyaWJ1dGVzCisgICAgUmVuZGVyQXNUZXh0UHJpbnRp bmdNb2RlICAgICAgICAgICAgPSAxIDw8IDUsIC8vIER1bXAgdGhlIHRyZWUgaW4gcHJpbnRpbmcg bW9kZS4KKyAgICBSZW5kZXJBc1RleHREb250VXBkYXRlTGF5b3V0ICAgICAgICA9IDEgPDwgNiwg Ly8gRG9uJ3QgdXBkYXRlIGxheW91dCwgdG8gbWFrZSBpdCBzYWZlIHRvIGNhbGwgc2hvd0xheWVy VHJlZSgpIGZyb20gdGhlIGRlYnVnZ2VyIGluc2lkZSBsYXlvdXQgb3IgcGFpbnRpbmcgY29kZS4K KyAgICBSZW5kZXJBc1RleHRTaG93TGF5b3V0U3RhdGUgICAgICAgICA9IDEgPDwgNywgLy8gUHJp bnQgdGhlIHZhcmlvdXMgJ25lZWRzIGxheW91dCcgYml0cyBvbiByZW5kZXJlcnMuCisgICAgUmVu ZGVyQXNUZXh0U2hvd092ZXJmbG93ICAgICAgICAgICAgPSAxIDw8IDgsIC8vIFByaW50IGxheW91 dCBhbmQgdmlzdWFsIG92ZXJmbG93LgorICAgIFJlbmRlckFzVGV4dFNob3dTVkdHZW9tZXRyeSAg ICAgICAgID0gMSA8PCA5LCAvLyBQcmludCBhZGRpdGlvbmFsIGdlb21ldHJ5IGZvciBTVkcgb2Jq ZWN0cy4KIH07CiB0eXBlZGVmIHVuc2lnbmVkIFJlbmRlckFzVGV4dEJlaGF2aW9yOwogCkBAIC01 Myw2ICs1NCw3IEBAIHR5cGVkZWYgdW5zaWduZWQgUmVuZGVyQXNUZXh0QmVoYXZpb3I7CiBXRUJD T1JFX0VYUE9SVCBTdHJpbmcgZXh0ZXJuYWxSZXByZXNlbnRhdGlvbihGcmFtZSosIFJlbmRlckFz VGV4dEJlaGF2aW9yID0gUmVuZGVyQXNUZXh0QmVoYXZpb3JOb3JtYWwpOwogV0VCQ09SRV9FWFBP UlQgU3RyaW5nIGV4dGVybmFsUmVwcmVzZW50YXRpb24oRWxlbWVudCosIFJlbmRlckFzVGV4dEJl aGF2aW9yID0gUmVuZGVyQXNUZXh0QmVoYXZpb3JOb3JtYWwpOwogdm9pZCB3cml0ZShUZXh0U3Ry ZWFtJiwgY29uc3QgUmVuZGVyT2JqZWN0JiwgaW50IGluZGVudCA9IDAsIFJlbmRlckFzVGV4dEJl aGF2aW9yID0gUmVuZGVyQXNUZXh0QmVoYXZpb3JOb3JtYWwpOwordm9pZCB3cml0ZURlYnVnSW5m byhUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyT2JqZWN0JiwgUmVuZGVyQXNUZXh0QmVoYXZpb3Ig PSBSZW5kZXJBc1RleHRCZWhhdmlvck5vcm1hbCk7CiAKIGNsYXNzIFJlbmRlclRyZWVBc1RleHQg ewogLy8gRklYTUU6IFRoaXMgaXMgYSBjaGVlc3kgaGFjayB0byBhbGxvdyBlYXN5IGFjY2VzcyB0 byBSZW5kZXJTdHlsZSBjb2xvcnMuICBJdCB3b24ndCBiZSBuZWVkZWQgaWYgd2UgY29udmVydApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNU ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4 dC5jcHAKaW5kZXggYjZjNjM4MmJjNWU3YWE1YTBmMWJhOTFjYjM2YmEyZDk3MmFhZGE1Ny4uNmQ3 OTVjODU0MTM2ODE1N2JjOTNjZDdkZTQ2OTVhMThkMTg5YzhlZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQuY3BwCkBAIC00Nyw3 ICs0Nyw2IEBACiAjaW5jbHVkZSAiUmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9yLmgiCiAjaW5j bHVkZSAiUmVuZGVyU1ZHUm9vdC5oIgogI2luY2x1ZGUgIlJlbmRlclNWR1RleHQuaCIKLSNpbmNs dWRlICJSZW5kZXJUcmVlQXNUZXh0LmgiCiAjaW5jbHVkZSAiU1ZHQ2lyY2xlRWxlbWVudC5oIgog I2luY2x1ZGUgIlNWR0VsbGlwc2VFbGVtZW50LmgiCiAjaW5jbHVkZSAiU1ZHSW5saW5lVGV4dEJv eC5oIgpAQCAtMjI4LDkgKzIyNywxOSBAQCBzdGF0aWMgdm9pZCB3cml0ZVN0eWxlKFRleHRTdHJl YW0mIHRzLCBjb25zdCBSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKICAgICB3cml0ZUlmTm90RW1w dHkodHMsICJlbmQgbWFya2VyIiwgc3ZnU3R5bGUubWFya2VyRW5kUmVzb3VyY2UoKSk7CiB9CiAK LXN0YXRpYyBUZXh0U3RyZWFtJiB3cml0ZVBvc2l0aW9uQW5kU3R5bGUoVGV4dFN0cmVhbSYgdHMs IGNvbnN0IFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyKQorc3RhdGljIFRleHRTdHJlYW0mIHdyaXRl UG9zaXRpb25BbmRTdHlsZShUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyRWxlbWVudCYgcmVu ZGVyZXIsIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yID0gUmVuZGVyQXNUZXh0QmVoYXZp b3JOb3JtYWwpCiB7CisgICAgaWYgKGJlaGF2aW9yICYgUmVuZGVyQXNUZXh0U2hvd1NWR0dlb21l dHJ5KSB7CisgICAgICAgIGlmIChpczxSZW5kZXJCb3g+KHJlbmRlcmVyKSkgeworICAgICAgICAg ICAgTGF5b3V0UmVjdCByID0gZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcikuZnJhbWVSZWN0 KCk7CisgICAgICAgICAgICB0cyA8PCAiICIgPDwgZW5jbG9zaW5nSW50UmVjdChyKTsKKyAgICAg ICAgfQorICAgICAgICAKKyAgICAgICAgdHMgPDwgIiBjbGlwcGVkIjsKKyAgICB9CisKICAgICB0 cyA8PCAiICIgPDwgZW5jbG9zaW5nSW50UmVjdChyZW5kZXJlci5hYnNvbHV0ZUNsaXBwZWRPdmVy Zmxvd1JlY3QoKSk7CisKICAgICB3cml0ZVN0eWxlKHRzLCByZW5kZXJlcik7CiAgICAgcmV0dXJu IHRzOwogfQpAQCAtMjc5LDExICsyODgsNiBAQCBzdGF0aWMgVGV4dFN0cmVhbSYgb3BlcmF0b3I8 PChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZHU2hhcGUmIHNoYXBlKQogICAgIHJldHVy biB0czsKIH0KIAotc3RhdGljIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMs IGNvbnN0IFJlbmRlclNWR1Jvb3QmIHJvb3QpCi17Ci0gICAgcmV0dXJuIHdyaXRlUG9zaXRpb25B bmRTdHlsZSh0cywgcm9vdCk7Ci19Ci0KIHN0YXRpYyB2b2lkIHdyaXRlUmVuZGVyU1ZHVGV4dEJv eChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZHVGV4dCYgdGV4dCkKIHsKICAgICBhdXRv KiBib3ggPSBkb3duY2FzdDxTVkdSb290SW5saW5lQm94Pih0ZXh0LmZpcnN0Um9vdEJveCgpKTsK QEAgLTM2MywxOSArMzY3LDI0IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCB3cml0ZVNWR0lubGluZVRl eHRCb3hlcyhUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyVGV4dCYgdGV4CiAgICAgfQogfQog Ci1zdGF0aWMgdm9pZCB3cml0ZVN0YW5kYXJkUHJlZml4KFRleHRTdHJlYW0mIHRzLCBjb25zdCBS ZW5kZXJPYmplY3QmIG9iamVjdCwgaW50IGluZGVudCkKK3N0YXRpYyB2b2lkIHdyaXRlU3RhbmRh cmRQcmVmaXgoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCYgb2JqZWN0LCBpbnQg aW5kZW50LCBSZW5kZXJBc1RleHRCZWhhdmlvciBiZWhhdmlvcikKIHsKICAgICB3cml0ZUluZGVu dCh0cywgaW5kZW50KTsKICAgICB0cyA8PCBvYmplY3QucmVuZGVyTmFtZSgpOwogCisgICAgaWYg KGJlaGF2aW9yICYgUmVuZGVyQXNUZXh0U2hvd0FkZHJlc3NlcykKKyAgICAgICAgdHMgPDwgIiAi IDw8IHN0YXRpY19jYXN0PGNvbnN0IHZvaWQqPigmb2JqZWN0KTsKKwogICAgIGlmIChvYmplY3Qu bm9kZSgpKQogICAgICAgICB0cyA8PCAiIHsiIDw8IG9iamVjdC5ub2RlKCktPm5vZGVOYW1lKCkg PDwgIn0iOworCisgICAgd3JpdGVEZWJ1Z0luZm8odHMsIG9iamVjdCwgYmVoYXZpb3IpOwogfQog Ci1zdGF0aWMgdm9pZCB3cml0ZUNoaWxkcmVuKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJF bGVtZW50JiBwYXJlbnQsIGludCBpbmRlbnQpCitzdGF0aWMgdm9pZCB3cml0ZUNoaWxkcmVuKFRl eHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJFbGVtZW50JiBwYXJlbnQsIGludCBpbmRlbnQsIFJl bmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yKQogewogICAgIGZvciAoY29uc3QgYXV0byYgY2hp bGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJPYmplY3Q+KHBhcmVudCkpCi0gICAgICAgIHdyaXRl KHRzLCBjaGlsZCwgaW5kZW50ICsgMSk7CisgICAgICAgIHdyaXRlKHRzLCBjaGlsZCwgaW5kZW50 ICsgMSwgYmVoYXZpb3IpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgd3JpdGVDb21tb25HcmFk aWVudFByb3BlcnRpZXMoVGV4dFN0cmVhbSYgdHMsIFNWR1NwcmVhZE1ldGhvZFR5cGUgc3ByZWFk TWV0aG9kLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIGdyYWRpZW50VHJhbnNmb3JtLCBTVkdVbml0 VHlwZXM6OlNWR1VuaXRUeXBlIGdyYWRpZW50VW5pdHMpCkBAIC0zODksOSArMzk4LDkgQEAgc3Rh dGljIGlubGluZSB2b2lkIHdyaXRlQ29tbW9uR3JhZGllbnRQcm9wZXJ0aWVzKFRleHRTdHJlYW0m IHRzLCBTVkdTcHJlYWRNZXRob2QKICAgICAgICAgdHMgPDwgIiBbZ3JhZGllbnRUcmFuc2Zvcm09 IiA8PCBncmFkaWVudFRyYW5zZm9ybSA8PCAiXSI7CiB9CiAKLXZvaWQgd3JpdGVTVkdSZXNvdXJj ZUNvbnRhaW5lcihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWlu ZXImIHJlc291cmNlLCBpbnQgaW5kZW50KQordm9pZCB3cml0ZVNWR1Jlc291cmNlQ29udGFpbmVy KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lciYgcmVzb3Vy Y2UsIGludCBpbmRlbnQsIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yKQogewotICAgIHdy aXRlU3RhbmRhcmRQcmVmaXgodHMsIHJlc291cmNlLCBpbmRlbnQpOworICAgIHdyaXRlU3RhbmRh cmRQcmVmaXgodHMsIHJlc291cmNlLCBpbmRlbnQsIGJlaGF2aW9yKTsKIAogICAgIGNvbnN0IEF0 b21pY1N0cmluZyYgaWQgPSByZXNvdXJjZS5lbGVtZW50KCkuZ2V0SWRBdHRyaWJ1dGUoKTsKICAg ICB3cml0ZU5hbWVBbmRRdW90ZWRWYWx1ZSh0cywgImlkIiwgaWQpOyAgICAKQEAgLTQ2OCw2OCAr NDc3LDY5IEBAIHZvaWQgd3JpdGVTVkdSZXNvdXJjZUNvbnRhaW5lcihUZXh0U3RyZWFtJiB0cywg Y29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXImCiAgICAgICAgIHRzIDw8ICIgW2NlbnRl cj0iIDw8IGNlbnRlclBvaW50IDw8ICJdIFtmb2NhbD0iIDw8IGZvY2FsUG9pbnQgPDwgIl0gW3Jh ZGl1cz0iIDw8IHJhZGl1cyA8PCAiXSBbZm9jYWxSYWRpdXM9IiA8PCBmb2NhbFJhZGl1cyA8PCAi XVxuIjsKICAgICB9IGVsc2UKICAgICAgICAgdHMgPDwgIlxuIjsKLSAgICB3cml0ZUNoaWxkcmVu KHRzLCByZXNvdXJjZSwgaW5kZW50KTsKKyAgICB3cml0ZUNoaWxkcmVuKHRzLCByZXNvdXJjZSwg aW5kZW50LCBiZWhhdmlvcik7CiB9CiAKLXZvaWQgd3JpdGVTVkdDb250YWluZXIoVGV4dFN0cmVh bSYgdHMsIGNvbnN0IFJlbmRlclNWR0NvbnRhaW5lciYgY29udGFpbmVyLCBpbnQgaW5kZW50KQor dm9pZCB3cml0ZVNWR0NvbnRhaW5lcihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZHQ29u dGFpbmVyJiBjb250YWluZXIsIGludCBpbmRlbnQsIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2 aW9yKQogewogICAgIC8vIEN1cnJlbnRseSBSZW5kZXJTVkdSZXNvdXJjZUZpbHRlclByaW1pdGl2 ZSBoYXMgbm8gbWVhbmluZ2Z1bCBvdXRwdXQuCiAgICAgaWYgKGNvbnRhaW5lci5pc1NWR1Jlc291 cmNlRmlsdGVyUHJpbWl0aXZlKCkpCiAgICAgICAgIHJldHVybjsKLSAgICB3cml0ZVN0YW5kYXJk UHJlZml4KHRzLCBjb250YWluZXIsIGluZGVudCk7Ci0gICAgd3JpdGVQb3NpdGlvbkFuZFN0eWxl KHRzLCBjb250YWluZXIpOworICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsIGNvbnRhaW5lciwg aW5kZW50LCBiZWhhdmlvcik7CisgICAgd3JpdGVQb3NpdGlvbkFuZFN0eWxlKHRzLCBjb250YWlu ZXIsIGJlaGF2aW9yKTsKICAgICB0cyA8PCAiXG4iOwotICAgIHdyaXRlUmVzb3VyY2VzKHRzLCBj b250YWluZXIsIGluZGVudCk7Ci0gICAgd3JpdGVDaGlsZHJlbih0cywgY29udGFpbmVyLCBpbmRl bnQpOworICAgIHdyaXRlUmVzb3VyY2VzKHRzLCBjb250YWluZXIsIGluZGVudCwgYmVoYXZpb3Ip OworICAgIHdyaXRlQ2hpbGRyZW4odHMsIGNvbnRhaW5lciwgaW5kZW50LCBiZWhhdmlvcik7CiB9 CiAKLXZvaWQgd3JpdGUoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlclNWR1Jvb3QmIHJvb3Qs IGludCBpbmRlbnQpCit2b2lkIHdyaXRlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJTVkdS b290JiByb290LCBpbnQgaW5kZW50LCBSZW5kZXJBc1RleHRCZWhhdmlvciBiZWhhdmlvcikKIHsK LSAgICB3cml0ZVN0YW5kYXJkUHJlZml4KHRzLCByb290LCBpbmRlbnQpOwotICAgIHRzIDw8IHJv b3QgPDwgIlxuIjsKLSAgICB3cml0ZUNoaWxkcmVuKHRzLCByb290LCBpbmRlbnQpOworICAgIHdy aXRlU3RhbmRhcmRQcmVmaXgodHMsIHJvb3QsIGluZGVudCwgYmVoYXZpb3IpOworICAgIHdyaXRl UG9zaXRpb25BbmRTdHlsZSh0cywgcm9vdCwgYmVoYXZpb3IpOworICAgIHRzIDw8ICJcbiI7Cisg ICAgd3JpdGVDaGlsZHJlbih0cywgcm9vdCwgaW5kZW50LCBiZWhhdmlvcik7CiB9CiAKLXZvaWQg d3JpdGVTVkdUZXh0KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJTVkdUZXh0JiB0ZXh0LCBp bnQgaW5kZW50KQordm9pZCB3cml0ZVNWR1RleHQoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRl clNWR1RleHQmIHRleHQsIGludCBpbmRlbnQsIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2aW9y KQogewotICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsIHRleHQsIGluZGVudCk7CisgICAgd3Jp dGVTdGFuZGFyZFByZWZpeCh0cywgdGV4dCwgaW5kZW50LCBiZWhhdmlvcik7CiAgICAgd3JpdGVS ZW5kZXJTVkdUZXh0Qm94KHRzLCB0ZXh0KTsKICAgICB0cyA8PCAiXG4iOwotICAgIHdyaXRlUmVz b3VyY2VzKHRzLCB0ZXh0LCBpbmRlbnQpOwotICAgIHdyaXRlQ2hpbGRyZW4odHMsIHRleHQsIGlu ZGVudCk7CisgICAgd3JpdGVSZXNvdXJjZXModHMsIHRleHQsIGluZGVudCwgYmVoYXZpb3IpOwor ICAgIHdyaXRlQ2hpbGRyZW4odHMsIHRleHQsIGluZGVudCwgYmVoYXZpb3IpOwogfQogCi12b2lk IHdyaXRlU1ZHSW5saW5lVGV4dChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyU1ZHSW5saW5l VGV4dCYgdGV4dCwgaW50IGluZGVudCkKK3ZvaWQgd3JpdGVTVkdJbmxpbmVUZXh0KFRleHRTdHJl YW0mIHRzLCBjb25zdCBSZW5kZXJTVkdJbmxpbmVUZXh0JiB0ZXh0LCBpbnQgaW5kZW50LCBSZW5k ZXJBc1RleHRCZWhhdmlvciBiZWhhdmlvcikKIHsKLSAgICB3cml0ZVN0YW5kYXJkUHJlZml4KHRz LCB0ZXh0LCBpbmRlbnQpOworICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsIHRleHQsIGluZGVu dCwgYmVoYXZpb3IpOwogICAgIHRzIDw8ICIgIiA8PCBlbmNsb3NpbmdJbnRSZWN0KEZsb2F0UmVj dCh0ZXh0LmZpcnN0UnVuTG9jYXRpb24oKSwgdGV4dC5mbG9hdExpbmVzQm91bmRpbmdCb3goKS5z aXplKCkpKSA8PCAiXG4iOwotICAgIHdyaXRlUmVzb3VyY2VzKHRzLCB0ZXh0LCBpbmRlbnQpOwor ICAgIHdyaXRlUmVzb3VyY2VzKHRzLCB0ZXh0LCBpbmRlbnQsIGJlaGF2aW9yKTsKICAgICB3cml0 ZVNWR0lubGluZVRleHRCb3hlcyh0cywgdGV4dCwgaW5kZW50KTsKIH0KIAotdm9pZCB3cml0ZVNW R0ltYWdlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJTVkdJbWFnZSYgaW1hZ2UsIGludCBp bmRlbnQpCit2b2lkIHdyaXRlU1ZHSW1hZ2UoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlclNW R0ltYWdlJiBpbWFnZSwgaW50IGluZGVudCwgUmVuZGVyQXNUZXh0QmVoYXZpb3IgYmVoYXZpb3Ip CiB7Ci0gICAgd3JpdGVTdGFuZGFyZFByZWZpeCh0cywgaW1hZ2UsIGluZGVudCk7Ci0gICAgd3Jp dGVQb3NpdGlvbkFuZFN0eWxlKHRzLCBpbWFnZSk7CisgICAgd3JpdGVTdGFuZGFyZFByZWZpeCh0 cywgaW1hZ2UsIGluZGVudCwgYmVoYXZpb3IpOworICAgIHdyaXRlUG9zaXRpb25BbmRTdHlsZSh0 cywgaW1hZ2UsIGJlaGF2aW9yKTsKICAgICB0cyA8PCAiXG4iOwotICAgIHdyaXRlUmVzb3VyY2Vz KHRzLCBpbWFnZSwgaW5kZW50KTsKKyAgICB3cml0ZVJlc291cmNlcyh0cywgaW1hZ2UsIGluZGVu dCwgYmVoYXZpb3IpOwogfQogCi12b2lkIHdyaXRlKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5k ZXJTVkdTaGFwZSYgc2hhcGUsIGludCBpbmRlbnQpCit2b2lkIHdyaXRlKFRleHRTdHJlYW0mIHRz LCBjb25zdCBSZW5kZXJTVkdTaGFwZSYgc2hhcGUsIGludCBpbmRlbnQsIFJlbmRlckFzVGV4dEJl aGF2aW9yIGJlaGF2aW9yKQogewotICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsIHNoYXBlLCBp bmRlbnQpOworICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsIHNoYXBlLCBpbmRlbnQsIGJlaGF2 aW9yKTsKICAgICB0cyA8PCBzaGFwZSA8PCAiXG4iOwotICAgIHdyaXRlUmVzb3VyY2VzKHRzLCBz aGFwZSwgaW5kZW50KTsKKyAgICB3cml0ZVJlc291cmNlcyh0cywgc2hhcGUsIGluZGVudCwgYmVo YXZpb3IpOwogfQogCi12b2lkIHdyaXRlU1ZHR3JhZGllbnRTdG9wKFRleHRTdHJlYW0mIHRzLCBj b25zdCBSZW5kZXJTVkdHcmFkaWVudFN0b3AmIHN0b3AsIGludCBpbmRlbnQpCit2b2lkIHdyaXRl U1ZHR3JhZGllbnRTdG9wKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJTVkdHcmFkaWVudFN0 b3AmIHN0b3AsIGludCBpbmRlbnQsIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yKQogewot ICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsIHN0b3AsIGluZGVudCk7CisgICAgd3JpdGVTdGFu ZGFyZFByZWZpeCh0cywgc3RvcCwgaW5kZW50LCBiZWhhdmlvcik7CiAKICAgICB0cyA8PCAiIFtv ZmZzZXQ9IiA8PCBzdG9wLmVsZW1lbnQoKS5vZmZzZXQoKSA8PCAiXSBbY29sb3I9IiA8PCBzdG9w LmVsZW1lbnQoKS5zdG9wQ29sb3JJbmNsdWRpbmdPcGFjaXR5KCkgPDwgIl1cbiI7CiB9CiAKLXZv aWQgd3JpdGVSZXNvdXJjZXMoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCYgcmVu ZGVyZXIsIGludCBpbmRlbnQpCit2b2lkIHdyaXRlUmVzb3VyY2VzKFRleHRTdHJlYW0mIHRzLCBj b25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBpbnQgaW5kZW50LCBSZW5kZXJBc1RleHRCZWhh dmlvciBiZWhhdmlvcikKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUgPSByZW5kZXJl ci5zdHlsZSgpOwogICAgIGNvbnN0IFNWR1JlbmRlclN0eWxlJiBzdmdTdHlsZSA9IHN0eWxlLnN2 Z1N0eWxlKCk7CkBAIC01NDIsNyArNTUyLDcgQEAgdm9pZCB3cml0ZVJlc291cmNlcyhUZXh0U3Ry ZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlciwgaW50IGluZGVudCkKICAgICAg ICAgICAgIHRzIDw8ICIgIjsKICAgICAgICAgICAgIHdyaXRlTmFtZUFuZFF1b3RlZFZhbHVlKHRz LCAibWFza2VyIiwgc3ZnU3R5bGUubWFza2VyUmVzb3VyY2UoKSk7CiAgICAgICAgICAgICB0cyA8 PCAiICI7Ci0gICAgICAgICAgICB3cml0ZVN0YW5kYXJkUHJlZml4KHRzLCAqbWFza2VyLCAwKTsK KyAgICAgICAgICAgIHdyaXRlU3RhbmRhcmRQcmVmaXgodHMsICptYXNrZXIsIDAsIGJlaGF2aW9y KTsKICAgICAgICAgICAgIHRzIDw8ICIgIiA8PCBtYXNrZXItPnJlc291cmNlQm91bmRpbmdCb3go cmVuZGVyZXIpIDw8ICJcbiI7CiAgICAgICAgIH0KICAgICB9CkBAIC01NTIsNyArNTYyLDcgQEAg dm9pZCB3cml0ZVJlc291cmNlcyhUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBy ZW5kZXJlciwgaW50IGluZGVudCkKICAgICAgICAgICAgIHRzIDw8ICIgIjsKICAgICAgICAgICAg IHdyaXRlTmFtZUFuZFF1b3RlZFZhbHVlKHRzLCAiY2xpcFBhdGgiLCBzdmdTdHlsZS5jbGlwcGVy UmVzb3VyY2UoKSk7CiAgICAgICAgICAgICB0cyA8PCAiICI7Ci0gICAgICAgICAgICB3cml0ZVN0 YW5kYXJkUHJlZml4KHRzLCAqY2xpcHBlciwgMCk7CisgICAgICAgICAgICB3cml0ZVN0YW5kYXJk UHJlZml4KHRzLCAqY2xpcHBlciwgMCwgYmVoYXZpb3IpOwogICAgICAgICAgICAgdHMgPDwgIiAi IDw8IGNsaXBwZXItPnJlc291cmNlQm91bmRpbmdCb3gocmVuZGVyZXIpIDw8ICJcbiI7CiAgICAg ICAgIH0KICAgICB9CkBAIC01NjgsNyArNTc4LDcgQEAgdm9pZCB3cml0ZVJlc291cmNlcyhUZXh0 U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlciwgaW50IGluZGVudCkKICAg ICAgICAgICAgICAgICAgICAgdHMgPDwgIiAiOwogICAgICAgICAgICAgICAgICAgICB3cml0ZU5h bWVBbmRRdW90ZWRWYWx1ZSh0cywgImZpbHRlciIsIGlkKTsKICAgICAgICAgICAgICAgICAgICAg dHMgPDwgIiAiOwotICAgICAgICAgICAgICAgICAgICB3cml0ZVN0YW5kYXJkUHJlZml4KHRzLCAq ZmlsdGVyLCAwKTsKKyAgICAgICAgICAgICAgICAgICAgd3JpdGVTdGFuZGFyZFByZWZpeCh0cywg KmZpbHRlciwgMCwgYmVoYXZpb3IpOwogICAgICAgICAgICAgICAgICAgICB0cyA8PCAiICIgPDwg ZmlsdGVyLT5yZXNvdXJjZUJvdW5kaW5nQm94KHJlbmRlcmVyKSA8PCAiXG4iOwogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmgKaW5kZXggNWYwNWRhYzFiYTlmYzNmNzczYmU0ZDJj ZWI4YzI4NjlmMjAwNjc0ZC4uNGEzYWNiYjM1YTYxMGUzZGRkYjVkZDdkYmNkNmQ1ZDU3YzIxMzdk OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVl QXNUZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVl QXNUZXh0LmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgU1ZHUmVuZGVyVHJlZUFzVGV4dF9o CiAjZGVmaW5lIFNWR1JlbmRlclRyZWVBc1RleHRfaAogCisjaW5jbHVkZSAiUmVuZGVyVHJlZUFz VGV4dC5oIgogI2luY2x1ZGUgIlRleHRTdHJlYW0uaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpA QCAtNDgsMTUgKzQ5LDE1IEBAIGNsYXNzIEFmZmluZVRyYW5zZm9ybTsKIGNsYXNzIFNWR1VuaXRU eXBlczsKIAogLy8gZnVuY3Rpb25zIHVzZWQgYnkgdGhlIG1haW4gUmVuZGVyVHJlZUFzVGV4dCBj b2RlCi12b2lkIHdyaXRlKFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJTVkdTaGFwZSYsIGludCBp bmRlbnQpOwotdm9pZCB3cml0ZShUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyU1ZHUm9vdCYsIGlu dCBpbmRlbnQpOwotdm9pZCB3cml0ZVNWR0dyYWRpZW50U3RvcChUZXh0U3RyZWFtJiwgY29uc3Qg UmVuZGVyU1ZHR3JhZGllbnRTdG9wJiwgaW50IGluZGVudCk7Ci12b2lkIHdyaXRlU1ZHUmVzb3Vy Y2VDb250YWluZXIoVGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVy JiwgaW50IGluZGVudCk7Ci12b2lkIHdyaXRlU1ZHQ29udGFpbmVyKFRleHRTdHJlYW0mLCBjb25z dCBSZW5kZXJTVkdDb250YWluZXImLCBpbnQgaW5kZW50KTsKLXZvaWQgd3JpdGVTVkdJbWFnZShU ZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyU1ZHSW1hZ2UmLCBpbnQgaW5kZW50KTsKLXZvaWQgd3Jp dGVTVkdJbmxpbmVUZXh0KFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJTVkdJbmxpbmVUZXh0Jiwg aW50IGluZGVudCk7Ci12b2lkIHdyaXRlU1ZHVGV4dChUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVy U1ZHVGV4dCYsIGludCBpbmRlbnQpOwotdm9pZCB3cml0ZVJlc291cmNlcyhUZXh0U3RyZWFtJiwg Y29uc3QgUmVuZGVyT2JqZWN0JiwgaW50IGluZGVudCk7Cit2b2lkIHdyaXRlKFRleHRTdHJlYW0m LCBjb25zdCBSZW5kZXJTVkdTaGFwZSYsIGludCBpbmRlbnQsIFJlbmRlckFzVGV4dEJlaGF2aW9y KTsKK3ZvaWQgd3JpdGUoVGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRlclNWR1Jvb3QmLCBpbnQgaW5k ZW50LCBSZW5kZXJBc1RleHRCZWhhdmlvcik7Cit2b2lkIHdyaXRlU1ZHR3JhZGllbnRTdG9wKFRl eHRTdHJlYW0mLCBjb25zdCBSZW5kZXJTVkdHcmFkaWVudFN0b3AmLCBpbnQgaW5kZW50LCBSZW5k ZXJBc1RleHRCZWhhdmlvcik7Cit2b2lkIHdyaXRlU1ZHUmVzb3VyY2VDb250YWluZXIoVGV4dFN0 cmVhbSYsIGNvbnN0IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyJiwgaW50IGluZGVudCwgUmVu ZGVyQXNUZXh0QmVoYXZpb3IpOwordm9pZCB3cml0ZVNWR0NvbnRhaW5lcihUZXh0U3RyZWFtJiwg Y29uc3QgUmVuZGVyU1ZHQ29udGFpbmVyJiwgaW50IGluZGVudCwgUmVuZGVyQXNUZXh0QmVoYXZp b3IpOwordm9pZCB3cml0ZVNWR0ltYWdlKFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJTVkdJbWFn ZSYsIGludCBpbmRlbnQsIFJlbmRlckFzVGV4dEJlaGF2aW9yKTsKK3ZvaWQgd3JpdGVTVkdJbmxp bmVUZXh0KFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJTVkdJbmxpbmVUZXh0JiwgaW50IGluZGVu dCwgUmVuZGVyQXNUZXh0QmVoYXZpb3IpOwordm9pZCB3cml0ZVNWR1RleHQoVGV4dFN0cmVhbSYs IGNvbnN0IFJlbmRlclNWR1RleHQmLCBpbnQgaW5kZW50LCBSZW5kZXJBc1RleHRCZWhhdmlvcik7 Cit2b2lkIHdyaXRlUmVzb3VyY2VzKFRleHRTdHJlYW0mLCBjb25zdCBSZW5kZXJPYmplY3QmLCBp bnQgaW5kZW50LCBSZW5kZXJBc1RleHRCZWhhdmlvcik7CiAKIC8vIGhlbHBlciBvcGVyYXRvcnMg c3BlY2lmaWMgdG8gZHVtcGluZyB0aGUgcmVuZGVyIHRyZWUuIHRoZXNlIGFyZSB1c2VkIGluIHZh cmlvdXMgY2xhc3NlcyB0byBkdW1wIHRoZSByZW5kZXIgdHJlZQogLy8gdGhlc2UgY291bGQgYmUg ZGVmaW5lZCBpbiBzZXBhcmF0ZSBuYW1lc3BhY2UgdG8gYXZvaWQgbWF0Y2hpbmcgdGhlc2UgZ2Vu ZXJpYyBzaWduYXR1cmVzIHVuaW50ZW50aW9uYWxseS4K