128091 2014-02-02 18:43:54 -0800 Modernize the toRenderSVGResourceContainer() helper. 2014-02-02 20:45:13 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue dino d-r esprehn+autocc fmalita glenn gyuyoung.kim kling kondapallykalyan pdr schenney simon.fraser oldest_to_newest 974883 0 kling 2014-02-02 18:43:54 -0800 Modernize the toRenderSVGResourceContainer() helper. 974884 1 222952 kling 2014-02-02 18:44:41 -0800 Created attachment 222952 Patch 974887 2 222952 andersca 2014-02-02 18:59:19 -0800 Comment on attachment 222952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222952&action=review > Source/WebCore/svg/SVGElement.cpp:1013 > + auto renderer = this->renderer(); I'd use auto* renderer here. 974901 3 kling 2014-02-02 20:45:13 -0800 Committed r163283: <http://trac.webkit.org/changeset/163283> 222952 2014-02-02 18:44:41 -0800 2014-02-02 18:59:19 -0800 Patch bug-128091.diff text/plain 18808 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNGUxNmZiLi44ZTk1ZGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzgg QEAKIDIwMTQtMDItMDIgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIE1vZGVybml6ZSB0aGUgdG9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcigpIGhlbHBlci4K KyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyODA5MT4KKworICAgICAgICBNYWtlIHRv UmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIoKSBhIGZyZWUgZnVuY3Rpb24gbGlrZSBhbGwgdGhl CisgICAgICAgIG90aGVyIGNhc3RpbmcgaGVscGVycy4gVXNlIHJlZmVyZW5jZXMgaW5zdGVhZCBv ZiBwb2ludGVycyB3aGVyZQorICAgICAgICBhcHBsaWNhYmxlLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyRmls dGVySW5mby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6RmlsdGVySW5mbzo6 dXBkYXRlUmVmZXJlbmNlRmlsdGVyQ2xpZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6RmlsdGVySW5mbzo6cmVtb3ZlUmVmZXJlbmNlRmlsdGVyQ2xpZW50cyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHR3JhZGllbnRTdG9w LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR0dyYWRpZW50U3RvcDo6c3R5bGVEaWRD aGFuZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHUmVzb3VyY2U6Om1hcmtGb3JMYXlvdXRBbmRQYXJl bnRSZXNvdXJjZUludmFsaWRhdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZUNvbnRhaW5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSZXNv dXJjZUNvbnRhaW5lcjo6bWFya0FsbENsaWVudHNGb3JJbnZhbGlkYXRpb24pOgorICAgICAgICAq IHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuaDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjpidWlsZFByaW1pdGl2ZXMpOgorICAgICAgICAq IHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3Jp dGVTVkdSZXNvdXJjZUNvbnRhaW5lcik6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9TVkdSZXNv dXJjZXNDeWNsZVNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdSZXNvdXJjZXNDeWNs ZVNvbHZlcjo6cmVzb2x2ZUN5Y2xlcyk6CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U1ZHRWxlbWVudDo6c3ZnQXR0cmlidXRlQ2hhbmdlZCk6CisKKzIw MTQtMDItMDIgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCiAgICAgICAgIFJl bmRlclNWR1Jlc291cmNlQ29udGFpbmVyIGNsaWVudHMgYXJlIGFsd2F5cyBSZW5kZXJFbGVtZW50 LgogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4MDg4PgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJGaWx0ZXJJbmZvLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckZpbHRlckluZm8uY3BwCmluZGV4IDMxMjVl ZjYuLmY1YmIyZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckZpbHRlckluZm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckZpbHRlckluZm8uY3BwCkBAIC0xMjIsNyArMTIyLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6 RmlsdGVySW5mbzo6dXBkYXRlUmVmZXJlbmNlRmlsdGVyQ2xpZW50cyhjb25zdCBGaWx0ZXJPcGVy YXRpb24KICAgICAgICAgICAgIEVsZW1lbnQqIGZpbHRlciA9IG1fbGF5ZXIucmVuZGVyZXIoKS5l bGVtZW50KCktPmRvY3VtZW50KCkuZ2V0RWxlbWVudEJ5SWQocmVmZXJlbmNlRmlsdGVyT3BlcmF0 aW9uLT5mcmFnbWVudCgpKTsKICAgICAgICAgICAgIGlmICghZmlsdGVyIHx8ICFmaWx0ZXItPnJl bmRlcmVyKCkgfHwgIWZpbHRlci0+cmVuZGVyZXIoKS0+aXNTVkdSZXNvdXJjZUZpbHRlcigpKQog ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgZmlsdGVyLT5yZW5kZXJlcigp LT50b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKCktPmFkZENsaWVudFJlbmRlckxheWVyKCZt X2xheWVyKTsKKyAgICAgICAgICAgIHRvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIoKmZpbHRl ci0+cmVuZGVyZXIoKSkuYWRkQ2xpZW50UmVuZGVyTGF5ZXIoJm1fbGF5ZXIpOwogICAgICAgICAg ICAgbV9pbnRlcm5hbFNWR1JlZmVyZW5jZXMuYXBwZW5kKGZpbHRlcik7CiAgICAgICAgIH0KICAg ICB9CkBAIC0xMzcsNyArMTM3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6RmlsdGVySW5mbzo6cmVt b3ZlUmVmZXJlbmNlRmlsdGVyQ2xpZW50cygpCiAgICAgICAgIEVsZW1lbnQqIGZpbHRlciA9IG1f aW50ZXJuYWxTVkdSZWZlcmVuY2VzW2ldLmdldCgpOwogICAgICAgICBpZiAoIWZpbHRlci0+cmVu ZGVyZXIoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBmaWx0ZXItPnJlbmRlcmVy KCktPnRvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIoKS0+cmVtb3ZlQ2xpZW50UmVuZGVyTGF5 ZXIoJm1fbGF5ZXIpOworICAgICAgICB0b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKCpmaWx0 ZXItPnJlbmRlcmVyKCkpLnJlbW92ZUNsaWVudFJlbmRlckxheWVyKCZtX2xheWVyKTsKICAgICB9 CiAgICAgbV9pbnRlcm5hbFNWR1JlZmVyZW5jZXMuY2xlYXIoKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggYzM0ZmY3Mi4uMjg5ZDk5ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTI0MTQsMTIgKzI0MTQs NiBAQCBib29sIFJlbmRlck9iamVjdDo6Y2FuQmVSZXBsYWNlZFdpdGhJbmxpbmVSdW5JbigpIGNv bnN0CiAKICNpZiBFTkFCTEUoU1ZHKQogCi1SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lciogUmVu ZGVyT2JqZWN0Ojp0b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKCkKLXsKLSAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gMDsKLX0KLQogdm9pZCBSZW5kZXJPYmplY3Q6OnNl dE5lZWRzQm91bmRhcmllc1VwZGF0ZSgpCiB7CiAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBwYXJl bnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3Qu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAppbmRleCAwMWRhMTA4 Li5hNjllZjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC00 NDEsOCArNDQxLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc1NWR1Jlc291cmNlRmls dGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTVkdSZXNv dXJjZUZpbHRlclByaW1pdGl2ZSgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKLSAgICB2aXJ0 dWFsIFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKiB0b1JlbmRlclNWR1Jlc291cmNlQ29udGFp bmVyKCk7Ci0KICAgICAvLyBGSVhNRTogVGhvc2UgYmVsb25nIGludG8gYSBTVkcgc3BlY2lmaWMg YmFzZS1jbGFzcyBmb3IgYWxsIHJlbmRlcmVycyAoc2VlIGFib3ZlKQogICAgIC8vIFVuZm9ydHVu YXRlbHkgd2UgZG9uJ3QgaGF2ZSBzdWNoIGEgY2xhc3MgeWV0LCBiZWNhdXNlIGl0J3Mgbm90IHBv c3NpYmxlIGZvciBhbGwgcmVuZGVyZXJzCiAgICAgLy8gdG8gaW5oZXJpdCBmcm9tIFJlbmRlclNW R09iamVjdCAtPiBSZW5kZXJPYmplY3QgKHNvbWUgbmVlZCBSZW5kZXJCbG9jayBpbmhlcml0YW5j ZSBmb3IgaW5zdGFuY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR0dyYWRpZW50U3RvcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR0dyYWRpZW50U3RvcC5jcHAKaW5kZXggNmU5MGQ2ZS4uYmM4NTJjYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdHcmFkaWVudFN0b3Au Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHR3JhZGllbnRT dG9wLmNwcApAQCAtNTgsOSArNTgsNyBAQCB2b2lkIFJlbmRlclNWR0dyYWRpZW50U3RvcDo6c3R5 bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eQogICAgIGlm ICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFTU0VSVChyZW5kZXJlci0+aXNT VkdSZXNvdXJjZUNvbnRhaW5lcigpKTsKLSAgICBSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lciog Y29udGFpbmVyID0gcmVuZGVyZXItPnRvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIoKTsKLSAg ICBjb250YWluZXItPnJlbW92ZUFsbENsaWVudHNGcm9tQ2FjaGUoKTsKKyAgICB0b1JlbmRlclNW R1Jlc291cmNlQ29udGFpbmVyKCpyZW5kZXJlcikucmVtb3ZlQWxsQ2xpZW50c0Zyb21DYWNoZSgp OwogfQogCiB2b2lkIFJlbmRlclNWR0dyYWRpZW50U3RvcDo6bGF5b3V0KCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZS5jcHAKaW5kZXggZDll MWQ4My4uNWY5NmY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZS5jcHAKQEAgLTE5Nyw3ICsxOTcsNyBAQCB2b2lkIFJlbmRlclNWR1Jl c291cmNlOjptYXJrRm9yTGF5b3V0QW5kUGFyZW50UmVzb3VyY2VJbnZhbGlkYXRpb24oUmVuZGVy T2JqZWN0JgogCiAgICAgICAgIGlmIChjdXJyZW50LT5pc1NWR1Jlc291cmNlQ29udGFpbmVyKCkp IHsKICAgICAgICAgICAgIC8vIFRoaXMgd2lsbCBwcm9jZXNzIHRoZSByZXN0IG9mIHRoZSBhbmNl c3RvcnMuCi0gICAgICAgICAgICBjdXJyZW50LT50b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVy KCktPnJlbW92ZUFsbENsaWVudHNGcm9tQ2FjaGUoKTsKKyAgICAgICAgICAgIHRvUmVuZGVyU1ZH UmVzb3VyY2VDb250YWluZXIoKmN1cnJlbnQpLnJlbW92ZUFsbENsaWVudHNGcm9tQ2FjaGUoKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKaW5k ZXggYmUwMWI1YS4uN2EzM2NkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lci5jcHAKQEAgLTEwMCw3ICsx MDAsNyBAQCB2b2lkIFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyOjptYXJrQWxsQ2xpZW50c0Zv ckludmFsaWRhdGlvbihJbnZhbGlkYXRpb25Nb2RlCiAKICAgICBmb3IgKGF1dG8gY2xpZW50IDog bV9jbGllbnRzKSB7CiAgICAgICAgIGlmIChjbGllbnQtPmlzU1ZHUmVzb3VyY2VDb250YWluZXIo KSkgewotICAgICAgICAgICAgY2xpZW50LT50b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKCkt PnJlbW92ZUFsbENsaWVudHNGcm9tQ2FjaGUobWFya0ZvckludmFsaWRhdGlvbik7CisgICAgICAg ICAgICB0b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKCpjbGllbnQpLnJlbW92ZUFsbENsaWVu dHNGcm9tQ2FjaGUobWFya0ZvckludmFsaWRhdGlvbik7CiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyLmgKaW5kZXggZDBkYTQ2YS4uMDBkOTBhMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNv bnRhaW5lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VDb250YWluZXIuaApAQCAtMzcsNyArMzcsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2 b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9s ZFN0eWxlKSBvdmVycmlkZSBmaW5hbDsKIAogICAgIHZpcnR1YWwgYm9vbCBpc1NWR1Jlc291cmNl Q29udGFpbmVyKCkgY29uc3Qgb3ZlcnJpZGUgZmluYWwgeyByZXR1cm4gdHJ1ZTsgfQotICAgIHZp cnR1YWwgUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIqIHRvUmVuZGVyU1ZHUmVzb3VyY2VDb250 YWluZXIoKSBvdmVycmlkZSBmaW5hbCB7IHJldHVybiB0aGlzOyB9CiAKICAgICBzdGF0aWMgYm9v bCBzaG91bGRUcmFuc2Zvcm1PblRleHRQYWludGluZyhSZW5kZXJPYmplY3QqLCBBZmZpbmVUcmFu c2Zvcm0mKTsKICAgICBzdGF0aWMgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybU9uTm9uU2NhbGlu Z1N0cm9rZShSZW5kZXJPYmplY3QqLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIHJlc291cmNlVHJh bnNmb3JtKTsKQEAgLTc3LDYgKzc2LDggQEAgcHJpdmF0ZToKICAgICBIYXNoU2V0PFJlbmRlckxh eWVyKj4gbV9jbGllbnRMYXllcnM7CiB9OwogCitSRU5ERVJfT0JKRUNUX1RZUEVfQ0FTVFMoUmVu ZGVyU1ZHUmVzb3VyY2VDb250YWluZXIsIGlzU1ZHUmVzb3VyY2VDb250YWluZXIoKSkKKwogaW5s aW5lIFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKiBnZXRSZW5kZXJTVkdSZXNvdXJjZUNvbnRh aW5lckJ5SWQoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBBdG9taWNTdHJpbmcmIGlkKQogewog ICAgIGlmIChpZC5pc0VtcHR5KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuY3BwCmluZGV4IGE5NmJlNzIuLjAzMmNj ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VGaWx0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVy U1ZHUmVzb3VyY2VGaWx0ZXIuY3BwCkBAIC03Niw3ICs3Niw3IEBAIHZvaWQgUmVuZGVyU1ZHUmVz b3VyY2VGaWx0ZXI6OnJlbW92ZUNsaWVudEZyb21DYWNoZShSZW5kZXJPYmplY3QmIGNsaWVudCwg Ym9vbCBtCiAgICAgbWFya0NsaWVudEZvckludmFsaWRhdGlvbihjbGllbnQsIG1hcmtGb3JJbnZh bGlkYXRpb24gPyBCb3VuZGFyaWVzSW52YWxpZGF0aW9uIDogUGFyZW50T25seUludmFsaWRhdGlv bik7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxTVkdGaWx0ZXJCdWlsZGVyPiBSZW5kZXJTVkdSZXNv dXJjZUZpbHRlcjo6YnVpbGRQcmltaXRpdmVzKFNWR0ZpbHRlciogZmlsdGVyKQorc3RkOjp1bmlx dWVfcHRyPFNWR0ZpbHRlckJ1aWxkZXI+IFJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjpidWlsZFBy aW1pdGl2ZXMoU1ZHRmlsdGVyKiBmaWx0ZXIpIGNvbnN0CiB7CiAgICAgRmxvYXRSZWN0IHRhcmdl dEJvdW5kaW5nQm94ID0gZmlsdGVyLT50YXJnZXRCb3VuZGluZ0JveCgpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmgK aW5kZXggOTdlNmZkYi4uODY4MTZiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuaApAQCAtNzYsNyArNzYsNyBAQCBw dWJsaWM6CiAKICAgICB2aXJ0dWFsIEZsb2F0UmVjdCByZXNvdXJjZUJvdW5kaW5nQm94KGNvbnN0 IFJlbmRlck9iamVjdCYpIG92ZXJyaWRlOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPFNWR0ZpbHRl ckJ1aWxkZXI+IGJ1aWxkUHJpbWl0aXZlcyhTVkdGaWx0ZXIqKTsKKyAgICBzdGQ6OnVuaXF1ZV9w dHI8U1ZHRmlsdGVyQnVpbGRlcj4gYnVpbGRQcmltaXRpdmVzKFNWR0ZpbHRlciopIGNvbnN0Owog CiAgICAgU1ZHVW5pdFR5cGVzOjpTVkdVbml0VHlwZSBmaWx0ZXJVbml0cygpIGNvbnN0IHsgcmV0 dXJuIGZpbHRlckVsZW1lbnQoKS5maWx0ZXJVbml0cygpOyB9CiAgICAgU1ZHVW5pdFR5cGVzOjpT VkdVbml0VHlwZSBwcmltaXRpdmVVbml0cygpIGNvbnN0IHsgcmV0dXJuIGZpbHRlckVsZW1lbnQo KS5wcmltaXRpdmVVbml0cygpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcAppbmRleCBhYTYwNDA5Li4wYTgyZjkyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4 dC5jcHAKQEAgLTQ3Niw0OCArNDc2LDQ3IEBAIHZvaWQgd3JpdGVTVkdSZXNvdXJjZUNvbnRhaW5l cihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QsIGludCBpCiAgICAg Y29uc3QgQXRvbWljU3RyaW5nJiBpZCA9IGVsZW1lbnQtPmdldElkQXR0cmlidXRlKCk7CiAgICAg d3JpdGVOYW1lQW5kUXVvdGVkVmFsdWUodHMsICJpZCIsIGlkKTsgICAgCiAKLSAgICBSZW5kZXJT VkdSZXNvdXJjZUNvbnRhaW5lciogcmVzb3VyY2UgPSBjb25zdF9jYXN0PFJlbmRlck9iamVjdCY+ KG9iamVjdCkudG9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcigpOwotICAgIEFTU0VSVChyZXNv dXJjZSk7CisgICAgY29uc3QgYXV0byYgcmVzb3VyY2UgPSB0b1JlbmRlclNWR1Jlc291cmNlQ29u dGFpbmVyKG9iamVjdCk7CiAKLSAgICBpZiAocmVzb3VyY2UtPnJlc291cmNlVHlwZSgpID09IE1h c2tlclJlc291cmNlVHlwZSkgewotICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlciogbWFz a2VyID0gc3RhdGljX2Nhc3Q8UmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIqPihyZXNvdXJjZSk7Ci0g ICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywgIm1hc2tVbml0cyIsIG1hc2tlci0+bWFza1Vu aXRzKCkpOwotICAgICAgICB3cml0ZU5hbWVWYWx1ZVBhaXIodHMsICJtYXNrQ29udGVudFVuaXRz IiwgbWFza2VyLT5tYXNrQ29udGVudFVuaXRzKCkpOworICAgIGlmIChyZXNvdXJjZS5yZXNvdXJj ZVR5cGUoKSA9PSBNYXNrZXJSZXNvdXJjZVR5cGUpIHsKKyAgICAgICAgY29uc3QgYXV0byYgbWFz a2VyID0gc3RhdGljX2Nhc3Q8Y29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXImPihyZXNvdXJj ZSk7CisgICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywgIm1hc2tVbml0cyIsIG1hc2tlci5t YXNrVW5pdHMoKSk7CisgICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywgIm1hc2tDb250ZW50 VW5pdHMiLCBtYXNrZXIubWFza0NvbnRlbnRVbml0cygpKTsKICAgICAgICAgdHMgPDwgIlxuIjsK ICNpZiBFTkFCTEUoRklMVEVSUykKLSAgICB9IGVsc2UgaWYgKHJlc291cmNlLT5yZXNvdXJjZVR5 cGUoKSA9PSBGaWx0ZXJSZXNvdXJjZVR5cGUpIHsKLSAgICAgICAgUmVuZGVyU1ZHUmVzb3VyY2VG aWx0ZXIqIGZpbHRlciA9IHN0YXRpY19jYXN0PFJlbmRlclNWR1Jlc291cmNlRmlsdGVyKj4ocmVz b3VyY2UpOwotICAgICAgICB3cml0ZU5hbWVWYWx1ZVBhaXIodHMsICJmaWx0ZXJVbml0cyIsIGZp bHRlci0+ZmlsdGVyVW5pdHMoKSk7Ci0gICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywgInBy aW1pdGl2ZVVuaXRzIiwgZmlsdGVyLT5wcmltaXRpdmVVbml0cygpKTsKKyAgICB9IGVsc2UgaWYg KHJlc291cmNlLnJlc291cmNlVHlwZSgpID09IEZpbHRlclJlc291cmNlVHlwZSkgeworICAgICAg ICBjb25zdCBhdXRvJiBmaWx0ZXIgPSBzdGF0aWNfY2FzdDxjb25zdCBSZW5kZXJTVkdSZXNvdXJj ZUZpbHRlciY+KHJlc291cmNlKTsKKyAgICAgICAgd3JpdGVOYW1lVmFsdWVQYWlyKHRzLCAiZmls dGVyVW5pdHMiLCBmaWx0ZXIuZmlsdGVyVW5pdHMoKSk7CisgICAgICAgIHdyaXRlTmFtZVZhbHVl UGFpcih0cywgInByaW1pdGl2ZVVuaXRzIiwgZmlsdGVyLnByaW1pdGl2ZVVuaXRzKCkpOwogICAg ICAgICB0cyA8PCAiXG4iOwogICAgICAgICAvLyBDcmVhdGluZyBhIHBsYWNlaG9sZGVyIGZpbHRl ciB3aGljaCBpcyBwYXNzZWQgdG8gdGhlIGJ1aWxkZXIuCiAgICAgICAgIEZsb2F0UmVjdCBkdW1t eVJlY3Q7CiAgICAgICAgIFJlZlB0cjxTVkdGaWx0ZXI+IGR1bW15RmlsdGVyID0gU1ZHRmlsdGVy OjpjcmVhdGUoQWZmaW5lVHJhbnNmb3JtKCksIGR1bW15UmVjdCwgZHVtbXlSZWN0LCBkdW1teVJl Y3QsIHRydWUpOwotICAgICAgICBpZiAoYXV0byBidWlsZGVyID0gZmlsdGVyLT5idWlsZFByaW1p dGl2ZXMoZHVtbXlGaWx0ZXIuZ2V0KCkpKSB7CisgICAgICAgIGlmIChhdXRvIGJ1aWxkZXIgPSBm aWx0ZXIuYnVpbGRQcmltaXRpdmVzKGR1bW15RmlsdGVyLmdldCgpKSkgewogICAgICAgICAgICAg aWYgKEZpbHRlckVmZmVjdCogbGFzdEVmZmVjdCA9IGJ1aWxkZXItPmxhc3RFZmZlY3QoKSkKICAg ICAgICAgICAgICAgICBsYXN0RWZmZWN0LT5leHRlcm5hbFJlcHJlc2VudGF0aW9uKHRzLCBpbmRl bnQgKyAxKTsKICAgICAgICAgfQogI2VuZGlmCi0gICAgfSBlbHNlIGlmIChyZXNvdXJjZS0+cmVz b3VyY2VUeXBlKCkgPT0gQ2xpcHBlclJlc291cmNlVHlwZSkgewotICAgICAgICBSZW5kZXJTVkdS ZXNvdXJjZUNsaXBwZXIqIGNsaXBwZXIgPSBzdGF0aWNfY2FzdDxSZW5kZXJTVkdSZXNvdXJjZUNs aXBwZXIqPihyZXNvdXJjZSk7Ci0gICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywgImNsaXBQ YXRoVW5pdHMiLCBjbGlwcGVyLT5jbGlwUGF0aFVuaXRzKCkpOworICAgIH0gZWxzZSBpZiAocmVz b3VyY2UucmVzb3VyY2VUeXBlKCkgPT0gQ2xpcHBlclJlc291cmNlVHlwZSkgeworICAgICAgICBj b25zdCBhdXRvJiBjbGlwcGVyID0gc3RhdGljX2Nhc3Q8Y29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VD bGlwcGVyJj4ocmVzb3VyY2UpOworICAgICAgICB3cml0ZU5hbWVWYWx1ZVBhaXIodHMsICJjbGlw UGF0aFVuaXRzIiwgY2xpcHBlci5jbGlwUGF0aFVuaXRzKCkpOwogICAgICAgICB0cyA8PCAiXG4i OwotICAgIH0gZWxzZSBpZiAocmVzb3VyY2UtPnJlc291cmNlVHlwZSgpID09IE1hcmtlclJlc291 cmNlVHlwZSkgewotICAgICAgICBSZW5kZXJTVkdSZXNvdXJjZU1hcmtlciogbWFya2VyID0gc3Rh dGljX2Nhc3Q8UmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXIqPihyZXNvdXJjZSk7Ci0gICAgICAgIHdy aXRlTmFtZVZhbHVlUGFpcih0cywgIm1hcmtlclVuaXRzIiwgbWFya2VyLT5tYXJrZXJVbml0cygp KTsKLSAgICAgICAgdHMgPDwgIiBbcmVmIGF0ICIgPDwgbWFya2VyLT5yZWZlcmVuY2VQb2ludCgp IDw8ICJdIjsKKyAgICB9IGVsc2UgaWYgKHJlc291cmNlLnJlc291cmNlVHlwZSgpID09IE1hcmtl clJlc291cmNlVHlwZSkgeworICAgICAgICBjb25zdCBhdXRvJiBtYXJrZXIgPSBzdGF0aWNfY2Fz dDxjb25zdCBSZW5kZXJTVkdSZXNvdXJjZU1hcmtlciY+KHJlc291cmNlKTsKKyAgICAgICAgd3Jp dGVOYW1lVmFsdWVQYWlyKHRzLCAibWFya2VyVW5pdHMiLCBtYXJrZXIubWFya2VyVW5pdHMoKSk7 CisgICAgICAgIHRzIDw8ICIgW3JlZiBhdCAiIDw8IG1hcmtlci5yZWZlcmVuY2VQb2ludCgpIDw8 ICJdIjsKICAgICAgICAgdHMgPDwgIiBbYW5nbGU9IjsKLSAgICAgICAgaWYgKG1hcmtlci0+YW5n bGUoKSA9PSAtMSkKKyAgICAgICAgaWYgKG1hcmtlci5hbmdsZSgpID09IC0xKQogICAgICAgICAg ICAgdHMgPDwgImF1dG8iIDw8ICJdXG4iOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICB0cyA8 PCBtYXJrZXItPmFuZ2xlKCkgPDwgIl1cbiI7Ci0gICAgfSBlbHNlIGlmIChyZXNvdXJjZS0+cmVz b3VyY2VUeXBlKCkgPT0gUGF0dGVyblJlc291cmNlVHlwZSkgewotICAgICAgICBSZW5kZXJTVkdS ZXNvdXJjZVBhdHRlcm4qIHBhdHRlcm4gPSBzdGF0aWNfY2FzdDxSZW5kZXJTVkdSZXNvdXJjZVBh dHRlcm4qPihyZXNvdXJjZSk7CisgICAgICAgICAgICB0cyA8PCBtYXJrZXIuYW5nbGUoKSA8PCAi XVxuIjsKKyAgICB9IGVsc2UgaWYgKHJlc291cmNlLnJlc291cmNlVHlwZSgpID09IFBhdHRlcm5S ZXNvdXJjZVR5cGUpIHsKKyAgICAgICAgY29uc3QgYXV0byYgcGF0dGVybiA9IHN0YXRpY19jYXN0 PGNvbnN0IFJlbmRlclNWR1Jlc291cmNlUGF0dGVybiY+KHJlc291cmNlKTsKIAogICAgICAgICAv LyBEdW1wIGZpbmFsIHJlc3VsdHMgdGhhdCBhcmUgdXNlZCBmb3IgcmVuZGVyaW5nLiBObyB1c2Ug aW4gYXNraW5nIFNWR1BhdHRlcm5FbGVtZW50IGZvciBpdHMgcGF0dGVyblVuaXRzKCksIGFzIGl0 IG1heQogICAgICAgICAvLyBsaW5rIHRvIG90aGVyIHBhdHRlcm5zIHVzaW5nIHhsaW5rOmhyZWYs IHdlIG5lZWQgdG8gYnVpbGQgdGhlIGZ1bGwgaW5oZXJpdGFuY2UgY2hhaW4sIGFrYS4gY29sbGVj dFBhdHRlcm5Qcm9wZXJ0aWVzKCkKICAgICAgICAgUGF0dGVybkF0dHJpYnV0ZXMgYXR0cmlidXRl czsKLSAgICAgICAgcGF0dGVybi0+cGF0dGVybkVsZW1lbnQoKS5jb2xsZWN0UGF0dGVybkF0dHJp YnV0ZXMoYXR0cmlidXRlcyk7CisgICAgICAgIHBhdHRlcm4ucGF0dGVybkVsZW1lbnQoKS5jb2xs ZWN0UGF0dGVybkF0dHJpYnV0ZXMoYXR0cmlidXRlcyk7CiAKICAgICAgICAgd3JpdGVOYW1lVmFs dWVQYWlyKHRzLCAicGF0dGVyblVuaXRzIiwgYXR0cmlidXRlcy5wYXR0ZXJuVW5pdHMoKSk7CiAg ICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywgInBhdHRlcm5Db250ZW50VW5pdHMiLCBhdHRy aWJ1dGVzLnBhdHRlcm5Db250ZW50VW5pdHMoKSk7CkBAIC01MjYsMjkgKzUyNSwyOSBAQCB2b2lk IHdyaXRlU1ZHUmVzb3VyY2VDb250YWluZXIoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9i amVjdCYgb2JqZWN0LCBpbnQgaQogICAgICAgICBpZiAoIXRyYW5zZm9ybS5pc0lkZW50aXR5KCkp CiAgICAgICAgICAgICB0cyA8PCAiIFtwYXR0ZXJuVHJhbnNmb3JtPSIgPDwgdHJhbnNmb3JtIDw8 ICJdIjsKICAgICAgICAgdHMgPDwgIlxuIjsKLSAgICB9IGVsc2UgaWYgKHJlc291cmNlLT5yZXNv dXJjZVR5cGUoKSA9PSBMaW5lYXJHcmFkaWVudFJlc291cmNlVHlwZSkgewotICAgICAgICBSZW5k ZXJTVkdSZXNvdXJjZUxpbmVhckdyYWRpZW50KiBncmFkaWVudCA9IHN0YXRpY19jYXN0PFJlbmRl clNWR1Jlc291cmNlTGluZWFyR3JhZGllbnQqPihyZXNvdXJjZSk7CisgICAgfSBlbHNlIGlmIChy ZXNvdXJjZS5yZXNvdXJjZVR5cGUoKSA9PSBMaW5lYXJHcmFkaWVudFJlc291cmNlVHlwZSkgewor ICAgICAgICBjb25zdCBhdXRvJiBncmFkaWVudCA9IHN0YXRpY19jYXN0PGNvbnN0IFJlbmRlclNW R1Jlc291cmNlTGluZWFyR3JhZGllbnQmPihyZXNvdXJjZSk7CiAKICAgICAgICAgLy8gRHVtcCBm aW5hbCByZXN1bHRzIHRoYXQgYXJlIHVzZWQgZm9yIHJlbmRlcmluZy4gTm8gdXNlIGluIGFza2lu ZyBTVkdHcmFkaWVudEVsZW1lbnQgZm9yIGl0cyBncmFkaWVudFVuaXRzKCksIGFzIGl0IG1heQog ICAgICAgICAvLyBsaW5rIHRvIG90aGVyIGdyYWRpZW50cyB1c2luZyB4bGluazpocmVmLCB3ZSBu ZWVkIHRvIGJ1aWxkIHRoZSBmdWxsIGluaGVyaXRhbmNlIGNoYWluLCBha2EuIGNvbGxlY3RHcmFk aWVudFByb3BlcnRpZXMoKQogICAgICAgICBMaW5lYXJHcmFkaWVudEF0dHJpYnV0ZXMgYXR0cmli dXRlczsKLSAgICAgICAgZ3JhZGllbnQtPmxpbmVhckdyYWRpZW50RWxlbWVudCgpLmNvbGxlY3RH cmFkaWVudEF0dHJpYnV0ZXMoYXR0cmlidXRlcyk7CisgICAgICAgIGdyYWRpZW50LmxpbmVhckdy YWRpZW50RWxlbWVudCgpLmNvbGxlY3RHcmFkaWVudEF0dHJpYnV0ZXMoYXR0cmlidXRlcyk7CiAg ICAgICAgIHdyaXRlQ29tbW9uR3JhZGllbnRQcm9wZXJ0aWVzKHRzLCBhdHRyaWJ1dGVzLnNwcmVh ZE1ldGhvZCgpLCBhdHRyaWJ1dGVzLmdyYWRpZW50VHJhbnNmb3JtKCksIGF0dHJpYnV0ZXMuZ3Jh ZGllbnRVbml0cygpKTsKIAotICAgICAgICB0cyA8PCAiIFtzdGFydD0iIDw8IGdyYWRpZW50LT5z dGFydFBvaW50KGF0dHJpYnV0ZXMpIDw8ICJdIFtlbmQ9IiA8PCBncmFkaWVudC0+ZW5kUG9pbnQo YXR0cmlidXRlcykgPDwgIl1cbiI7Ci0gICAgfSAgZWxzZSBpZiAocmVzb3VyY2UtPnJlc291cmNl VHlwZSgpID09IFJhZGlhbEdyYWRpZW50UmVzb3VyY2VUeXBlKSB7Ci0gICAgICAgIFJlbmRlclNW R1Jlc291cmNlUmFkaWFsR3JhZGllbnQqIGdyYWRpZW50ID0gc3RhdGljX2Nhc3Q8UmVuZGVyU1ZH UmVzb3VyY2VSYWRpYWxHcmFkaWVudCo+KHJlc291cmNlKTsKKyAgICAgICAgdHMgPDwgIiBbc3Rh cnQ9IiA8PCBncmFkaWVudC5zdGFydFBvaW50KGF0dHJpYnV0ZXMpIDw8ICJdIFtlbmQ9IiA8PCBn cmFkaWVudC5lbmRQb2ludChhdHRyaWJ1dGVzKSA8PCAiXVxuIjsKKyAgICB9ICBlbHNlIGlmIChy ZXNvdXJjZS5yZXNvdXJjZVR5cGUoKSA9PSBSYWRpYWxHcmFkaWVudFJlc291cmNlVHlwZSkgewor ICAgICAgICBjb25zdCBhdXRvJiBncmFkaWVudCA9IHN0YXRpY19jYXN0PGNvbnN0IFJlbmRlclNW R1Jlc291cmNlUmFkaWFsR3JhZGllbnQmPihyZXNvdXJjZSk7CiAKICAgICAgICAgLy8gRHVtcCBm aW5hbCByZXN1bHRzIHRoYXQgYXJlIHVzZWQgZm9yIHJlbmRlcmluZy4gTm8gdXNlIGluIGFza2lu ZyBTVkdHcmFkaWVudEVsZW1lbnQgZm9yIGl0cyBncmFkaWVudFVuaXRzKCksIGFzIGl0IG1heQog ICAgICAgICAvLyBsaW5rIHRvIG90aGVyIGdyYWRpZW50cyB1c2luZyB4bGluazpocmVmLCB3ZSBu ZWVkIHRvIGJ1aWxkIHRoZSBmdWxsIGluaGVyaXRhbmNlIGNoYWluLCBha2EuIGNvbGxlY3RHcmFk aWVudFByb3BlcnRpZXMoKQogICAgICAgICBSYWRpYWxHcmFkaWVudEF0dHJpYnV0ZXMgYXR0cmli dXRlczsKLSAgICAgICAgZ3JhZGllbnQtPnJhZGlhbEdyYWRpZW50RWxlbWVudCgpLmNvbGxlY3RH cmFkaWVudEF0dHJpYnV0ZXMoYXR0cmlidXRlcyk7CisgICAgICAgIGdyYWRpZW50LnJhZGlhbEdy YWRpZW50RWxlbWVudCgpLmNvbGxlY3RHcmFkaWVudEF0dHJpYnV0ZXMoYXR0cmlidXRlcyk7CiAg ICAgICAgIHdyaXRlQ29tbW9uR3JhZGllbnRQcm9wZXJ0aWVzKHRzLCBhdHRyaWJ1dGVzLnNwcmVh ZE1ldGhvZCgpLCBhdHRyaWJ1dGVzLmdyYWRpZW50VHJhbnNmb3JtKCksIGF0dHJpYnV0ZXMuZ3Jh ZGllbnRVbml0cygpKTsKIAotICAgICAgICBGbG9hdFBvaW50IGZvY2FsUG9pbnQgPSBncmFkaWVu dC0+Zm9jYWxQb2ludChhdHRyaWJ1dGVzKTsKLSAgICAgICAgRmxvYXRQb2ludCBjZW50ZXJQb2lu dCA9IGdyYWRpZW50LT5jZW50ZXJQb2ludChhdHRyaWJ1dGVzKTsKLSAgICAgICAgZmxvYXQgcmFk aXVzID0gZ3JhZGllbnQtPnJhZGl1cyhhdHRyaWJ1dGVzKTsKLSAgICAgICAgZmxvYXQgZm9jYWxS YWRpdXMgPSBncmFkaWVudC0+Zm9jYWxSYWRpdXMoYXR0cmlidXRlcyk7CisgICAgICAgIEZsb2F0 UG9pbnQgZm9jYWxQb2ludCA9IGdyYWRpZW50LmZvY2FsUG9pbnQoYXR0cmlidXRlcyk7CisgICAg ICAgIEZsb2F0UG9pbnQgY2VudGVyUG9pbnQgPSBncmFkaWVudC5jZW50ZXJQb2ludChhdHRyaWJ1 dGVzKTsKKyAgICAgICAgZmxvYXQgcmFkaXVzID0gZ3JhZGllbnQucmFkaXVzKGF0dHJpYnV0ZXMp OworICAgICAgICBmbG9hdCBmb2NhbFJhZGl1cyA9IGdyYWRpZW50LmZvY2FsUmFkaXVzKGF0dHJp YnV0ZXMpOwogCiAgICAgICAgIHRzIDw8ICIgW2NlbnRlcj0iIDw8IGNlbnRlclBvaW50IDw8ICJd IFtmb2NhbD0iIDw8IGZvY2FsUG9pbnQgPDwgIl0gW3JhZGl1cz0iIDw8IHJhZGl1cyA8PCAiXSBb Zm9jYWxSYWRpdXM9IiA8PCBmb2NhbFJhZGl1cyA8PCAiXVxuIjsKICAgICB9IGVsc2UKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVzb3VyY2VzQ3ljbGVTb2x2 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZXNvdXJjZXNDeWNsZVNv bHZlci5jcHAKaW5kZXggYzY3NzZmNi4uOWYzYThmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9TVkdSZXNvdXJjZXNDeWNsZVNvbHZlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdSZXNvdXJjZXNDeWNsZVNvbHZlci5jcHAKQEAgLTEw OCw3ICsxMDgsNyBAQCB2b2lkIFNWR1Jlc291cmNlc0N5Y2xlU29sdmVyOjpyZXNvbHZlQ3ljbGVz KCkKICAgICBhdXRvIHBhcmVudCA9IG1fcmVuZGVyZXIucGFyZW50KCk7CiAgICAgd2hpbGUgKHBh cmVudCkgewogICAgICAgICBpZiAocGFyZW50LT5pc1NWR1Jlc291cmNlQ29udGFpbmVyKCkpCi0g ICAgICAgICAgICBwYXJlbnRSZXNvdXJjZXMuYWRkKHBhcmVudC0+dG9SZW5kZXJTVkdSZXNvdXJj ZUNvbnRhaW5lcigpKTsKKyAgICAgICAgICAgIHBhcmVudFJlc291cmNlcy5hZGQodG9SZW5kZXJT VkdSZXNvdXJjZUNvbnRhaW5lcihwYXJlbnQpKTsKICAgICAgICAgcGFyZW50ID0gcGFyZW50LT5w YXJlbnQoKTsKICAgICB9CiAKQEAgLTEzMiw3ICsxMzIsNyBAQCB2b2lkIFNWR1Jlc291cmNlc0N5 Y2xlU29sdmVyOjpyZXNvbHZlQ3ljbGVzKCkKIAogICAgIC8vIElmIHdlJ3JlIGEgcmVzb3VyY2Us IGFkZCBvdXJzZWx2ZXMgdG8gdGhlIEhhc2hTZXQuCiAgICAgaWYgKG1fcmVuZGVyZXIuaXNTVkdS ZXNvdXJjZUNvbnRhaW5lcigpKQotICAgICAgICBtX2FsbFJlc291cmNlcy5hZGQobV9yZW5kZXJl ci50b1JlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKCkpOworICAgICAgICBtX2FsbFJlc291cmNl cy5hZGQoJnRvUmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIobV9yZW5kZXJlcikpOwogCiAgICAg QVNTRVJUKCFtX2FsbFJlc291cmNlcy5pc0VtcHR5KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVu dC5jcHAKaW5kZXggNjM3YzM2MC4uMzg2NjMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv c3ZnL1NWR0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNw cApAQCAtMTAxMCwxMCArMTAxMCwxMCBAQCB2b2lkIFNWR0VsZW1lbnQ6OnN2Z0F0dHJpYnV0ZUNo YW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0ck5hbWUpCiAgICAgfQogCiAgICAgaWYgKGlz SWRBdHRyaWJ1dGVOYW1lKGF0dHJOYW1lKSkgewotICAgICAgICBSZW5kZXJPYmplY3QqIG9iamVj dCA9IHJlbmRlcmVyKCk7CisgICAgICAgIGF1dG8gcmVuZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigp OwogICAgICAgICAvLyBOb3RpZnkgcmVzb3VyY2VzIGFib3V0IGlkIGNoYW5nZXMsIHRoaXMgaXMg aW1wb3J0YW50IGFzIHdlIGNhY2hlIHJlc291cmNlcyBieSBpZCBpbiBTVkdEb2N1bWVudEV4dGVu c2lvbnMKLSAgICAgICAgaWYgKG9iamVjdCAmJiBvYmplY3QtPmlzU1ZHUmVzb3VyY2VDb250YWlu ZXIoKSkKLSAgICAgICAgICAgIG9iamVjdC0+dG9SZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcigp LT5pZENoYW5nZWQoKTsKKyAgICAgICAgaWYgKHJlbmRlcmVyICYmIHJlbmRlcmVyLT5pc1NWR1Jl c291cmNlQ29udGFpbmVyKCkpCisgICAgICAgICAgICB0b1JlbmRlclNWR1Jlc291cmNlQ29udGFp bmVyKCpyZW5kZXJlcikuaWRDaGFuZ2VkKCk7CiAgICAgICAgIGlmIChpbkRvY3VtZW50KCkpCiAg ICAgICAgICAgICBidWlsZFBlbmRpbmdSZXNvdXJjZXNJZk5lZWRlZCgpOwogICAgICAgICBTVkdF bGVtZW50SW5zdGFuY2U6OmludmFsaWRhdGVBbGxJbnN0YW5jZXNPZkVsZW1lbnQodGhpcyk7Cg==