165744 2016-12-11 16:05:56 -0800 Web Inspector: content views are not restored on reload if its tree element is filtered out 2017-05-23 18:09:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg mattbaker commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1258904 0 bburg 2016-12-11 16:05:56 -0800 STEPS TO REPRODUCE: 1. Go to a website 2. Open Resources Tab 3. Select some resource tree element 4. Enter some jibberish into "Filter Resource List" at the bottom of the sidebar 5. Reload => Content view is restored as expected despite no tree element visible 6. Reload => Content view is not restored, shows the main resource My hunch is that we are unable to correctly serialize the current content view / represented object the second time because its corresponding tree element was never created. State restoration code is based on the selected tree element, so if nothing is selected then we won't restore anything either. 1258905 1 bburg 2016-12-11 16:07:16 -0800 <rdar://problem/27461323> 1304372 2 308985 mattbaker 2017-05-03 16:46:30 -0700 Created attachment 308985 Patch 1312136 3 308985 hi 2017-05-23 17:09:05 -0700 Comment on attachment 308985 Patch r=me 1312148 4 mattbaker 2017-05-23 17:41:41 -0700 You can cq+ at the same time, if you don't have any feedback that needs to be addressed. 1312153 5 308985 commit-queue 2017-05-23 18:09:22 -0700 Comment on attachment 308985 Patch Clearing flags on attachment: 308985 Committed r217317: <http://trac.webkit.org/changeset/217317> 1312154 6 commit-queue 2017-05-23 18:09:24 -0700 All reviewed patches have been landed. Closing bug. 308985 2017-05-03 16:46:30 -0700 2017-05-23 18:09:22 -0700 Patch bug-165744-20170503164630.patch text/plain 6936 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA5 MjRkZWQ2MTYwYzcxMTNhMjcwYjE4MzI3OGMyNzUyNDAzODQxNWU1Li5jNDNmNWFkODVjM2M3OGEy OWJmODhhZTZiMDQ1YjE3MDAyMTliOGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMiBAQAorMjAxNy0wNS0wMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY29udGVudCB2aWV3cyBhcmUgbm90IHJlc3RvcmVk IG9uIHJlbG9hZCBpZiBpdHMgdHJlZSBlbGVtZW50IGlzIGZpbHRlcmVkIG91dAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1NzQ0CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8yNzQ2MTMyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCeSBkZWZhdWx0LCBOYXZpZ2F0aW9uU2lkZWJhciBzaG91bGQgZ2V0 IHRoZSBzZWxlY3RlZCByZXByZXNlbnRlZCBvYmplY3QKKyAgICAgICAgZnJvbSBpdHMgY29udGVu dCBicm93c2VyLCBpbnN0ZWFkIG9mIHJlbHlpbmcgb24gdGhlIHRyZWUgc2VsZWN0aW9uLiBUaGlz CisgICAgICAgIGFsbG93cyBhIGZpbHRlcmVkIHRyZWUgc2VsZWN0aW9uIHRvIHBlcnNpc3QgYWNy b3NzIHBhZ2UgbG9hZHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRp b25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGVi YXJQYW5lbC5wcm90b3R5cGUuZ2V0IGN1cnJlbnRSZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuc2F2ZVN0YXRl VG9Db29raWUpOgorICAgICAgICBHZXQgdGhlIHJlcHJlc2VudGVkIG9iamVjdCBmcm9tIHRoZSBj b250ZW50IGJyb3dzZXIgaW5zdGVhZCBvZiByZWx5aW5nCisgICAgICAgIG9uIHRoZSB0cmVlIHNl bGVjdGlvbiAod2hpY2ggY2FuIGJlIGZpbHRlcmVkIG91dCkuCisKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdXBkYXRlRmlsdGVyKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdHJl ZUVsZW1lbnRBZGRlZE9yQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlv blNpZGViYXJQYW5lbC5wcm90b3R5cGUuX3RyZWVFbGVtZW50V2FzRmlsdGVyZWQpOgorICAgICAg ICBSZXNlbGVjdCB0aGUgcmVwcmVzZW50ZWQgb2JqZWN0J3MgdHJlZSBlbGVtZW50IHdoZW4gaXQg aXMgc2hvd24gZHVlCisgICAgICAgIHRvIGEgY2hhbmdlIGluIHRoZSBmaWx0ZXIgc3RhdGUuCisK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5n ZXQgaGFzU2VsZWN0ZWRFbGVtZW50KTogRGVsZXRlZC4KKyAgICAgICAgTm90IHVzZWQuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUucmVwcmVz ZW50ZWRPYmplY3RXYXNGaWx0ZXJlZCk6IERlbGV0ZWQuCisgICAgICAgIE5vdCB1c2VkLiBSZXBs YWNlZCBieSBfdHJlZUVsZW1lbnRXYXNGaWx0ZXJlZC4KKwogMjAxNy0wNS0wMyAgTmlraXRhIFZh c2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBVbmNhdWdodCBFeGNlcHRp b246IENhbid0IG1ha2UgYSBDb250ZW50VmlldyBmb3IgYW4gdW5rbm93biByZXByZXNlbnRlZE9i amVjdCBvZiB0eXBlOiBJbmRleGVkRGF0YWJhc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJh clBhbmVsLmpzCmluZGV4IDRjMzI3NjNjYmU5MTg4M2E5YWI3YTRiYjAyNjI4MmZkYjk0N2NhZDMu LjU3NjAzODJmMGQ4NzYzYjc3OGUwMmQ2MmVmMjU0NGU0YTAyMmI3YTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFy UGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAtMTAwLDkgKzEwMCwxMiBAQCBXZWJJbnNwZWN0 b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwg ZXh0ZW5kcyBXZWJJbgogICAgICAgICByZXR1cm4gdGhpcy5fY29udGVudFRyZWVPdXRsaW5lR3Jv dXAuaXRlbXM7CiAgICAgfQogCi0gICAgZ2V0IGhhc1NlbGVjdGVkRWxlbWVudCgpCisgICAgZ2V0 IGN1cnJlbnRSZXByZXNlbnRlZE9iamVjdCgpCiAgICAgewotICAgICAgICByZXR1cm4gISF0aGlz Ll9jb250ZW50VHJlZU91dGxpbmVHcm91cC5zZWxlY3RlZFRyZWVFbGVtZW50CisgICAgICAgIGlm ICghdGhpcy5fY29udGVudEJyb3dzZXIpCisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKworICAg ICAgICByZXR1cm4gdGhpcy5fY29udGVudEJyb3dzZXIuY3VycmVudFJlcHJlc2VudGVkT2JqZWN0 c1swXSB8fCBudWxsOwogICAgIH0KIAogICAgIGdldCBmaWx0ZXJCYXIoKQpAQCAtMjA0LDI2ICsy MDcsMjEgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZp Z2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICB7CiAgICAgICAgIGNvbnNvbGUu YXNzZXJ0KGNvb2tpZSk7CiAKLSAgICAgICAgLy8gVGhpcyBkb2VzIG5vdCBzYXZlIGZvbGRlciBz ZWxlY3Rpb25zLCB3aGljaCBsYWNrIGEgcmVwcmVzZW50ZWQgb2JqZWN0IGFuZCBjb250ZW50IHZp ZXcuCi0gICAgICAgIHZhciBzZWxlY3RlZFRyZWVFbGVtZW50ID0gbnVsbDsKLSAgICAgICAgdGhp cy5jb250ZW50VHJlZU91dGxpbmVzLmZvckVhY2goZnVuY3Rpb24ob3V0bGluZSkgewotICAgICAg ICAgICAgaWYgKG91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCkKLSAgICAgICAgICAgICAgICBz ZWxlY3RlZFRyZWVFbGVtZW50ID0gb3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50OwotICAgICAg ICB9KTsKLQotICAgICAgICBpZiAoIXNlbGVjdGVkVHJlZUVsZW1lbnQpCisgICAgICAgIGlmICgh dGhpcy5fY29udGVudEJyb3dzZXIpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYg KHRoaXMuX2lzVHJlZUVsZW1lbnRXaXRob3V0UmVwcmVzZW50ZWRPYmplY3Qoc2VsZWN0ZWRUcmVl RWxlbWVudCkpCisgICAgICAgIGxldCByZXByZXNlbnRlZE9iamVjdCA9IHRoaXMuY3VycmVudFJl cHJlc2VudGVkT2JqZWN0OworICAgICAgICBpZiAoIXJlcHJlc2VudGVkT2JqZWN0KQogICAgICAg ICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciByZXByZXNlbnRlZE9iamVjdCA9IHNlbGVjdGVk VHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAgICAgICAgIGNvb2tpZVtXZWJJbnNwZWN0 b3IuVHlwZUlkZW50aWZpZXJDb29raWVLZXldID0gcmVwcmVzZW50ZWRPYmplY3QuY29uc3RydWN0 b3IuVHlwZUlkZW50aWZpZXI7CiAKLSAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0LnNhdmVJ ZGVudGl0eVRvQ29va2llKQorICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3Quc2F2ZUlkZW50 aXR5VG9Db29raWUpIHsKICAgICAgICAgICAgIHJlcHJlc2VudGVkT2JqZWN0LnNhdmVJZGVudGl0 eVRvQ29va2llKGNvb2tpZSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNvbnNvbGUuZXJy b3IoIkVycm9yOiBUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCBpcyBtaXNzaW5nIGEgc2F2 ZUlkZW50aXR5VG9Db29raWUgaW1wbGVtZW50YXRpb24uIFRyZWVFbGVtZW50LmNvbnN0cnVjdG9y OiAiLCBzZWxlY3RlZFRyZWVFbGVtZW50LmNvbnN0cnVjdG9yKTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnNvbGUuZXJyb3IoIk5hdmlnYXRpb25TaWRlYmFy UGFuZWwgcmVwcmVzZW50ZWRPYmplY3QgaXMgbWlzc2luZyBhIHNhdmVJZGVudGl0eVRvQ29va2ll IGltcGxlbWVudGF0aW9uLiIsIHJlcHJlc2VudGVkT2JqZWN0KTsKICAgICB9CiAKICAgICAvLyBU aGlzIGNhbiBiZSBzdXBwbGVtZW50ZWQgYnkgc3ViY2xhc3NlcyB0aGF0IGFkbWl0IGEgc2ltcGxl ciBzdHJhdGVneSBmb3Igc3RhdGljIHRyZWUgZWxlbWVudHMuCkBAIC00MjUsMTEgKzQyMyw2IEBA IFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsID0gY2xhc3MgTmF2aWdhdGlvblNp ZGViYXJQYW5lbCBleHRlbmRzIFdlYkluCiAKICAgICAvLyBQcm90ZWN0ZWQKIAotICAgIHJlcHJl c2VudGVkT2JqZWN0V2FzRmlsdGVyZWQocmVwcmVzZW50ZWRPYmplY3QsIGZpbHRlcmVkKQotICAg IHsKLSAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkgc3ViY2xhc3NlcyBpZiBuZWVkZWQuCi0gICAg fQotCiAgICAgcHJ1bmVTdGFsZVJlc291cmNlVHJlZUVsZW1lbnRzKCkKICAgICB7CiAgICAgICAg IGlmICh0aGlzLl9jaGVja0ZvclN0YWxlUmVzb3VyY2VzVGltZW91dElkZW50aWZpZXIpIHsKQEAg LTU3MCw3ICs1NjMsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNs YXNzIE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICAgICAgICAg ICAgICBjb25zdCBjdXJyZW50VHJlZUVsZW1lbnRXYXNIaWRkZW4gPSBjdXJyZW50VHJlZUVsZW1l bnQuaGlkZGVuOwogICAgICAgICAgICAgICAgICAgICB0aGlzLmFwcGx5RmlsdGVyc1RvVHJlZUVs ZW1lbnQoY3VycmVudFRyZWVFbGVtZW50KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGN1cnJl bnRUcmVlRWxlbWVudFdhc0hpZGRlbiAhPT0gY3VycmVudFRyZWVFbGVtZW50LmhpZGRlbikKLSAg ICAgICAgICAgICAgICAgICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3RXYXNGaWx0ZXJlZChj dXJyZW50VHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QsIGN1cnJlbnRUcmVlRWxlbWVudC5o aWRkZW4pOworICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnRXYXNGaWx0 ZXJlZChjdXJyZW50VHJlZUVsZW1lbnQpOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAg ICAgICAgIGN1cnJlbnRUcmVlRWxlbWVudCA9IGN1cnJlbnRUcmVlRWxlbWVudC50cmF2ZXJzZU5l eHRUcmVlRWxlbWVudChmYWxzZSwgbnVsbCwgZG9udFBvcHVsYXRlKTsKQEAgLTU5NSw3ICs1ODgs NyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIE5hdmlnYXRp b25TaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbgogICAgICAgICAgICAgICAgIGNvbnN0IGN1cnJl bnRUcmVlRWxlbWVudFdhc0hpZGRlbiA9IGN1cnJlbnRUcmVlRWxlbWVudC5oaWRkZW47CiAgICAg ICAgICAgICAgICAgdGhpcy5hcHBseUZpbHRlcnNUb1RyZWVFbGVtZW50KGN1cnJlbnRUcmVlRWxl bWVudCk7CiAgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRUcmVlRWxlbWVudFdhc0hpZGRlbiAh PT0gY3VycmVudFRyZWVFbGVtZW50LmhpZGRlbikKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5y ZXByZXNlbnRlZE9iamVjdFdhc0ZpbHRlcmVkKGN1cnJlbnRUcmVlRWxlbWVudC5yZXByZXNlbnRl ZE9iamVjdCwgY3VycmVudFRyZWVFbGVtZW50LmhpZGRlbik7CisgICAgICAgICAgICAgICAgICAg IHRoaXMuX3RyZWVFbGVtZW50V2FzRmlsdGVyZWQoY3VycmVudFRyZWVFbGVtZW50KTsKICAgICAg ICAgICAgIH0KIAogICAgICAgICAgICAgY3VycmVudFRyZWVFbGVtZW50ID0gY3VycmVudFRyZWVF bGVtZW50LnRyYXZlcnNlTmV4dFRyZWVFbGVtZW50KGZhbHNlLCB0cmVlRWxlbWVudCwgZG9udFBv cHVsYXRlKTsKQEAgLTc0NCw2ICs3MzcsMjIgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRl YmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KIAog ICAgICAgICByZXR1cm4gZW1wdHlDb250ZW50UGxhY2Vob2xkZXJFbGVtZW50OwogICAgIH0KKwor ICAgIF90cmVlRWxlbWVudFdhc0ZpbHRlcmVkKHRyZWVFbGVtZW50KQorICAgIHsKKyAgICAgICAg aWYgKHRyZWVFbGVtZW50LnNlbGVjdGVkIHx8IHRyZWVFbGVtZW50LmhpZGRlbikKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBsZXQgcmVwcmVzZW50ZWRPYmplY3QgPSB0aGlzLmN1cnJl bnRSZXByZXNlbnRlZE9iamVjdDsKKyAgICAgICAgaWYgKCFyZXByZXNlbnRlZE9iamVjdCB8fCB0 cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCAhPT0gcmVwcmVzZW50ZWRPYmplY3QpCisgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgY29uc3Qgb21pdEZvY3VzID0gdHJ1ZTsKKyAgICAg ICAgY29uc3Qgc2VsZWN0ZWRCeVVzZXIgPSBmYWxzZTsKKyAgICAgICAgY29uc3Qgc3VwcHJlc3NP blNlbGVjdCA9IHRydWU7CisgICAgICAgIGNvbnN0IHN1cHByZXNzT25EZXNlbGVjdCA9IHRydWU7 CisgICAgICAgIHRyZWVFbGVtZW50LnJldmVhbEFuZFNlbGVjdChvbWl0Rm9jdXMsIHNlbGVjdGVk QnlVc2VyLCBzdXBwcmVzc09uU2VsZWN0LCBzdXBwcmVzc09uRGVzZWxlY3QpOworICAgIH0KIH07 CiAKIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLlN1cHByZXNzRmlsdGVyaW5n U3ltYm9sID0gU3ltYm9sKCJzdXBwcmVzcy1maWx0ZXJpbmciKTsK