190970 2018-10-26 11:57:43 -0700 Web Inspector: simplify some editing code checks 2018-10-26 14:04:26 -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 webkit-bug-importer oldest_to_newest 1472528 0 hi 2018-10-26 11:57:43 -0700 There's no need to check each parent for the "CodeMirror" class when `CodeMirror` gets added as an expando property on the element itself. 1472533 1 353197 hi 2018-10-26 12:03:17 -0700 Created attachment 353197 Patch 1472569 2 353197 joepeck 2018-10-26 13:34:55 -0700 Comment on attachment 353197 Patch r=me, be on the look-out if any issues pop up since this has been some traditionally tricky code, but this looks good to me and I don't expect any fallout. 1472578 3 353197 commit-queue 2018-10-26 14:03:57 -0700 Comment on attachment 353197 Patch Clearing flags on attachment: 353197 Committed r237482: <https://trac.webkit.org/changeset/237482> 1472579 4 commit-queue 2018-10-26 14:03:58 -0700 All reviewed patches have been landed. Closing bug. 1472580 5 webkit-bug-importer 2018-10-26 14:04:26 -0700 <rdar://problem/45598701> 353197 2018-10-26 12:03:17 -0700 2018-10-26 14:03:57 -0700 Patch bug-190970-20181026120316.patch text/plain 6359 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQyZWUzNTcyZjRkMTE1ZmI4MjQxZTg5NDE3NWI5 NjVhY2FlMDgwODYuLmZhZTEwYjMwYjlkNmJmZDQ2ZjlhZDRhYmZkZDkwMWNhOGFmM2ZmMjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEwLTI2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBz aW1wbGlmeSBzb21lIGVkaXRpbmcgY29kZSBjaGVja3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDk3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6Cisg ICAgICAgIChXSS5fZm9jdXNDaGFuZ2VkKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFz ZS9VdGlsaXRpZXMuanM6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmdT dXBwb3J0LmpzOgorICAgICAgICAoV0kuZW5jbG9zaW5nQ29kZU1pcnJvcik6IEFkZGVkLgorICAg ICAgICAoV0kuaXNCZWluZ0VkaXRlZCk6CisgICAgICAgIChXSS5pc0V2ZW50VGFyZ2V0QW5FZGl0 YWJsZUZpZWxkKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xl LmpzOgorICAgICAgICAoV0kuUXVpY2tDb25zb2xlKToKKwogMjAxOC0xMC0yNSAgRGV2aW4gUm91 c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FudmFz IFJlY29yZGluZyBsb2FkaW5nIGdvZXMgc2lnbmlmaWNhbnRseSBzbG93ZXIgd2hlbiAiRnJhbWUi IHRyZWUgZWxlbWVudCBpcyBleHBhbmRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDNkY2RiYzVjYjBkMWU0YzYxMjI0NjRkNjlm YWMzM2VjODc4ZDRkMjYuLjMxOTAwMjNiMjQ0YTNhODNmMWE0YTc0NWY0MGRmMDI1MDRjMDdhNDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMKQEAgLTEyOTQsMTMgKzEyOTQsMjEgQEAgV0kuX2ZvY3VzQ2hhbmdlZCA9IGZ1bmN0aW9uKGV2 ZW50KQogCiAgICAgaWYgKFdJLmlzRXZlbnRUYXJnZXRBbkVkaXRhYmxlRmllbGQoZXZlbnQpKSB7 CiAgICAgICAgIC8vIFN0aWxsIHVwZGF0ZSB0aGUgY3VycmVudEZvY3VzRWxlbWVudCBpZiBpbnNp ZGUgb2YgYSBDb2RlTWlycm9yIGVkaXRvciBvciBhbiBpbnB1dCBlbGVtZW50LgotICAgICAgICBs ZXQgY29kZU1pcnJvckVkaXRvckVsZW1lbnQgPSBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9kZU9y U2VsZldpdGhDbGFzcygiQ29kZU1pcnJvciIpOwotICAgICAgICBpZiAoY29kZU1pcnJvckVkaXRv ckVsZW1lbnQgJiYgY29kZU1pcnJvckVkaXRvckVsZW1lbnQgIT09IHRoaXMuY3VycmVudEZvY3Vz RWxlbWVudCkgewotICAgICAgICAgICAgdGhpcy5wcmV2aW91c0ZvY3VzRWxlbWVudCA9IHRoaXMu Y3VycmVudEZvY3VzRWxlbWVudDsKLSAgICAgICAgICAgIHRoaXMuY3VycmVudEZvY3VzRWxlbWVu dCA9IGNvZGVNaXJyb3JFZGl0b3JFbGVtZW50OwotICAgICAgICB9IGVsc2UgaWYgKGV2ZW50LnRh cmdldC50YWdOYW1lID09PSAiSU5QVVQiKSB7CisgICAgICAgIGxldCBuZXdGb2N1c0VsZW1lbnQg PSBudWxsOworICAgICAgICBpZiAoZXZlbnQudGFyZ2V0IGluc3RhbmNlb2YgSFRNTElucHV0RWxl bWVudCB8fCBldmVudC50YXJnZXQgaW5zdGFuY2VvZiBIVE1MVGV4dEFyZWFFbGVtZW50KQorICAg ICAgICAgICAgbmV3Rm9jdXNFbGVtZW50ID0gZXZlbnQudGFyZ2V0OworICAgICAgICBlbHNlIHsK KyAgICAgICAgICAgIGxldCBjb2RlTWlycm9yID0gV0kuZW5jbG9zaW5nQ29kZU1pcnJvcihldmVu dC50YXJnZXQpOworICAgICAgICAgICAgaWYgKGNvZGVNaXJyb3IpIHsKKyAgICAgICAgICAgICAg ICBsZXQgY29kZU1pcnJvckVsZW1lbnQgPSBjb2RlTWlycm9yLmdldFdyYXBwZXJFbGVtZW50KCk7 CisgICAgICAgICAgICAgICAgaWYgKGNvZGVNaXJyb3JFbGVtZW50ICYmIGNvZGVNaXJyb3JFbGVt ZW50ICE9PSB0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAgICAgICAgICAgICAgICAgIG5l d0ZvY3VzRWxlbWVudCA9IGNvZGVNaXJyb3JFbGVtZW50OworICAgICAgICAgICAgfQorICAgICAg ICB9CisKKyAgICAgICAgaWYgKG5ld0ZvY3VzRWxlbWVudCkgewogICAgICAgICAgICAgdGhpcy5w cmV2aW91c0ZvY3VzRWxlbWVudCA9IHRoaXMuY3VycmVudEZvY3VzRWxlbWVudDsKLSAgICAgICAg ICAgIHRoaXMuY3VycmVudEZvY3VzRWxlbWVudCA9IGV2ZW50LnRhcmdldDsKKyAgICAgICAgICAg IHRoaXMuY3VycmVudEZvY3VzRWxlbWVudCA9IG5ld0ZvY3VzRWxlbWVudDsKICAgICAgICAgfQog CiAgICAgICAgIC8vIER1ZSB0byB0aGUgY2hhbmdlIGluIFdJLmlzRXZlbnRUYXJnZXRBbkVkaXRh YmxlRmllbGQgKHIxOTYyNzEpLCB0aGlzIHJldHVybgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwppbmRleCA2NmEyM2ZjYzBh NWViZTg3ZGI0NmM0MjRmMDYzZjUwNjNiNmExMmYwLi42OTAzNWNjN2NmZjA0YzQ4MTQyYTI2Nzkx M2UxODlmNGViY2I3ZDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtMzc5LDE2ICszNzksNiBAQCBPYmplY3Qu ZGVmaW5lUHJvcGVydHkoRWxlbWVudC5wcm90b3R5cGUsICJpc0luc2VydGlvbkNhcmV0SW5zaWRl IiwKICAgICB9CiB9KTsKIAotT2JqZWN0LmRlZmluZVByb3BlcnR5KEVsZW1lbnQucHJvdG90eXBl LCAicmVtb3ZlTWF0Y2hpbmdTdHlsZUNsYXNzZXMiLAotewotICAgIHZhbHVlKGNsYXNzTmFtZVJl Z2V4KQotICAgIHsKLSAgICAgICAgdmFyIHJlZ2V4ID0gbmV3IFJlZ0V4cCgiKF58XFxzKykiICsg Y2xhc3NOYW1lUmVnZXggKyAiKCR8XFxzKykiKTsKLSAgICAgICAgaWYgKHJlZ2V4LnRlc3QodGhp cy5jbGFzc05hbWUpKQotICAgICAgICAgICAgdGhpcy5jbGFzc05hbWUgPSB0aGlzLmNsYXNzTmFt ZS5yZXBsYWNlKHJlZ2V4LCAiICIpOwotICAgIH0KLX0pOwotCiBPYmplY3QuZGVmaW5lUHJvcGVy dHkoRWxlbWVudC5wcm90b3R5cGUsICJjcmVhdGVDaGlsZCIsCiB7CiAgICAgdmFsdWUoZWxlbWVu dE5hbWUsIGNsYXNzTmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0VkaXRpbmdTdXBwb3J0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanMKaW5kZXggNzllYmIyM2NhNGQy YjdkZWJjZTNkOThhODhmNWY5MjgwYzcwMTFkMS4uZTJhYTYxNGQwMzIzOWQ0NTVhMTIyMzdkZTMy ZDhhOGM5YmRiNGIzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanMKQEAgLTIzLDYgKzIzLDE2IEBA CiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorV0kuZW5jbG9zaW5n Q29kZU1pcnJvciA9IGZ1bmN0aW9uKGVsZW1lbnQpCit7CisgICAgd2hpbGUgKGVsZW1lbnQpIHsK KyAgICAgICAgaWYgKGVsZW1lbnQuQ29kZU1pcnJvcikKKyAgICAgICAgICAgIHJldHVybiBlbGVt ZW50LkNvZGVNaXJyb3I7CisgICAgICAgIGVsZW1lbnQgPSBlbGVtZW50LnBhcmVudE5vZGU7Cisg ICAgfQorICAgIHJldHVybiBudWxsOworfTsKKwogV0kuaXNCZWluZ0VkaXRlZCA9IGZ1bmN0aW9u KGVsZW1lbnQpCiB7CiAgICAgd2hpbGUgKGVsZW1lbnQpIHsKQEAgLTMwLDcgKzQwLDYgQEAgV0ku aXNCZWluZ0VkaXRlZCA9IGZ1bmN0aW9uKGVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICAgICAgZWxlbWVudCA9IGVsZW1lbnQucGFyZW50Tm9kZTsKICAgICB9Ci0KICAgICBy ZXR1cm4gZmFsc2U7CiB9OwogCkBAIC01NywyNiArNjYsMTkgQEAgV0kuaXNFZGl0aW5nQW55Rmll bGQgPSBmdW5jdGlvbigpCiAKIFdJLmlzRXZlbnRUYXJnZXRBbkVkaXRhYmxlRmllbGQgPSBmdW5j dGlvbihldmVudCkKIHsKLSAgICBsZXQgdGV4dElucHV0VHlwZXMgPSBuZXcgU2V0KFsidGV4dCIs ICJzZWFyY2giLCAibnVtYmVyIiwgInRlbCIsICJ1cmwiLCAiZW1haWwiLCAicGFzc3dvcmQiXSk7 Ci0gICAgaWYgKGV2ZW50LnRhcmdldCBpbnN0YW5jZW9mIEhUTUxJbnB1dEVsZW1lbnQpCi0gICAg ICAgIHJldHVybiB0ZXh0SW5wdXRUeXBlcy5oYXMoZXZlbnQudGFyZ2V0LnR5cGUpOwotCi0gICAg bGV0IGNvZGVNaXJyb3JFZGl0b3JFbGVtZW50ID0gZXZlbnQudGFyZ2V0LmVuY2xvc2luZ05vZGVP clNlbGZXaXRoQ2xhc3MoIkNvZGVNaXJyb3IiKTsKLSAgICBpZiAoY29kZU1pcnJvckVkaXRvckVs ZW1lbnQgJiYgY29kZU1pcnJvckVkaXRvckVsZW1lbnQuQ29kZU1pcnJvcikKLSAgICAgICAgcmV0 dXJuICFjb2RlTWlycm9yRWRpdG9yRWxlbWVudC5Db2RlTWlycm9yLmdldE9wdGlvbigicmVhZE9u bHkiKTsKLQotICAgIGlmIChldmVudC50YXJnZXQgaW5zdGFuY2VvZiBIVE1MVGV4dEFyZWFFbGVt ZW50KQorICAgIGlmIChldmVudC50YXJnZXQgaW5zdGFuY2VvZiBIVE1MSW5wdXRFbGVtZW50IHx8 IGV2ZW50LnRhcmdldCBpbnN0YW5jZW9mIEhUTUxUZXh0QXJlYUVsZW1lbnQpCiAgICAgICAgIHJl dHVybiB0cnVlOwogCiAgICAgaWYgKGV2ZW50LnRhcmdldC5pc0NvbnRlbnRFZGl0YWJsZSkKICAg ICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAoZXZlbnQudGFyZ2V0LmVuY2xvc2luZ05vZGVP clNlbGZXaXRoQ2xhc3MoInRleHQtcHJvbXB0IikpCi0gICAgICAgIHJldHVybiB0cnVlOwotCiAg ICAgaWYgKFdJLmlzQmVpbmdFZGl0ZWQoZXZlbnQudGFyZ2V0KSkKICAgICAgICAgcmV0dXJuIHRy dWU7CiAKKyAgICBsZXQgY29kZU1pcnJvciA9IFdJLmVuY2xvc2luZ0NvZGVNaXJyb3IoZXZlbnQu dGFyZ2V0KTsKKyAgICBpZiAoY29kZU1pcnJvcikKKyAgICAgICAgcmV0dXJuICFjb2RlTWlycm9y LmdldE9wdGlvbigicmVhZE9ubHkiKTsKKwogICAgIHJldHVybiBmYWxzZTsKIH07CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29u c29sZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNr Q29uc29sZS5qcwppbmRleCBlMDA0YjVhODFhYzE5NzQyY2U3MjYzMDA2OGZiODNhOGQxZWNiYTAz Li5hZmZlZDMyODBiMjhmNjdiMGNmYWE3ZjE3ZjczYThiNGNmM2NiZmI4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25z b2xlLmpzCkBAIC00NCw3ICs0NCw2IEBAIFdJLlF1aWNrQ29uc29sZSA9IGNsYXNzIFF1aWNrQ29u c29sZSBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlZG93biIsIHRoaXMuX2hhbmRsZU1vdXNlRG93bi5iaW5kKHRoaXMpKTsKIAogICAg ICAgICB0aGlzLnByb21wdCA9IG5ldyBXSS5Db25zb2xlUHJvbXB0KG51bGwsICJ0ZXh0L2phdmFz Y3JpcHQiKTsKLSAgICAgICAgdGhpcy5wcm9tcHQuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ0ZXh0 LXByb21wdCIpOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5wcm9tcHQpOwogCiAgICAg ICAgIC8vIEZJWE1FOiBDb2RlTWlycm9yIDQgaGFzIGEgZGVmYXVsdCAiRXNjIiBrZXkgaGFuZGxl ciB0aGF0IGFsd2F5cyBwcmV2ZW50cyBkZWZhdWx0Lgo=