194300 2019-02-05 13:32:01 -0800 Web Inspector: Elements tab: selection is broken after deleting the selected node 2019-02-06 00:54:59 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker hi inspector-bugzilla-changes nvasilyev webkit-bug-importer oldest_to_newest 1502492 0 mattbaker 2019-02-05 13:32:01 -0800 Summary: Selection is broken after deleting the selected node. Deleting a selected node causes a new node to be selected, as expected, and the details sidebar and DOM path reflect the new selection. However, clicking on another node does not deselect the current node. A new node is selected, but the previous selection remains visible. Steps to Reproduce: 1. Inspect test page 2. Elements tab 3. Select DIV "node-2" 4. Press Delete 5. DIV "node-3" becomes selected in the tree 6. Hit up arrow key Actual: => HTML closing tag (the last node) is selected Expected: => DIV "node-1" is selected 1502493 1 webkit-bug-importer 2019-02-05 13:32:30 -0800 <rdar://problem/47829275> 1502494 2 361217 mattbaker 2019-02-05 13:32:51 -0800 Created attachment 361217 [HTML] Test Page 1502532 3 361224 mattbaker 2019-02-05 15:06:32 -0800 Created attachment 361224 Patch 1502543 4 mattbaker 2019-02-05 15:21:38 -0800 (In reply to Matt Baker from comment #3) > Created attachment 361224 [details] > Patch Hmm, I think `numberOfElementsInSubtree` needs to account for the closing tag TreeElement. Checking now. 1502544 5 mattbaker 2019-02-05 15:26:18 -0800 (In reply to Matt Baker from comment #4) > (In reply to Matt Baker from comment #3) > > Created attachment 361224 [details] > > Patch > > Hmm, I think `numberOfElementsInSubtree` needs to account for the closing > tag TreeElement. Checking now. Nope! The TreeElement for the closing tag is a child of TreeElement for the open tag. 1502556 6 361224 nvasilyev 2019-02-05 15:38:12 -0800 Comment on attachment 361224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361224&action=review > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1105 > + } How often do we call _indexesForSubtree? This seems fairly expensive. It doesn't seem to be any worse than before but I wonder if we can make it even better. If it's performance sensitive, perhaps we can optimize breadth-first search here. For instance, avoid using shift() since it changes indexes of array items every time. 1502559 7 361224 nvasilyev 2019-02-05 15:43:16 -0800 Comment on attachment 361224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361224&action=review >> Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1105 >> + } > > How often do we call _indexesForSubtree? > > This seems fairly expensive. It doesn't seem to be any worse than before but I wonder if we can make it even better. If it's performance sensitive, perhaps we can optimize breadth-first search here. For instance, avoid using shift() since it changes indexes of array items every time. A straightforward optimization here is to replace shift with pop and use a depth-first search. https://jsperf.com/pop-vs-shift-on-a-array/1 1502562 8 361233 mattbaker 2019-02-05 15:43:59 -0800 Created attachment 361233 Patch 1502564 9 mattbaker 2019-02-05 15:45:02 -0800 (In reply to Nikita Vasilyev from comment #7) > Comment on attachment 361224 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=361224&action=review > > >> Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1105 > >> + } > > > > How often do we call _indexesForSubtree? Not often. Only when removing things from the DOM tree. However, a series of node removals triggered from script could potentially be slow. > > This seems fairly expensive. It doesn't seem to be any worse than before but I wonder if we can make it even better. If it's performance sensitive, perhaps we can optimize breadth-first search here. For instance, avoid using shift() since it changes indexes of array items every time. > > A straightforward optimization here is to replace shift with pop and use a > depth-first search. > > https://jsperf.com/pop-vs-shift-on-a-array/1 Done! 1502568 10 361233 hi 2019-02-05 15:58:34 -0800 Comment on attachment 361233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361233&action=review > Source/WebInspectorUI/ChangeLog:18 > + This method did not stay within the subtree rooted at `treeElement`. If you're saying that `stayWithin` wasn't working, isn't that a bug worth fixing? > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1097 > + let child = elements.pop(); I don't like the idea of constantly pushing/popping to an array. Do you have any performance numbers as to whether this approach is faster than using recursion? A recursive approach would only modify count, which should be less work. function numberOfElementsInSubtree(treeElement) { let count = 0; if (treeElement.revealed()) { ++count; for (let child of treeElement.children) count += numberOfElementsInSubtree(child); } return count; } > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1102 > + elements.push(...child.children); This should definitely be a `concat` instead of a spread. I've often found that spread is often not that great, performance wise. elements = elements.concat(child.children); 1502569 11 mattbaker 2019-02-05 16:02:58 -0800 (In reply to Devin Rousso from comment #10) > Comment on attachment 361233 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=361233&action=review > > > Source/WebInspectorUI/ChangeLog:18 > > + This method did not stay within the subtree rooted at `treeElement`. > > If you're saying that `stayWithin` wasn't working, isn't that a bug worth > fixing? It seems like a bug, but I'm not 100% sure what the intention was and don't want to change that here, as it would have such a large ripple effect. > > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1097 > > + let child = elements.pop(); > > I don't like the idea of constantly pushing/popping to an array. Do you > have any performance numbers as to whether this approach is faster than > using recursion? A recursive approach would only modify count, which should > be less work. > > function numberOfElementsInSubtree(treeElement) { > let count = 0; > if (treeElement.revealed()) { > ++count; > for (let child of treeElement.children) > count += numberOfElementsInSubtree(child); > } > return count; > } I wanted to avoid a recursive approach just in case a very large subtree is being traversed. I seem to recall this being a thing at one point. Secondly, we can't use treeElement.revealed(), since that will return false for children with a collapsed parent, and we want to count all TreeElements that are in the tree. > > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1102 > > + elements.push(...child.children); > > This should definitely be a `concat` instead of a spread. I've often found > that spread is often not that great, performance wise. > > elements = elements.concat(child.children); I actually meant to change that. Thanks for reminding. 1502570 12 361235 mattbaker 2019-02-05 16:06:25 -0800 Created attachment 361235 Patch 1502589 13 361235 hi 2019-02-05 16:33:49 -0800 Comment on attachment 361235 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=361235&action=review rs=me > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1096 > + let child = elements.pop(); Rather than pop, perhaps you can just keep an index and traverse the array with the index (instead of checking `elements.length`, you could check `index < elements.length`). My gut is telling me we should avoid modifying the array as much as possible (lots of `length` churn). 1502613 14 361235 mattbaker 2019-02-05 16:57:56 -0800 Comment on attachment 361235 Patch https://trac.webkit.org/changeset/241003 361217 2019-02-05 13:32:51 -0800 2019-02-05 13:32:51 -0800 [HTML] Test Page delete-node-test.html text/html 80 mattbaker PGRpdiBjbGFzcz0ibm9kZS0xIj48L2Rpdj4KPGRpdiBjbGFzcz0ibm9kZS0yIj48L2Rpdj4KPGRp diBjbGFzcz0ibm9kZS0zIj48L2Rpdj4= 361224 2019-02-05 15:06:32 -0800 2019-02-05 15:43:57 -0800 Patch bug-194300-20190205150631.patch text/plain 3193 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk OWYyNDgwMzhmMjUxNzNjNzM3OWZiNzc0YzQyZDFhZmFmMjdmOWE3Li5jOGEzYWE4ZjBkNzhmYjFk OTEzYTFkNTMxNzljZDZlNDU2OWM0M2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wMi0wNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRWxlbWVudHMgdGFiOiBzZWxlY3Rpb24gaXMgYnJv a2VuIGFmdGVyIGRlbGV0aW5nIHRoZSBzZWxlY3RlZCBub2RlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMDAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzQ3ODI5Mjc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERlbGV0aW5nIGEgVHJlZUVsZW1lbnQgY2FuIGNhdXNlIGFuIEluZGV4U2V0IGluY2x1 ZGluZyBpbmRleGVzCisgICAgICAgIG91dHNpZGUgdGhlIGRlbGV0ZWQgcmFuZ2UgdG8gYmUgcGFz c2VkIHRvIFNlbGVjdGlvbkNvbnRyb2xsZXIsCisgICAgICAgIGNvcnJ1cHRpbmcgdGhlIGludGVy bmFsIHNlbGVjdGlvbiBzdGF0ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZU91dGxpbmUuanM6CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuX2luZGV4ZXNG b3JTdWJ0cmVlLm51bWJlck9mRWxlbWVudHNJblN1YnRyZWUpOiBBZGRlZC4KKyAgICAgICAgKFdJ LlRyZWVPdXRsaW5lLnByb3RvdHlwZS5faW5kZXhlc0ZvclN1YnRyZWUpOgorICAgICAgICBGaW5k aW5nIHRoZSBsYXN0IChyaWdodG1vc3QgbGVhZikgVHJlZUVsZW1lbnQgaW4gdGhlIHN1YnRyZWUg dXNlZAorICAgICAgICBUcmVlRWxlbWVudC5wcm90b3R5cGUudHJhdmVyc2VOZXh0RWxlbWVudCB0 byBkbyBhIGRlcHRoIGZpcnN0IHRyYXZlcnNhbC4KKyAgICAgICAgVGhpcyBtZXRob2QgZGlkIG5v dCBzdGF5IHdpdGhpbiB0aGUgc3VidHJlZSByb290ZWQgYXQgYHRyZWVFbGVtZW50YC4KKwogMjAx OS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IHJlbW92ZSBoYXJtbGVzcyAicHJvcGVydHkgd2FzIHVu bG9ja2VkIiBhc3NlcnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCmluZGV4IGY3ODNhY2RhYmZhNmRhZDM3YmEw MWQ1MzViNzczMjc3NzViZjg1M2UuLjk3ZmYyZDg1YWM3ZTIzMDFlYzhlZTM1NWY4ZDJhYWM4Y2Jj Nzk1OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCkBAIC0xMDkwLDI2ICsxMDkwLDI1IEBAIFdJLlRyZWVP dXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYg KCF0cmVlT3V0bGluZSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwogCi0gICAgICAgIGxldCBm aXJzdENoaWxkID0gdHJlZUVsZW1lbnQuY2hpbGRyZW5bMF07Ci0gICAgICAgIGlmICh0cmVlRWxl bWVudC5yb290ICYmICFmaXJzdENoaWxkKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0KLSAg ICAgICAgbGV0IGN1cnJlbnQgPSBmaXJzdENoaWxkIHx8IHRyZWVFbGVtZW50OwotICAgICAgICBs ZXQgc3RhcnRJbmRleCA9IHRyZWVPdXRsaW5lLl9pbmRleE9mVHJlZUVsZW1lbnQoY3VycmVudCk7 Ci0gICAgICAgIGxldCBlbmRJbmRleCA9IHN0YXJ0SW5kZXg7Ci0KLSAgICAgICAgY29uc3Qgc2tp cFVucmV2ZWFsZWQgPSBmYWxzZTsKLSAgICAgICAgY29uc3Qgc3RheVdpdGhpbiA9IHRyZWVFbGVt ZW50OwotICAgICAgICBjb25zdCBkb250UG9wdWxhdGUgPSB0cnVlOwotCi0gICAgICAgIHdoaWxl IChjdXJyZW50ID0gY3VycmVudC50cmF2ZXJzZU5leHRUcmVlRWxlbWVudChza2lwVW5yZXZlYWxl ZCwgc3RheVdpdGhpbiwgZG9udFBvcHVsYXRlKSkKLSAgICAgICAgICAgIGVuZEluZGV4Kys7Cisg ICAgICAgIGZ1bmN0aW9uIG51bWJlck9mRWxlbWVudHNJblN1YnRyZWUodHJlZUVsZW1lbnQpIHsK KyAgICAgICAgICAgIGxldCBlbGVtZW50cyA9IHRyZWVFbGVtZW50LnJvb3QgPyBBcnJheS5mcm9t KHRyZWVFbGVtZW50LmNoaWxkcmVuKSA6IFt0cmVlRWxlbWVudF07CisgICAgICAgICAgICBsZXQg Y291bnQgPSAwOworICAgICAgICAgICAgd2hpbGUgKGVsZW1lbnRzLmxlbmd0aCkgeworICAgICAg ICAgICAgICAgIGxldCBjaGlsZCA9IGVsZW1lbnRzLnNoaWZ0KCk7CisgICAgICAgICAgICAgICAg aWYgKGNoaWxkLmhpZGRlbikKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAg ICAgbGV0IGNvdW50ID0gZW5kSW5kZXggLSBzdGFydEluZGV4ICsgMTsKKyAgICAgICAgICAgICAg ICBjb3VudCsrOworICAgICAgICAgICAgICAgIGVsZW1lbnRzLnB1c2goLi4uY2hpbGQuY2hpbGRy ZW4pOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJuIGNvdW50OworICAgICAgICB9 CiAKKyAgICAgICAgbGV0IGZpcnN0Q2hpbGQgPSB0cmVlRWxlbWVudC5yb290ID8gdHJlZUVsZW1l bnQuY2hpbGRyZW5bMF0gOiB0cmVlRWxlbWVudDsKKyAgICAgICAgbGV0IHN0YXJ0SW5kZXggPSB0 cmVlT3V0bGluZS5faW5kZXhPZlRyZWVFbGVtZW50KGZpcnN0Q2hpbGQpOworICAgICAgICBsZXQg Y291bnQgPSBudW1iZXJPZkVsZW1lbnRzSW5TdWJ0cmVlKHRyZWVFbGVtZW50KTsKICAgICAgICAg bGV0IGluZGV4ZXMgPSBuZXcgV0kuSW5kZXhTZXQ7CiAgICAgICAgIGluZGV4ZXMuYWRkUmFuZ2Uo c3RhcnRJbmRleCwgY291bnQpOwotCiAgICAgICAgIHJldHVybiBpbmRleGVzOwogICAgIH0KIH07 Cg== 361233 2019-02-05 15:43:59 -0800 2019-02-05 16:06:24 -0800 Patch bug-194300-20190205154358.patch text/plain 3191 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk OWYyNDgwMzhmMjUxNzNjNzM3OWZiNzc0YzQyZDFhZmFmMjdmOWE3Li5jOGEzYWE4ZjBkNzhmYjFk OTEzYTFkNTMxNzljZDZlNDU2OWM0M2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wMi0wNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRWxlbWVudHMgdGFiOiBzZWxlY3Rpb24gaXMgYnJv a2VuIGFmdGVyIGRlbGV0aW5nIHRoZSBzZWxlY3RlZCBub2RlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMDAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzQ3ODI5Mjc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERlbGV0aW5nIGEgVHJlZUVsZW1lbnQgY2FuIGNhdXNlIGFuIEluZGV4U2V0IGluY2x1 ZGluZyBpbmRleGVzCisgICAgICAgIG91dHNpZGUgdGhlIGRlbGV0ZWQgcmFuZ2UgdG8gYmUgcGFz c2VkIHRvIFNlbGVjdGlvbkNvbnRyb2xsZXIsCisgICAgICAgIGNvcnJ1cHRpbmcgdGhlIGludGVy bmFsIHNlbGVjdGlvbiBzdGF0ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZU91dGxpbmUuanM6CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuX2luZGV4ZXNG b3JTdWJ0cmVlLm51bWJlck9mRWxlbWVudHNJblN1YnRyZWUpOiBBZGRlZC4KKyAgICAgICAgKFdJ LlRyZWVPdXRsaW5lLnByb3RvdHlwZS5faW5kZXhlc0ZvclN1YnRyZWUpOgorICAgICAgICBGaW5k aW5nIHRoZSBsYXN0IChyaWdodG1vc3QgbGVhZikgVHJlZUVsZW1lbnQgaW4gdGhlIHN1YnRyZWUg dXNlZAorICAgICAgICBUcmVlRWxlbWVudC5wcm90b3R5cGUudHJhdmVyc2VOZXh0RWxlbWVudCB0 byBkbyBhIGRlcHRoIGZpcnN0IHRyYXZlcnNhbC4KKyAgICAgICAgVGhpcyBtZXRob2QgZGlkIG5v dCBzdGF5IHdpdGhpbiB0aGUgc3VidHJlZSByb290ZWQgYXQgYHRyZWVFbGVtZW50YC4KKwogMjAx OS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IHJlbW92ZSBoYXJtbGVzcyAicHJvcGVydHkgd2FzIHVu bG9ja2VkIiBhc3NlcnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCmluZGV4IGY3ODNhY2RhYmZhNmRhZDM3YmEw MWQ1MzViNzczMjc3NzViZjg1M2UuLjEzMDNiOWI3ODQ2OWIzMGZkYzQ2MWVjYWYxMTcxOTE0MTk0 OGEzNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCkBAIC0xMDkwLDI2ICsxMDkwLDI1IEBAIFdJLlRyZWVP dXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYg KCF0cmVlT3V0bGluZSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwogCi0gICAgICAgIGxldCBm aXJzdENoaWxkID0gdHJlZUVsZW1lbnQuY2hpbGRyZW5bMF07Ci0gICAgICAgIGlmICh0cmVlRWxl bWVudC5yb290ICYmICFmaXJzdENoaWxkKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0KLSAg ICAgICAgbGV0IGN1cnJlbnQgPSBmaXJzdENoaWxkIHx8IHRyZWVFbGVtZW50OwotICAgICAgICBs ZXQgc3RhcnRJbmRleCA9IHRyZWVPdXRsaW5lLl9pbmRleE9mVHJlZUVsZW1lbnQoY3VycmVudCk7 Ci0gICAgICAgIGxldCBlbmRJbmRleCA9IHN0YXJ0SW5kZXg7Ci0KLSAgICAgICAgY29uc3Qgc2tp cFVucmV2ZWFsZWQgPSBmYWxzZTsKLSAgICAgICAgY29uc3Qgc3RheVdpdGhpbiA9IHRyZWVFbGVt ZW50OwotICAgICAgICBjb25zdCBkb250UG9wdWxhdGUgPSB0cnVlOwotCi0gICAgICAgIHdoaWxl IChjdXJyZW50ID0gY3VycmVudC50cmF2ZXJzZU5leHRUcmVlRWxlbWVudChza2lwVW5yZXZlYWxl ZCwgc3RheVdpdGhpbiwgZG9udFBvcHVsYXRlKSkKLSAgICAgICAgICAgIGVuZEluZGV4Kys7Cisg ICAgICAgIGZ1bmN0aW9uIG51bWJlck9mRWxlbWVudHNJblN1YnRyZWUodHJlZUVsZW1lbnQpIHsK KyAgICAgICAgICAgIGxldCBlbGVtZW50cyA9IHRyZWVFbGVtZW50LnJvb3QgPyBBcnJheS5mcm9t KHRyZWVFbGVtZW50LmNoaWxkcmVuKSA6IFt0cmVlRWxlbWVudF07CisgICAgICAgICAgICBsZXQg Y291bnQgPSAwOworICAgICAgICAgICAgd2hpbGUgKGVsZW1lbnRzLmxlbmd0aCkgeworICAgICAg ICAgICAgICAgIGxldCBjaGlsZCA9IGVsZW1lbnRzLnBvcCgpOworICAgICAgICAgICAgICAgIGlm IChjaGlsZC5oaWRkZW4pCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAg IGxldCBjb3VudCA9IGVuZEluZGV4IC0gc3RhcnRJbmRleCArIDE7CisgICAgICAgICAgICAgICAg Y291bnQrKzsKKyAgICAgICAgICAgICAgICBlbGVtZW50cy5wdXNoKC4uLmNoaWxkLmNoaWxkcmVu KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiBjb3VudDsKKyAgICAgICAgfQog CisgICAgICAgIGxldCBmaXJzdENoaWxkID0gdHJlZUVsZW1lbnQucm9vdCA/IHRyZWVFbGVtZW50 LmNoaWxkcmVuWzBdIDogdHJlZUVsZW1lbnQ7CisgICAgICAgIGxldCBzdGFydEluZGV4ID0gdHJl ZU91dGxpbmUuX2luZGV4T2ZUcmVlRWxlbWVudChmaXJzdENoaWxkKTsKKyAgICAgICAgbGV0IGNv dW50ID0gbnVtYmVyT2ZFbGVtZW50c0luU3VidHJlZSh0cmVlRWxlbWVudCk7CiAgICAgICAgIGxl dCBpbmRleGVzID0gbmV3IFdJLkluZGV4U2V0OwogICAgICAgICBpbmRleGVzLmFkZFJhbmdlKHN0 YXJ0SW5kZXgsIGNvdW50KTsKLQogICAgICAgICByZXR1cm4gaW5kZXhlczsKICAgICB9CiB9Owo= 361235 2019-02-05 16:06:25 -0800 2019-02-06 00:54:52 -0800 Patch bug-194300-20190205160625.patch text/plain 3223 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwOTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 NmIzMzgzNmQzNzExYjYzYjRhYWMxZGE5M2FjMmM5NmQ3MDVkZTIzLi5hZjI3ZWZhYTFkODA2OTIy Y2EzZTMyNDZiM2I2YTkzYzQ0OGVmZDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wMi0wNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRWxlbWVudHMgdGFiOiBzZWxlY3Rpb24gaXMgYnJv a2VuIGFmdGVyIGRlbGV0aW5nIHRoZSBzZWxlY3RlZCBub2RlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMDAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzQ3ODI5Mjc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERlbGV0aW5nIGEgVHJlZUVsZW1lbnQgY2FuIGNhdXNlIGFuIEluZGV4U2V0IGluY2x1 ZGluZyBpbmRleGVzCisgICAgICAgIG91dHNpZGUgdGhlIGRlbGV0ZWQgcmFuZ2UgdG8gYmUgcGFz c2VkIHRvIFNlbGVjdGlvbkNvbnRyb2xsZXIsCisgICAgICAgIGNvcnJ1cHRpbmcgdGhlIGludGVy bmFsIHNlbGVjdGlvbiBzdGF0ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZU91dGxpbmUuanM6CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuX2luZGV4ZXNG b3JTdWJ0cmVlLm51bWJlck9mRWxlbWVudHNJblN1YnRyZWUpOiBBZGRlZC4KKyAgICAgICAgKFdJ LlRyZWVPdXRsaW5lLnByb3RvdHlwZS5faW5kZXhlc0ZvclN1YnRyZWUpOgorICAgICAgICBGaW5k aW5nIHRoZSBsYXN0IChyaWdodG1vc3QgbGVhZikgVHJlZUVsZW1lbnQgaW4gdGhlIHN1YnRyZWUg dXNlZAorICAgICAgICBUcmVlRWxlbWVudC5wcm90b3R5cGUudHJhdmVyc2VOZXh0RWxlbWVudCB0 byBkbyBhIGRlcHRoIGZpcnN0IHRyYXZlcnNhbC4KKyAgICAgICAgVGhpcyBtZXRob2QgZGlkIG5v dCBzdGF5IHdpdGhpbiB0aGUgc3VidHJlZSByb290ZWQgYXQgYHRyZWVFbGVtZW50YC4KKwogMjAx OS0wMi0wNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogUkVHUkVTU0lPTiAocjI0MDk0Nyk6IFJlc291cmNlcyB0YWI6IGNhbid0IHNl bGVjdCBtYWluIGZyYW1lIGFmdGVyIHJlZnJlc2hpbmcgcGFnZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwppbmRl eCA0ZWYzZTg2ZWVhMjMzZDI4MjYxYjEzODFhMGZmMzEwYzc2YmI3OWIwLi45ZjIxYTJjNTVhNzhl MTI2NzNiZjQ5ZDk1NzBlYzVhMDQ4NWY2YTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpAQCAtMTA4OSwy NiArMTA4OSwyNSBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMg V0kuT2JqZWN0CiAgICAgICAgIGlmICghdHJlZU91dGxpbmUpCiAgICAgICAgICAgICByZXR1cm4g bnVsbDsKIAotICAgICAgICBsZXQgZmlyc3RDaGlsZCA9IHRyZWVFbGVtZW50LmNoaWxkcmVuWzBd OwotICAgICAgICBpZiAodHJlZUVsZW1lbnQucm9vdCAmJiAhZmlyc3RDaGlsZCkKLSAgICAgICAg ICAgIHJldHVybiBudWxsOwotCi0gICAgICAgIGxldCBjdXJyZW50ID0gZmlyc3RDaGlsZCB8fCB0 cmVlRWxlbWVudDsKLSAgICAgICAgbGV0IHN0YXJ0SW5kZXggPSB0cmVlT3V0bGluZS5faW5kZXhP ZlRyZWVFbGVtZW50KGN1cnJlbnQpOwotICAgICAgICBsZXQgZW5kSW5kZXggPSBzdGFydEluZGV4 OwotCi0gICAgICAgIGNvbnN0IHNraXBVbnJldmVhbGVkID0gZmFsc2U7Ci0gICAgICAgIGNvbnN0 IHN0YXlXaXRoaW4gPSB0cmVlRWxlbWVudDsKLSAgICAgICAgY29uc3QgZG9udFBvcHVsYXRlID0g dHJ1ZTsKLQotICAgICAgICB3aGlsZSAoY3VycmVudCA9IGN1cnJlbnQudHJhdmVyc2VOZXh0VHJl ZUVsZW1lbnQoc2tpcFVucmV2ZWFsZWQsIHN0YXlXaXRoaW4sIGRvbnRQb3B1bGF0ZSkpCi0gICAg ICAgICAgICBlbmRJbmRleCsrOworICAgICAgICBmdW5jdGlvbiBudW1iZXJPZkVsZW1lbnRzSW5T dWJ0cmVlKHRyZWVFbGVtZW50KSB7CisgICAgICAgICAgICBsZXQgZWxlbWVudHMgPSB0cmVlRWxl bWVudC5yb290ID8gQXJyYXkuZnJvbSh0cmVlRWxlbWVudC5jaGlsZHJlbikgOiBbdHJlZUVsZW1l bnRdOworICAgICAgICAgICAgbGV0IGNvdW50ID0gMDsKKyAgICAgICAgICAgIHdoaWxlIChlbGVt ZW50cy5sZW5ndGgpIHsKKyAgICAgICAgICAgICAgICBsZXQgY2hpbGQgPSBlbGVtZW50cy5wb3Ao KTsKKyAgICAgICAgICAgICAgICBpZiAoY2hpbGQuaGlkZGVuKQorICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKIAotICAgICAgICBsZXQgY291bnQgPSBlbmRJbmRleCAtIHN0YXJ0SW5kZXgg KyAxOworICAgICAgICAgICAgICAgIGNvdW50Kys7CisgICAgICAgICAgICAgICAgZWxlbWVudHMg PSBlbGVtZW50cy5jb25jYXQoY2hpbGQuY2hpbGRyZW4pOworICAgICAgICAgICAgfQorICAgICAg ICAgICAgcmV0dXJuIGNvdW50OworICAgICAgICB9CiAKKyAgICAgICAgbGV0IGZpcnN0Q2hpbGQg PSB0cmVlRWxlbWVudC5yb290ID8gdHJlZUVsZW1lbnQuY2hpbGRyZW5bMF0gOiB0cmVlRWxlbWVu dDsKKyAgICAgICAgbGV0IHN0YXJ0SW5kZXggPSB0cmVlT3V0bGluZS5faW5kZXhPZlRyZWVFbGVt ZW50KGZpcnN0Q2hpbGQpOworICAgICAgICBsZXQgY291bnQgPSBudW1iZXJPZkVsZW1lbnRzSW5T dWJ0cmVlKHRyZWVFbGVtZW50KTsKICAgICAgICAgbGV0IGluZGV4ZXMgPSBuZXcgV0kuSW5kZXhT ZXQ7CiAgICAgICAgIGluZGV4ZXMuYWRkUmFuZ2Uoc3RhcnRJbmRleCwgY291bnQpOwotCiAgICAg ICAgIHJldHVybiBpbmRleGVzOwogICAgIH0KIH07Cg==