199950 2019-07-19 10:36:41 -0700 Web Inspector: Elements: Styles: move psuedo-selector rules before inherited rules 2019-08-03 16:15:16 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck nvasilyev webkit-bug-importer oldest_to_newest 1554244 0 hi 2019-07-19 10:36:41 -0700 Since pseudo-selector rules (usually) affect the selected element, it's more useful to have them near that element's rules than after all of it's inherited rules. 1554259 1 nvasilyev 2019-07-19 11:09:15 -0700 I agree! I would prefer to have pseudo rules be right after the rules that match directly. 1554278 2 374486 hi 2019-07-19 12:03:44 -0700 Created attachment 374486 Patch 1554279 3 374487 hi 2019-07-19 12:04:38 -0700 Created attachment 374487 Patch 1558255 4 374487 joepeck 2019-08-02 20:44:00 -0700 Comment on attachment 374487 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374487&action=review r=me! > Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:306 > + beforePseudoId = InspectorBackend.domains.CSS.PseudoId.Before; You probably already know but this conflicts with your other change, so be careful when landing both. > Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:331 > + if (style.inherited && (!previousStyle || !previousStyle.inherited)) > + addPseudoStyles(); Can this be simplified to just: if (style.inherited) addPsuedoStyles(); It seems like the `(!previousStyle || !previousStyle.inherited)` part is just to avoid calling the function again but the function already gracefully handles multiple times, so it will already do the work for us. 1558319 5 374487 hi 2019-08-03 15:31:55 -0700 Comment on attachment 374487 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374487&action=review >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:306 >> + beforePseudoId = InspectorBackend.domains.CSS.PseudoId.Before; > > You probably already know but this conflicts with your other change, so be careful when landing both. Yep :) >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:331 >> + addPseudoStyles(); > > Can this be simplified to just: > > if (style.inherited) > addPsuedoStyles(); > > It seems like the `(!previousStyle || !previousStyle.inherited)` part is just to avoid calling the function again but the function already gracefully handles multiple times, so it will already do the work for us. Ooooo good point! 1558320 6 375492 hi 2019-08-03 15:32:18 -0700 Created attachment 375492 Patch 1558321 7 375492 commit-queue 2019-08-03 16:14:21 -0700 Comment on attachment 375492 Patch Clearing flags on attachment: 375492 Committed r248204: <https://trac.webkit.org/changeset/248204> 1558322 8 commit-queue 2019-08-03 16:14:23 -0700 All reviewed patches have been landed. Closing bug. 1558323 9 webkit-bug-importer 2019-08-03 16:15:16 -0700 <rdar://problem/53907105> 374486 2019-07-19 12:03:44 -0700 2019-07-19 12:04:37 -0700 Patch bug-199950-20190719120343.patch text/plain 4162 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFmZTZhZTcwOGViYmQ1MWQyODQzMWQ3OTBmZDc2 MjJlYTgyYTJhZTUuLjcwYzM3ZTk1MDExOTUzZmY0MmE0MzJlNjFjN2ZlNTRjMzRhZDJjMTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE5LTA3LTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogU3R5bGVzOiBtb3ZlIHBzdWVkby1zZWxlY3RvciBydWxlcyBiZWZvcmUgaW5oZXJp dGVkIHJ1bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTk5NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVs LmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLnByb3Rv dHlwZS5sYXlvdXQpOgorCiAyMDE5LTA3LTE3ICBPbGl2aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5A c29mdGF0aG9tZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYXBwbGljYXRpb24veG1s IGNvbnRlbnQgbm90IHNob3duCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFJ1bGVz U3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggZTBlOWI0YmNjZjBmMjE2MzFjZTBkMzg3NmE4ZjMw M2YwZDQ2N2E1Ny4uZDgzNTIzMTdmMzYwZmQ0ZmNjNmI2YjU3NDU1ZGRkMDlkMDhiMGRmZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5q cwpAQCAtMjk0LDMxICsyOTQsNDUgQEAgV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1Bh bmVsID0gY2xhc3MgU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsIGUKICAgICAgICAg ICAgICAgICBhZGRTZWN0aW9uKHByZXNlcnZlZFNlY3Rpb24pOwogICAgICAgICB9OwogCi0gICAg ICAgIGZvciAobGV0IHN0eWxlIG9mIHRoaXMubm9kZVN0eWxlcy51bmlxdWVPcmRlcmVkU3R5bGVz KQorICAgICAgICBsZXQgYWRkZWRQc2V1ZG9TdHlsZXMgPSBmYWxzZTsKKyAgICAgICAgbGV0IGFk ZFBzZXVkb1N0eWxlcyA9ICgpID0+IHsKKyAgICAgICAgICAgIGlmIChhZGRlZFBzZXVkb1N0eWxl cykKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIC8vIEFkZCBhbGwgcHNl dWRvIHN0eWxlcyBiZWZvcmUgYW55IGluaGVyaXRlZCBydWxlcy4KKyAgICAgICAgICAgIGxldCBi ZWZvcmVQc2V1ZG9JZCA9IG51bGw7CisgICAgICAgICAgICBsZXQgYWZ0ZXJQc2V1ZG9JZCA9IG51 bGw7CisgICAgICAgICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5kb21haW5zLkNTUy5Qc2V1ZG9J ZCkgeworICAgICAgICAgICAgICAgIGJlZm9yZVBzZXVkb0lkID0gSW5zcGVjdG9yQmFja2VuZC5k b21haW5zLkNTUy5Qc2V1ZG9JZC5CZWZvcmU7CisgICAgICAgICAgICAgICAgYWZ0ZXJQc2V1ZG9J ZCA9IEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DU1MuUHNldWRvSWQuQWZ0ZXI7CisgICAgICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIC8vIENvbXBhdGliaWxpdHkgKGlPUyAxMi4y KTogQ1NTLlBzZXVkb0lkIGRpZCBub3QgZXhpc3QuCisgICAgICAgICAgICAgICAgYmVmb3JlUHNl dWRvSWQgPSA0OworICAgICAgICAgICAgICAgIGFmdGVyUHNldWRvSWQgPSA1OworICAgICAgICAg ICAgfQorCisgICAgICAgICAgICBmb3IgKGxldCBbcHNldWRvSWQsIHBzZXVkb0VsZW1lbnRJbmZv XSBvZiB0aGlzLm5vZGVTdHlsZXMucHNldWRvRWxlbWVudHMpIHsKKyAgICAgICAgICAgICAgICBs ZXQgcHNldWRvRWxlbWVudCA9IG51bGw7CisgICAgICAgICAgICAgICAgaWYgKHBzZXVkb0lkID09 PSBiZWZvcmVQc2V1ZG9JZCkKKyAgICAgICAgICAgICAgICAgICAgcHNldWRvRWxlbWVudCA9IHRo aXMubm9kZVN0eWxlcy5ub2RlLmJlZm9yZVBzZXVkb0VsZW1lbnQoKTsKKyAgICAgICAgICAgICAg ICBlbHNlIGlmIChwc2V1ZG9JZCA9PT0gYWZ0ZXJQc2V1ZG9JZCkKKyAgICAgICAgICAgICAgICAg ICAgcHNldWRvRWxlbWVudCA9IHRoaXMubm9kZVN0eWxlcy5ub2RlLmFmdGVyUHNldWRvRWxlbWVu dCgpOworICAgICAgICAgICAgICAgIGFkZEhlYWRlcihXSS5VSVN0cmluZygiUHNldWRvLUVsZW1l bnQiKSwgcHNldWRvRWxlbWVudCB8fCBwc2V1ZG9JZCk7CisKKyAgICAgICAgICAgICAgICBmb3Ig KGxldCBzdHlsZSBvZiBXSS5ET01Ob2RlU3R5bGVzLnVuaXF1ZU9yZGVyZWRTdHlsZXMocHNldWRv RWxlbWVudEluZm8ub3JkZXJlZFN0eWxlcykpCisgICAgICAgICAgICAgICAgICAgIGNyZWF0ZVNl Y3Rpb24oc3R5bGUpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBhZGRlZFBzZXVkb1N0 eWxlcyA9IHRydWU7CisgICAgICAgIH07CisKKyAgICAgICAgZm9yIChsZXQgc3R5bGUgb2YgdGhp cy5ub2RlU3R5bGVzLnVuaXF1ZU9yZGVyZWRTdHlsZXMpIHsKKyAgICAgICAgICAgIGlmIChzdHls ZS5pbmhlcml0ZWQgJiYgKCFwcmV2aW91c1N0eWxlIHx8ICFwcmV2aW91c1N0eWxlLmluaGVyaXRl ZCkpCisgICAgICAgICAgICAgICAgYWRkUHNldWRvU3R5bGVzKCk7CiAgICAgICAgICAgICBjcmVh dGVTZWN0aW9uKHN0eWxlKTsKLQotICAgICAgICBsZXQgYmVmb3JlUHNldWRvSWQgPSBudWxsOwot ICAgICAgICBsZXQgYWZ0ZXJQc2V1ZG9JZCA9IG51bGw7Ci0gICAgICAgIGlmIChJbnNwZWN0b3JC YWNrZW5kLmRvbWFpbnMuQ1NTLlBzZXVkb0lkKSB7Ci0gICAgICAgICAgICBiZWZvcmVQc2V1ZG9J ZCA9IEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DU1MuUHNldWRvSWQuQmVmb3JlOwotICAgICAg ICAgICAgYWZ0ZXJQc2V1ZG9JZCA9IEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DU1MuUHNldWRv SWQuQWZ0ZXI7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBDb21wYXRpYmlsaXR5 IChpT1MgMTIuMik6IENTUy5Qc2V1ZG9JZCBkaWQgbm90IGV4aXN0LgotICAgICAgICAgICAgYmVm b3JlUHNldWRvSWQgPSA0OwotICAgICAgICAgICAgYWZ0ZXJQc2V1ZG9JZCA9IDU7CiAgICAgICAg IH0KIAotICAgICAgICBmb3IgKGxldCBbcHNldWRvSWQsIHBzZXVkb0VsZW1lbnRJbmZvXSBvZiB0 aGlzLm5vZGVTdHlsZXMucHNldWRvRWxlbWVudHMpIHsKLSAgICAgICAgICAgIGxldCBwc2V1ZG9F bGVtZW50ID0gbnVsbDsKLSAgICAgICAgICAgIGlmIChwc2V1ZG9JZCA9PT0gYmVmb3JlUHNldWRv SWQpCi0gICAgICAgICAgICAgICAgcHNldWRvRWxlbWVudCA9IHRoaXMubm9kZVN0eWxlcy5ub2Rl LmJlZm9yZVBzZXVkb0VsZW1lbnQoKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHBzZXVkb0lkID09 PSBhZnRlclBzZXVkb0lkKQotICAgICAgICAgICAgICAgIHBzZXVkb0VsZW1lbnQgPSB0aGlzLm5v ZGVTdHlsZXMubm9kZS5hZnRlclBzZXVkb0VsZW1lbnQoKTsKLSAgICAgICAgICAgIGFkZEhlYWRl cihXSS5VSVN0cmluZygiUHNldWRvLUVsZW1lbnQiKSwgcHNldWRvRWxlbWVudCB8fCBwc2V1ZG9J ZCk7Ci0KLSAgICAgICAgICAgIGZvciAobGV0IHN0eWxlIG9mIFdJLkRPTU5vZGVTdHlsZXMudW5p cXVlT3JkZXJlZFN0eWxlcyhwc2V1ZG9FbGVtZW50SW5mby5vcmRlcmVkU3R5bGVzKSkKLSAgICAg ICAgICAgICAgICBjcmVhdGVTZWN0aW9uKHN0eWxlKTsKLSAgICAgICAgfQorICAgICAgICBhZGRQ c2V1ZG9TdHlsZXMoKTsKIAogICAgICAgICB0aGlzLl9uZXdSdWxlU2VsZWN0b3IgPSBudWxsOwog Cg== 374487 2019-07-19 12:04:38 -0700 2019-08-03 15:32:17 -0700 Patch bug-199950-20190719120437.patch text/plain 4391 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFmZTZhZTcwOGViYmQ1MWQyODQzMWQ3OTBmZDc2 MjJlYTgyYTJhZTUuLjFkYzg2YTQyM2VjZmVkOWRlMjc5Y2VmN2U3OWMyMmRhZTY4YTczYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA3LTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogU3R5bGVzOiBtb3ZlIHBzdWVkby1zZWxlY3RvciBydWxlcyBiZWZvcmUgaW5oZXJp dGVkIHJ1bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTk5NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTaW5jZSBwc2V1ZG8tc2VsZWN0b3IgcnVsZXMgKHVzdWFsbHkpIGFmZmVjdCB0aGUgc2VsZWN0 ZWQgZWxlbWVudCwgb3IgYXJlIHJlbGF0ZWQgdG8gaXRzCisgICAgICAgIGNvbnRlbnQsIGl0J3Mg bW9yZSB1c2VmdWwgdG8gaGF2ZSB0aGVtIG5lYXIgdGhhdCBlbGVtZW50J3MgcnVsZXMgaW5zdGVh ZCBvZiBhZnRlciBhbGwgb2YKKyAgICAgICAgaXQncyBpbmhlcml0ZWQgcnVsZXMuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5l bC5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90 b3R5cGUubGF5b3V0KToKKwogMjAxOS0wNy0xNyAgT2xpdmllciBCbGluICA8b2xpdmllci5ibGlu QHNvZnRhdGhvbWUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFwcGxpY2F0aW9uL3ht bCBjb250ZW50IG5vdCBzaG93bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxl c1N0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IGUwZTliNGJjY2YwZjIxNjMxY2UwZDM4NzZhOGYz MDNmMGQ0NjdhNTcuLmQ4MzUyMzE3ZjM2MGZkNGZjYzZiNmI1NzQ1NWRkZDA5ZDA4YjBkZmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVh ZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwu anMKQEAgLTI5NCwzMSArMjk0LDQ1IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQ YW5lbCA9IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBlCiAgICAgICAg ICAgICAgICAgYWRkU2VjdGlvbihwcmVzZXJ2ZWRTZWN0aW9uKTsKICAgICAgICAgfTsKIAotICAg ICAgICBmb3IgKGxldCBzdHlsZSBvZiB0aGlzLm5vZGVTdHlsZXMudW5pcXVlT3JkZXJlZFN0eWxl cykKKyAgICAgICAgbGV0IGFkZGVkUHNldWRvU3R5bGVzID0gZmFsc2U7CisgICAgICAgIGxldCBh ZGRQc2V1ZG9TdHlsZXMgPSAoKSA9PiB7CisgICAgICAgICAgICBpZiAoYWRkZWRQc2V1ZG9TdHls ZXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAvLyBBZGQgYWxsIHBz ZXVkbyBzdHlsZXMgYmVmb3JlIGFueSBpbmhlcml0ZWQgcnVsZXMuCisgICAgICAgICAgICBsZXQg YmVmb3JlUHNldWRvSWQgPSBudWxsOworICAgICAgICAgICAgbGV0IGFmdGVyUHNldWRvSWQgPSBu dWxsOworICAgICAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DU1MuUHNldWRv SWQpIHsKKyAgICAgICAgICAgICAgICBiZWZvcmVQc2V1ZG9JZCA9IEluc3BlY3RvckJhY2tlbmQu ZG9tYWlucy5DU1MuUHNldWRvSWQuQmVmb3JlOworICAgICAgICAgICAgICAgIGFmdGVyUHNldWRv SWQgPSBJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuQ1NTLlBzZXVkb0lkLkFmdGVyOworICAgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAvLyBDb21wYXRpYmlsaXR5IChpT1MgMTIu Mik6IENTUy5Qc2V1ZG9JZCBkaWQgbm90IGV4aXN0LgorICAgICAgICAgICAgICAgIGJlZm9yZVBz ZXVkb0lkID0gNDsKKyAgICAgICAgICAgICAgICBhZnRlclBzZXVkb0lkID0gNTsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgZm9yIChsZXQgW3BzZXVkb0lkLCBwc2V1ZG9FbGVtZW50SW5m b10gb2YgdGhpcy5ub2RlU3R5bGVzLnBzZXVkb0VsZW1lbnRzKSB7CisgICAgICAgICAgICAgICAg bGV0IHBzZXVkb0VsZW1lbnQgPSBudWxsOworICAgICAgICAgICAgICAgIGlmIChwc2V1ZG9JZCA9 PT0gYmVmb3JlUHNldWRvSWQpCisgICAgICAgICAgICAgICAgICAgIHBzZXVkb0VsZW1lbnQgPSB0 aGlzLm5vZGVTdHlsZXMubm9kZS5iZWZvcmVQc2V1ZG9FbGVtZW50KCk7CisgICAgICAgICAgICAg ICAgZWxzZSBpZiAocHNldWRvSWQgPT09IGFmdGVyUHNldWRvSWQpCisgICAgICAgICAgICAgICAg ICAgIHBzZXVkb0VsZW1lbnQgPSB0aGlzLm5vZGVTdHlsZXMubm9kZS5hZnRlclBzZXVkb0VsZW1l bnQoKTsKKyAgICAgICAgICAgICAgICBhZGRIZWFkZXIoV0kuVUlTdHJpbmcoIlBzZXVkby1FbGVt ZW50IiksIHBzZXVkb0VsZW1lbnQgfHwgcHNldWRvSWQpOworCisgICAgICAgICAgICAgICAgZm9y IChsZXQgc3R5bGUgb2YgV0kuRE9NTm9kZVN0eWxlcy51bmlxdWVPcmRlcmVkU3R5bGVzKHBzZXVk b0VsZW1lbnRJbmZvLm9yZGVyZWRTdHlsZXMpKQorICAgICAgICAgICAgICAgICAgICBjcmVhdGVT ZWN0aW9uKHN0eWxlKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgYWRkZWRQc2V1ZG9T dHlsZXMgPSB0cnVlOworICAgICAgICB9OworCisgICAgICAgIGZvciAobGV0IHN0eWxlIG9mIHRo aXMubm9kZVN0eWxlcy51bmlxdWVPcmRlcmVkU3R5bGVzKSB7CisgICAgICAgICAgICBpZiAoc3R5 bGUuaW5oZXJpdGVkICYmICghcHJldmlvdXNTdHlsZSB8fCAhcHJldmlvdXNTdHlsZS5pbmhlcml0 ZWQpKQorICAgICAgICAgICAgICAgIGFkZFBzZXVkb1N0eWxlcygpOwogICAgICAgICAgICAgY3Jl YXRlU2VjdGlvbihzdHlsZSk7Ci0KLSAgICAgICAgbGV0IGJlZm9yZVBzZXVkb0lkID0gbnVsbDsK LSAgICAgICAgbGV0IGFmdGVyUHNldWRvSWQgPSBudWxsOwotICAgICAgICBpZiAoSW5zcGVjdG9y QmFja2VuZC5kb21haW5zLkNTUy5Qc2V1ZG9JZCkgewotICAgICAgICAgICAgYmVmb3JlUHNldWRv SWQgPSBJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuQ1NTLlBzZXVkb0lkLkJlZm9yZTsKLSAgICAg ICAgICAgIGFmdGVyUHNldWRvSWQgPSBJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuQ1NTLlBzZXVk b0lkLkFmdGVyOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gQ29tcGF0aWJpbGl0 eSAoaU9TIDEyLjIpOiBDU1MuUHNldWRvSWQgZGlkIG5vdCBleGlzdC4KLSAgICAgICAgICAgIGJl Zm9yZVBzZXVkb0lkID0gNDsKLSAgICAgICAgICAgIGFmdGVyUHNldWRvSWQgPSA1OwogICAgICAg ICB9CiAKLSAgICAgICAgZm9yIChsZXQgW3BzZXVkb0lkLCBwc2V1ZG9FbGVtZW50SW5mb10gb2Yg dGhpcy5ub2RlU3R5bGVzLnBzZXVkb0VsZW1lbnRzKSB7Ci0gICAgICAgICAgICBsZXQgcHNldWRv RWxlbWVudCA9IG51bGw7Ci0gICAgICAgICAgICBpZiAocHNldWRvSWQgPT09IGJlZm9yZVBzZXVk b0lkKQotICAgICAgICAgICAgICAgIHBzZXVkb0VsZW1lbnQgPSB0aGlzLm5vZGVTdHlsZXMubm9k ZS5iZWZvcmVQc2V1ZG9FbGVtZW50KCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChwc2V1ZG9JZCA9 PT0gYWZ0ZXJQc2V1ZG9JZCkKLSAgICAgICAgICAgICAgICBwc2V1ZG9FbGVtZW50ID0gdGhpcy5u b2RlU3R5bGVzLm5vZGUuYWZ0ZXJQc2V1ZG9FbGVtZW50KCk7Ci0gICAgICAgICAgICBhZGRIZWFk ZXIoV0kuVUlTdHJpbmcoIlBzZXVkby1FbGVtZW50IiksIHBzZXVkb0VsZW1lbnQgfHwgcHNldWRv SWQpOwotCi0gICAgICAgICAgICBmb3IgKGxldCBzdHlsZSBvZiBXSS5ET01Ob2RlU3R5bGVzLnVu aXF1ZU9yZGVyZWRTdHlsZXMocHNldWRvRWxlbWVudEluZm8ub3JkZXJlZFN0eWxlcykpCi0gICAg ICAgICAgICAgICAgY3JlYXRlU2VjdGlvbihzdHlsZSk7Ci0gICAgICAgIH0KKyAgICAgICAgYWRk UHNldWRvU3R5bGVzKCk7CiAKICAgICAgICAgdGhpcy5fbmV3UnVsZVNlbGVjdG9yID0gbnVsbDsK IAo= 375492 2019-08-03 15:32:18 -0700 2019-08-03 16:14:21 -0700 Patch bug-199950-20190803153217.patch text/plain 4339 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDIwY2QyNGY4M2M1NTBkZDE0MjhjNGQwMTViNmU2 YWI4ZDlmMjIxYjcuLjU2OTFiZTZmMjA4MWI2ZWViYWQyYWYwNWFmZTY1YjE3MDg0OGZlMmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA4LTAzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBF bGVtZW50czogU3R5bGVzOiBtb3ZlIHBzdWVkby1zZWxlY3RvciBydWxlcyBiZWZvcmUgaW5oZXJp dGVkIHJ1bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTk5NTAKKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAg ICAgU2luY2UgcHNldWRvLXNlbGVjdG9yIHJ1bGVzICh1c3VhbGx5KSBhZmZlY3QgdGhlIHNlbGVj dGVkIGVsZW1lbnQsIG9yIGFyZSByZWxhdGVkIHRvIGl0cworICAgICAgICBjb250ZW50LCBpdCdz IG1vcmUgdXNlZnVsIHRvIGhhdmUgdGhlbSBuZWFyIHRoYXQgZWxlbWVudCdzIHJ1bGVzIGluc3Rl YWQgb2YgYWZ0ZXIgYWxsIG9mCisgICAgICAgIGl0J3MgaW5oZXJpdGVkIHJ1bGVzLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFu ZWwuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwucHJv dG90eXBlLmxheW91dCk6CisKIDIwMTktMDgtMDMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVsZW1lbnRzOiBTdHlsZXM6IGFkZCBp Y29ucyBmb3IgdmFyaW91cyBDU1MgcnVsZSB0eXBlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWls c1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IDk2MzExMDc5ODdkMThmN2Q0 ZTNiYmMyMDk0MDk1MTNmZDQzYmY0NjUuLjU5NGUyNDFmZDk5MzgwNmNmYmU4YjM1NTBiMDZiNmZm MTU1YjBiNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFJ1bGVzU3R5bGVE ZXRhaWxzUGFuZWwuanMKQEAgLTMwMCwzMSArMzAwLDQ1IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNT dHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5l bCBlCiAgICAgICAgICAgICAgICAgYWRkU2VjdGlvbihwcmVzZXJ2ZWRTZWN0aW9uKTsKICAgICAg ICAgfTsKIAotICAgICAgICBmb3IgKGxldCBzdHlsZSBvZiB0aGlzLm5vZGVTdHlsZXMudW5pcXVl T3JkZXJlZFN0eWxlcykKKyAgICAgICAgbGV0IGFkZGVkUHNldWRvU3R5bGVzID0gZmFsc2U7Cisg ICAgICAgIGxldCBhZGRQc2V1ZG9TdHlsZXMgPSAoKSA9PiB7CisgICAgICAgICAgICBpZiAoYWRk ZWRQc2V1ZG9TdHlsZXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAv LyBBZGQgYWxsIHBzZXVkbyBzdHlsZXMgYmVmb3JlIGFueSBpbmhlcml0ZWQgcnVsZXMuCisgICAg ICAgICAgICBsZXQgYmVmb3JlUHNldWRvSWQgPSBudWxsOworICAgICAgICAgICAgbGV0IGFmdGVy UHNldWRvSWQgPSBudWxsOworICAgICAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuZG9tYWlu cy5DU1MuUHNldWRvSWQpIHsKKyAgICAgICAgICAgICAgICBiZWZvcmVQc2V1ZG9JZCA9IFdJLkNT U01hbmFnZXIuUHNldWRvU2VsZWN0b3JOYW1lcy5CZWZvcmU7CisgICAgICAgICAgICAgICAgYWZ0 ZXJQc2V1ZG9JZCA9IFdJLkNTU01hbmFnZXIuUHNldWRvU2VsZWN0b3JOYW1lcy5BZnRlcjsKKyAg ICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgLy8gQ29tcGF0aWJpbGl0eSAoaU9T IDEyLjIpOiBDU1MuUHNldWRvSWQgZGlkIG5vdCBleGlzdC4KKyAgICAgICAgICAgICAgICBiZWZv cmVQc2V1ZG9JZCA9IDQ7CisgICAgICAgICAgICAgICAgYWZ0ZXJQc2V1ZG9JZCA9IDU7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIGZvciAobGV0IFtwc2V1ZG9JZCwgcHNldWRvRWxlbWVu dEluZm9dIG9mIHRoaXMubm9kZVN0eWxlcy5wc2V1ZG9FbGVtZW50cykgeworICAgICAgICAgICAg ICAgIGxldCBwc2V1ZG9FbGVtZW50ID0gbnVsbDsKKyAgICAgICAgICAgICAgICBpZiAocHNldWRv SWQgPT09IGJlZm9yZVBzZXVkb0lkKQorICAgICAgICAgICAgICAgICAgICBwc2V1ZG9FbGVtZW50 ID0gdGhpcy5ub2RlU3R5bGVzLm5vZGUuYmVmb3JlUHNldWRvRWxlbWVudCgpOworICAgICAgICAg ICAgICAgIGVsc2UgaWYgKHBzZXVkb0lkID09PSBhZnRlclBzZXVkb0lkKQorICAgICAgICAgICAg ICAgICAgICBwc2V1ZG9FbGVtZW50ID0gdGhpcy5ub2RlU3R5bGVzLm5vZGUuYWZ0ZXJQc2V1ZG9F bGVtZW50KCk7CisgICAgICAgICAgICAgICAgYWRkSGVhZGVyKFdJLlVJU3RyaW5nKCJQc2V1ZG8t RWxlbWVudCIpLCBwc2V1ZG9FbGVtZW50IHx8IHBzZXVkb0lkKTsKKworICAgICAgICAgICAgICAg IGZvciAobGV0IHN0eWxlIG9mIFdJLkRPTU5vZGVTdHlsZXMudW5pcXVlT3JkZXJlZFN0eWxlcyhw c2V1ZG9FbGVtZW50SW5mby5vcmRlcmVkU3R5bGVzKSkKKyAgICAgICAgICAgICAgICAgICAgY3Jl YXRlU2VjdGlvbihzdHlsZSk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGFkZGVkUHNl dWRvU3R5bGVzID0gdHJ1ZTsKKyAgICAgICAgfTsKKworICAgICAgICBmb3IgKGxldCBzdHlsZSBv ZiB0aGlzLm5vZGVTdHlsZXMudW5pcXVlT3JkZXJlZFN0eWxlcykgeworICAgICAgICAgICAgaWYg KHN0eWxlLmluaGVyaXRlZCkKKyAgICAgICAgICAgICAgICBhZGRQc2V1ZG9TdHlsZXMoKTsKICAg ICAgICAgICAgIGNyZWF0ZVNlY3Rpb24oc3R5bGUpOwotCi0gICAgICAgIGxldCBiZWZvcmVQc2V1 ZG9JZCA9IG51bGw7Ci0gICAgICAgIGxldCBhZnRlclBzZXVkb0lkID0gbnVsbDsKLSAgICAgICAg aWYgKEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DU1MuUHNldWRvSWQpIHsKLSAgICAgICAgICAg IGJlZm9yZVBzZXVkb0lkID0gV0kuQ1NTTWFuYWdlci5Qc2V1ZG9TZWxlY3Rvck5hbWVzLkJlZm9y ZTsKLSAgICAgICAgICAgIGFmdGVyUHNldWRvSWQgPSBXSS5DU1NNYW5hZ2VyLlBzZXVkb1NlbGVj dG9yTmFtZXMuQWZ0ZXI7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBDb21wYXRp YmlsaXR5IChpT1MgMTIuMik6IENTUy5Qc2V1ZG9JZCBkaWQgbm90IGV4aXN0LgotICAgICAgICAg ICAgYmVmb3JlUHNldWRvSWQgPSA0OwotICAgICAgICAgICAgYWZ0ZXJQc2V1ZG9JZCA9IDU7CiAg ICAgICAgIH0KIAotICAgICAgICBmb3IgKGxldCBbcHNldWRvSWQsIHBzZXVkb0VsZW1lbnRJbmZv XSBvZiB0aGlzLm5vZGVTdHlsZXMucHNldWRvRWxlbWVudHMpIHsKLSAgICAgICAgICAgIGxldCBw c2V1ZG9FbGVtZW50ID0gbnVsbDsKLSAgICAgICAgICAgIGlmIChwc2V1ZG9JZCA9PT0gYmVmb3Jl UHNldWRvSWQpCi0gICAgICAgICAgICAgICAgcHNldWRvRWxlbWVudCA9IHRoaXMubm9kZVN0eWxl cy5ub2RlLmJlZm9yZVBzZXVkb0VsZW1lbnQoKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHBzZXVk b0lkID09PSBhZnRlclBzZXVkb0lkKQotICAgICAgICAgICAgICAgIHBzZXVkb0VsZW1lbnQgPSB0 aGlzLm5vZGVTdHlsZXMubm9kZS5hZnRlclBzZXVkb0VsZW1lbnQoKTsKLSAgICAgICAgICAgIGFk ZEhlYWRlcihXSS5VSVN0cmluZygiUHNldWRvLUVsZW1lbnQiKSwgcHNldWRvRWxlbWVudCB8fCBw c2V1ZG9JZCk7Ci0KLSAgICAgICAgICAgIGZvciAobGV0IHN0eWxlIG9mIFdJLkRPTU5vZGVTdHls ZXMudW5pcXVlT3JkZXJlZFN0eWxlcyhwc2V1ZG9FbGVtZW50SW5mby5vcmRlcmVkU3R5bGVzKSkK LSAgICAgICAgICAgICAgICBjcmVhdGVTZWN0aW9uKHN0eWxlKTsKLSAgICAgICAgfQorICAgICAg ICBhZGRQc2V1ZG9TdHlsZXMoKTsKIAogICAgICAgICB0aGlzLl9uZXdSdWxlU2VsZWN0b3IgPSBu dWxsOwogCg==