210893 2020-04-22 19:41:38 -0700 Web Inspector: front-end shouldn't change the order of User Style Sheet rules 2020-05-14 13:41:26 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev ews-watchlist graouts hi inspector-bugzilla-changes joepeck timothy tsavell webkit-bug-importer oldest_to_newest 1644629 0 nvasilyev 2020-04-22 19:41:38 -0700 <rdar://problem/61937118> 1644630 1 webkit-bug-importer 2020-04-22 19:41:52 -0700 <rdar://problem/62227866> 1644635 2 397305 nvasilyev 2020-04-22 19:50:51 -0700 Created attachment 397305 Patch 1644803 3 397305 hi 2020-04-23 09:44:35 -0700 Comment on attachment 397305 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397305&action=review r-, as I think this would no longer conform to the CSS cascade spec <https://www.w3.org/TR/css-cascade-3/#cascading>. It seems more likely that the issue is in the backend, specifically when we decide to use `Inspector::Protocol::CSS::StyleSheetOrigin::User`. Also, this needs tests. > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:791 > userAndUserAgentStyles.push(rule.style); this should be renamed if it's only `UserAgent` styles 1644959 4 nvasilyev 2020-04-23 14:15:03 -0700 (In reply to Devin Rousso from comment #3) > Comment on attachment 397305 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=397305&action=review > > r-, as I think this would no longer conform to the CSS cascade spec > <https://www.w3.org/TR/css-cascade-3/#cascading>. > > It seems more likely that the issue is in the backend, specifically when we > decide to use `Inspector::Protocol::CSS::StyleSheetOrigin::User`. Hm, it must be this: ``` Inspector::Protocol::CSS::StyleSheetOrigin InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument) { if (m_creatingViaInspectorStyleSheet) return Inspector::Protocol::CSS::StyleSheetOrigin::Inspector; if (pageStyleSheet && !pageStyleSheet->ownerNode() && pageStyleSheet->href().isEmpty()) return Inspector::Protocol::CSS::StyleSheetOrigin::UserAgent; if (pageStyleSheet && pageStyleSheet->ownerNode() && pageStyleSheet->ownerNode()->nodeName() == "#document") return Inspector::Protocol::CSS::StyleSheetOrigin::User; auto iterator = m_documentToInspectorStyleSheet.find(ownerDocument); if (iterator != m_documentToInspectorStyleSheet.end()) { for (auto& inspectorStyleSheet : iterator->value) { if (pageStyleSheet == inspectorStyleSheet->pageStyleSheet()) return Inspector::Protocol::CSS::StyleSheetOrigin::Inspector; } } return Inspector::Protocol::CSS::StyleSheetOrigin::Regular; } ``` > > Also, this needs tests. Any tips on how to test this? 1644977 5 nvasilyev 2020-04-23 15:01:38 -0700 It looks like this ``` if (pageStyleSheet && pageStyleSheet->ownerNode() && pageStyleSheet->ownerNode()->nodeName() == "#document") return Inspector::Protocol::CSS::StyleSheetOrigin::User; ``` is rather arbitrary and should be replaced with something that looks into the stylesheet's level. WebCore/page/UserStyleSheet.h defines `level` method. It looks like this is what should be used to determine whether inspector receives `Inspector::Protocol::CSS::StyleSheetOrigin::User` or something else. I don't understand the relationship between page/UserStyleSheet and css/CSSStyleSheet. I don't know if I can access the `level` method here. 1646889 6 nvasilyev 2020-04-29 00:28:28 -0700 (In reply to Nikita Vasilyev from comment #4) > > Also, this needs tests. > > Any tips on how to test this? Specifically, I need to mock User Style Sheet in an inspector test. We haven't done anything like this. 1651952 7 nvasilyev 2020-05-12 14:34:00 -0700 From what I observed, Web Inspector front-end receives style rules in the correct order. I see the order is determined here in WebCore/style/InspectorCSSOMWrappers.cpp: void InspectorCSSOMWrappers::collectDocumentWrappers(ExtensionStyleSheets& extensionStyleSheets) { ... collect(extensionStyleSheets.pageUserSheet()); collectFromStyleSheets(extensionStyleSheets.injectedUserStyleSheets()); collectFromStyleSheets(extensionStyleSheets.documentUserStyleSheets()); collectFromStyleSheets(extensionStyleSheets.injectedAuthorStyleSheets()); collectFromStyleSheets(extensionStyleSheets.authorStyleSheetsForTesting()); ... } Given that the order is (correctly) determined on the backend, it seems strange to have a front-end method (WI.DOMNodeStyles.prototype._collectStylesInCascadeOrder) that changes the order. I'm working on tests now. 1652068 8 399217 nvasilyev 2020-05-12 18:28:39 -0700 Created attachment 399217 Patch (In reply to Nikita Vasilyev from comment #5) > It looks like this > > ``` > if (pageStyleSheet && pageStyleSheet->ownerNode() && > pageStyleSheet->ownerNode()->nodeName() == "#document") > return Inspector::Protocol::CSS::StyleSheetOrigin::User; > ``` > > is rather arbitrary and should be replaced with something that looks into > the stylesheet's level. > > WebCore/page/UserStyleSheet.h defines `level` method. It looks like this is > what should be used to determine whether inspector receives > `Inspector::Protocol::CSS::StyleSheetOrigin::User` or something else. > > I don't understand the relationship between page/UserStyleSheet and > css/CSSStyleSheet. I don't know if I can access the `level` method here. I couldn't figure out how to do this but checking for "user-style-sheet://" protocol worked pretty well! cq- for now as I'm still trying to figure out how to write a Web Inspector test. 1652070 9 399218 nvasilyev 2020-05-12 18:38:21 -0700 Created attachment 399218 Patch 1652072 10 399218 hi 2020-05-12 18:43:27 -0700 Comment on attachment 399218 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399218&action=review > Source/WebCore/inspector/agents/InspectorCSSAgent.cpp:934 > - if (pageStyleSheet && pageStyleSheet->ownerNode() && pageStyleSheet->ownerNode()->nodeName() == "#document") > + if (pageStyleSheet && pageStyleSheet->baseURL() && pageStyleSheet->baseURL().protocolIs("user-style-sheet")) This seems fragile. I wonder if it's possible for an app to have a custom URL scheme handler for `user-style-sheet://`? Why not just check `pageStyleSheet->contents().isUserStyleSheet()`? 1652130 11 399244 nvasilyev 2020-05-12 23:39:20 -0700 Created attachment 399244 Patch isUserStyleSheet() works well, too! P.S. I your patch in Bug 211827 - Web Inspector: rename CSS.StyleSheetOrigin.Regular to CSS.StyleSheetOrigin.Author to match the spec. I'll rebase mine if yours lands first. 1652132 12 nvasilyev 2020-05-12 23:40:10 -0700 (In reply to Nikita Vasilyev from comment #11) > > P.S. I your patch... *I saw your patch... 1652630 13 399244 hi 2020-05-14 08:20:30 -0700 Comment on attachment 399244 Patch r=me 1652692 14 timothy 2020-05-14 10:47:01 -0700 <rdar://problem/61937118> 1652744 15 ews-feeder 2020-05-14 12:28:45 -0700 Committed r261703: <https://trac.webkit.org/changeset/261703> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399244. 1652777 16 tsavell 2020-05-14 13:41:26 -0700 It looks like the changes in https://trac.webkit.org/changeset/261703/webkit broke inspector/css/getMatchedStylesForNode.html Tracking in https://bugs.webkit.org/show_bug.cgi?id=211918 397305 2020-04-22 19:50:51 -0700 2020-05-12 18:28:39 -0700 Patch patch.txt text/plain 1725 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcxN2NmNWQwYTkzLi4xMzRlZjc1MmZmNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDQtMjIgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZnJvbnQtZW5kIHNob3VsZG4ndCBjaGFuZ2UgdGhlIG9yZGVyIG9mIFVzZXIgU3R5bGUgU2hl ZXQgcnVsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMDg5MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE5MzcxMTg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVs cy9ET01Ob2RlU3R5bGVzLmpzOgorICAgICAgICAoV0kuRE9NTm9kZVN0eWxlcy5wcm90b3R5cGUu X2NvbGxlY3RTdHlsZXNJbkNhc2NhZGVPcmRlcik6CisgICAgICAgIGBtYXRjaGVkUnVsZXNgIGhl cmUgYWxyZWFkeSBoYXMgVXNlciBTdHlsZSBTaGVldCBydWxlcyBpbiB0aGUgY29ycmVjdCBvcmRl ci4gTm8gbmVlZCBjaGFuZ2UgaXQuCisKIDIwMjAtMDQtMTcgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04ocjI0MjAx OCk6IHVzaW5nIGBSZWdFeHAucHJvdG90eXBlLnRlc3RgIHdpdGggYSBnbG9iYWwgYFJlZ0V4cGAg d2lsbCBpZ25vcmUgb25lIHBvdGVudGlhbCBtYXRjaCBhZnRlciBlYWNoIHN1Y2Nlc3NmdWwgbWF0 Y2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9ET01Ob2RlU3R5bGVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL0RPTU5vZGVTdHlsZXMuanMKaW5kZXggOTdiMzRjYjNmYzguLjAyZjU2ODViYTViIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9N Tm9kZVN0eWxlcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvRE9NTm9kZVN0eWxlcy5qcwpAQCAtNzgzLDEwICs3ODMsMTAgQEAgV0kuRE9NTm9kZVN0 eWxlcyA9IGNsYXNzIERPTU5vZGVTdHlsZXMgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAg IHN3aXRjaCAocnVsZS50eXBlKSB7CiAgICAgICAgICAgICBjYXNlIFdJLkNTU1N0eWxlU2hlZXQu VHlwZS5JbnNwZWN0b3I6CiAgICAgICAgICAgICBjYXNlIFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5B dXRob3I6CisgICAgICAgICAgICBjYXNlIFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5Vc2VyOgogICAg ICAgICAgICAgICAgIHJlc3VsdC5wdXNoKHJ1bGUuc3R5bGUpOwogICAgICAgICAgICAgICAgIGJy ZWFrOwogCi0gICAgICAgICAgICBjYXNlIFdJLkNTU1N0eWxlU2hlZXQuVHlwZS5Vc2VyOgogICAg ICAgICAgICAgY2FzZSBXSS5DU1NTdHlsZVNoZWV0LlR5cGUuVXNlckFnZW50OgogICAgICAgICAg ICAgICAgIHVzZXJBbmRVc2VyQWdlbnRTdHlsZXMucHVzaChydWxlLnN0eWxlKTsKICAgICAgICAg ICAgICAgICBicmVhazsK 399217 2020-05-12 18:28:39 -0700 2020-05-12 18:32:02 -0700 Patch patch.txt text/plain 2105 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMjZhNmQwODk3MC4uNWY2YjU1MzQ5YjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMC0wNS0xMiAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxl LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBmcm9udC1lbmQgc2hvdWxkbid0IGNoYW5n ZSB0aGUgb3JkZXIgb2YgVXNlciBTdHlsZSBTaGVldCBydWxlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwODkzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS82MTkzNzExOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBQcmV2aW91c2x5LCBzb21lIHN0eWxlIHNoZWV0cyB3b3VsZCBnZXQgaW5jb3JyZWN0 bHkgZGV0ZWN0ZWQgYXMgSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2lu OjpVc2VyLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIGN1cnJlbnRseSB0aGVyZSBk b2Vzbid0IHNlZW0gdG8gYmUgYSB3YXkgdG8gc2ltdWxhdGUgYSBVc2VyIFN0eWxlIFNoZWV0IGlu IFdlYiBJbnNwZWN0b3IgdGVzdHMuCisgICAgICAgIFRoZSBleGlzdGluZyB3aW5kb3cuaW50ZXJu YWxzLmluc2VydFVzZXJDU1MgZG9lc24ndCBzaW11bGF0ZSBhIHN0eWxlc2hlZXQgd2l0aCBhICJ1 c2VyLXN0eWxlLXNoZWV0IiBwcm90b2NvbC4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMv SW5zcGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdl bnQ6OmRldGVjdE9yaWdpbik6CisKIDIwMjAtMDQtMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdIEFkZCBjb2x1bW4gc3Bhbm5pbmcgc3VwcG9y dCBmb3IgZmxleGlibGUgdGFibGUgd2lkdGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggNDY2YWRkMTI2NDUuLmYz NDg5NTY5Zjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3RvckNTU0FnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRz L0luc3BlY3RvckNTU0FnZW50LmNwcApAQCAtOTMwLDggKzkzMCw4IEBAIEluc3BlY3Rvcjo6UHJv dG9jb2w6OkNTUzo6U3R5bGVTaGVldE9yaWdpbiBJbnNwZWN0b3JDU1NBZ2VudDo6ZGV0ZWN0T3Jp Z2luKENTU1N0CiAgICAgaWYgKHBhZ2VTdHlsZVNoZWV0ICYmICFwYWdlU3R5bGVTaGVldC0+b3du ZXJOb2RlKCkgJiYgcGFnZVN0eWxlU2hlZXQtPmhyZWYoKS5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW46OlVzZXJBZ2Vu dDsKIAotICAgIC8vIGlmIChwYWdlU3R5bGVTaGVldCAmJiBwYWdlU3R5bGVTaGVldC0+b3duZXJO b2RlKCkgJiYgcGFnZVN0eWxlU2hlZXQtPm93bmVyTm9kZSgpLT5ub2RlTmFtZSgpID09ICIjZG9j dW1lbnQiKQotICAgICAgICAvLyByZXR1cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpTdHls ZVNoZWV0T3JpZ2luOjpVc2VyOworICAgIGlmIChwYWdlU3R5bGVTaGVldCAmJiBwYWdlU3R5bGVT aGVldC0+YmFzZVVSTCgpICYmIHBhZ2VTdHlsZVNoZWV0LT5iYXNlVVJMKCkucHJvdG9jb2xJcygi dXNlci1zdHlsZS1zaGVldCIpKQorICAgICAgICByZXR1cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6 Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyOwogCiAgICAgYXV0byBpdGVyYXRvciA9IG1fZG9j dW1lbnRUb0luc3BlY3RvclN0eWxlU2hlZXQuZmluZChvd25lckRvY3VtZW50KTsKICAgICBpZiAo aXRlcmF0b3IgIT0gbV9kb2N1bWVudFRvSW5zcGVjdG9yU3R5bGVTaGVldC5lbmQoKSkgewo= 399218 2020-05-12 18:38:21 -0700 2020-05-12 23:39:20 -0700 Patch patch.txt text/plain 1953 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNGExMjVkNGY1Yy4uYjAwZmQxNTNlOWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMC0wNS0xMiAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxl LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBmcm9udC1lbmQgc2hvdWxkbid0IGNoYW5n ZSB0aGUgb3JkZXIgb2YgVXNlciBTdHlsZSBTaGVldCBydWxlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwODkzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS82MTkzNzExOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBQcmV2aW91c2x5LCBzb21lIHN0eWxlIHNoZWV0cyB3b3VsZCBnZXQgaW5jb3JyZWN0 bHkgZGV0ZWN0ZWQgYXMgSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2lu OjpVc2VyLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIGN1cnJlbnRseSB0aGVyZSBk b2Vzbid0IHNlZW0gdG8gYmUgYSB3YXkgdG8gc2ltdWxhdGUgYSBVc2VyIFN0eWxlIFNoZWV0IGlu IFdlYiBJbnNwZWN0b3IgdGVzdHMuCisgICAgICAgIFRoZSBleGlzdGluZyB3aW5kb3cuaW50ZXJu YWxzLmluc2VydFVzZXJDU1MgZG9lc24ndCBzaW11bGF0ZSBhIHN0eWxlc2hlZXQgd2l0aCBhICJ1 c2VyLXN0eWxlLXNoZWV0IiBwcm90b2NvbC4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMv SW5zcGVjdG9yQ1NTQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdl bnQ6OmRldGVjdE9yaWdpbik6CisKIDIwMjAtMDQtMjkgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9y bWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIFN3aXRjaCB0byBhdWRpb2lu dGVybGVhdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5z cGVjdG9yQ1NTQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggNTZiYzBhMDc0NGQuLjkxZDE5ZTI5NGJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckNTU0FnZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckNTU0FnZW50 LmNwcApAQCAtOTMxLDcgKzkzMSw3IEBAIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkNTUzo6U3R5bGVT aGVldE9yaWdpbiBJbnNwZWN0b3JDU1NBZ2VudDo6ZGV0ZWN0T3JpZ2luKENTU1N0CiAgICAgaWYg KHBhZ2VTdHlsZVNoZWV0ICYmICFwYWdlU3R5bGVTaGVldC0+b3duZXJOb2RlKCkgJiYgcGFnZVN0 eWxlU2hlZXQtPmhyZWYoKS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBJbnNwZWN0b3I6OlBy b3RvY29sOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW46OlVzZXJBZ2VudDsKIAotICAgIGlmIChwYWdl U3R5bGVTaGVldCAmJiBwYWdlU3R5bGVTaGVldC0+b3duZXJOb2RlKCkgJiYgcGFnZVN0eWxlU2hl ZXQtPm93bmVyTm9kZSgpLT5ub2RlTmFtZSgpID09ICIjZG9jdW1lbnQiKQorICAgIGlmIChwYWdl U3R5bGVTaGVldCAmJiBwYWdlU3R5bGVTaGVldC0+YmFzZVVSTCgpICYmIHBhZ2VTdHlsZVNoZWV0 LT5iYXNlVVJMKCkucHJvdG9jb2xJcygidXNlci1zdHlsZS1zaGVldCIpKQogICAgICAgICByZXR1 cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyOwogCiAg ICAgYXV0byBpdGVyYXRvciA9IG1fZG9jdW1lbnRUb0luc3BlY3RvclN0eWxlU2hlZXQuZmluZChv d25lckRvY3VtZW50KTsK 399244 2020-05-12 23:39:20 -0700 2020-05-14 12:28:46 -0700 Patch patch.txt text/plain 6504 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2MmMzNGUwMGNiZi4uMDI2ODViZTY1ZmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAyMC0wNS0xMiAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBmcm9udC1lbmQgc2hvdWxkbid0IGNoYW5nZSB0aGUgb3JkZXIg b2YgVXNlciBTdHlsZSBTaGVldCBydWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjEwODkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MTkzNzEx OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0 IHRoYXQgQXV0aG9yQ1NTIGFuZCBVc2VyQ1NTIGFyZSBjb3JyZWN0bHkgYXJyYW5nZWQuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvY3NzL2dldE1hdGNoZWRTdHlsZXNGb3JOb2RlLWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY3NzL2dldE1hdGNoZWRTdHlsZXNGb3JOb2RlLmh0bWw6 CisKIDIwMjAtMDQtMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtURkNdIEFkZCBjb2x1bW4gc3Bhbm5pbmcgc3VwcG9ydCBmb3IgZmxleGlibGUgdGFi bGUgd2lkdGgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvZ2V0TWF0Y2hl ZFN0eWxlc0Zvck5vZGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9n ZXRNYXRjaGVkU3R5bGVzRm9yTm9kZS1leHBlY3RlZC50eHQKaW5kZXggMmM0ZDUyNDQ5ZDQuLmJi NTA3ZWVjZDkxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL2dldE1hdGNo ZWRTdHlsZXNGb3JOb2RlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv Y3NzL2dldE1hdGNoZWRTdHlsZXNGb3JOb2RlLWV4cGVjdGVkLnR4dApAQCAtNyw2ICs3LDE0OCBA QCBHZXR0aW5nIG1hdGNoZWQgc3R5bGVzIGZvciAiZGl2I3giLi4uCiAKIE1hdGNoZWQ6CiBbCisg IHsKKyAgICAicnVsZSI6IHsKKyAgICAgICJzZWxlY3Rvckxpc3QiOiB7CisgICAgICAgICJzZWxl Y3RvcnMiOiBbCisgICAgICAgICAgeworICAgICAgICAgICAgInRleHQiOiAiZGl2IiwKKyAgICAg ICAgICAgICJzcGVjaWZpY2l0eSI6IFsKKyAgICAgICAgICAgICAgMCwKKyAgICAgICAgICAgICAg MCwKKyAgICAgICAgICAgICAgMQorICAgICAgICAgICAgXQorICAgICAgICAgIH0KKyAgICAgICAg XSwKKyAgICAgICAgInRleHQiOiAiZGl2IgorICAgICAgfSwKKyAgICAgICJzb3VyY2VMaW5lIjog IjxmaWx0ZXJlZD4iLAorICAgICAgIm9yaWdpbiI6ICJ1c2VyIiwKKyAgICAgICJzdHlsZSI6IHsK KyAgICAgICAgImNzc1Byb3BlcnRpZXMiOiBbCisgICAgICAgICAgeworICAgICAgICAgICAgIm5h bWUiOiAiei1pbmRleCIsCisgICAgICAgICAgICAidmFsdWUiOiAiNjAwIgorICAgICAgICAgIH0K KyAgICAgICAgXSwKKyAgICAgICAgInNob3J0aGFuZEVudHJpZXMiOiBbXSwKKyAgICAgICAgInN0 eWxlSWQiOiAiPGZpbHRlcmVkPiIsCisgICAgICAgICJ3aWR0aCI6ICIiLAorICAgICAgICAiaGVp Z2h0IjogIiIKKyAgICAgIH0sCisgICAgICAic291cmNlVVJMIjogIjxmaWx0ZXJlZD4iCisgICAg fSwKKyAgICAibWF0Y2hpbmdTZWxlY3RvcnMiOiBbCisgICAgICAwCisgICAgXQorICB9LAorICB7 CisgICAgInJ1bGUiOiB7CisgICAgICAic2VsZWN0b3JMaXN0IjogeworICAgICAgICAic2VsZWN0 b3JzIjogWworICAgICAgICAgIHsKKyAgICAgICAgICAgICJ0ZXh0IjogImRpdiIsCisgICAgICAg ICAgICAic3BlY2lmaWNpdHkiOiBbCisgICAgICAgICAgICAgIDAsCisgICAgICAgICAgICAgIDAs CisgICAgICAgICAgICAgIDEKKyAgICAgICAgICAgIF0KKyAgICAgICAgICB9CisgICAgICAgIF0s CisgICAgICAgICJ0ZXh0IjogImRpdiIKKyAgICAgIH0sCisgICAgICAic291cmNlTGluZSI6ICI8 ZmlsdGVyZWQ+IiwKKyAgICAgICJvcmlnaW4iOiAidXNlciIsCisgICAgICAic3R5bGUiOiB7Cisg ICAgICAgICJjc3NQcm9wZXJ0aWVzIjogWworICAgICAgICAgIHsKKyAgICAgICAgICAgICJuYW1l IjogInotaW5kZXgiLAorICAgICAgICAgICAgInZhbHVlIjogIjUwMCIKKyAgICAgICAgICB9Cisg ICAgICAgIF0sCisgICAgICAgICJzaG9ydGhhbmRFbnRyaWVzIjogW10sCisgICAgICAgICJzdHls ZUlkIjogIjxmaWx0ZXJlZD4iLAorICAgICAgICAid2lkdGgiOiAiIiwKKyAgICAgICAgImhlaWdo dCI6ICIiCisgICAgICB9LAorICAgICAgInNvdXJjZVVSTCI6ICI8ZmlsdGVyZWQ+IgorICAgIH0s CisgICAgIm1hdGNoaW5nU2VsZWN0b3JzIjogWworICAgICAgMAorICAgIF0KKyAgfSwKKyAgewor ICAgICJydWxlIjogeworICAgICAgInNlbGVjdG9yTGlzdCI6IHsKKyAgICAgICAgInNlbGVjdG9y cyI6IFsKKyAgICAgICAgICB7CisgICAgICAgICAgICAidGV4dCI6ICJkaXYiLAorICAgICAgICAg ICAgInNwZWNpZmljaXR5IjogWworICAgICAgICAgICAgICAwLAorICAgICAgICAgICAgICAwLAor ICAgICAgICAgICAgICAxCisgICAgICAgICAgICBdCisgICAgICAgICAgfQorICAgICAgICBdLAor ICAgICAgICAidGV4dCI6ICJkaXYiCisgICAgICB9LAorICAgICAgInNvdXJjZUxpbmUiOiAiPGZp bHRlcmVkPiIsCisgICAgICAib3JpZ2luIjogInJlZ3VsYXIiLAorICAgICAgInN0eWxlIjogewor ICAgICAgICAiY3NzUHJvcGVydGllcyI6IFsKKyAgICAgICAgICB7CisgICAgICAgICAgICAibmFt ZSI6ICJ6LWluZGV4IiwKKyAgICAgICAgICAgICJ2YWx1ZSI6ICI0MDAiCisgICAgICAgICAgfQor ICAgICAgICBdLAorICAgICAgICAic2hvcnRoYW5kRW50cmllcyI6IFtdLAorICAgICAgICAic3R5 bGVJZCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICAgIndpZHRoIjogIiIsCisgICAgICAgICJoZWln aHQiOiAiIgorICAgICAgfSwKKyAgICAgICJzb3VyY2VVUkwiOiAiPGZpbHRlcmVkPiIsCisgICAg ICAicnVsZUlkIjogIjxmaWx0ZXJlZD4iCisgICAgfSwKKyAgICAibWF0Y2hpbmdTZWxlY3RvcnMi OiBbCisgICAgICAwCisgICAgXQorICB9LAorICB7CisgICAgInJ1bGUiOiB7CisgICAgICAic2Vs ZWN0b3JMaXN0IjogeworICAgICAgICAic2VsZWN0b3JzIjogWworICAgICAgICAgIHsKKyAgICAg ICAgICAgICJ0ZXh0IjogImRpdiIsCisgICAgICAgICAgICAic3BlY2lmaWNpdHkiOiBbCisgICAg ICAgICAgICAgIDAsCisgICAgICAgICAgICAgIDAsCisgICAgICAgICAgICAgIDEKKyAgICAgICAg ICAgIF0KKyAgICAgICAgICB9CisgICAgICAgIF0sCisgICAgICAgICJ0ZXh0IjogImRpdiIKKyAg ICAgIH0sCisgICAgICAic291cmNlTGluZSI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICJvcmlnaW4i OiAicmVndWxhciIsCisgICAgICAic3R5bGUiOiB7CisgICAgICAgICJjc3NQcm9wZXJ0aWVzIjog WworICAgICAgICAgIHsKKyAgICAgICAgICAgICJuYW1lIjogInotaW5kZXgiLAorICAgICAgICAg ICAgInZhbHVlIjogIjMwMCIKKyAgICAgICAgICB9CisgICAgICAgIF0sCisgICAgICAgICJzaG9y dGhhbmRFbnRyaWVzIjogW10sCisgICAgICAgICJzdHlsZUlkIjogIjxmaWx0ZXJlZD4iLAorICAg ICAgICAid2lkdGgiOiAiIiwKKyAgICAgICAgImhlaWdodCI6ICIiCisgICAgICB9LAorICAgICAg InNvdXJjZVVSTCI6ICI8ZmlsdGVyZWQ+IiwKKyAgICAgICJydWxlSWQiOiAiPGZpbHRlcmVkPiIK KyAgICB9LAorICAgICJtYXRjaGluZ1NlbGVjdG9ycyI6IFsKKyAgICAgIDAKKyAgICBdCisgIH0s CiAgIHsKICAgICAicnVsZSI6IHsKICAgICAgICJzZWxlY3Rvckxpc3QiOiB7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL2dldE1hdGNoZWRTdHlsZXNGb3JOb2RlLmh0bWwg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL2dldE1hdGNoZWRTdHlsZXNGb3JOb2RlLmh0bWwK aW5kZXggZGI5NWRkZjMzMGYuLjZmN2ZhYzYwZjc2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvY3NzL2dldE1hdGNoZWRTdHlsZXNGb3JOb2RlLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2Nzcy9nZXRNYXRjaGVkU3R5bGVzRm9yTm9kZS5odG1sCkBAIC0xLDYgKzEs MTIgQEAKIDxodG1sPgogPGhlYWQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNw ZWN0b3IvcmVzb3VyY2VzL3Byb3RvY29sLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK3dp bmRvdy5pbnRlcm5hbHMuaW5zZXJ0QXV0aG9yQ1NTKCJkaXYgeyB6LWluZGV4OiA0MDA7IH0iKTsK K3dpbmRvdy5pbnRlcm5hbHMuaW5zZXJ0VXNlckNTUygiZGl2IHsgei1pbmRleDogNjAwOyB9Iik7 Cit3aW5kb3cuaW50ZXJuYWxzLmluc2VydEF1dGhvckNTUygiZGl2IHsgei1pbmRleDogMzAwOyB9 Iik7Cit3aW5kb3cuaW50ZXJuYWxzLmluc2VydFVzZXJDU1MoImRpdiB7IHotaW5kZXg6IDUwMDsg fSIpOworPC9zY3JpcHQ+CiA8c3R5bGU+CiAgICAgQGltcG9ydCB1cmwocmVzb3VyY2VzL2V4dGVy bmFsLmNzcz8xKSAobWluLXdpZHRoOiAwcHgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI2YTZkMDg5NzAu LmQ3NGJmYmM4MGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDUtMTIgIE5p a2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogZnJvbnQtZW5kIHNob3VsZG4ndCBjaGFuZ2UgdGhlIG9yZGVyIG9mIFVzZXIgU3R5bGUg U2hlZXQgcnVsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMDg5MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE5MzcxMTg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJldmlvdXNseSwgc29tZSBz dHlsZSBzaGVldHMgd2VyZSBmYWxzbHkgZGV0ZWN0ZWQgYXMgSW5zcGVjdG9yOjpQcm90b2NvbDo6 Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyCisgICAgICAgIGNhdXNpbmcgaW5jb3JyZWN0IG9y ZGVyIG9mIHN0eWxlIHJ1bGVzIGluIFdlYiBJbnNwZWN0b3IuCisKKyAgICAgICAgVGVzdDogaW5z cGVjdG9yL2Nzcy9nZXRNYXRjaGVkU3R5bGVzRm9yTm9kZS5odG1sCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvckNTU0FnZW50OjpkZXRlY3RPcmlnaW4pOgorCiAyMDIwLTA0LTE5ICBaYWxhbiBCdWp0 YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bVEZDXSBBZGQgY29sdW1uIHNw YW5uaW5nIHN1cHBvcnQgZm9yIGZsZXhpYmxlIHRhYmxlIHdpZHRoCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckNTU0FnZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCmluZGV4IDg3 ZmEzYjliZTRiLi5jZDljMGQwMzBhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2FnZW50cy9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKQEAgLTkzMCw3ICs5MzAsNyBAQCBJ bnNwZWN0b3I6OlByb3RvY29sOjpDU1M6OlN0eWxlU2hlZXRPcmlnaW4gSW5zcGVjdG9yQ1NTQWdl bnQ6OmRldGVjdE9yaWdpbihDU1NTdAogICAgIGlmIChwYWdlU3R5bGVTaGVldCAmJiAhcGFnZVN0 eWxlU2hlZXQtPm93bmVyTm9kZSgpICYmIHBhZ2VTdHlsZVNoZWV0LT5ocmVmKCkuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpTdHlsZVNoZWV0T3Jp Z2luOjpVc2VyQWdlbnQ7CiAKLSAgICBpZiAocGFnZVN0eWxlU2hlZXQgJiYgcGFnZVN0eWxlU2hl ZXQtPm93bmVyTm9kZSgpICYmIHBhZ2VTdHlsZVNoZWV0LT5vd25lck5vZGUoKS0+bm9kZU5hbWUo KSA9PSAiI2RvY3VtZW50IikKKyAgICBpZiAocGFnZVN0eWxlU2hlZXQgJiYgcGFnZVN0eWxlU2hl ZXQtPmNvbnRlbnRzKCkuaXNVc2VyU3R5bGVTaGVldCgpKQogICAgICAgICByZXR1cm4gSW5zcGVj dG9yOjpQcm90b2NvbDo6Q1NTOjpTdHlsZVNoZWV0T3JpZ2luOjpVc2VyOwogCiAgICAgYXV0byBp dGVyYXRvciA9IG1fZG9jdW1lbnRUb0luc3BlY3RvclN0eWxlU2hlZXQuZmluZChvd25lckRvY3Vt ZW50KTsK