181470 2018-01-09 21:13:52 -0800 [RenderTreeBuilder] Move RenderRuby's moveChildren logic to RenderTreeBuilder 2018-01-10 07:54:38 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1387560 0 zalan 2018-01-09 21:13:52 -0800 ssia 1387561 1 webkit-bug-importer 2018-01-09 21:14:30 -0800 <rdar://problem/36397683> 1387562 2 330880 zalan 2018-01-09 21:17:46 -0800 Created attachment 330880 Patch 1387563 3 330880 zalan 2018-01-09 21:19:46 -0800 Comment on attachment 330880 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=330880&action=review > Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp:172 > +void RenderTreeBuilder::Ruby::moveChildrenInternal(RenderRubyBase& from, RenderRubyBase& to, RenderObject* beforeChild) Don't really like this name 1387659 4 330880 commit-queue 2018-01-10 07:54:36 -0800 Comment on attachment 330880 Patch Clearing flags on attachment: 330880 Committed r226714: <https://trac.webkit.org/changeset/226714> 1387660 5 commit-queue 2018-01-10 07:54:38 -0800 All reviewed patches have been landed. Closing bug. 330880 2018-01-09 21:17:46 -0800 2018-01-10 07:54:36 -0800 Patch bug-181470-20180109211745.patch text/plain 15946 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdiZWFjNDMxYmYwODNm YzBlZmQ1NmQxYWJjMzljYzEzNTRhODU0Zi4uMzljN2Y1ZDE3YjdhZWVjYjUzZjE4NWU5NGJmOTk1 Yjc5YjJmYzMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE4LTAxLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlclJ1YnkncyBtb3ZlQ2hpbGRyZW4gbG9naWMgdG8gUmVuZGVyVHJlZUJ1aWxk ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTQ3 MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzYzOTc2ODM+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhYm91dCBtb3ZpbmcgY29kZSwg bm8gY2xlYW51cCBhbmQvb3Igbm9ybWFsaXphdGlvbiAodW5mb3J0dW5hdGVseSBpdCBhbHNvIG1l YW5zCisgICAgICAgIHNvbWUgdGVtcG9yYXJ5IGNoYW5nZXMpLiAgCisKKyAgICAgICAgTm8gY2hh bmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclJ1YnlCYXNlOjptb3ZlQ2hpbGRyZW4pOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyUnVieUJhc2U6Om1lcmdlQ2hpbGRyZW5XaXRoQmFzZSk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSdWJ5QmFzZTo6bW92ZUlubGluZUNoaWxkcmVu KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJ1YnlCYXNlOjptb3ZlQmxvY2tD aGlsZHJlbik6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNlLmg6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyUnVieVJ1bjo6dGFrZUNoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1 aWxkZXI6Om1vdmVSdWJ5Q2hpbGRyZW4pOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9S ZW5kZXJUcmVlQnVpbGRlci5oOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlclJ1YnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6 OlJ1Ynk6Om1vdmVJbmxpbmVDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVl QnVpbGRlcjo6UnVieTo6bW92ZUJsb2NrQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6Om1vdmVDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6bW92ZUNoaWxkcmVuSW50ZXJuYWwpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6Omluc2VydENoaWxkKToKKyAgICAgICAg KiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5Lmg6CisKIDIwMTgtMDEt MDkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVuZGVyVHJl ZUJ1aWxkZXJdIE1vdmUgTWF0aE1MIGFkZENoaWxkIGxvZ2ljIHRvIFJlbmRlclRyZWVCdWlsZGVy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5kZXggMTRmMDk3 MDQ4ZjJkZGNmZjhhNzgyNGFjMjQ4ODM4ODRlZGQzYjU4Yi4uYmQwYWQwZjNmOGIxYTkyNmIxN2Jh YWMyMTQ2YzE5OTgxMzdhMzM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuaApAQCAtMzk0LDYgKzM5NCw4IEBAIHB1YmxpYzoKICAgICAvLyBjb2x1bW4gYmFs YW5jZXIgdG8gaGVscCBzZXQgYSBnb29kIG1pbmltdW0gY29sdW1uIGhlaWdodC4KICAgICB2b2lk IHVwZGF0ZU1pbmltdW1QYWdlSGVpZ2h0KExheW91dFVuaXQgb2Zmc2V0LCBMYXlvdXRVbml0IG1p bkhlaWdodCk7CiAKKyAgICB2b2lkIGFkZEZsb2F0c1RvTmV3UGFyZW50KFJlbmRlckJsb2NrRmxv dyYgdG9CbG9ja0Zsb3cpIGNvbnN0OworCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBjb21wdXRlSW50 cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVu aXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgCkBAIC00NTMsOCArNDU1 LDYgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgaXNUb3BMYXlvdXRPdmVyZmxvd0FsbG93ZWQoKSBj b25zdCBvdmVycmlkZTsKICAgICBib29sIGlzTGVmdExheW91dE92ZXJmbG93QWxsb3dlZCgpIGNv bnN0IG92ZXJyaWRlOwogCi0gICAgdm9pZCBhZGRGbG9hdHNUb05ld1BhcmVudChSZW5kZXJCbG9j a0Zsb3cmIHRvQmxvY2tGbG93KSBjb25zdDsKLSAgICAKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0 ZUNvbHVtbkNvdW50QW5kV2lkdGgoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBjYWNoZVByaW9yQ2hh cmFjdGVyc0lmTmVlZGVkKGNvbnN0IExhenlMaW5lQnJlYWtJdGVyYXRvciYpIHt9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5QmFzZS5jcHAKaW5kZXggMjFiZDljYTgzZDI4 MDU1NjFhYWMzNWJmZTZkNjQ0ODYxYjliZGFiYS4uN2JjMWFhNTY4YTM4NzBiZjdjZDcwMGFlMGM4 NWUxMjE0MGUxMzZhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clJ1YnlCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieUJh c2UuY3BwCkBAIC01NCw4NCArNTQsNiBAQCBib29sIFJlbmRlclJ1YnlCYXNlOjppc0NoaWxkQWxs b3dlZChjb25zdCBSZW5kZXJPYmplY3QmIGNoaWxkLCBjb25zdCBSZW5kZXJTdHlsZQogICAgIHJl dHVybiBjaGlsZC5pc0lubGluZSgpOwogfQogCi12b2lkIFJlbmRlclJ1YnlCYXNlOjptb3ZlQ2hp bGRyZW4oUmVuZGVyUnVieUJhc2UqIHRvQmFzZSwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkK LXsKLSAgICAvLyBUaGlzIGZ1bmN0aW9uIHJlbW92ZXMgYWxsIGNoaWxkcmVuIHRoYXQgYXJlIGJl Zm9yZSAoISkgYmVmb3JlQ2hpbGQKLSAgICAvLyBhbmQgYXBwZW5kcyB0aGVtIHRvIHRvQmFzZS4K LSAgICBBU1NFUlRfQVJHKHRvQmFzZSwgdG9CYXNlKTsKLQotICAgIGlmIChiZWZvcmVDaGlsZCAm JiBiZWZvcmVDaGlsZC0+cGFyZW50KCkgIT0gdGhpcykKLSAgICAgICAgYmVmb3JlQ2hpbGQgPSBS ZW5kZXJUcmVlQnVpbGRlcjo6Y3VycmVudCgpLT5zcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hp bGQoKnRoaXMsIGJlZm9yZUNoaWxkKTsKLQotICAgIGlmIChjaGlsZHJlbklubGluZSgpKQotICAg ICAgICBtb3ZlSW5saW5lQ2hpbGRyZW4odG9CYXNlLCBiZWZvcmVDaGlsZCk7Ci0gICAgZWxzZQot ICAgICAgICBtb3ZlQmxvY2tDaGlsZHJlbih0b0Jhc2UsIGJlZm9yZUNoaWxkKTsKLQotICAgIHNl dE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOwotICAgIHRvQmFzZS0+c2V0TmVlZHNM YXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxjKCk7Ci19Ci0KLXZvaWQgUmVuZGVyUnVieUJhc2U6Om1l cmdlQ2hpbGRyZW5XaXRoQmFzZShSZW5kZXJSdWJ5QmFzZSYgdG9CbG9jaykKLXsKLSAgICBtb3Zl Q2hpbGRyZW4oJnRvQmxvY2spOwotICAgIGFkZEZsb2F0c1RvTmV3UGFyZW50KHRvQmxvY2spOwot fQotCi12b2lkIFJlbmRlclJ1YnlCYXNlOjptb3ZlSW5saW5lQ2hpbGRyZW4oUmVuZGVyUnVieUJh c2UqIHRvQmFzZSwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKLXsKLSAgICBBU1NFUlQoY2hp bGRyZW5JbmxpbmUoKSk7Ci0gICAgQVNTRVJUX0FSRyh0b0Jhc2UsIHRvQmFzZSk7Ci0KLSAgICBp ZiAoIWZpcnN0Q2hpbGQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgUmVuZGVyQmxvY2sqIHRv QmxvY2s7Ci0gICAgaWYgKHRvQmFzZS0+Y2hpbGRyZW5JbmxpbmUoKSkgewotICAgICAgICAvLyBU aGUgc3RhbmRhcmQgYW5kIGVhc3kgY2FzZTogbW92ZSB0aGUgY2hpbGRyZW4gaW50byB0aGUgdGFy Z2V0IGJhc2UKLSAgICAgICAgdG9CbG9jayA9IHRvQmFzZTsKLSAgICB9IGVsc2UgewotICAgICAg ICAvLyBXZSBuZWVkIHRvIHdyYXAgdGhlIGlubGluZSBvYmplY3RzIGludG8gYW4gYW5vbnltb3Vz IGJsb2NrLgotICAgICAgICAvLyBJZiB0b0Jhc2UgaGFzIGEgc3VpdGFibGUgYmxvY2ssIHdlIHJl LXVzZSBpdCwgb3RoZXJ3aXNlIGNyZWF0ZSBhIG5ldyBvbmUuCi0gICAgICAgIFJlbmRlck9iamVj dCogbGFzdENoaWxkID0gdG9CYXNlLT5sYXN0Q2hpbGQoKTsKLSAgICAgICAgaWYgKGxhc3RDaGls ZCAmJiBsYXN0Q2hpbGQtPmlzQW5vbnltb3VzQmxvY2soKSAmJiBsYXN0Q2hpbGQtPmNoaWxkcmVu SW5saW5lKCkpCi0gICAgICAgICAgICB0b0Jsb2NrID0gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KGxh c3RDaGlsZCk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgYXV0byBuZXdUb0Jsb2NrID0g dG9CYXNlLT5jcmVhdGVBbm9ueW1vdXNCbG9jaygpOwotICAgICAgICAgICAgdG9CbG9jayA9IG5l d1RvQmxvY2suZ2V0KCk7Ci0gICAgICAgICAgICB0b0Jhc2UtPmluc2VydENoaWxkSW50ZXJuYWwo V1RGTW92ZShuZXdUb0Jsb2NrKSwgbnVsbHB0cik7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgLy8g TW92ZSBvdXIgaW5saW5lIGNoaWxkcmVuIGludG8gdGhlIHRhcmdldCBibG9jayB3ZSBkZXRlcm1p bmVkIGFib3ZlLgotICAgIG1vdmVDaGlsZHJlblRvKHRvQmxvY2ssIGZpcnN0Q2hpbGQoKSwgYmVm b3JlQ2hpbGQsIFJlbmRlckJveE1vZGVsT2JqZWN0OjpOb3JtYWxpemVBZnRlckluc2VydGlvbjo6 Tm8pOwotfQotCi12b2lkIFJlbmRlclJ1YnlCYXNlOjptb3ZlQmxvY2tDaGlsZHJlbihSZW5kZXJS dWJ5QmFzZSogdG9CYXNlLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQotewotICAgIEFTU0VS VCghY2hpbGRyZW5JbmxpbmUoKSk7Ci0gICAgQVNTRVJUX0FSRyh0b0Jhc2UsIHRvQmFzZSk7Ci0K LSAgICBpZiAoIWZpcnN0Q2hpbGQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKHRvQmFz ZS0+Y2hpbGRyZW5JbmxpbmUoKSkKLSAgICAgICAgUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQo KS0+bWFrZUNoaWxkcmVuTm9uSW5saW5lKCp0b0Jhc2UpOwotCi0gICAgLy8gSWYgYW4gYW5vbnlt b3VzIGJsb2NrIHdvdWxkIGJlIHB1dCBuZXh0IHRvIGFub3RoZXIgc3VjaCBibG9jaywgdGhlbiBt ZXJnZSB0aG9zZS4KLSAgICBSZW5kZXJPYmplY3QqIGZpcnN0Q2hpbGRIZXJlID0gZmlyc3RDaGls ZCgpOwotICAgIFJlbmRlck9iamVjdCogbGFzdENoaWxkVGhlcmUgPSB0b0Jhc2UtPmxhc3RDaGls ZCgpOwotICAgIGlmIChmaXJzdENoaWxkSGVyZS0+aXNBbm9ueW1vdXNCbG9jaygpICYmIGZpcnN0 Q2hpbGRIZXJlLT5jaGlsZHJlbklubGluZSgpIAotICAgICAgICAgICAgJiYgbGFzdENoaWxkVGhl cmUgJiYgbGFzdENoaWxkVGhlcmUtPmlzQW5vbnltb3VzQmxvY2soKSAmJiBsYXN0Q2hpbGRUaGVy ZS0+Y2hpbGRyZW5JbmxpbmUoKSkgeyAgICAgICAgICAgIAotICAgICAgICBSZW5kZXJCbG9jayog YW5vbkJsb2NrSGVyZSA9IGRvd25jYXN0PFJlbmRlckJsb2NrPihmaXJzdENoaWxkSGVyZSk7Ci0g ICAgICAgIFJlbmRlckJsb2NrKiBhbm9uQmxvY2tUaGVyZSA9IGRvd25jYXN0PFJlbmRlckJsb2Nr PihsYXN0Q2hpbGRUaGVyZSk7Ci0gICAgICAgIGFub25CbG9ja0hlcmUtPm1vdmVBbGxDaGlsZHJl blRvKGFub25CbG9ja1RoZXJlLCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Tm9ybWFsaXplQWZ0ZXJJ bnNlcnRpb246Olllcyk7Ci0gICAgICAgIGFub25CbG9ja0hlcmUtPmRlbGV0ZUxpbmVzKCk7Ci0g ICAgICAgIGFub25CbG9ja0hlcmUtPnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95KCk7Ci0gICAg fQotICAgIC8vIE1vdmUgYWxsIHJlbWFpbmluZyBjaGlsZHJlbiBub3JtYWxseS4KLSAgICBtb3Zl Q2hpbGRyZW5Ubyh0b0Jhc2UsIGZpcnN0Q2hpbGQoKSwgYmVmb3JlQ2hpbGQsIFJlbmRlckJveE1v ZGVsT2JqZWN0OjpOb3JtYWxpemVBZnRlckluc2VydGlvbjo6Tm8pOwotfQotCiBSZW5kZXJSdWJ5 UnVuKiBSZW5kZXJSdWJ5QmFzZTo6cnVieVJ1bigpIGNvbnN0CiB7CiAgICAgQVNTRVJUKHBhcmVu dCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5QmFz ZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNlLmgKaW5kZXggOGU0 MDJiYmE3NGM0OTk3MTQ2YjYyYWJlNGU3MGY5ZjE2ZTdmNTBkZi4uYTM2ZWJlNGE2YTQ1N2I2YjAy YjNkMTY4YTk3Y2Y1OTY2MjIxNWVhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclJ1YnlCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clJ1YnlCYXNlLmgKQEAgLTU5LDIwICs1OSwxMSBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBj YWNoZVByaW9yQ2hhcmFjdGVyc0lmTmVlZGVkKGNvbnN0IExhenlMaW5lQnJlYWtJdGVyYXRvciYp IG92ZXJyaWRlOwogCi0gICAgdm9pZCBtb3ZlQ2hpbGRyZW4oUmVuZGVyUnVieUJhc2UqIHRvQmFz ZSwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IDApOwotCiBwcml2YXRlOgogICAgIGJvb2wg aXNSdWJ5QmFzZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KICAgICBib29sIGlz Q2hpbGRBbGxvd2VkKGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IFJlbmRlclN0eWxlJikgY29u c3Qgb3ZlcnJpZGU7CiAgICAgRVRleHRBbGlnbiB0ZXh0QWxpZ25tZW50Rm9yTGluZShib29sIGVu ZHNXaXRoU29mdEJyZWFrKSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIGFkanVzdElubGluZURp cmVjdGlvbkxpbmVCb3VuZHMoaW50IGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQsIGZsb2F0JiBs b2dpY2FsTGVmdCwgZmxvYXQmIGxvZ2ljYWxXaWR0aCkgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgdm9p ZCBtZXJnZUNoaWxkcmVuV2l0aEJhc2UoUmVuZGVyUnVieUJhc2UmIHRvQmxvY2spOwotCi0gICAg dm9pZCBtb3ZlSW5saW5lQ2hpbGRyZW4oUmVuZGVyUnVieUJhc2UqIHRvQmFzZSwgUmVuZGVyT2Jq ZWN0KiBiZWZvcmVDaGlsZCA9IDApOwotICAgIHZvaWQgbW92ZUJsb2NrQ2hpbGRyZW4oUmVuZGVy UnVieUJhc2UqIHRvQmFzZSwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IDApOwotCi0gICAg Ly8gQWxsb3cgUmVuZGVyUnVieVJ1biB0byBtYW5pcHVsYXRlIHRoZSBjaGlsZHJlbiB3aXRoaW4g cnVieSBiYXNlcy4KLSAgICBmcmllbmQgY2xhc3MgUmVuZGVyUnVieVJ1bjsKIAogICAgIGZsb2F0 IG1faW5pdGlhbE9mZnNldDsKICAgICB1bnNpZ25lZCBtX2lzQWZ0ZXJFeHBhbnNpb24gOiAxOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwCmluZGV4IDJjOTAxN2Ez MWFlZmNmNTNhMzE3YTI3YmUzYTI5MjcxYmQ2YzYxMmMuLmE4Y2Y3MTZiZGRiNDI0MTA0MzIyZGM0 NWViYjgwNWI1NzJiYzJiN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSdWJ5UnVuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVi eVJ1bi5jcHAKQEAgLTEyMSw3ICsxMjEsNyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5k ZXJSdWJ5UnVuOjp0YWtlQ2hpbGQoUmVuZGVyT2JqZWN0JiBjaGlsZCkKICAgICAgICAgICAgIGlm IChyaWdodFJ1bi5oYXNSdWJ5QmFzZSgpKSB7CiAgICAgICAgICAgICAgICAgUmVuZGVyUnVieUJh c2UqIHJpZ2h0QmFzZSA9IHJpZ2h0UnVuLnJ1YnlCYXNlU2FmZSgpOwogICAgICAgICAgICAgICAg IC8vIENvbGxlY3QgYWxsIGNoaWxkcmVuIGluIGEgc2luZ2xlIGJhc2UsIHRoZW4gc3dhcCB0aGUg YmFzZXMuCi0gICAgICAgICAgICAgICAgcmlnaHRCYXNlLT5tZXJnZUNoaWxkcmVuV2l0aEJhc2Uo KmJhc2UpOworICAgICAgICAgICAgICAgIFJlbmRlclRyZWVCdWlsZGVyOjpjdXJyZW50KCktPm1v dmVSdWJ5Q2hpbGRyZW4oKnJpZ2h0QmFzZSwgKmJhc2UpOwogICAgICAgICAgICAgICAgIG1vdmVD aGlsZFRvKCZyaWdodFJ1biwgYmFzZSwgUmVuZGVyQm94TW9kZWxPYmplY3Q6Ok5vcm1hbGl6ZUFm dGVySW5zZXJ0aW9uOjpObyk7CiAgICAgICAgICAgICAgICAgcmlnaHRSdW4ubW92ZUNoaWxkVG8o dGhpcywgcmlnaHRCYXNlLCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Tm9ybWFsaXplQWZ0ZXJJbnNl cnRpb246Ok5vKTsKICAgICAgICAgICAgICAgICAvLyBUaGUgbm93IGVtcHR5IHJ1YnkgYmFzZSB3 aWxsIGJlIHJlbW92ZWQgYmVsb3cuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCAwY2RlMmRhMWI2ZGZlOTU2 ODE3M2VmYzZmMDMxYTIwZmRkM2ZkODcyLi5hZDBjNzQ4MzVjYzNjYWY3MTkwNjMxZWVjZmMyNmU5 ZWMxNzRmZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRh dGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTMzMSw2ICszMzEsMTEgQEAgdm9pZCBSZW5k ZXJUcmVlQnVpbGRlcjo6c3BsaXRGbG93KFJlbmRlcklubGluZSYgcGFyZW50LCBSZW5kZXJPYmpl Y3QqIGJlZm9yZUNoaWwKICAgICBpbmxpbmVCdWlsZGVyKCkuc3BsaXRGbG93KHBhcmVudCwgYmVm b3JlQ2hpbGQsIFdURk1vdmUobmV3QmxvY2tCb3gpLCBXVEZNb3ZlKGNoaWxkKSwgb2xkQ29udCk7 CiB9CiAKK3ZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Om1vdmVSdWJ5Q2hpbGRyZW4oUmVuZGVyUnVi eUJhc2UmIGZyb20sIFJlbmRlclJ1YnlCYXNlJiB0bykKK3sKKyAgICBydWJ5QnVpbGRlcigpLm1v dmVDaGlsZHJlbihmcm9tLCB0byk7Cit9CisKIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Omluc2Vy dENoaWxkVG9SZW5kZXJCbG9ja0Zsb3coUmVuZGVyQmxvY2tGbG93JiBwYXJlbnQsIFJlbmRlclB0 cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAg IGJsb2NrRmxvd0J1aWxkZXIoKS5pbnNlcnRDaGlsZChwYXJlbnQsIFdURk1vdmUoY2hpbGQpLCBi ZWZvcmVDaGlsZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlci5oCmluZGV4IDE5ZjliNjZmNmJkMTYyMjhiYzhiY2U0NzI1NTQz ZGE1ZTBlOWM5MmMuLjZlY2EzYzg5OWNhMDYwNTEwNjcxMWU0Nzk2MmU0NmQ1OWNlOTIyZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVl QnVpbGRlci5oCkBAIC0zMCw2ICszMCw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNz IFJlbmRlck1hdGhNTEZlbmNlZDsKK2NsYXNzIFJlbmRlclJ1YnlCYXNlOwogY2xhc3MgUmVuZGVy UnVieVJ1bjsKIGNsYXNzIFJlbmRlclNWR0NvbnRhaW5lcjsKIGNsYXNzIFJlbmRlclNWR0lubGlu ZTsKQEAgLTcyLDYgKzczLDcgQEAgcHVibGljOgogICAgIHZvaWQgbWFrZUNoaWxkcmVuTm9uSW5s aW5lKFJlbmRlckJsb2NrJiBwYXJlbnQsIFJlbmRlck9iamVjdCogaW5zZXJ0aW9uUG9pbnQgPSBu dWxscHRyKTsKICAgICBSZW5kZXJPYmplY3QqIHNwbGl0QW5vbnltb3VzQm94ZXNBcm91bmRDaGls ZChSZW5kZXJCb3gmIHBhcmVudCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7CiAgICAgdm9p ZCBzcGxpdEZsb3coUmVuZGVySW5saW5lJiBwYXJlbnQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hp bGQsIFJlbmRlclB0cjxSZW5kZXJCbG9jaz4gbmV3QmxvY2tCb3gsIFJlbmRlclB0cjxSZW5kZXJP YmplY3Q+IGNoaWxkLCBSZW5kZXJCb3hNb2RlbE9iamVjdCogb2xkQ29udCk7CisgICAgdm9pZCBt b3ZlUnVieUNoaWxkcmVuKFJlbmRlclJ1YnlCYXNlJiBmcm9tLCBSZW5kZXJSdWJ5QmFzZSYgdG8p OwogCiBwcml2YXRlOgogICAgIGNsYXNzIEZpcnN0TGV0dGVyOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNw cAppbmRleCBhNzg2NTEwNzQ3YjY4YTQ1YjYwMTc2YTRhMDc3ODBiMjIyNGQxMTM0Li5mZjFjYTdj NjFjYzJjY2M5Y2M5YWNhM2RhNzg2NWNhYTc3MjZmYjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNw cApAQCAtMTExLDYgKzExMSw4MCBAQCBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6UnVieShSZW5k ZXJUcmVlQnVpbGRlciYgYnVpbGRlcikKIHsKIH0KIAordm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6 UnVieTo6bW92ZUlubGluZUNoaWxkcmVuKFJlbmRlclJ1YnlCYXNlJiBmcm9tLCBSZW5kZXJSdWJ5 QmFzZSYgdG8sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCit7CisgICAgQVNTRVJUKGZyb20u Y2hpbGRyZW5JbmxpbmUoKSk7CisKKyAgICBpZiAoIWZyb20uZmlyc3RDaGlsZCgpKQorICAgICAg ICByZXR1cm47CisKKyAgICBSZW5kZXJCbG9jayogdG9CbG9jayA9IG51bGxwdHI7CisgICAgaWYg KHRvLmNoaWxkcmVuSW5saW5lKCkpIHsKKyAgICAgICAgLy8gVGhlIHN0YW5kYXJkIGFuZCBlYXN5 IGNhc2U6IG1vdmUgdGhlIGNoaWxkcmVuIGludG8gdGhlIHRhcmdldCBiYXNlCisgICAgICAgIHRv QmxvY2sgPSAmdG87CisgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gV2UgbmVlZCB0byB3cmFwIHRo ZSBpbmxpbmUgb2JqZWN0cyBpbnRvIGFuIGFub255bW91cyBibG9jay4KKyAgICAgICAgLy8gSWYg dG9CYXNlIGhhcyBhIHN1aXRhYmxlIGJsb2NrLCB3ZSByZS11c2UgaXQsIG90aGVyd2lzZSBjcmVh dGUgYSBuZXcgb25lLgorICAgICAgICBhdXRvKiBsYXN0Q2hpbGQgPSB0by5sYXN0Q2hpbGQoKTsK KyAgICAgICAgaWYgKGxhc3RDaGlsZCAmJiBsYXN0Q2hpbGQtPmlzQW5vbnltb3VzQmxvY2soKSAm JiBsYXN0Q2hpbGQtPmNoaWxkcmVuSW5saW5lKCkpCisgICAgICAgICAgICB0b0Jsb2NrID0gZG93 bmNhc3Q8UmVuZGVyQmxvY2s+KGxhc3RDaGlsZCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAg ICAgYXV0byBuZXdUb0Jsb2NrID0gdG8uY3JlYXRlQW5vbnltb3VzQmxvY2soKTsKKyAgICAgICAg ICAgIHRvQmxvY2sgPSBuZXdUb0Jsb2NrLmdldCgpOworICAgICAgICAgICAgdG8uaW5zZXJ0Q2hp bGRJbnRlcm5hbChXVEZNb3ZlKG5ld1RvQmxvY2spLCBudWxscHRyKTsKKyAgICAgICAgfQorICAg IH0KKyAgICAvLyBNb3ZlIG91ciBpbmxpbmUgY2hpbGRyZW4gaW50byB0aGUgdGFyZ2V0IGJsb2Nr IHdlIGRldGVybWluZWQgYWJvdmUuCisgICAgZnJvbS5tb3ZlQ2hpbGRyZW5Ubyh0b0Jsb2NrLCBm cm9tLmZpcnN0Q2hpbGQoKSwgYmVmb3JlQ2hpbGQsIFJlbmRlckJveE1vZGVsT2JqZWN0OjpOb3Jt YWxpemVBZnRlckluc2VydGlvbjo6Tm8pOworfQorCit2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpS dWJ5Ojptb3ZlQmxvY2tDaGlsZHJlbihSZW5kZXJSdWJ5QmFzZSYgZnJvbSwgUmVuZGVyUnVieUJh c2UmIHRvLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQoreworICAgIEFTU0VSVCghZnJvbS5j aGlsZHJlbklubGluZSgpKTsKKworICAgIGlmICghZnJvbS5maXJzdENoaWxkKCkpCisgICAgICAg IHJldHVybjsKKworICAgIGlmICh0by5jaGlsZHJlbklubGluZSgpKQorICAgICAgICBtX2J1aWxk ZXIubWFrZUNoaWxkcmVuTm9uSW5saW5lKHRvKTsKKworICAgIC8vIElmIGFuIGFub255bW91cyBi bG9jayB3b3VsZCBiZSBwdXQgbmV4dCB0byBhbm90aGVyIHN1Y2ggYmxvY2ssIHRoZW4gbWVyZ2Ug dGhvc2UuCisgICAgYXV0byogZmlyc3RDaGlsZEhlcmUgPSBmcm9tLmZpcnN0Q2hpbGQoKTsKKyAg ICBhdXRvKiBsYXN0Q2hpbGRUaGVyZSA9IHRvLmxhc3RDaGlsZCgpOworICAgIGlmIChmaXJzdENo aWxkSGVyZS0+aXNBbm9ueW1vdXNCbG9jaygpICYmIGZpcnN0Q2hpbGRIZXJlLT5jaGlsZHJlbklu bGluZSgpCisgICAgICAgICYmIGxhc3RDaGlsZFRoZXJlICYmIGxhc3RDaGlsZFRoZXJlLT5pc0Fu b255bW91c0Jsb2NrKCkgJiYgbGFzdENoaWxkVGhlcmUtPmNoaWxkcmVuSW5saW5lKCkpIHsKKyAg ICAgICAgYXV0byogYW5vbkJsb2NrSGVyZSA9IGRvd25jYXN0PFJlbmRlckJsb2NrPihmaXJzdENo aWxkSGVyZSk7CisgICAgICAgIGF1dG8qIGFub25CbG9ja1RoZXJlID0gZG93bmNhc3Q8UmVuZGVy QmxvY2s+KGxhc3RDaGlsZFRoZXJlKTsKKyAgICAgICAgYW5vbkJsb2NrSGVyZS0+bW92ZUFsbENo aWxkcmVuVG8oYW5vbkJsb2NrVGhlcmUsIFJlbmRlckJveE1vZGVsT2JqZWN0OjpOb3JtYWxpemVB ZnRlckluc2VydGlvbjo6WWVzKTsKKyAgICAgICAgYW5vbkJsb2NrSGVyZS0+ZGVsZXRlTGluZXMo KTsKKyAgICAgICAgYW5vbkJsb2NrSGVyZS0+cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3koKTsK KyAgICB9CisgICAgLy8gTW92ZSBhbGwgcmVtYWluaW5nIGNoaWxkcmVuIG5vcm1hbGx5LgorICAg IGZyb20ubW92ZUNoaWxkcmVuVG8oJnRvLCBmcm9tLmZpcnN0Q2hpbGQoKSwgYmVmb3JlQ2hpbGQs IFJlbmRlckJveE1vZGVsT2JqZWN0OjpOb3JtYWxpemVBZnRlckluc2VydGlvbjo6Tm8pOworfQor Cit2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5Ojptb3ZlQ2hpbGRyZW4oUmVuZGVyUnVieUJh c2UmIGZyb20sIFJlbmRlclJ1YnlCYXNlJiB0bykKK3sKKyAgICBtb3ZlQ2hpbGRyZW5JbnRlcm5h bChmcm9tLCB0byk7CisgICAgZnJvbS5hZGRGbG9hdHNUb05ld1BhcmVudCh0byk7Cit9CisKK3Zv aWQgUmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6Om1vdmVDaGlsZHJlbkludGVybmFsKFJlbmRlclJ1 YnlCYXNlJiBmcm9tLCBSZW5kZXJSdWJ5QmFzZSYgdG8sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hp bGQpCit7CisgICAgLy8gVGhpcyBmdW5jdGlvbiByZW1vdmVzIGFsbCBjaGlsZHJlbiB0aGF0IGFy ZSBiZWZvcmUgKCEpIGJlZm9yZUNoaWxkCisgICAgLy8gYW5kIGFwcGVuZHMgdGhlbSB0byB0b0Jh c2UuCisgICAgaWYgKGJlZm9yZUNoaWxkICYmIGJlZm9yZUNoaWxkLT5wYXJlbnQoKSAhPSAmZnJv bSkKKyAgICAgICAgYmVmb3JlQ2hpbGQgPSBtX2J1aWxkZXIuc3BsaXRBbm9ueW1vdXNCb3hlc0Fy b3VuZENoaWxkKGZyb20sIGJlZm9yZUNoaWxkKTsKKworICAgIGlmIChmcm9tLmNoaWxkcmVuSW5s aW5lKCkpCisgICAgICAgIG1vdmVJbmxpbmVDaGlsZHJlbihmcm9tLCB0bywgYmVmb3JlQ2hpbGQp OworICAgIGVsc2UKKyAgICAgICAgbW92ZUJsb2NrQ2hpbGRyZW4oZnJvbSwgdG8sIGJlZm9yZUNo aWxkKTsKKworICAgIGZyb20uc2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxjKCk7Cisg ICAgdG8uc2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxjKCk7Cit9CisKIHZvaWQgUmVu ZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6Omluc2VydENoaWxkKFJlbmRlclJ1YnlSdW4mIHBhcmVudCwg UmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQp CiB7CiAgICAgaWYgKGNoaWxkLT5pc1J1YnlUZXh0KCkpIHsKQEAgLTE0Nyw3ICsyMjEsNyBAQCB2 b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjppbnNlcnRDaGlsZChSZW5kZXJSdWJ5UnVuJiBw YXJlbnQsIFJlbmRlclB0cjxSZW5kZQogICAgICAgICAgICAgYXV0byYgcnVuID0gKm5ld1J1bjsK ICAgICAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZCgqcnVieSwgV1RGTW92ZShuZXdSdW4p LCAmcGFyZW50KTsKICAgICAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZChydW4sIFdURk1v dmUoY2hpbGQpKTsKLSAgICAgICAgICAgIHBhcmVudC5ydWJ5QmFzZVNhZmUoKS0+bW92ZUNoaWxk cmVuKHJ1bi5ydWJ5QmFzZVNhZmUoKSwgYmVmb3JlQ2hpbGQpOworICAgICAgICAgICAgbW92ZUNo aWxkcmVuSW50ZXJuYWwoKnBhcmVudC5ydWJ5QmFzZVNhZmUoKSwgKnJ1bi5ydWJ5QmFzZVNhZmUo KSwgYmVmb3JlQ2hpbGQpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJSdWJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1 aWxkZXJSdWJ5LmgKaW5kZXggYWFhNjg4NzlhNDU3OTMwZmM4NWJmNjI0ODIzYTUyZDExYmY0MDRi ZS4uMzUzMTU3OTM4YjU3MWI3YzEyMzI4NzBlMmFiZmRkMjBkY2Q4MjAzNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRl clJ1YnkuaApAQCAtNDQsNyArNDQsMTMgQEAgcHVibGljOgogICAgIFJlbmRlckVsZW1lbnQmIGZp bmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1YnlBc0Jsb2NrJiBwYXJlbnQsIGNvbnN0 IFJlbmRlck9iamVjdCYgY2hpbGQsIFJlbmRlck9iamVjdComIGJlZm9yZUNoaWxkKTsKICAgICBS ZW5kZXJFbGVtZW50JiBmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZChSZW5kZXJSdWJ5QXNJbmxp bmUmIHBhcmVudCwgY29uc3QgUmVuZGVyT2JqZWN0JiBjaGlsZCwgUmVuZGVyT2JqZWN0KiYgYmVm b3JlQ2hpbGQpOwogCisgICAgdm9pZCBtb3ZlQ2hpbGRyZW4oUmVuZGVyUnVieUJhc2UmIGZyb20s IFJlbmRlclJ1YnlCYXNlJiB0byk7CisKIHByaXZhdGU6CisgICAgdm9pZCBtb3ZlSW5saW5lQ2hp bGRyZW4oUmVuZGVyUnVieUJhc2UmIGZyb20sIFJlbmRlclJ1YnlCYXNlJiB0bywgUmVuZGVyT2Jq ZWN0KiBiZWZvcmVDaGlsZCk7CisgICAgdm9pZCBtb3ZlQmxvY2tDaGlsZHJlbihSZW5kZXJSdWJ5 QmFzZSYgZnJvbSwgUmVuZGVyUnVieUJhc2UmIHRvLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxk KTsKKyAgICB2b2lkIG1vdmVDaGlsZHJlbkludGVybmFsKFJlbmRlclJ1YnlCYXNlJiBmcm9tLCBS ZW5kZXJSdWJ5QmFzZSYgdG8sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsK KwogICAgIFJlbmRlclRyZWVCdWlsZGVyJiBtX2J1aWxkZXI7CiB9OwogCg==