208271 2020-02-26 15:43:13 -0800 Add performance probes for HTML parsing 2020-03-02 21:18:11 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham beidson benjamin cdumez cmarcelo commit-queue dbates esprehn+autocc ews-watchlist gyuyoung.kim koivisto nham sam webkit-bug-importer oldest_to_newest 1623231 0 nham 2020-02-26 15:43:13 -0800 When analyzing a document loading trace, it's useful to know what lines of HTML have been parsed. Let's add some trace points for this. 1623232 1 webkit-bug-importer 2020-02-26 15:43:45 -0800 <rdar://problem/59824845> 1623234 2 391793 nham 2020-02-26 15:47:02 -0800 Created attachment 391793 Patch 1623872 3 391793 dbates 2020-02-27 21:13:15 -0800 Comment on attachment 391793 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391793&action=review This patch is good. > Source/WTF/ChangeLog:8 > + This adds some instrumentation so we can know which lines of HTML have been parsed when This is ok as-is. No change is necessary. FYI it is an "in the know" convention that change log lines are wrapped at ~100 characters. > Source/WebCore/ChangeLog:8 > + This adds some instrumentation so we can know which lines of HTML have been parsed when Ditto. Again, NO change necessary. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:30 > +#include <wtf/SystemTracing.h> This is ok as-is. According to WebKit code style this include should be after all other includes. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:307 > + bool isMainDocument = document() && document()->frame() && document()->frame()->isMainFrame(); This is ok as-is. The optimal solution removes the null check of document() because 1. It can never be nullptr when THIS function called. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:309 > + TextPosition startPosition = textPosition(); This is ok as-is. The optimal solution is to use auto because 1. The right hand side (rhs) is as descriptive as the left. 2. If the data type of the rhs were to change in the future then using auto will prevent implicit conversion, which could be a 🐜. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:316 > + TextPosition endPosition = textPosition(); Ditto. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:317 > + tracePoint(ParseHTMLEnd, endPosition.m_line.oneBasedInt(), endPosition.m_column.oneBasedInt()); This is ok as-is. A better solution would be to define a lambda or INLINED private member function that takes a TracePointCode and use this function twice because: 1. Do not need to duplicate code 2. If there is a bug in this code or future enhancement then it can be made in one place instead of 2. One suggestion for a name, tracePointIfMainDocument() > Tools/ChangeLog:8 > + This adds some instrumentation so we can know which lines of HTML have been parsed when Ok as is. NO change necessary. Line is long. 1623873 4 391793 dbates 2020-02-27 21:14:41 -0800 Comment on attachment 391793 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391793&action=review > Source/WTF/ChangeLog:5 > + Ok as-is. NO change necessary. Another "in the know" convention is to put radar URL here and in every ChangeLog because: 1. Makes it convenient for Apple engineers to open radar bug 1624080 5 392006 nham 2020-02-28 12:56:57 -0800 Created attachment 392006 Patch 1624191 6 392006 sam 2020-02-28 17:13:13 -0800 Comment on attachment 392006 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392006&action=review > Source/WebCore/html/parser/HTMLDocumentParser.cpp:70 > + , m_shouldEmitTracePoints(isMainDocumentLoadingFromHTTP(document)) Why only when isMainDocumentLoadingFromHTTP? 1624276 7 nham 2020-02-29 07:53:28 -0800 (In reply to Sam Weinig from comment #6) > Comment on attachment 392006 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=392006&action=review > > > Source/WebCore/html/parser/HTMLDocumentParser.cpp:70 > > + , m_shouldEmitTracePoints(isMainDocumentLoadingFromHTTP(document)) > > Why only when isMainDocumentLoadingFromHTTP? For one thing, when you only log intervals related to the main document, it's unambiguous which URL is being parsed when you see the interval in the trace. Once you start emitting parsing intervals related to iframes in the trace, the next question is probably what iframe URL is being parsed. Passing in string metadata like this isn't easy to do for a ktrace-based probe. For another, if trace points can nest (like iframe parsing interval under a main frame parsing interval), then you have to pass something like a pointer to allow the instrumentation tool to properly nest the intervals. We don't do this properly anywhere with WTF::tracePoint right now. I am thinking of passing HTML parsing events through os_signpost, which has a richer API for annotation which allows us to pass things like URLs, but they show up in a bit uglier way in our instrumentation tool, and it's blocked by https://bugs.webkit.org/show_bug.cgi?id=208395. 1624924 8 392245 nham 2020-03-02 20:33:42 -0800 Created attachment 392245 Patch for landing 1624937 9 392245 commit-queue 2020-03-02 21:18:09 -0800 Comment on attachment 392245 Patch for landing Clearing flags on attachment: 392245 Committed r257763: <https://trac.webkit.org/changeset/257763> 1624938 10 commit-queue 2020-03-02 21:18:11 -0800 All reviewed patches have been landed. Closing bug. 391793 2020-02-26 15:47:02 -0800 2020-02-28 12:56:55 -0800 Patch bug-208271-20200226154702.patch text/plain 6185 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDZlMWQ4ZWNhYTNiZTFiMWY2YmIzZDZl YTZkMGI0MjI2MjFiOTY2MzAuLjExMGE2YmY3ZWFlN2JkZDg4YjViZjliNTJmOTlmMzgwNGUwMDhk NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDItMjYgIEJlbiBOaGFtICA8bmhhbUBhcHBs ZS5jb20+CisKKyAgICAgICAgQWRkIHBlcmZvcm1hbmNlIHByb2JlcyBmb3IgSFRNTCBwYXJzaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgyNzEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFk ZHMgc29tZSBpbnN0cnVtZW50YXRpb24gc28gd2UgY2FuIGtub3cgd2hpY2ggbGluZXMgb2YgSFRN TCBoYXZlIGJlZW4gcGFyc2VkIHdoZW4KKyAgICAgICAgbG9va2luZyBhdCBhIHBlcmZvcm1hbmNl IHRyYWNlLgorCisgICAgICAgICogd3RmL1N5c3RlbVRyYWNpbmcuaDoKKwogMjAyMC0wMi0yNSAg RGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogc2FmYXJpIGFwcCBleHRlbnNpb24gaXNvbGF0ZWQgd29ybGRzIGFuZCBpbmplY3RlZCBmaWxl cyB1c2UgdGhlIGV4dGVuc2lvbidzIGlkZW50aWZpZXIgaW5zdGVhZCBvZiBpdHMgbmFtZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGFlYWY5NjdiMzhkMzdkNmIyNjUwMDYwYWZhNDQ1MDZhNGIxYWVmZTIuLjk3YmIz NzhmODA3ZWRjOGNhMmFiODI4MDYxYTMwZTZiNGNkMTg2NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNiBAQAorMjAyMC0wMi0yNiAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4KKworICAgICAg ICBBZGQgcGVyZm9ybWFuY2UgcHJvYmVzIGZvciBIVE1MIHBhcnNpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODI3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBzb21lIGluc3RydW1l bnRhdGlvbiBzbyB3ZSBjYW4ga25vdyB3aGljaCBsaW5lcyBvZiBIVE1MIGhhdmUgYmVlbiBwYXJz ZWQgd2hlbgorICAgICAgICBsb29raW5nIGF0IGEgcGVyZm9ybWFuY2UgdHJhY2UuCisKKyAgICAg ICAgKiBodG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTERvY3VtZW50UGFyc2VyOjpwdW1wVG9rZW5pemVyKToKKwogMjAyMC0wMi0yNiAgSmFj b2IgVXBob2ZmICA8amFjb2JfdXBob2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjU3MzczLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvU3lzdGVt VHJhY2luZy5oIGIvU291cmNlL1dURi93dGYvU3lzdGVtVHJhY2luZy5oCmluZGV4IDBiZjVkZDlk NDAwZTg1MGM0NjQ0YmUxMDRmZDJkMmYyN2U0YjFkZmUuLjQxZjNlMGU4MDNkY2M2YjIxNmM4NzRi NDgzZWNiNDExZTc1NDQ0ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1N5c3RlbVRyYWNp bmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9TeXN0ZW1UcmFjaW5nLmgKQEAgLTg2LDYgKzg2LDgg QEAgZW51bSBUcmFjZVBvaW50Q29kZSB7CiAgICAgQ29tcG9zaXRpbmdVcGRhdGVFbmQsCiAgICAg RGlzcGF0Y2hUb3VjaEV2ZW50c1N0YXJ0LAogICAgIERpc3BhdGNoVG91Y2hFdmVudHNFbmQsCisg ICAgUGFyc2VIVE1MU3RhcnQsCisgICAgUGFyc2VIVE1MRW5kLAogCiAgICAgV2ViS2l0UmFuZ2Ug PSAxMDAwMCwKICAgICBXZWJIVE1MVmlld1BhaW50U3RhcnQsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAppbmRleCBlNjZhMGYzMDcyYmRl NWUxNDE0OWZmODcwMDgzZWFmMWJmOTAxNWM0Li5mZTU2MDE0Nzk4ZDlhM2QzZWQ5NzdhNjRmMTNl OTljMzcwODM1ODY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1M RG9jdW1lbnRQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxE b2N1bWVudFBhcnNlci5jcHAKQEAgLTI3LDYgKzI3LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIK ICNpbmNsdWRlICJIVE1MRG9jdW1lbnRQYXJzZXIuaCIKIAorI2luY2x1ZGUgPHd0Zi9TeXN0ZW1U cmFjaW5nLmg+CisKICNpbmNsdWRlICJDdXN0b21IZWFkZXJGaWVsZHMuaCIKICNpbmNsdWRlICJD dXN0b21FbGVtZW50UmVhY3Rpb25RdWV1ZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50RnJhZ21lbnQu aCIKQEAgLTMwMiw4ICszMDQsMTkgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6OnB1bXBUb2tl bml6ZXIoU3luY2hyb25vdXNNb2RlIG1vZGUpCiAKICAgICBtX3hzc0F1ZGl0b3IuaW5pdChkb2N1 bWVudCgpLCAmbV94c3NBdWRpdG9yRGVsZWdhdGUpOwogCisgICAgYm9vbCBpc01haW5Eb2N1bWVu dCA9IGRvY3VtZW50KCkgJiYgZG9jdW1lbnQoKS0+ZnJhbWUoKSAmJiBkb2N1bWVudCgpLT5mcmFt ZSgpLT5pc01haW5GcmFtZSgpOworICAgIGlmIChpc01haW5Eb2N1bWVudCkgeworICAgICAgICBU ZXh0UG9zaXRpb24gc3RhcnRQb3NpdGlvbiA9IHRleHRQb3NpdGlvbigpOworICAgICAgICB0cmFj ZVBvaW50KFBhcnNlSFRNTFN0YXJ0LCBzdGFydFBvc2l0aW9uLm1fbGluZS5vbmVCYXNlZEludCgp LCBzdGFydFBvc2l0aW9uLm1fY29sdW1uLm9uZUJhc2VkSW50KCkpOworICAgIH0KKwogICAgIGJv b2wgc2hvdWxkUmVzdW1lID0gcHVtcFRva2VuaXplckxvb3AobW9kZSwgaXNQYXJzaW5nRnJhZ21l bnQoKSwgc2Vzc2lvbik7CiAKKyAgICBpZiAoaXNNYWluRG9jdW1lbnQpIHsKKyAgICAgICAgVGV4 dFBvc2l0aW9uIGVuZFBvc2l0aW9uID0gdGV4dFBvc2l0aW9uKCk7CisgICAgICAgIHRyYWNlUG9p bnQoUGFyc2VIVE1MRW5kLCBlbmRQb3NpdGlvbi5tX2xpbmUub25lQmFzZWRJbnQoKSwgZW5kUG9z aXRpb24ubV9jb2x1bW4ub25lQmFzZWRJbnQoKSk7CisgICAgfQorCiAgICAgLy8gRW5zdXJlIHdl IGhhdmVuJ3QgYmVlbiB0b3RhbGx5IGRlcmVmJ2VkIGFmdGVyIHB1bXBpbmcuIEFueSBjYWxsZXIg b2YgdGhpcwogICAgIC8vIGZ1bmN0aW9uIHNob3VsZCBiZSBob2xkaW5nIGEgUmVmUHRyIHRvIHRo aXMgdG8gZW5zdXJlIHdlIHdlcmVuJ3QgZGVsZXRlZC4KICAgICBBU1NFUlQocmVmQ291bnQoKSA+ PSAxKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCBjNWE2NTZjMWQ4ZmJkMDQ5OWZhNTcwNDI5OWYyN2U2NjNlYjcwZDZiLi44NjY1ZDU2ZWFkYzQx ZGNjM2Y3ZWZlM2QyOWZiODZmZjc4MjU2ZWMxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDItMjYgIEJlbiBO aGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHBlcmZvcm1hbmNlIHByb2JlcyBm b3IgSFRNTCBwYXJzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDgyNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIGFkZHMgc29tZSBpbnN0cnVtZW50YXRpb24gc28gd2UgY2FuIGtub3cgd2hp Y2ggbGluZXMgb2YgSFRNTCBoYXZlIGJlZW4gcGFyc2VkIHdoZW4KKyAgICAgICAgbG9va2luZyBh dCBhIHBlcmZvcm1hbmNlIHRyYWNlLgorCisgICAgICAgICogVHJhY2luZy9TeXN0ZW1UcmFjZVBv aW50cy5wbGlzdDoKKwogMjAyMC0wMi0yNiAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5j b20+CiAKICAgICAgICAgW2lPU10gU2VuZCBmb2N1cyB1cGRhdGUgaW1tZWRpYXRlbHkgb24gYmVj b21pbmcgb3IgcmVzaWduaW5nIGZpcnN0IHJlc3BvbmRlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvVHJh Y2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdCBiL1Rvb2xzL1RyYWNpbmcvU3lzdGVtVHJhY2VQ b2ludHMucGxpc3QKaW5kZXggMmI1M2I0MmNlZWI5YmY3ZDNjNzI5NjZmMmJkYTJiOTMxYjZmZjg0 Zi4uZDViMmNlNzk5ODI0Y2M1YzA1NGNjNjc1YWE1NjcyZTg3ZjY5ODUwZCAxMDA2NDQKLS0tIGEv VG9vbHMvVHJhY2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdAorKysgYi9Ub29scy9UcmFjaW5n L1N5c3RlbVRyYWNlUG9pbnRzLnBsaXN0CkBAIC0yODUsNiArMjg1LDQ2IEBACiAgICAgICAgICAg ICAgICAgIDxrZXk+Q29kZUVuZDwva2V5PgogICAgICAgICAgICAgICAgICA8c3RyaW5nPjUwMzU8 L3N0cmluZz4KICAgICAgICAgICAgICA8L2RpY3Q+CisgICAgICAgICAgICAgPGRpY3Q+CisgICAg ICAgICAgICAgICAgIDxrZXk+TmFtZTwva2V5PgorICAgICAgICAgICAgICAgICA8c3RyaW5nPlBh cnNlIEhUTUw8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5UeXBlPC9rZXk+CisgICAg ICAgICAgICAgICAgIDxzdHJpbmc+SW50ZXJ2YWw8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAg PGtleT5Db21wb25lbnQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz40Nzwvc3RyaW5n PgorICAgICAgICAgICAgICAgICA8a2V5PkNvZGVCZWdpbjwva2V5PgorICAgICAgICAgICAgICAg ICA8c3RyaW5nPjUwMzY8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5Db2RlRW5kPC9r ZXk+CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+NTAzNzwvc3RyaW5nPgorICAgICAgICAgICAg ICAgICA8a2V5PkFyZ05hbWVzQmVnaW48L2tleT4KKyAgICAgICAgICAgICAgICAgPGRpY3Q+Cisg ICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAgICAgICAgICAgICAgICA8 c3RyaW5nPlN0YXJ0IExpbmU8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgPGtleT5Bcmcy PC9rZXk+CisgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+U3RhcnQgQ29sPC9zdHJpbmc+Cisg ICAgICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAgICAgICAgICAgPGtleT5BcmdWYWx1ZVR5 cGVzQmVnaW48L2tleT4KKyAgICAgICAgICAgICAgICAgPGRpY3Q+CisgICAgICAgICAgICAgICAg ICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPkRlY2ltYWw8 L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcyPC9rZXk+CisgICAgICAgICAg ICAgICAgICAgIDxzdHJpbmc+RGVjaW1hbDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8L2Rp Y3Q+CisgICAgICAgICAgICAgICAgIDxrZXk+QXJnTmFtZXNFbmQ8L2tleT4KKyAgICAgICAgICAg ICAgICAgPGRpY3Q+CisgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAg ICAgICAgICAgICAgICA8c3RyaW5nPkVuZCBMaW5lPC9zdHJpbmc+CisgICAgICAgICAgICAgICAg ICAgIDxrZXk+QXJnMjwva2V5PgorICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPkVuZCBDb2w8 L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0PgorICAgICAgICAgICAgICAgICA8a2V5 PkFyZ1ZhbHVlVHlwZXNFbmQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPGRpY3Q+CisgICAgICAg ICAgICAgICAgICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAgICAgICAgICAgICAgICA8c3RyaW5n PkRlY2ltYWw8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcyPC9rZXk+Cisg ICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+RGVjaW1hbDwvc3RyaW5nPgorICAgICAgICAgICAg ICAgICA8L2RpY3Q+CisgICAgICAgICAgICAgPC9kaWN0PgogICAgICAgICAgICAgIDxkaWN0Pgog ICAgICAgICAgICAgICAgICA8a2V5Pk5hbWU8L2tleT4KICAgICAgICAgICAgICAgICAgPHN0cmlu Zz5QYWludCBXZWJIVE1MVmlldzwvc3RyaW5nPgo= 392006 2020-02-28 12:56:57 -0800 2020-03-02 20:33:40 -0800 Patch bug-208271-20200228125656.patch text/plain 7539 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNhM2ExODc2ZmY0ZDFhMWU0NWEzNTVi ZDMzZGQ4NTQ4YTMzNmFmN2UuLmYzNzBhNDQyMzk0M2YyYjM3Mjc4MmFiZGM1MTUzZGU1MGJmOTRj NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDItMjggIEJlbiBOaGFtICA8bmhhbUBhcHBs ZS5jb20+CisKKyAgICAgICAgQWRkIHBlcmZvcm1hbmNlIHByb2JlcyBmb3IgSFRNTCBwYXJzaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgyNzEK KworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgVGhpcyBhZGRz IHByb2JlcyB0aGF0IHNob3cgd2hpY2ggbGluZXMgb2YgSFRNTCBhcmUgaGF2ZSBiZWVuIHBhcnNl ZC4KKworICAgICAgICAqIHd0Zi9TeXN0ZW1UcmFjaW5nLmg6CisKIDIwMjAtMDItMjcgIEJhc3Vr ZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10g Rml4IFJlbW90ZUluc3BlY3RvciByZWNvbm5lY3QgaXNzdWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxZDBiNGY1 YjBlZWJkNjc0OWE3YTY0YjhkMTE5YTljZmU1OTg5ZTJiLi5iODkyNGQwZWVkYmM1NGNhNmRhMzA2 NmQzNWJhNTA4MGJlNzZmN2I1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDIt MjggIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHBlcmZvcm1hbmNl IHByb2JlcyBmb3IgSFRNTCBwYXJzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDgyNzEKKworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0 ZXMuCisKKyAgICAgICAgVGhpcyBhZGRzIHByb2JlcyB0aGF0IHNob3cgd2hpY2ggbGluZXMgb2Yg SFRNTCBhcmUgaGF2ZSBiZWVuIHBhcnNlZC4KKworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxE b2N1bWVudFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6 OnB1bXBUb2tlbml6ZXIpOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNl ci5oOgorCiAyMDIwLTAyLTI4ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAg ICAgICB1cGRhdGVDU1NUcmFuc2l0aW9uc0ZvckVsZW1lbnRBbmRQcm9wZXJ0eSBzaG91bGQgY2xv bmUgUmVuZGVyU3R5bGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9TeXN0ZW1UcmFjaW5n LmggYi9Tb3VyY2UvV1RGL3d0Zi9TeXN0ZW1UcmFjaW5nLmgKaW5kZXggMGJmNWRkOWQ0MDBlODUw YzQ2NDRiZTEwNGZkMmQyZjI3ZTRiMWRmZS4uNDFmM2UwZTgwM2RjYzZiMjE2Yzg3NGI0ODNlY2I0 MTFlNzU0NDQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvU3lzdGVtVHJhY2luZy5oCisr KyBiL1NvdXJjZS9XVEYvd3RmL1N5c3RlbVRyYWNpbmcuaApAQCAtODYsNiArODYsOCBAQCBlbnVt IFRyYWNlUG9pbnRDb2RlIHsKICAgICBDb21wb3NpdGluZ1VwZGF0ZUVuZCwKICAgICBEaXNwYXRj aFRvdWNoRXZlbnRzU3RhcnQsCiAgICAgRGlzcGF0Y2hUb3VjaEV2ZW50c0VuZCwKKyAgICBQYXJz ZUhUTUxTdGFydCwKKyAgICBQYXJzZUhUTUxFbmQsCiAKICAgICBXZWJLaXRSYW5nZSA9IDEwMDAw LAogICAgIFdlYkhUTUxWaWV3UGFpbnRTdGFydCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4IGU2NmEwZjMwNzJiZGU1ZTE0MTQ5 ZmY4NzAwODNlYWYxYmY5MDE1YzQuLmNjZTllZGEwNGY0MDczOTI5NzQ0MTUyZGZkNjI3M2I5NGRk NzI2ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVu dFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50 UGFyc2VyLmNwcApAQCAtNDUsMTIgKzQ1LDE5IEBACiAjaW5jbHVkZSAiU2NyaXB0RWxlbWVudC5o IgogI2luY2x1ZGUgIlRocm93T25EeW5hbWljTWFya3VwSW5zZXJ0aW9uQ291bnRJbmNyZW1lbnRl ci5oIgogCisjaW5jbHVkZSA8d3RmL1N5c3RlbVRyYWNpbmcuaD4KKwogbmFtZXNwYWNlIFdlYkNv cmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCiBERUZJTkVfQUxMT0NBVE9SX1dJ VEhfSEVBUF9JREVOVElGSUVSKEhUTUxEb2N1bWVudFBhcnNlcik7CiAKK3N0YXRpYyBib29sIGlz TWFpbkRvY3VtZW50TG9hZGluZ0Zyb21IVFRQKGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCkKK3sK KyAgICByZXR1cm4gIWRvY3VtZW50Lm93bmVyRWxlbWVudCgpICYmIGRvY3VtZW50LnVybCgpLnBy b3RvY29sSXNJbkhUVFBGYW1pbHkoKTsKK30KKwogSFRNTERvY3VtZW50UGFyc2VyOjpIVE1MRG9j dW1lbnRQYXJzZXIoSFRNTERvY3VtZW50JiBkb2N1bWVudCkKICAgICA6IFNjcmlwdGFibGVEb2N1 bWVudFBhcnNlcihkb2N1bWVudCkKICAgICAsIG1fb3B0aW9ucyhkb2N1bWVudCkKQEAgLTYwLDYg KzY3LDcgQEAgSFRNTERvY3VtZW50UGFyc2VyOjpIVE1MRG9jdW1lbnRQYXJzZXIoSFRNTERvY3Vt ZW50JiBkb2N1bWVudCkKICAgICAsIG1fcGFyc2VyU2NoZWR1bGVyKG1ha2VVbmlxdWU8SFRNTFBh cnNlclNjaGVkdWxlcj4oKnRoaXMpKQogICAgICwgbV94c3NBdWRpdG9yRGVsZWdhdGUoZG9jdW1l bnQpCiAgICAgLCBtX3ByZWxvYWRlcihtYWtlVW5pcXVlPEhUTUxSZXNvdXJjZVByZWxvYWRlcj4o ZG9jdW1lbnQpKQorICAgICwgbV9zaG91bGRFbWl0VHJhY2VQb2ludHMoaXNNYWluRG9jdW1lbnRM b2FkaW5nRnJvbUhUVFAoZG9jdW1lbnQpKQogewogfQogCkBAIC03NCw2ICs4Miw3IEBAIGlubGlu ZSBIVE1MRG9jdW1lbnRQYXJzZXI6OkhUTUxEb2N1bWVudFBhcnNlcihEb2N1bWVudEZyYWdtZW50 JiBmcmFnbWVudCwgRWxlbWVuCiAgICAgLCBtX3Rva2VuaXplcihtX29wdGlvbnMpCiAgICAgLCBt X3RyZWVCdWlsZGVyKG1ha2VVbmlxdWU8SFRNTFRyZWVCdWlsZGVyPigqdGhpcywgZnJhZ21lbnQs IGNvbnRleHRFbGVtZW50LCBwYXJzZXJDb250ZW50UG9saWN5KCksIG1fb3B0aW9ucykpCiAgICAg LCBtX3hzc0F1ZGl0b3JEZWxlZ2F0ZShmcmFnbWVudC5kb2N1bWVudCgpKQorICAgICwgbV9zaG91 bGRFbWl0VHJhY2VQb2ludHMoZmFsc2UpIC8vIEF2b2lkIGVtaXR0aW5nIHRyYWNlIHBvaW50cyB3 aGVuIHBhcnNpbmcgZnJhZ21lbnRzIGxpa2Ugb3V0ZXJIVE1MLgogewogICAgIC8vIGh0dHBzOi8v aHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL3N5bnRheC5odG1sI3BhcnNpbmctaHRtbC1m cmFnbWVudHMKICAgICBpZiAoY29udGV4dEVsZW1lbnQuaXNIVE1MRWxlbWVudCgpKQpAQCAtMzAy LDcgKzMxMSwxNyBAQCB2b2lkIEhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcihTeW5j aHJvbm91c01vZGUgbW9kZSkKIAogICAgIG1feHNzQXVkaXRvci5pbml0KGRvY3VtZW50KCksICZt X3hzc0F1ZGl0b3JEZWxlZ2F0ZSk7CiAKKyAgICBhdXRvIGVtaXRUcmFjZVBvaW50ID0gW3RoaXNd KFRyYWNlUG9pbnRDb2RlIGNvZGUpIHsKKyAgICAgICAgaWYgKCFtX3Nob3VsZEVtaXRUcmFjZVBv aW50cykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBhdXRvIHBvc2l0aW9uID0gdGV4 dFBvc2l0aW9uKCk7CisgICAgICAgIHRyYWNlUG9pbnQoY29kZSwgcG9zaXRpb24ubV9saW5lLm9u ZUJhc2VkSW50KCksIHBvc2l0aW9uLm1fY29sdW1uLm9uZUJhc2VkSW50KCkpOworICAgIH07CisK KyAgICBlbWl0VHJhY2VQb2ludChQYXJzZUhUTUxTdGFydCk7CiAgICAgYm9vbCBzaG91bGRSZXN1 bWUgPSBwdW1wVG9rZW5pemVyTG9vcChtb2RlLCBpc1BhcnNpbmdGcmFnbWVudCgpLCBzZXNzaW9u KTsKKyAgICBlbWl0VHJhY2VQb2ludChQYXJzZUhUTUxFbmQpOwogCiAgICAgLy8gRW5zdXJlIHdl IGhhdmVuJ3QgYmVlbiB0b3RhbGx5IGRlcmVmJ2VkIGFmdGVyIHB1bXBpbmcuIEFueSBjYWxsZXIg b2YgdGhpcwogICAgIC8vIGZ1bmN0aW9uIHNob3VsZCBiZSBob2xkaW5nIGEgUmVmUHRyIHRvIHRo aXMgdG8gZW5zdXJlIHdlIHdlcmVuJ3QgZGVsZXRlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmgKaW5kZXggZTFlYjQ1YzBjYmIzMzhkN2I2ZGNj OGQ2NmU3ODA3MjNmMjNkN2JkYi4uODUyNzZhYjFhN2RlMGM4N2Q4NTNjYWJjYTkxMzVkMTBlODQ1 YjMyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50 UGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFy c2VyLmgKQEAgLTE0Myw2ICsxNDMsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2VuZFdhc0Rl bGF5ZWQgeyBmYWxzZSB9OwogICAgIHVuc2lnbmVkIG1fcHVtcFNlc3Npb25OZXN0aW5nTGV2ZWwg eyAwIH07CisgICAgYm9vbCBtX3Nob3VsZEVtaXRUcmFjZVBvaW50cyB7IGZhbHNlIH07CiB9Owog CiBpbmxpbmUgSFRNTFRva2VuaXplciYgSFRNTERvY3VtZW50UGFyc2VyOjp0b2tlbml6ZXIoKQpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGYxMmFh NmI1MDVkYjc3NDliYTcwMzNjNWJhZTM1MGY1OWU5ZGQwMDQuLmNjMjQyMjdjMjNjYTU4Yzk2NTQw OTQwNzI5MTJmOTc4ZGNiNDU2NGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0wMi0yOCAgQmVuIE5oYW0gIDxu aGFtQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgcGVyZm9ybWFuY2UgcHJvYmVzIGZvciBIVE1M IHBhcnNpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwODI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRlcy4KKworICAgICAgICBU aGlzIGFkZHMgcHJvYmVzIHRoYXQgc2hvdyB3aGljaCBsaW5lcyBvZiBIVE1MIGFyZSBoYXZlIGJl ZW4gcGFyc2VkLgorCisgICAgICAgICogVHJhY2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdDoK KwogMjAyMC0wMi0yOCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW2V3c10gY29tbWl0IHF1ZXVlIHNob3VsZCBza2lwIGJ1aWxkaW5nIGFuZCB0ZXN0aW5n IGZvciByb2xsb3V0IHBhdGNoZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1RyYWNpbmcvU3lzdGVtVHJh Y2VQb2ludHMucGxpc3QgYi9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNlUG9pbnRzLnBsaXN0Cmlu ZGV4IDJiNTNiNDJjZWViOWJmN2QzYzcyOTY2ZjJiZGEyYjkzMWI2ZmY4NGYuLmQ1YjJjZTc5OTgy NGNjNWMwNTRjYzY3NWFhNTY3MmU4N2Y2OTg1MGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1RyYWNpbmcv U3lzdGVtVHJhY2VQb2ludHMucGxpc3QKKysrIGIvVG9vbHMvVHJhY2luZy9TeXN0ZW1UcmFjZVBv aW50cy5wbGlzdApAQCAtMjg1LDYgKzI4NSw0NiBAQAogICAgICAgICAgICAgICAgICA8a2V5PkNv ZGVFbmQ8L2tleT4KICAgICAgICAgICAgICAgICAgPHN0cmluZz41MDM1PC9zdHJpbmc+CiAgICAg ICAgICAgICAgPC9kaWN0PgorICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAgICAgICAgICA8 a2V5Pk5hbWU8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz5QYXJzZSBIVE1MPC9zdHJp bmc+CisgICAgICAgICAgICAgICAgIDxrZXk+VHlwZTwva2V5PgorICAgICAgICAgICAgICAgICA8 c3RyaW5nPkludGVydmFsPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29tcG9uZW50 PC9rZXk+CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+NDc8L3N0cmluZz4KKyAgICAgICAgICAg ICAgICAgPGtleT5Db2RlQmVnaW48L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz41MDM2 PC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29kZUVuZDwva2V5PgorICAgICAgICAg ICAgICAgICA8c3RyaW5nPjUwMzc8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5BcmdO YW1lc0JlZ2luPC9rZXk+CisgICAgICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAgICAgICAg ICAgICA8a2V5PkFyZzE8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5TdGFydCBM aW5lPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMjwva2V5PgorICAgICAg ICAgICAgICAgICAgICA8c3RyaW5nPlN0YXJ0IENvbDwvc3RyaW5nPgorICAgICAgICAgICAgICAg ICA8L2RpY3Q+CisgICAgICAgICAgICAgICAgIDxrZXk+QXJnVmFsdWVUeXBlc0JlZ2luPC9rZXk+ CisgICAgICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzE8 L2tleT4KKyAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5EZWNpbWFsPC9zdHJpbmc+CisgICAg ICAgICAgICAgICAgICAgIDxrZXk+QXJnMjwva2V5PgorICAgICAgICAgICAgICAgICAgICA8c3Ry aW5nPkRlY2ltYWw8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0PgorICAgICAgICAg ICAgICAgICA8a2V5PkFyZ05hbWVzRW5kPC9rZXk+CisgICAgICAgICAgICAgICAgIDxkaWN0Pgor ICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzE8L2tleT4KKyAgICAgICAgICAgICAgICAgICAg PHN0cmluZz5FbmQgTGluZTwvc3RyaW5nPgorICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzI8 L2tleT4KKyAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5FbmQgQ29sPC9zdHJpbmc+CisgICAg ICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAgICAgICAgICAgPGtleT5BcmdWYWx1ZVR5cGVz RW5kPC9rZXk+CisgICAgICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAgICAgICAgICAgICA8 a2V5PkFyZzE8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5EZWNpbWFsPC9zdHJp bmc+CisgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMjwva2V5PgorICAgICAgICAgICAgICAg ICAgICA8c3RyaW5nPkRlY2ltYWw8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0Pgor ICAgICAgICAgICAgIDwvZGljdD4KICAgICAgICAgICAgICA8ZGljdD4KICAgICAgICAgICAgICAg ICAgPGtleT5OYW1lPC9rZXk+CiAgICAgICAgICAgICAgICAgIDxzdHJpbmc+UGFpbnQgV2ViSFRN TFZpZXc8L3N0cmluZz4K 392245 2020-03-02 20:33:42 -0800 2020-03-02 21:18:09 -0800 Patch for landing bug-208271-20200302203341.patch text/plain 7573 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDU0MzIzN2FjMThmYzgzOWM3NWI2NTdi MmI4NGJhNTdkNTQ3MzY1ZGEuLjgyNDZmMmQyN2M5YjZkYmMyZjQ2ZjI0OTJiODI1OTJlZWQyODNm NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMDIgIEJlbiBOaGFtICA8bmhhbUBhcHBs ZS5jb20+CisKKyAgICAgICAgQWRkIHBlcmZvcm1hbmNlIHByb2JlcyBmb3IgSFRNTCBwYXJzaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgyNzEK KworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgVGhpcyBhZGRz IHByb2JlcyB0aGF0IHNob3cgd2hpY2ggbGluZXMgb2YgSFRNTCBhcmUgaGF2ZSBiZWVuIHBhcnNl ZC4KKworICAgICAgICAqIHd0Zi9TeXN0ZW1UcmFjaW5nLmg6CisKIDIwMjAtMDMtMDIgIEFsYW4g Q29vbiAgPGFsYW5jb29uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbmV3IE1hYyB0YXJnZXQg bnVtYmVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDYwNzc0ODA2NzcxZmE2MDFlMDNiYzFkMTYwYjg1ZmVhMDk3 Zjg4YTUuLjVlM2RjNDljZDMxM2NiNjQ0N2Q0YTgzMGVjN2M4YjUxOTZiNmRkNGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wMy0wMiAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgcGVyZm9ybWFuY2UgcHJvYmVzIGZvciBIVE1MIHBhcnNpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODI3MQorCisg ICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRlcy4KKworICAgICAgICBUaGlzIGFkZHMgcHJv YmVzIHRoYXQgc2hvdyB3aGljaCBsaW5lcyBvZiBIVE1MIGFyZSBoYXZlIGJlZW4gcGFyc2VkLgor CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcik6CisgICAgICAgICog aHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmg6CisKIDIwMjAtMDMtMDIgIEFuZHJlcyBH b256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBmb3IgTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvdmFsdWUtY2hhbmdlL3ZhbHVlLWNoYW5nZS11c2VyLWlu Zm8tY29udGVudGVkaXRhYmxlLmh0bWwgaW4gSXNvbGF0ZWRUcmVlIG1vZGUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL3d0Zi9TeXN0ZW1UcmFjaW5nLmggYi9Tb3VyY2UvV1RGL3d0Zi9TeXN0ZW1U cmFjaW5nLmgKaW5kZXggMGJmNWRkOWQ0MDBlODUwYzQ2NDRiZTEwNGZkMmQyZjI3ZTRiMWRmZS4u NDFmM2UwZTgwM2RjYzZiMjE2Yzg3NGI0ODNlY2I0MTFlNzU0NDQ4NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dURi93dGYvU3lzdGVtVHJhY2luZy5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1N5c3RlbVRy YWNpbmcuaApAQCAtODYsNiArODYsOCBAQCBlbnVtIFRyYWNlUG9pbnRDb2RlIHsKICAgICBDb21w b3NpdGluZ1VwZGF0ZUVuZCwKICAgICBEaXNwYXRjaFRvdWNoRXZlbnRzU3RhcnQsCiAgICAgRGlz cGF0Y2hUb3VjaEV2ZW50c0VuZCwKKyAgICBQYXJzZUhUTUxTdGFydCwKKyAgICBQYXJzZUhUTUxF bmQsCiAKICAgICBXZWJLaXRSYW5nZSA9IDEwMDAwLAogICAgIFdlYkhUTUxWaWV3UGFpbnRTdGFy dCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBh cnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIu Y3BwCmluZGV4IGU2NmEwZjMwNzJiZGU1ZTE0MTQ5ZmY4NzAwODNlYWYxYmY5MDE1YzQuLmNjZTll ZGEwNGY0MDczOTI5NzQ0MTUyZGZkNjI3M2I5NGRkNzI2ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtNDUsMTIgKzQ1LDE5 IEBACiAjaW5jbHVkZSAiU2NyaXB0RWxlbWVudC5oIgogI2luY2x1ZGUgIlRocm93T25EeW5hbWlj TWFya3VwSW5zZXJ0aW9uQ291bnRJbmNyZW1lbnRlci5oIgogCisjaW5jbHVkZSA8d3RmL1N5c3Rl bVRyYWNpbmcuaD4KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRN TE5hbWVzOwogCiBERUZJTkVfQUxMT0NBVE9SX1dJVEhfSEVBUF9JREVOVElGSUVSKEhUTUxEb2N1 bWVudFBhcnNlcik7CiAKK3N0YXRpYyBib29sIGlzTWFpbkRvY3VtZW50TG9hZGluZ0Zyb21IVFRQ KGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCkKK3sKKyAgICByZXR1cm4gIWRvY3VtZW50Lm93bmVy RWxlbWVudCgpICYmIGRvY3VtZW50LnVybCgpLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKTsKK30K KwogSFRNTERvY3VtZW50UGFyc2VyOjpIVE1MRG9jdW1lbnRQYXJzZXIoSFRNTERvY3VtZW50JiBk b2N1bWVudCkKICAgICA6IFNjcmlwdGFibGVEb2N1bWVudFBhcnNlcihkb2N1bWVudCkKICAgICAs IG1fb3B0aW9ucyhkb2N1bWVudCkKQEAgLTYwLDYgKzY3LDcgQEAgSFRNTERvY3VtZW50UGFyc2Vy OjpIVE1MRG9jdW1lbnRQYXJzZXIoSFRNTERvY3VtZW50JiBkb2N1bWVudCkKICAgICAsIG1fcGFy c2VyU2NoZWR1bGVyKG1ha2VVbmlxdWU8SFRNTFBhcnNlclNjaGVkdWxlcj4oKnRoaXMpKQogICAg ICwgbV94c3NBdWRpdG9yRGVsZWdhdGUoZG9jdW1lbnQpCiAgICAgLCBtX3ByZWxvYWRlcihtYWtl VW5pcXVlPEhUTUxSZXNvdXJjZVByZWxvYWRlcj4oZG9jdW1lbnQpKQorICAgICwgbV9zaG91bGRF bWl0VHJhY2VQb2ludHMoaXNNYWluRG9jdW1lbnRMb2FkaW5nRnJvbUhUVFAoZG9jdW1lbnQpKQog ewogfQogCkBAIC03NCw2ICs4Miw3IEBAIGlubGluZSBIVE1MRG9jdW1lbnRQYXJzZXI6OkhUTUxE b2N1bWVudFBhcnNlcihEb2N1bWVudEZyYWdtZW50JiBmcmFnbWVudCwgRWxlbWVuCiAgICAgLCBt X3Rva2VuaXplcihtX29wdGlvbnMpCiAgICAgLCBtX3RyZWVCdWlsZGVyKG1ha2VVbmlxdWU8SFRN TFRyZWVCdWlsZGVyPigqdGhpcywgZnJhZ21lbnQsIGNvbnRleHRFbGVtZW50LCBwYXJzZXJDb250 ZW50UG9saWN5KCksIG1fb3B0aW9ucykpCiAgICAgLCBtX3hzc0F1ZGl0b3JEZWxlZ2F0ZShmcmFn bWVudC5kb2N1bWVudCgpKQorICAgICwgbV9zaG91bGRFbWl0VHJhY2VQb2ludHMoZmFsc2UpIC8v IEF2b2lkIGVtaXR0aW5nIHRyYWNlIHBvaW50cyB3aGVuIHBhcnNpbmcgZnJhZ21lbnRzIGxpa2Ug b3V0ZXJIVE1MLgogewogICAgIC8vIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlw YWdlL3N5bnRheC5odG1sI3BhcnNpbmctaHRtbC1mcmFnbWVudHMKICAgICBpZiAoY29udGV4dEVs ZW1lbnQuaXNIVE1MRWxlbWVudCgpKQpAQCAtMzAyLDcgKzMxMSwxNyBAQCB2b2lkIEhUTUxEb2N1 bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcihTeW5jaHJvbm91c01vZGUgbW9kZSkKIAogICAgIG1f eHNzQXVkaXRvci5pbml0KGRvY3VtZW50KCksICZtX3hzc0F1ZGl0b3JEZWxlZ2F0ZSk7CiAKKyAg ICBhdXRvIGVtaXRUcmFjZVBvaW50ID0gW3RoaXNdKFRyYWNlUG9pbnRDb2RlIGNvZGUpIHsKKyAg ICAgICAgaWYgKCFtX3Nob3VsZEVtaXRUcmFjZVBvaW50cykKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICBhdXRvIHBvc2l0aW9uID0gdGV4dFBvc2l0aW9uKCk7CisgICAgICAgIHRyYWNl UG9pbnQoY29kZSwgcG9zaXRpb24ubV9saW5lLm9uZUJhc2VkSW50KCksIHBvc2l0aW9uLm1fY29s dW1uLm9uZUJhc2VkSW50KCkpOworICAgIH07CisKKyAgICBlbWl0VHJhY2VQb2ludChQYXJzZUhU TUxTdGFydCk7CiAgICAgYm9vbCBzaG91bGRSZXN1bWUgPSBwdW1wVG9rZW5pemVyTG9vcChtb2Rl LCBpc1BhcnNpbmdGcmFnbWVudCgpLCBzZXNzaW9uKTsKKyAgICBlbWl0VHJhY2VQb2ludChQYXJz ZUhUTUxFbmQpOwogCiAgICAgLy8gRW5zdXJlIHdlIGhhdmVuJ3QgYmVlbiB0b3RhbGx5IGRlcmVm J2VkIGFmdGVyIHB1bXBpbmcuIEFueSBjYWxsZXIgb2YgdGhpcwogICAgIC8vIGZ1bmN0aW9uIHNo b3VsZCBiZSBob2xkaW5nIGEgUmVmUHRyIHRvIHRoaXMgdG8gZW5zdXJlIHdlIHdlcmVuJ3QgZGVs ZXRlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVu dFBhcnNlci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2Vy LmgKaW5kZXggZTFlYjQ1YzBjYmIzMzhkN2I2ZGNjOGQ2NmU3ODA3MjNmMjNkN2JkYi4uODUyNzZh YjFhN2RlMGM4N2Q4NTNjYWJjYTkxMzVkMTBlODQ1YjMyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmgKQEAgLTE0Myw2ICsxNDMsNyBAQCBw cml2YXRlOgogCiAgICAgYm9vbCBtX2VuZFdhc0RlbGF5ZWQgeyBmYWxzZSB9OwogICAgIHVuc2ln bmVkIG1fcHVtcFNlc3Npb25OZXN0aW5nTGV2ZWwgeyAwIH07CisgICAgYm9vbCBtX3Nob3VsZEVt aXRUcmFjZVBvaW50cyB7IGZhbHNlIH07CiB9OwogCiBpbmxpbmUgSFRNTFRva2VuaXplciYgSFRN TERvY3VtZW50UGFyc2VyOjp0b2tlbml6ZXIoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDE2NzczOWM1ZTI0NTU3NjI2NjQwYWIzYzQ2MThjOGYy YjI3MGU3ZWUuLmZmMWViMGViM2M2NDkzMjhlZTY2MmI2ZGU4ZTAzZjY4MzhhMDE2YjUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NCBAQAorMjAyMC0wMy0wMiAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgcGVyZm9ybWFuY2UgcHJvYmVzIGZvciBIVE1MIHBhcnNpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODI3MQorCisgICAgICAgIFJldmlld2Vk IGJ5IERhbmllbCBCYXRlcy4KKworICAgICAgICBUaGlzIGFkZHMgcHJvYmVzIHRoYXQgc2hvdyB3 aGljaCBsaW5lcyBvZiBIVE1MIGFyZSBoYXZlIGJlZW4gcGFyc2VkLgorCisgICAgICAgICogVHJh Y2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdDoKKwogMjAyMC0wMy0wMiAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBNYXBwaW5nIGZyb20g TUlNRSB0eXBlIHRvIFVUSSB0eXBlIHNob3VsZCBiZSBkb25lIGluIHRoZSBVSSBwcm9jZXNzCmRp ZmYgLS1naXQgYS9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNlUG9pbnRzLnBsaXN0IGIvVG9vbHMv VHJhY2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdAppbmRleCAyYjUzYjQyY2VlYjliZjdkM2M3 Mjk2NmYyYmRhMmI5MzFiNmZmODRmLi5kNWIyY2U3OTk4MjRjYzVjMDU0Y2M2NzVhYTU2NzJlODdm Njk4NTBkIDEwMDY0NAotLS0gYS9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNlUG9pbnRzLnBsaXN0 CisrKyBiL1Rvb2xzL1RyYWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxpc3QKQEAgLTI4NSw2ICsy ODUsNDYgQEAKICAgICAgICAgICAgICAgICAgPGtleT5Db2RlRW5kPC9rZXk+CiAgICAgICAgICAg ICAgICAgIDxzdHJpbmc+NTAzNTwvc3RyaW5nPgogICAgICAgICAgICAgIDwvZGljdD4KKyAgICAg ICAgICAgICA8ZGljdD4KKyAgICAgICAgICAgICAgICAgPGtleT5OYW1lPC9rZXk+CisgICAgICAg ICAgICAgICAgIDxzdHJpbmc+UGFyc2UgSFRNTDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8 a2V5PlR5cGU8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz5JbnRlcnZhbDwvc3RyaW5n PgorICAgICAgICAgICAgICAgICA8a2V5PkNvbXBvbmVudDwva2V5PgorICAgICAgICAgICAgICAg ICA8c3RyaW5nPjQ3PC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29kZUJlZ2luPC9r ZXk+CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+NTAzNjwvc3RyaW5nPgorICAgICAgICAgICAg ICAgICA8a2V5PkNvZGVFbmQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz41MDM3PC9z dHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+QXJnTmFtZXNCZWdpbjwva2V5PgorICAgICAg ICAgICAgICAgICA8ZGljdD4KKyAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcxPC9rZXk+Cisg ICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+U3RhcnQgTGluZTwvc3RyaW5nPgorICAgICAgICAg ICAgICAgICAgICA8a2V5PkFyZzI8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5T dGFydCBDb2w8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0PgorICAgICAgICAgICAg ICAgICA8a2V5PkFyZ1ZhbHVlVHlwZXNCZWdpbjwva2V5PgorICAgICAgICAgICAgICAgICA8ZGlj dD4KKyAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcxPC9rZXk+CisgICAgICAgICAgICAgICAg ICAgIDxzdHJpbmc+RGVjaW1hbDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICAgICA8a2V5PkFy ZzI8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5EZWNpbWFsPC9zdHJpbmc+Cisg ICAgICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAgICAgICAgICAgPGtleT5BcmdOYW1lc0Vu ZDwva2V5PgorICAgICAgICAgICAgICAgICA8ZGljdD4KKyAgICAgICAgICAgICAgICAgICAgPGtl eT5BcmcxPC9rZXk+CisgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+RW5kIExpbmU8L3N0cmlu Zz4KKyAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcyPC9rZXk+CisgICAgICAgICAgICAgICAg ICAgIDxzdHJpbmc+RW5kIENvbDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8L2RpY3Q+Cisg ICAgICAgICAgICAgICAgIDxrZXk+QXJnVmFsdWVUeXBlc0VuZDwva2V5PgorICAgICAgICAgICAg ICAgICA8ZGljdD4KKyAgICAgICAgICAgICAgICAgICAgPGtleT5BcmcxPC9rZXk+CisgICAgICAg ICAgICAgICAgICAgIDxzdHJpbmc+RGVjaW1hbDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICAg ICA8a2V5PkFyZzI8L2tleT4KKyAgICAgICAgICAgICAgICAgICAgPHN0cmluZz5EZWNpbWFsPC9z dHJpbmc+CisgICAgICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAgICAgICA8L2RpY3Q+CiAg ICAgICAgICAgICAgPGRpY3Q+CiAgICAgICAgICAgICAgICAgIDxrZXk+TmFtZTwva2V5PgogICAg ICAgICAgICAgICAgICA8c3RyaW5nPlBhaW50IFdlYkhUTUxWaWV3PC9zdHJpbmc+Cg==