149730 2015-10-01 16:14:22 -0700 Web Inspector: Simplify filterableData processing 2015-10-01 18:54:16 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1130077 0 joepeck 2015-10-01 16:14:22 -0700 * SUMMARY Simplify filterableData processing. Just construct the filterable data with an array of text elements instead of dynamically converting it later. 1130078 1 262297 joepeck 2015-10-01 16:15:03 -0700 Created attachment 262297 [PATCH] Proposed Fix 1130137 2 262297 commit-queue 2015-10-01 18:54:12 -0700 Comment on attachment 262297 [PATCH] Proposed Fix Clearing flags on attachment: 262297 Committed r190448: <http://trac.webkit.org/changeset/190448> 1130138 3 commit-queue 2015-10-01 18:54:16 -0700 All reviewed patches have been landed. Closing bug. 262297 2015-10-01 16:15:03 -0700 2015-10-01 18:54:12 -0700 [PATCH] Proposed Fix simplify-text-filter.patch text/plain 5226 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE1Yjk3MDQuLjc2NmRhM2EgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE1LTEwLTAxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2ltcGxp ZnkgZmlsdGVyYWJsZURhdGEgcHJvY2Vzc2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5NzMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVl RWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50VHJlZUVsZW1lbnQu cHJvdG90eXBlLmdldCBmaWx0ZXJhYmxlRGF0YSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5h dmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLmFwcGx5RmlsdGVyc1RvVHJlZUVsZW1lbnQu bWF0Y2hUZXh0RmlsdGVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNl VHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVu dC5wcm90b3R5cGUuZ2V0IGZpbHRlcmFibGVEYXRhKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRUaW1lbGluZVZpZXcucHJvdG90eXBlLm1hdGNoVHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmls dGVycyk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hSZXN1 bHRUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWFyY2hSZXN1bHRUcmVl RWxlbWVudC5wcm90b3R5cGUuZ2V0IGZpbHRlcmFibGVEYXRhKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TZWFyY2hSZXN1bHRUcmVlRWxlbWVudCk6CisKKzIwMTUtMTAtMDEgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEbyBu b3QgaW1tZWRpYXRlbHkgY3JlYXRlIGFsbCBQcm9maWxlTm9kZVRyZWVFbGVtZW50cyB3aGVuIHNo b3dpbmcgSmF2YVNjcmlwdCBhbmQgRXZlbnRzIHRpbWVsaW5lCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk3MjYKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2lu dFRyZWVFbGVtZW50LmpzCmluZGV4IGY5YjAyYmQuLjIyODljMWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRUcmVlRWxlbWVu dC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVh a3BvaW50VHJlZUVsZW1lbnQuanMKQEAgLTczLDcgKzczLDcgQEAgV2ViSW5zcGVjdG9yLkJyZWFr cG9pbnRUcmVlRWxlbWVudCA9IGNsYXNzIEJyZWFrcG9pbnRUcmVlRWxlbWVudCBleHRlbmRzIFdl Ykluc3AKIAogICAgIGdldCBmaWx0ZXJhYmxlRGF0YSgpCiAgICAgewotICAgICAgICByZXR1cm4g e3RleHQ6IHRoaXMuYnJlYWtwb2ludC51cmx9OworICAgICAgICByZXR1cm4ge3RleHQ6IFt0aGlz LmJyZWFrcG9pbnQudXJsXX07CiAgICAgfQogCiAgICAgb25kZWxldGUoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05h dmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggNjlhZTI2MS4uNmE2Y2M5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC0zNDEsMjIgKzM0MSwyMCBAQCBXZWJJ bnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFy UGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICB2YXIgZmlsdGVyYWJsZURhdGEgPSB0cmVlRWxl bWVudC5maWx0ZXJhYmxlRGF0YSB8fCB7fTsKIAogICAgICAgICB2YXIgZmxhZ3MgPSB7ZXhwYW5k VHJlZUVsZW1lbnQ6IGZhbHNlfTsKKyAgICAgICAgdmFyIGZpbHRlclJlZ2V4ID0gdGhpcy5fdGV4 dEZpbHRlclJlZ2V4OwogCi0gICAgICAgIHZhciBzZWxmID0gdGhpczsKICAgICAgICAgZnVuY3Rp b24gbWF0Y2hUZXh0RmlsdGVyKGlucHV0cykKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFp bnB1dHMgfHwgIXNlbGYuX3RleHRGaWx0ZXJSZWdleCkKKyAgICAgICAgICAgIGlmICghaW5wdXRz IHx8ICFmaWx0ZXJSZWdleCkKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgICAg ICAgICAgLy8gQ29udmVydCB0byBhIHNpbmdsZSBpdGVtIGFycmF5IGlmIG5lZWRlZC4KLSAgICAg ICAgICAgIGlmICghKGlucHV0cyBpbnN0YW5jZW9mIEFycmF5KSkKLSAgICAgICAgICAgICAgICBp bnB1dHMgPSBbaW5wdXRzXTsKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGlucHV0cyBpbnN0 YW5jZW9mIEFycmF5LCAiZmlsdGVyYWJsZURhdGEudGV4dCBzaG91bGQgYmUgYW4gYXJyYXkgb2Yg dGV4dCBpbnB1dHMiKTsKIAogICAgICAgICAgICAgLy8gTG9vcCBvdmVyIGFsbCB0aGUgaW5wdXRz IGFuZCB0cnkgdG8gbWF0Y2ggdGhlbS4KICAgICAgICAgICAgIGZvciAodmFyIGlucHV0IG9mIGlu cHV0cykgewogICAgICAgICAgICAgICAgIGlmICghaW5wdXQpCiAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIGlmIChzZWxmLl90ZXh0RmlsdGVyUmVnZXgudGVz dChpbnB1dCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoZmlsdGVyUmVnZXgudGVzdChpbnB1dCkp IHsKICAgICAgICAgICAgICAgICAgICAgZmxhZ3MuZXhwYW5kVHJlZUVsZW1lbnQgPSB0cnVlOwog ICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJj ZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUmVzb3VyY2VUcmVlRWxlbWVudC5qcwppbmRleCA3NTY3MGQ3Li5hNTIzMmJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRy ZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlVHJlZUVsZW1lbnQuanMKQEAgLTgzLDcgKzgzLDcgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlVHJlZUVsZW1lbnQgPSBjbGFzcyBSZXNvdXJjZVRyZWVFbGVtZW50IGV4dGVuZHMg V2ViSW5zcGVjdG8KIAogICAgIGdldCBmaWx0ZXJhYmxlRGF0YSgpCiAgICAgewotICAgICAgICBy ZXR1cm4ge3RleHQ6IHRoaXMuX3Jlc291cmNlLnVybH07CisgICAgICAgIHJldHVybiB7dGV4dDog W3RoaXMuX3Jlc291cmNlLnVybF19OwogICAgIH0KIAogICAgIG9uZGJsY2xpY2soKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGlt ZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NyaXB0VGltZWxpbmVWaWV3LmpzCmluZGV4IDdlYTUxODEuLjlmYzdkYTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5l Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T Y3JpcHRUaW1lbGluZVZpZXcuanMKQEAgLTE1MiwxMSArMTUyLDYgQEAgV2ViSW5zcGVjdG9yLlNj cmlwdFRpbWVsaW5lVmlldyA9IGNsYXNzIFNjcmlwdFRpbWVsaW5lVmlldyBleHRlbmRzIFdlYklu c3BlY3Rvci4KICAgICAgICAgcmV0dXJuIHBhdGhDb21wb25lbnRzOwogICAgIH0KIAotICAgIG1h dGNoVHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmlsdGVycyh0cmVlRWxlbWVudCkKLSAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLl9kYXRhR3JpZC50cmVlRWxlbWVudE1hdGNoZXNBY3RpdmVTY29w ZUZpbHRlcnModHJlZUVsZW1lbnQpOwotICAgIH0KLQogICAgIHJlc2V0KCkKICAgICB7CiAgICAg ICAgIHN1cGVyLnJlc2V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TZWFyY2hSZXN1bHRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFJlc3VsdFRyZWVFbGVtZW50Lmpz CmluZGV4IDFhNjE3ZGYuLjZkZGZhYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFJlc3VsdFRyZWVFbGVtZW50LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFJlc3VsdFRyZWVF bGVtZW50LmpzCkBAIC04MCw3ICs4MCw3IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hSZXN1bHRUcmVl RWxlbWVudCA9IGNsYXNzIFNlYXJjaFJlc3VsdFRyZWVFbGVtZW50IGV4dGVuZHMgV2ViCiAKICAg ICBnZXQgZmlsdGVyYWJsZURhdGEoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHt0ZXh0OiB0aGlz LnJlcHJlc2VudGVkT2JqZWN0LnRpdGxlfTsKKyAgICAgICAgcmV0dXJuIHt0ZXh0OiBbdGhpcy5y ZXByZXNlbnRlZE9iamVjdC50aXRsZV19OwogICAgIH0KIH07CiAK