203982 2019-11-07 16:33:20 -0800 Scrolling to fragment shouldn't happen as a part of updating style 2019-11-25 14:14:22 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202843 204593 1 rniwa rniwa cdumez dbates esprehn+autocc ews-watchlist japhet kangil.han koivisto simon.fraser thorton webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1588484 0 rniwa 2019-11-07 16:33:20 -0800 Document::resolveStyle sometimes frameView.scrollToFragment when there were pending stylesheets inside FrameView::scrollToAnchor, which is called by FrameLoader::scrollToFragmentWithParentBoundary. 1590829 1 383686 rniwa 2019-11-15 21:13:47 -0800 Created attachment 383686 WIP1 1591108 2 383686 simon.fraser 2019-11-18 10:38:34 -0800 Comment on attachment 383686 WIP1 View in context: https://bugs.webkit.org/attachment.cgi?id=383686&action=review > Source/WebCore/dom/Document.cpp:3476 > + if (m_gotoAnchorNeededAfterStylesheetsLoad) { > + // https://html.spec.whatwg.org/multipage/browsing-the-web.html#try-to-scroll-to-the-fragment > + eventLoop().queueTask(TaskSource::Networking, *this, [this] { > + if (!m_renderView) > + return; > + m_renderView->frameView().scrollToFragment(m_url); > + }); > + } Shouldn't this be in the "run the scrolling steps" part of the event loop? 1591239 3 rniwa 2019-11-18 14:27:49 -0800 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 383686 [details] > WIP1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=383686&action=review > > > Source/WebCore/dom/Document.cpp:3476 > > + if (m_gotoAnchorNeededAfterStylesheetsLoad) { > > + // https://html.spec.whatwg.org/multipage/browsing-the-web.html#try-to-scroll-to-the-fragment > > + eventLoop().queueTask(TaskSource::Networking, *this, [this] { > > + if (!m_renderView) > > + return; > > + m_renderView->frameView().scrollToFragment(m_url); > > + }); > > + } > > Shouldn't this be in the "run the scrolling steps" part of the event loop? Nope: https://html.spec.whatwg.org/multipage/browsing-the-web.html#scroll-to-the-fragment-identifier which triggers: https://drafts.csswg.org/cssom-view/#perform-a-scroll just scrolls it. There is a separate section about what scrolling step does but that doesn't include the actual scrolling: https://drafts.csswg.org/cssom-view/#scrolling-events 1592606 4 384110 rniwa 2019-11-21 17:33:36 -0800 Created attachment 384110 Patch 1592616 5 384114 rniwa 2019-11-21 17:57:25 -0800 Created attachment 384114 Patch 1592648 6 rniwa 2019-11-21 21:09:38 -0800 Committed r252761: <https://trac.webkit.org/changeset/252761> 1592649 7 webkit-bug-importer 2019-11-21 21:10:21 -0800 <rdar://problem/57418860> 1592721 8 384114 koivisto 2019-11-22 03:43:21 -0800 Comment on attachment 384114 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384114&action=review > Source/WebCore/dom/Document.cpp:-2006 > - if (m_gotoAnchorNeededAfterStylesheetsLoad && !styleScope().hasPendingSheets()) > - frameView.scrollToFragment(m_url); You should also remove this code from Document::needsStyleRecalc() // Ensure this happens eventually as it is currently in resolveStyle. This can be removed if the code moves. if (m_gotoAnchorNeededAfterStylesheetsLoad && !styleScope().hasPendingSheets()) return true; 383686 2019-11-15 21:13:47 -0800 2019-11-21 17:33:35 -0800 WIP1 bug-203982-20191115211346.patch text/plain 6838 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MjUyMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE5LTExLTE1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNjcm9sbGluZyB0byBmcmFnbWVu dCBzaG91bGRuJ3QgaGFwcGVuIGFzIGEgcGFydCBvZiB1cGRhdGluZyBzdHlsZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzOTgyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc2Nyb2xsIHRvIHRo ZSBjdXJyZW50IFVSTCdzIGZyYWdtZW50IGF0IHRoZSBlbmQgb2YgcmVzb2x2ZVN0eWxlLiBJbnN0 ZWFkLCBzY2hlZHVsZSBhIHRhc2sKKyAgICAgICAgdG8gc2Nyb2xsIHRvIHRoZSBjdXJyZW50IFVS TCdzIGZyYWdtZW50IHdoZW4gYWxsIHBlbmRpbmcgc3R5bGVzaGVldHMgaGF2ZSBmaW5pc2hlZCBs b2FkaW5nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBtb3ZlcyB0aGUgY29kZSB3aGljaCBz ZXRzIGEgRG9jdW1lbnQncyBtX2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZGZs YWcKKyAgICAgICAgZnJvbSBGcmFtZVZpZXcgdG8gRnJhbWVMb2FkZXIgYXMgRnJhbWVWaWV3IHNo b3VsZG4ndCBiZSByZWx5aW5nIG9uIHRoZSBzdGF0ZXMgb2YgcGVuZGluZyBzdHlsZXNoZWV0cy4K KworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dDo6cmVzb2x2ZVN0eWxlKTogUmVtb3ZlZCB0aGUgY29kZSB0byBzY3JvbGwgdG8gdGhlIGN1cnJl bnQgVVJMJ3MgZnJhZ21lbnQuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGlkUmVtb3Zl QWxsUGVuZGluZ1N0eWxlc2hlZXQpOiBBZGRlZCBhIGNvZGUgdG8gc2NoZWR1bGUgYSB0YXNrIHRv IHNjb2xsLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6c2Nyb2xsVG9GcmFnbWVudFdpdGhQYXJlbnRCb3VuZGFyeSk6IE1v dmVkIHRoZSBjb2RlIHRvIHRyaWdnZXIgdGhlIGNvZGUKKyAgICAgICAgaW4gZGlkUmVtb3ZlQWxs UGVuZGluZ1N0eWxlc2hlZXQgZnJvbSBGcmFtZVZpZXcuCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzY3JvbGxUb0ZyYWdtZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudEludGVybmFsKTog UmVuYW1lZCBmcm9tIHNjcm9sbFRvQW5jaG9yIHNpbmNlIHRoaXMgZnVuY3Rpb24gc2V0cworICAg ICAgICB0aGUgY3VycmVudCBhbmNob3IuIEFsc28gcmVtb3ZlZCB0aGUgY29kZSB3aGljaCBkZWZl cnMgdGhlIHNjcm9sbGluZyBiYXNlZCBvbiBwZW5kaW5nIHN0eWxlc2hlZXRzJworICAgICAgICBz dGF0ZXMgc2luY2Ugc3VjaCBhIGNvZGUgZG9lc24ndCBiZWxvbmcgaW4gRnJhbWVWaWV3LgorICAg ICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisKIDIwMTktMTEtMTUgIEVyaWMgQ2FybHNvbiAgPGVy aWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRG9uJ3QgdXNlIEFWQ2FwdHVyZSBvbiB3 YXRjaE9TIGFuZCB0dk9TCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDI1 MjUxOSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE5OTcsOSArMTk5Nyw2IEBAIHZvaWQgRG9jdW1lbnQ6OnJlc29sdmVTdHlsZShSZXNvbHZl U3R5bGUKICAgICAvLyBjaGVjayBpZiB0aGV5IG5lZWQgdG8gYmUgcmVzdW1lZCBhZnRlciBsYXlv dXQuCiAgICAgaWYgKHVwZGF0ZWRDb21wb3NpdGluZ0xheWVycyAmJiAhZnJhbWVWaWV3Lm5lZWRz TGF5b3V0KCkpCiAgICAgICAgIGZyYW1lVmlldy52aWV3cG9ydENvbnRlbnRzQ2hhbmdlZCgpOwot Ci0gICAgaWYgKG1fZ290b0FuY2hvck5lZWRlZEFmdGVyU3R5bGVzaGVldHNMb2FkICYmICFzdHls ZVNjb3BlKCkuaGFzUGVuZGluZ1NoZWV0cygpKQotICAgICAgICBmcmFtZVZpZXcuc2Nyb2xsVG9G cmFnbWVudChtX3VybCk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZVRleHRSZW5kZXJlcihU ZXh0JiB0ZXh0LCB1bnNpZ25lZCBvZmZzZXRPZlJlcGxhY2VkVGV4dCwgdW5zaWduZWQgbGVuZ3Ro T2ZSZXBsYWNlZFRleHQpCkBAIC0zNDY4LDYgKzM0NjUsMTUgQEAgdm9pZCBEb2N1bWVudDo6ZGlk UmVtb3ZlQWxsUGVuZGluZ1N0eWxlcwogewogICAgIGlmIChhdXRvKiBwYXJzZXIgPSBzY3JpcHRh YmxlRG9jdW1lbnRQYXJzZXIoKSkKICAgICAgICAgcGFyc2VyLT5leGVjdXRlU2NyaXB0c1dhaXRp bmdGb3JTdHlsZXNoZWV0c1Nvb24oKTsKKworICAgIGlmIChtX2dvdG9BbmNob3JOZWVkZWRBZnRl clN0eWxlc2hlZXRzTG9hZCkgeworICAgICAgICAvLyBodHRwczovL2h0bWwuc3BlYy53aGF0d2cu b3JnL211bHRpcGFnZS9icm93c2luZy10aGUtd2ViLmh0bWwjdHJ5LXRvLXNjcm9sbC10by10aGUt ZnJhZ21lbnQKKyAgICAgICAgZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Ok5ldHdv cmtpbmcsICp0aGlzLCBbdGhpc10geworICAgICAgICAgICAgaWYgKCFtX3JlbmRlclZpZXcpCisg ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgbV9yZW5kZXJWaWV3LT5mcmFtZVZp ZXcoKS5zY3JvbGxUb0ZyYWdtZW50KG1fdXJsKTsKKyAgICAgICAgfSk7CisgICAgfQogfQogCiBi b29sIERvY3VtZW50Ojp1c2VzU3R5bGVCYXNlZEVkaXRhYmlsaXR5KCkgY29uc3QKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gMjUyNTE5KQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzI0 OSwxMiArMzI0OSwxOSBAQCBzdGF0aWMgYm9vbCBpc1NhbWVEb2N1bWVudFJlbG9hZChib29sIGlz CiAKIHZvaWQgRnJhbWVMb2FkZXI6OnNjcm9sbFRvRnJhZ21lbnRXaXRoUGFyZW50Qm91bmRhcnko Y29uc3QgVVJMJiB1cmwsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKQogewotICAgIEZyYW1lVmlldyog dmlldyA9IG1fZnJhbWUudmlldygpOwotICAgIGlmICghdmlldykKKyAgICBhdXRvIHZpZXcgPSBt YWtlUmVmUHRyKG1fZnJhbWUudmlldygpKTsKKyAgICBhdXRvIGRvY3VtZW50ID0gbWFrZVJlZlB0 cihtX2ZyYW1lLmRvY3VtZW50KCkpOworICAgIGlmICghdmlldyB8fCAhZG9jdW1lbnQpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGlmIChpc1NhbWVEb2N1bWVudFJlbG9hZChpc05ld05hdmlnYXRp b24sIG1fbG9hZFR5cGUpIHx8IGl0ZW1BbGxvd3NTY3JvbGxSZXN0b3JhdGlvbihoaXN0b3J5KCku Y3VycmVudEl0ZW0oKSkpCi0gICAgICAgIHZpZXctPnNjcm9sbFRvRnJhZ21lbnQodXJsKTsKKyAg ICBpZiAoaXNTYW1lRG9jdW1lbnRSZWxvYWQoaXNOZXdOYXZpZ2F0aW9uLCBtX2xvYWRUeXBlKSB8 fCBpdGVtQWxsb3dzU2Nyb2xsUmVzdG9yYXRpb24oaGlzdG9yeSgpLmN1cnJlbnRJdGVtKCkpKSB7 CisgICAgICAgIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2Jyb3dz aW5nLXRoZS13ZWIuaHRtbCN0cnktdG8tc2Nyb2xsLXRvLXRoZS1mcmFnbWVudAorICAgICAgICBp ZiAoIWRvY3VtZW50LT5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKSkKKyAgICAgICAgICAgIGRvY3Vt ZW50LT5zZXRHb3RvQW5jaG9yTmVlZGVkQWZ0ZXJTdHlsZXNoZWV0c0xvYWQodHJ1ZSk7CisgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIHZpZXctPnNjcm9sbFRvRnJhZ21lbnQodXJsKTsKKyAgICB9 CisKIH0KIAogYm9vbCBGcmFtZUxvYWRlcjo6c2hvdWxkQ2xvc2UoKQpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMjUyNTE5KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTY5LDEyICsyMTY5LDEyIEBAIHZv aWQgRnJhbWVWaWV3OjpyZXN0b3JlU2Nyb2xsYmFyKCkKIGJvb2wgRnJhbWVWaWV3OjpzY3JvbGxU b0ZyYWdtZW50KGNvbnN0IFVSTCYgdXJsKQogewogICAgIFN0cmluZyBmcmFnbWVudElkZW50aWZp ZXIgPSB1cmwuZnJhZ21lbnRJZGVudGlmaWVyKCk7Ci0gICAgaWYgKHNjcm9sbFRvQW5jaG9yKGZy YWdtZW50SWRlbnRpZmllcikpCisgICAgaWYgKHNjcm9sbFRvRnJhZ21lbnRJbnRlcm5hbChmcmFn bWVudElkZW50aWZpZXIpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIFRyeSBhZ2Fp biBhZnRlciBkZWNvZGluZyB0aGUgcmVmLCBiYXNlZCBvbiB0aGUgZG9jdW1lbnQncyBlbmNvZGlu Zy4KICAgICBpZiAoVGV4dFJlc291cmNlRGVjb2RlciogZGVjb2RlciA9IGZyYW1lKCkuZG9jdW1l bnQoKS0+ZGVjb2RlcigpKSB7Ci0gICAgICAgIGlmIChzY3JvbGxUb0FuY2hvcihkZWNvZGVVUkxF c2NhcGVTZXF1ZW5jZXMoZnJhZ21lbnRJZGVudGlmaWVyLCBkZWNvZGVyLT5lbmNvZGluZygpKSkp CisgICAgICAgIGlmIChzY3JvbGxUb0ZyYWdtZW50SW50ZXJuYWwoZGVjb2RlVVJMRXNjYXBlU2Vx dWVuY2VzKGZyYWdtZW50SWRlbnRpZmllciwgZGVjb2Rlci0+ZW5jb2RpbmcoKSkpKQogICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCkBAIC0yMTgyLDcgKzIxODIsNyBAQCBib29sIEZy YW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudChjb25zdCBVCiAgICAgcmV0dXJuIGZhbHNlOwogfQog Ci1ib29sIEZyYW1lVmlldzo6c2Nyb2xsVG9BbmNob3IoY29uc3QgU3RyaW5nJiBmcmFnbWVudElk ZW50aWZpZXIpCitib29sIEZyYW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudEludGVybmFsKGNvbnN0 IFN0cmluZyYgZnJhZ21lbnRJZGVudGlmaWVyKQogewogICAgIExPRyhTY3JvbGxpbmcsICJGcmFt ZVZpZXc6OnNjcm9sbFRvQW5jaG9yICVzIiwgZnJhZ21lbnRJZGVudGlmaWVyLnV0ZjgoKS5kYXRh KCkpOwogCkBAIC0yMTkyLDEzICsyMTkyLDcgQEAgYm9vbCBGcmFtZVZpZXc6OnNjcm9sbFRvQW5j aG9yKGNvbnN0IFN0cgogCiAgICAgQVNTRVJUKGZyYW1lKCkuZG9jdW1lbnQoKSk7CiAgICAgYXV0 byYgZG9jdW1lbnQgPSAqZnJhbWUoKS5kb2N1bWVudCgpOwotCi0gICAgaWYgKCFkb2N1bWVudC5o YXZlU3R5bGVzaGVldHNMb2FkZWQoKSkgewotICAgICAgICBkb2N1bWVudC5zZXRHb3RvQW5jaG9y TmVlZGVkQWZ0ZXJTdHlsZXNoZWV0c0xvYWQodHJ1ZSk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsK LSAgICB9Ci0KLSAgICBkb2N1bWVudC5zZXRHb3RvQW5jaG9yTmVlZGVkQWZ0ZXJTdHlsZXNoZWV0 c0xvYWQoZmFsc2UpOworICAgIFJFTEVBU0VfQVNTRVJUKGRvY3VtZW50LmhhdmVTdHlsZXNoZWV0 c0xvYWRlZCgpKTsKIAogICAgIEVsZW1lbnQqIGFuY2hvckVsZW1lbnQgPSBkb2N1bWVudC5maW5k QW5jaG9yKGZyYWdtZW50SWRlbnRpZmllcik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu aAkocmV2aXNpb24gMjUyNTE5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtNDI3LDcgKzQyNyw2IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIGFkanVzdFBhZ2VIZWlnaHREZXByZWNhdGVkKGZsb2F0KiBuZXdCb3R0b20sIGZs b2F0IG9sZFRvcCwgZmxvYXQgb2xkQm90dG9tLCBmbG9hdCBib3R0b21MaW1pdCk7CiAKICAgICBi b29sIHNjcm9sbFRvRnJhZ21lbnQoY29uc3QgVVJMJik7Ci0gICAgYm9vbCBzY3JvbGxUb0FuY2hv cihjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIG1haW50YWluU2Nyb2xsUG9zaXRpb25BdEFuY2hv cihDb250YWluZXJOb2RlKik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzY3JvbGxFbGVtZW50 VG9SZWN0KGNvbnN0IEVsZW1lbnQmLCBjb25zdCBJbnRSZWN0Jik7CiAKQEAgLTc4MCw2ICs3Nzks NyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVXaWRnZXRQb3NpdGlvbnNUaW1lckZpcmVk KCk7CiAKKyAgICBib29sIHNjcm9sbFRvRnJhZ21lbnRJbnRlcm5hbChjb25zdCBTdHJpbmcmKTsK ICAgICB2b2lkIHNjcm9sbFRvQW5jaG9yKCk7CiAgICAgdm9pZCBzY3JvbGxQb3NpdGlvbkNoYW5n ZWQoY29uc3QgU2Nyb2xsUG9zaXRpb24mIG9sZFBvc2l0aW9uLCBjb25zdCBTY3JvbGxQb3NpdGlv biYgbmV3UG9zaXRpb24pOwogICAgIHZvaWQgc2Nyb2xsYWJsZUFyZWFTZXRDaGFuZ2VkKCk7Cg== 384110 2019-11-21 17:33:36 -0800 2019-11-21 17:38:46 -0800 Patch bug-203982-20191121173336.patch text/plain 8498 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1Mjc1NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE5LTExLTIxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNjcm9sbGluZyB0byBmcmFnbWVu dCBzaG91bGRuJ3QgaGFwcGVuIGFzIGEgcGFydCBvZiB1cGRhdGluZyBzdHlsZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzOTgyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc2Nyb2xsIHRvIHRo ZSBjdXJyZW50IFVSTCdzIGZyYWdtZW50IGF0IHRoZSBlbmQgb2YgcmVzb2x2ZVN0eWxlLiBJbnN0 ZWFkLCBzY2hlZHVsZSBhIHRhc2sKKyAgICAgICAgdG8gc2Nyb2xsIHRvIHRoZSBjdXJyZW50IFVS TCdzIGZyYWdtZW50IHdoZW4gYWxsIHBlbmRpbmcgc3R5bGVzaGVldHMgaGF2ZSBmaW5pc2hlZCBs b2FkaW5nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBtb3ZlcyB0aGUgY29kZSB3aGljaCBz ZXRzIGEgRG9jdW1lbnQncyBtX2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZGZs YWcKKyAgICAgICAgZnJvbSBGcmFtZVZpZXcgdG8gRnJhbWVMb2FkZXIgYXMgRnJhbWVWaWV3IHNo b3VsZG4ndCBiZSByZWx5aW5nIG9uIHRoZSBzdGF0ZXMgb2YgcGVuZGluZyBzdHlsZXNoZWV0cy4K KworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dDo6cmVzb2x2ZVN0eWxlKTogUmVtb3ZlZCB0aGUgY29kZSB0byBzY3JvbGwgdG8gdGhlIGN1cnJl bnQgVVJMJ3MgZnJhZ21lbnQuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGlkUmVtb3Zl QWxsUGVuZGluZ1N0eWxlc2hlZXQpOiBBZGRlZCBhIGNvZGUgdG8gc2NoZWR1bGUgYSB0YXNrIHRv IHNjb2xsLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6c2Nyb2xsVG9GcmFnbWVudFdpdGhQYXJlbnRCb3VuZGFyeSk6IE1v dmVkIHRoZSBjb2RlIHRvIHRyaWdnZXIgdGhlIGNvZGUKKyAgICAgICAgaW4gZGlkUmVtb3ZlQWxs UGVuZGluZ1N0eWxlc2hlZXQgZnJvbSBGcmFtZVZpZXcuCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzY3JvbGxUb0ZyYWdtZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudEludGVybmFsKTog UmVuYW1lZCBmcm9tIHNjcm9sbFRvQW5jaG9yIHNpbmNlIHRoaXMgZnVuY3Rpb24gc2V0cworICAg ICAgICB0aGUgY3VycmVudCBhbmNob3IuIEFsc28gcmVtb3ZlZCB0aGUgY29kZSB3aGljaCBkZWZl cnMgdGhlIHNjcm9sbGluZyBiYXNlZCBvbiBwZW5kaW5nIHN0eWxlc2hlZXRzJworICAgICAgICBz dGF0ZXMgc2luY2Ugc3VjaCBhIGNvZGUgZG9lc24ndCBiZWxvbmcgaW4gRnJhbWVWaWV3LgorICAg ICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisKIDIwMTktMTEtMjEgIFBlbmcgTGl1ICA8cGVuZy5s aXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBJZ25vcmUgdGhlIHJlcXVlc3RzIHRvIGVudGVyL2V4 aXQgdmlkZW8gZnVsbHNjcmVlbi9waWN0dXJlLWluLXBpY3R1cmUgaWYgdGhlIHJlcXVlc3Rpbmcg bW9kZSBpcyB0aGUgc2FtZSBhcyB0aGUgY3VycmVudCBtb2RlCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAJKHJldmlzaW9uIDI1Mjc1NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMDEsOSArMjAwMSw2IEBAIHZvaWQgRG9jdW1lbnQ6 OnJlc29sdmVTdHlsZShSZXNvbHZlU3R5bGUKICAgICAvLyBjaGVjayBpZiB0aGV5IG5lZWQgdG8g YmUgcmVzdW1lZCBhZnRlciBsYXlvdXQuCiAgICAgaWYgKHVwZGF0ZWRDb21wb3NpdGluZ0xheWVy cyAmJiAhZnJhbWVWaWV3Lm5lZWRzTGF5b3V0KCkpCiAgICAgICAgIGZyYW1lVmlldy52aWV3cG9y dENvbnRlbnRzQ2hhbmdlZCgpOwotCi0gICAgaWYgKG1fZ290b0FuY2hvck5lZWRlZEFmdGVyU3R5 bGVzaGVldHNMb2FkICYmICFzdHlsZVNjb3BlKCkuaGFzUGVuZGluZ1NoZWV0cygpKQotICAgICAg ICBmcmFtZVZpZXcuc2Nyb2xsVG9GcmFnbWVudChtX3VybCk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6 OnVwZGF0ZVRleHRSZW5kZXJlcihUZXh0JiB0ZXh0LCB1bnNpZ25lZCBvZmZzZXRPZlJlcGxhY2Vk VGV4dCwgdW5zaWduZWQgbGVuZ3RoT2ZSZXBsYWNlZFRleHQpCkBAIC0zNDcyLDYgKzM0NjksMjAg QEAgdm9pZCBEb2N1bWVudDo6ZGlkUmVtb3ZlQWxsUGVuZGluZ1N0eWxlcwogewogICAgIGlmIChh dXRvKiBwYXJzZXIgPSBzY3JpcHRhYmxlRG9jdW1lbnRQYXJzZXIoKSkKICAgICAgICAgcGFyc2Vy LT5leGVjdXRlU2NyaXB0c1dhaXRpbmdGb3JTdHlsZXNoZWV0c1Nvb24oKTsKKworICAgIGlmICht X2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCkgeworICAgICAgICAvLyBodHRw czovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS9icm93c2luZy10aGUtd2ViLmh0bWwj dHJ5LXRvLXNjcm9sbC10by10aGUtZnJhZ21lbnQKKyAgICAgICAgZXZlbnRMb29wKCkucXVldWVU YXNrKFRhc2tTb3VyY2U6Ok5ldHdvcmtpbmcsICp0aGlzLCBbcHJvdGVjdGVkVGhpcyA9IG1ha2VS ZWYoKnRoaXMpLCB0aGlzXSB7CisgICAgICAgICAgICBhdXRvIGZyYW1lVmlldyA9IG1ha2VSZWZQ dHIodmlldygpKTsKKyAgICAgICAgICAgIGlmICghZnJhbWVWaWV3KQorICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIGlmICghaGF2ZVN0eWxlc2hlZXRzTG9hZGVkKCkpIHsKKyAg ICAgICAgICAgICAgICBtX2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCA9IHRy dWU7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAg ZnJhbWVWaWV3LT5zY3JvbGxUb0ZyYWdtZW50KG1fdXJsKTsKKyAgICAgICAgfSk7CisgICAgfQog fQogCiBib29sIERvY3VtZW50Ojp1c2VzU3R5bGVCYXNlZEVkaXRhYmlsaXR5KCkgY29uc3QKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gMjUyNzU2KQor KysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzI1MCwxMiArMzI1MCwxOSBAQCBzdGF0aWMgYm9vbCBpc1NhbWVEb2N1bWVudFJlbG9hZChi b29sIGlzCiAKIHZvaWQgRnJhbWVMb2FkZXI6OnNjcm9sbFRvRnJhZ21lbnRXaXRoUGFyZW50Qm91 bmRhcnkoY29uc3QgVVJMJiB1cmwsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKQogewotICAgIEZyYW1l VmlldyogdmlldyA9IG1fZnJhbWUudmlldygpOwotICAgIGlmICghdmlldykKKyAgICBhdXRvIHZp ZXcgPSBtYWtlUmVmUHRyKG1fZnJhbWUudmlldygpKTsKKyAgICBhdXRvIGRvY3VtZW50ID0gbWFr ZVJlZlB0cihtX2ZyYW1lLmRvY3VtZW50KCkpOworICAgIGlmICghdmlldyB8fCAhZG9jdW1lbnQp CiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChpc1NhbWVEb2N1bWVudFJlbG9hZChpc05ld05h dmlnYXRpb24sIG1fbG9hZFR5cGUpIHx8IGl0ZW1BbGxvd3NTY3JvbGxSZXN0b3JhdGlvbihoaXN0 b3J5KCkuY3VycmVudEl0ZW0oKSkpCi0gICAgICAgIHZpZXctPnNjcm9sbFRvRnJhZ21lbnQodXJs KTsKKyAgICBpZiAoaXNTYW1lRG9jdW1lbnRSZWxvYWQoaXNOZXdOYXZpZ2F0aW9uLCBtX2xvYWRU eXBlKSB8fCBpdGVtQWxsb3dzU2Nyb2xsUmVzdG9yYXRpb24oaGlzdG9yeSgpLmN1cnJlbnRJdGVt KCkpKSB7CisgICAgICAgIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdl L2Jyb3dzaW5nLXRoZS13ZWIuaHRtbCN0cnktdG8tc2Nyb2xsLXRvLXRoZS1mcmFnbWVudAorICAg ICAgICBpZiAoIWRvY3VtZW50LT5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKSkKKyAgICAgICAgICAg IGRvY3VtZW50LT5zZXRHb3RvQW5jaG9yTmVlZGVkQWZ0ZXJTdHlsZXNoZWV0c0xvYWQodHJ1ZSk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHZpZXctPnNjcm9sbFRvRnJhZ21lbnQodXJsKTsK KyAgICB9CisKIH0KIAogYm9vbCBGcmFtZUxvYWRlcjo6c2hvdWxkQ2xvc2UoKQpJbmRleDogU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMjUyNzU2KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTY5LDEyICsyMTY5LDEy IEBAIHZvaWQgRnJhbWVWaWV3OjpyZXN0b3JlU2Nyb2xsYmFyKCkKIGJvb2wgRnJhbWVWaWV3Ojpz Y3JvbGxUb0ZyYWdtZW50KGNvbnN0IFVSTCYgdXJsKQogewogICAgIFN0cmluZyBmcmFnbWVudElk ZW50aWZpZXIgPSB1cmwuZnJhZ21lbnRJZGVudGlmaWVyKCk7Ci0gICAgaWYgKHNjcm9sbFRvQW5j aG9yKGZyYWdtZW50SWRlbnRpZmllcikpCisgICAgaWYgKHNjcm9sbFRvRnJhZ21lbnRJbnRlcm5h bChmcmFnbWVudElkZW50aWZpZXIpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIFRy eSBhZ2FpbiBhZnRlciBkZWNvZGluZyB0aGUgcmVmLCBiYXNlZCBvbiB0aGUgZG9jdW1lbnQncyBl bmNvZGluZy4KICAgICBpZiAoVGV4dFJlc291cmNlRGVjb2RlciogZGVjb2RlciA9IGZyYW1lKCku ZG9jdW1lbnQoKS0+ZGVjb2RlcigpKSB7Ci0gICAgICAgIGlmIChzY3JvbGxUb0FuY2hvcihkZWNv ZGVVUkxFc2NhcGVTZXF1ZW5jZXMoZnJhZ21lbnRJZGVudGlmaWVyLCBkZWNvZGVyLT5lbmNvZGlu ZygpKSkpCisgICAgICAgIGlmIChzY3JvbGxUb0ZyYWdtZW50SW50ZXJuYWwoZGVjb2RlVVJMRXNj YXBlU2VxdWVuY2VzKGZyYWdtZW50SWRlbnRpZmllciwgZGVjb2Rlci0+ZW5jb2RpbmcoKSkpKQog ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCkBAIC0yMTgyLDcgKzIxODIsNyBAQCBi b29sIEZyYW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudChjb25zdCBVCiAgICAgcmV0dXJuIGZhbHNl OwogfQogCi1ib29sIEZyYW1lVmlldzo6c2Nyb2xsVG9BbmNob3IoY29uc3QgU3RyaW5nJiBmcmFn bWVudElkZW50aWZpZXIpCitib29sIEZyYW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudEludGVybmFs KGNvbnN0IFN0cmluZyYgZnJhZ21lbnRJZGVudGlmaWVyKQogewogICAgIExPRyhTY3JvbGxpbmcs ICJGcmFtZVZpZXc6OnNjcm9sbFRvQW5jaG9yICVzIiwgZnJhZ21lbnRJZGVudGlmaWVyLnV0Zjgo KS5kYXRhKCkpOwogCkBAIC0yMTkyLDEzICsyMTkyLDcgQEAgYm9vbCBGcmFtZVZpZXc6OnNjcm9s bFRvQW5jaG9yKGNvbnN0IFN0cgogCiAgICAgQVNTRVJUKGZyYW1lKCkuZG9jdW1lbnQoKSk7CiAg ICAgYXV0byYgZG9jdW1lbnQgPSAqZnJhbWUoKS5kb2N1bWVudCgpOwotCi0gICAgaWYgKCFkb2N1 bWVudC5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKSkgewotICAgICAgICBkb2N1bWVudC5zZXRHb3Rv QW5jaG9yTmVlZGVkQWZ0ZXJTdHlsZXNoZWV0c0xvYWQodHJ1ZSk7Ci0gICAgICAgIHJldHVybiBm YWxzZTsKLSAgICB9Ci0KLSAgICBkb2N1bWVudC5zZXRHb3RvQW5jaG9yTmVlZGVkQWZ0ZXJTdHls ZXNoZWV0c0xvYWQoZmFsc2UpOworICAgIFJFTEVBU0VfQVNTRVJUKGRvY3VtZW50LmhhdmVTdHls ZXNoZWV0c0xvYWRlZCgpKTsKIAogICAgIEVsZW1lbnQqIGFuY2hvckVsZW1lbnQgPSBkb2N1bWVu dC5maW5kQW5jaG9yKGZyYWdtZW50SWRlbnRpZmllcik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuaAkocmV2aXNpb24gMjUyNzU2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDI1LDcgKzQyNSw2IEBAIHB1YmxpYzoKICAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIGFkanVzdFBhZ2VIZWlnaHREZXByZWNhdGVkKGZsb2F0KiBuZXdCb3R0 b20sIGZsb2F0IG9sZFRvcCwgZmxvYXQgb2xkQm90dG9tLCBmbG9hdCBib3R0b21MaW1pdCk7CiAK ICAgICBib29sIHNjcm9sbFRvRnJhZ21lbnQoY29uc3QgVVJMJik7Ci0gICAgYm9vbCBzY3JvbGxU b0FuY2hvcihjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIG1haW50YWluU2Nyb2xsUG9zaXRpb25B dEFuY2hvcihDb250YWluZXJOb2RlKik7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzY3JvbGxF bGVtZW50VG9SZWN0KGNvbnN0IEVsZW1lbnQmLCBjb25zdCBJbnRSZWN0Jik7CiAKQEAgLTc3OCw2 ICs3NzcsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVXaWRnZXRQb3NpdGlvbnNUaW1l ckZpcmVkKCk7CiAKKyAgICBib29sIHNjcm9sbFRvRnJhZ21lbnRJbnRlcm5hbChjb25zdCBTdHJp bmcmKTsKICAgICB2b2lkIHNjcm9sbFRvQW5jaG9yKCk7CiAgICAgdm9pZCBzY3JvbGxQb3NpdGlv bkNoYW5nZWQoY29uc3QgU2Nyb2xsUG9zaXRpb24mIG9sZFBvc2l0aW9uLCBjb25zdCBTY3JvbGxQ b3NpdGlvbiYgbmV3UG9zaXRpb24pOwogICAgIHZvaWQgc2Nyb2xsYWJsZUFyZWFTZXRDaGFuZ2Vk KCk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTI3NTYpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxOS0xMS0yMSAgUnlvc3VrZSBOaXdh ICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBTY3JvbGxpbmcgdG8gZnJhZ21lbnQgc2hv dWxkbid0IGhhcHBlbiBhcyBhIHBhcnQgb2YgdXBkYXRpbmcgc3R5bGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzk4MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hZGUgYW4gZXhpc3RpbmcgdGVzdCBt b3JlIHJvYnVzdC4KKworICAgICAgICAqIGZhc3QvcGFyc2VyL2Fkb3B0aW9uLWFnZW5jeS11bmxv YWQtaWZyYW1lLTQuaHRtbDogTWFkZSB0aGUgaWZyYW1lJ3MgZGF0YSBVUkwgbm90IGNhY2hhYmxl LgorCiAyMDE5LTExLTIxICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBpbiBhZ2FpbiwgcmVncmVzc2lvbiBpcyBub3QgY2F1 c2VkIGJ5IGl0CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9hZG9wdGlvbi1hZ2VuY3kt dW5sb2FkLWlmcmFtZS00Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9wYXJz ZXIvYWRvcHRpb24tYWdlbmN5LXVubG9hZC1pZnJhbWUtNC5odG1sCShyZXZpc2lvbiAyNTI3NTYp CisrKyBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9hZG9wdGlvbi1hZ2VuY3ktdW5sb2FkLWlmcmFt ZS00Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAgdGVzdC5zdGVwKCgpID0+ IHsKIAogICAgIGRvYy53cml0ZShgPGRpdj48Yj48cD48c2NyaXB0PgogICAgICAgICBwYXJlbnQu cCA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ3AnKTsKLSAgICAgICAgZG9jdW1lbnQud3JpdGUo JzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iZGF0YTosYSI+Jyk7CisgICAgICAgIGRvY3Vt ZW50LndyaXRlKCc8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9ImRhdGE6LGEkeyhuZXcgRGF0 ZSkudG9JU09TdHJpbmcoKSArIE1hdGgucmFuZG9tKCl9Ij4nKTsKICAgICAgICAgbG9jYXRpb24u aGFzaCA9ICd0YXJnZXQnOwogICAgIDxcL3NjcmlwdD48L2I+PC9wPjwvZGl2PjwvYm9keT5gKTsK IH0pOwo= 384114 2019-11-21 17:57:25 -0800 2019-11-21 18:30:48 -0800 Patch bug-203982-20191121175725.patch text/plain 8491 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1Mjc1NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE5LTExLTIxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNjcm9sbGluZyB0byBmcmFnbWVu dCBzaG91bGRuJ3QgaGFwcGVuIGFzIGEgcGFydCBvZiB1cGRhdGluZyBzdHlsZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzOTgyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc2Nyb2xsIHRvIHRo ZSBjdXJyZW50IFVSTCdzIGZyYWdtZW50IGF0IHRoZSBlbmQgb2YgcmVzb2x2ZVN0eWxlLiBJbnN0 ZWFkLCBzY2hlZHVsZSBhIHRhc2sKKyAgICAgICAgdG8gc2Nyb2xsIHRvIHRoZSBjdXJyZW50IFVS TCdzIGZyYWdtZW50IHdoZW4gYWxsIHBlbmRpbmcgc3R5bGVzaGVldHMgaGF2ZSBmaW5pc2hlZCBs b2FkaW5nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBtb3ZlcyB0aGUgY29kZSB3aGljaCBz ZXRzIGEgRG9jdW1lbnQncyBtX2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZGZs YWcKKyAgICAgICAgZnJvbSBGcmFtZVZpZXcgdG8gRnJhbWVMb2FkZXIgYXMgRnJhbWVWaWV3IHNo b3VsZG4ndCBiZSByZWx5aW5nIG9uIHRoZSBzdGF0ZXMgb2YgcGVuZGluZyBzdHlsZXNoZWV0cy4K KworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dDo6cmVzb2x2ZVN0eWxlKTogUmVtb3ZlZCB0aGUgY29kZSB0byBzY3JvbGwgdG8gdGhlIGN1cnJl bnQgVVJMJ3MgZnJhZ21lbnQuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGlkUmVtb3Zl QWxsUGVuZGluZ1N0eWxlc2hlZXQpOiBBZGRlZCBhIGNvZGUgdG8gc2NoZWR1bGUgYSB0YXNrIHRv IHNjb2xsLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6c2Nyb2xsVG9GcmFnbWVudFdpdGhQYXJlbnRCb3VuZGFyeSk6IE1v dmVkIHRoZSBjb2RlIHRvIHRyaWdnZXIgdGhlIGNvZGUKKyAgICAgICAgaW4gZGlkUmVtb3ZlQWxs UGVuZGluZ1N0eWxlc2hlZXQgZnJvbSBGcmFtZVZpZXcuCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzY3JvbGxUb0ZyYWdtZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsVG9GcmFnbWVudEludGVybmFsKTog UmVuYW1lZCBmcm9tIHNjcm9sbFRvQW5jaG9yIHNpbmNlIHRoaXMgZnVuY3Rpb24gc2V0cworICAg ICAgICB0aGUgY3VycmVudCBhbmNob3IuIEFsc28gcmVtb3ZlZCB0aGUgY29kZSB3aGljaCBkZWZl cnMgdGhlIHNjcm9sbGluZyBiYXNlZCBvbiBwZW5kaW5nIHN0eWxlc2hlZXRzJworICAgICAgICBz dGF0ZXMgc2luY2Ugc3VjaCBhIGNvZGUgZG9lc24ndCBiZWxvbmcgaW4gRnJhbWVWaWV3LgorICAg ICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisKIDIwMTktMTEtMjEgIFBlbmcgTGl1ICA8cGVuZy5s aXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBJZ25vcmUgdGhlIHJlcXVlc3RzIHRvIGVudGVyL2V4 aXQgdmlkZW8gZnVsbHNjcmVlbi9waWN0dXJlLWluLXBpY3R1cmUgaWYgdGhlIHJlcXVlc3Rpbmcg bW9kZSBpcyB0aGUgc2FtZSBhcyB0aGUgY3VycmVudCBtb2RlCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAJKHJldmlzaW9uIDI1Mjc1NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMDEsOSArMjAwMSw2IEBAIHZvaWQgRG9jdW1lbnQ6 OnJlc29sdmVTdHlsZShSZXNvbHZlU3R5bGUKICAgICAvLyBjaGVjayBpZiB0aGV5IG5lZWQgdG8g YmUgcmVzdW1lZCBhZnRlciBsYXlvdXQuCiAgICAgaWYgKHVwZGF0ZWRDb21wb3NpdGluZ0xheWVy cyAmJiAhZnJhbWVWaWV3Lm5lZWRzTGF5b3V0KCkpCiAgICAgICAgIGZyYW1lVmlldy52aWV3cG9y dENvbnRlbnRzQ2hhbmdlZCgpOwotCi0gICAgaWYgKG1fZ290b0FuY2hvck5lZWRlZEFmdGVyU3R5 bGVzaGVldHNMb2FkICYmICFzdHlsZVNjb3BlKCkuaGFzUGVuZGluZ1NoZWV0cygpKQotICAgICAg ICBmcmFtZVZpZXcuc2Nyb2xsVG9GcmFnbWVudChtX3VybCk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6 OnVwZGF0ZVRleHRSZW5kZXJlcihUZXh0JiB0ZXh0LCB1bnNpZ25lZCBvZmZzZXRPZlJlcGxhY2Vk VGV4dCwgdW5zaWduZWQgbGVuZ3RoT2ZSZXBsYWNlZFRleHQpCkBAIC0zNDcyLDYgKzM0NjksMjAg QEAgdm9pZCBEb2N1bWVudDo6ZGlkUmVtb3ZlQWxsUGVuZGluZ1N0eWxlcwogewogICAgIGlmIChh dXRvKiBwYXJzZXIgPSBzY3JpcHRhYmxlRG9jdW1lbnRQYXJzZXIoKSkKICAgICAgICAgcGFyc2Vy LT5leGVjdXRlU2NyaXB0c1dhaXRpbmdGb3JTdHlsZXNoZWV0c1Nvb24oKTsKKworICAgIGlmICht X2dvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCkgeworICAgICAgICAvLyBodHRw czovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS9icm93c2luZy10aGUtd2ViLmh0bWwj dHJ5LXRvLXNjcm9sbC10by10aGUtZnJhZ21lbnQKKyAgICAgICAgZXZlbnRMb29wKCkucXVldWVU YXNrKFRhc2tTb3VyY2U6Ok5ldHdvcmtpbmcsIFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyksIHRoaXNdIHsKKyAgICAgICAgICAgIGF1dG8gZnJhbWVWaWV3ID0gbWFrZVJlZlB0cih2aWV3 KCkpOworICAgICAgICAgICAgaWYgKCFmcmFtZVZpZXcpCisgICAgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgaWYgKCFoYXZlU3R5bGVzaGVldHNMb2FkZWQoKSkgeworICAgICAgICAg ICAgICAgIG1fZ290b0FuY2hvck5lZWRlZEFmdGVyU3R5bGVzaGVldHNMb2FkID0gdHJ1ZTsKKyAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBmcmFtZVZp ZXctPnNjcm9sbFRvRnJhZ21lbnQobV91cmwpOworICAgICAgICB9KTsKKyAgICB9CiB9CiAKIGJv b2wgRG9jdW1lbnQ6OnVzZXNTdHlsZUJhc2VkRWRpdGFiaWxpdHkoKSBjb25zdApJbmRleDogU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAyNTI3NTYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjUw LDEyICszMjUwLDE5IEBAIHN0YXRpYyBib29sIGlzU2FtZURvY3VtZW50UmVsb2FkKGJvb2wgaXMK IAogdm9pZCBGcmFtZUxvYWRlcjo6c2Nyb2xsVG9GcmFnbWVudFdpdGhQYXJlbnRCb3VuZGFyeShj b25zdCBVUkwmIHVybCwgYm9vbCBpc05ld05hdmlnYXRpb24pCiB7Ci0gICAgRnJhbWVWaWV3KiB2 aWV3ID0gbV9mcmFtZS52aWV3KCk7Ci0gICAgaWYgKCF2aWV3KQorICAgIGF1dG8gdmlldyA9IG1h a2VSZWZQdHIobV9mcmFtZS52aWV3KCkpOworICAgIGF1dG8gZG9jdW1lbnQgPSBtYWtlUmVmUHRy KG1fZnJhbWUuZG9jdW1lbnQoKSk7CisgICAgaWYgKCF2aWV3IHx8ICFkb2N1bWVudCkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKGlzU2FtZURvY3VtZW50UmVsb2FkKGlzTmV3TmF2aWdhdGlv biwgbV9sb2FkVHlwZSkgfHwgaXRlbUFsbG93c1Njcm9sbFJlc3RvcmF0aW9uKGhpc3RvcnkoKS5j dXJyZW50SXRlbSgpKSkKLSAgICAgICAgdmlldy0+c2Nyb2xsVG9GcmFnbWVudCh1cmwpOworICAg IGlmIChpc1NhbWVEb2N1bWVudFJlbG9hZChpc05ld05hdmlnYXRpb24sIG1fbG9hZFR5cGUpIHx8 IGl0ZW1BbGxvd3NTY3JvbGxSZXN0b3JhdGlvbihoaXN0b3J5KCkuY3VycmVudEl0ZW0oKSkpIHsK KyAgICAgICAgLy8gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy9tdWx0aXBhZ2UvYnJvd3Np bmctdGhlLXdlYi5odG1sI3RyeS10by1zY3JvbGwtdG8tdGhlLWZyYWdtZW50CisgICAgICAgIGlm ICghZG9jdW1lbnQtPmhhdmVTdHlsZXNoZWV0c0xvYWRlZCgpKQorICAgICAgICAgICAgZG9jdW1l bnQtPnNldEdvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCh0cnVlKTsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgdmlldy0+c2Nyb2xsVG9GcmFnbWVudCh1cmwpOworICAgIH0K KwogfQogCiBib29sIEZyYW1lTG9hZGVyOjpzaG91bGRDbG9zZSgpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAyNTI3NTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNjksMTIgKzIxNjksMTIgQEAgdm9p ZCBGcmFtZVZpZXc6OnJlc3RvcmVTY3JvbGxiYXIoKQogYm9vbCBGcmFtZVZpZXc6OnNjcm9sbFRv RnJhZ21lbnQoY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgU3RyaW5nIGZyYWdtZW50SWRlbnRpZmll ciA9IHVybC5mcmFnbWVudElkZW50aWZpZXIoKTsKLSAgICBpZiAoc2Nyb2xsVG9BbmNob3IoZnJh Z21lbnRJZGVudGlmaWVyKSkKKyAgICBpZiAoc2Nyb2xsVG9GcmFnbWVudEludGVybmFsKGZyYWdt ZW50SWRlbnRpZmllcikpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gVHJ5IGFnYWlu IGFmdGVyIGRlY29kaW5nIHRoZSByZWYsIGJhc2VkIG9uIHRoZSBkb2N1bWVudCdzIGVuY29kaW5n LgogICAgIGlmIChUZXh0UmVzb3VyY2VEZWNvZGVyKiBkZWNvZGVyID0gZnJhbWUoKS5kb2N1bWVu dCgpLT5kZWNvZGVyKCkpIHsKLSAgICAgICAgaWYgKHNjcm9sbFRvQW5jaG9yKGRlY29kZVVSTEVz Y2FwZVNlcXVlbmNlcyhmcmFnbWVudElkZW50aWZpZXIsIGRlY29kZXItPmVuY29kaW5nKCkpKSkK KyAgICAgICAgaWYgKHNjcm9sbFRvRnJhZ21lbnRJbnRlcm5hbChkZWNvZGVVUkxFc2NhcGVTZXF1 ZW5jZXMoZnJhZ21lbnRJZGVudGlmaWVyLCBkZWNvZGVyLT5lbmNvZGluZygpKSkpCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTIxODIsNyArMjE4Miw3IEBAIGJvb2wgRnJh bWVWaWV3OjpzY3JvbGxUb0ZyYWdtZW50KGNvbnN0IFUKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK LWJvb2wgRnJhbWVWaWV3OjpzY3JvbGxUb0FuY2hvcihjb25zdCBTdHJpbmcmIGZyYWdtZW50SWRl bnRpZmllcikKK2Jvb2wgRnJhbWVWaWV3OjpzY3JvbGxUb0ZyYWdtZW50SW50ZXJuYWwoY29uc3Qg U3RyaW5nJiBmcmFnbWVudElkZW50aWZpZXIpCiB7CiAgICAgTE9HKFNjcm9sbGluZywgIkZyYW1l Vmlldzo6c2Nyb2xsVG9BbmNob3IgJXMiLCBmcmFnbWVudElkZW50aWZpZXIudXRmOCgpLmRhdGEo KSk7CiAKQEAgLTIxOTIsMTMgKzIxOTIsNyBAQCBib29sIEZyYW1lVmlldzo6c2Nyb2xsVG9BbmNo b3IoY29uc3QgU3RyCiAKICAgICBBU1NFUlQoZnJhbWUoKS5kb2N1bWVudCgpKTsKICAgICBhdXRv JiBkb2N1bWVudCA9ICpmcmFtZSgpLmRvY3VtZW50KCk7Ci0KLSAgICBpZiAoIWRvY3VtZW50Lmhh dmVTdHlsZXNoZWV0c0xvYWRlZCgpKSB7Ci0gICAgICAgIGRvY3VtZW50LnNldEdvdG9BbmNob3JO ZWVkZWRBZnRlclN0eWxlc2hlZXRzTG9hZCh0cnVlKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgIH0KLQotICAgIGRvY3VtZW50LnNldEdvdG9BbmNob3JOZWVkZWRBZnRlclN0eWxlc2hlZXRz TG9hZChmYWxzZSk7CisgICAgUkVMRUFTRV9BU1NFUlQoZG9jdW1lbnQuaGF2ZVN0eWxlc2hlZXRz TG9hZGVkKCkpOwogCiAgICAgRWxlbWVudCogYW5jaG9yRWxlbWVudCA9IGRvY3VtZW50LmZpbmRB bmNob3IoZnJhZ21lbnRJZGVudGlmaWVyKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o CShyZXZpc2lvbiAyNTI3NTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCSh3 b3JraW5nIGNvcHkpCkBAIC00MjUsNyArNDI1LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgYWRqdXN0UGFnZUhlaWdodERlcHJlY2F0ZWQoZmxvYXQqIG5ld0JvdHRvbSwgZmxv YXQgb2xkVG9wLCBmbG9hdCBvbGRCb3R0b20sIGZsb2F0IGJvdHRvbUxpbWl0KTsKIAogICAgIGJv b2wgc2Nyb2xsVG9GcmFnbWVudChjb25zdCBVUkwmKTsKLSAgICBib29sIHNjcm9sbFRvQW5jaG9y KGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgbWFpbnRhaW5TY3JvbGxQb3NpdGlvbkF0QW5jaG9y KENvbnRhaW5lck5vZGUqKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNjcm9sbEVsZW1lbnRU b1JlY3QoY29uc3QgRWxlbWVudCYsIGNvbnN0IEludFJlY3QmKTsKIApAQCAtNzc4LDYgKzc3Nyw3 IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHVwZGF0ZVdpZGdldFBvc2l0aW9uc1RpbWVyRmlyZWQo KTsKIAorICAgIGJvb2wgc2Nyb2xsVG9GcmFnbWVudEludGVybmFsKGNvbnN0IFN0cmluZyYpOwog ICAgIHZvaWQgc2Nyb2xsVG9BbmNob3IoKTsKICAgICB2b2lkIHNjcm9sbFBvc2l0aW9uQ2hhbmdl ZChjb25zdCBTY3JvbGxQb3NpdGlvbiYgb2xkUG9zaXRpb24sIGNvbnN0IFNjcm9sbFBvc2l0aW9u JiBuZXdQb3NpdGlvbik7CiAgICAgdm9pZCBzY3JvbGxhYmxlQXJlYVNldENoYW5nZWQoKTsKSW5k ZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHJldmlzaW9uIDI1Mjc1NikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTExLTIxICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNjcm9sbGluZyB0byBmcmFnbWVudCBzaG91bGRuJ3Qg aGFwcGVuIGFzIGEgcGFydCBvZiB1cGRhdGluZyBzdHlsZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzOTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFkZSBhbiBleGlzdGluZyB0ZXN0IG1vcmUgcm9i dXN0LgorCisgICAgICAgICogZmFzdC9wYXJzZXIvYWRvcHRpb24tYWdlbmN5LXVubG9hZC1pZnJh bWUtNC5odG1sOiBNYWRlIHRoZSBpZnJhbWUncyBkYXRhIFVSTCBub3QgY2FjaGFibGUuCisKIDIw MTktMTEtMjEgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIGluIGFnYWluLCByZWdyZXNzaW9uIGlzIG5vdCBjYXVzZWQgYnkg aXQKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcGFyc2VyL2Fkb3B0aW9uLWFnZW5jeS11bmxvYWQt aWZyYW1lLTQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9hZG9w dGlvbi1hZ2VuY3ktdW5sb2FkLWlmcmFtZS00Lmh0bWwJKHJldmlzaW9uIDI1Mjc1NikKKysrIExh eW91dFRlc3RzL2Zhc3QvcGFyc2VyL2Fkb3B0aW9uLWFnZW5jeS11bmxvYWQtaWZyYW1lLTQuaHRt bAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQCB0ZXN0LnN0ZXAoKCkgPT4gewogCiAg ICAgZG9jLndyaXRlKGA8ZGl2PjxiPjxwPjxzY3JpcHQ+CiAgICAgICAgIHBhcmVudC5wID0gZG9j dW1lbnQucXVlcnlTZWxlY3RvcigncCcpOwotICAgICAgICBkb2N1bWVudC53cml0ZSgnPGxpbmsg cmVsPSJzdHlsZXNoZWV0IiBocmVmPSJkYXRhOixhIj4nKTsKKyAgICAgICAgZG9jdW1lbnQud3Jp dGUoJzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iZGF0YTosYSR7KG5ldyBEYXRlKS50b0lT T1N0cmluZygpICsgTWF0aC5yYW5kb20oKX0iPicpOwogICAgICAgICBsb2NhdGlvbi5oYXNoID0g J3RhcmdldCc7CiAgICAgPFwvc2NyaXB0PjwvYj48L3A+PC9kaXY+PC9ib2R5PmApOwogfSk7Cg==