151539 2015-11-22 01:22:53 -0800 Web Inspector: Clean up FolderizedTreeElement folder settings 2015-11-22 11:24:21 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1144014 0 mattbaker 2015-11-22 01:22:53 -0800 * SUMMARY Clean up FolderizedTreeElement folder settings. The expanded setting is stored as an external property on each tree element. Instead the folderized element should just maintain a map of folders to settings. 1144015 1 webkit-bug-importer 2015-11-22 01:23:18 -0800 <rdar://problem/23643116> 1144016 2 266047 mattbaker 2015-11-22 01:33:35 -0800 Created attachment 266047 [Patch] Proposed Fix 1144051 3 266047 bburg 2015-11-22 10:38:21 -0800 Comment on attachment 266047 [Patch] Proposed Fix r=me 1144062 4 266047 commit-queue 2015-11-22 11:24:17 -0800 Comment on attachment 266047 [Patch] Proposed Fix Clearing flags on attachment: 266047 Committed r192735: <http://trac.webkit.org/changeset/192735> 1144063 5 commit-queue 2015-11-22 11:24:21 -0800 All reviewed patches have been landed. Closing bug. 266047 2015-11-22 01:33:35 -0800 2015-11-22 11:24:17 -0800 [Patch] Proposed Fix bug-151539-20151122013321.patch text/plain 3929 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz Yjk5ZjQ4ODE5MWNhMjMwNjFlZDIwZDc4ZTg3MTMzMWQ0NTFlNDYwLi41YzlkMTM4ODE0ODE4NDkw MjM5ZjJkMWVlNzNjYjdlOTM2MWI2ZTc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEg KzEsMTcgQEAKKzIwMTUtMTEtMjIgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENsZWFuIHVwIEZvbGRlcml6ZWRUcmVlRWxlbWVudCBm b2xkZXIgc2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MTUzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBleHBhbmRlZCBzdGF0ZSBmb3IgZWFjaCBmb2xkZXIgd2FzIHN0b3JlZCBhcyBh biBleHRlcm5hbCBwcm9wZXJ0eSBvbiB0aGUgZm9sZGVyCisgICAgICAgIHRyZWUgZWxlbWVudC4g Tm93IEZvbGRlcml6ZWRUcmVlRWxlbWVudCBrZWVwcyBhIG1hcCBvZiBmb2xkZXJzIHRvIHNldHRp bmdzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJlZUVsZW1l bnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRm9sZGVyaXplZFRyZWVFbGVtZW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQucHJvdG90eXBlLnJlbW92 ZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQu cHJvdG90eXBlLl9wYXJlbnRUcmVlRWxlbWVudEZvclJlcHJlc2VudGVkT2JqZWN0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Gb2xkZXJpemVkVHJlZUVsZW1lbnQucHJvdG90eXBlLl9mb2xkZXJU cmVlRWxlbWVudEV4cGFuZGVkU3RhdGVDaGFuZ2UpOgorCiA9PSBSb2xsZWQgb3ZlciB0byBDaGFu Z2VMb2ctMjAxNS0xMS0yMSA9PQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyaXplZFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9sZGVyaXplZFRyZWVFbGVtZW50LmpzCmlu ZGV4IGViODczMzc0MmRmNTdkNzkwZjQ1YjZkOTc4MmIzYzBhNjRjMmMxYTMuLjkwMzBmNGQ5Zjdh MmIxY2Y4YzQyNjcwZGJkNDIyZDA2ZmY4ODlkNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbGRlcml6ZWRUcmVlRWxlbWVudC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb2xkZXJpemVkVHJl ZUVsZW1lbnQuanMKQEAgLTMxLDYgKzMxLDcgQEAgV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVl RWxlbWVudCA9IGNsYXNzIEZvbGRlcml6ZWRUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3AKIAog ICAgICAgICB0aGlzLnNob3VsZFJlZnJlc2hDaGlsZHJlbiA9IHRydWU7CiAKKyAgICAgICAgdGhp cy5fZm9sZGVyRXhwYW5kZWRTZXR0aW5nTWFwID0gbmV3IE1hcDsKICAgICAgICAgdGhpcy5fZm9s ZGVyU2V0dGluZ3NLZXkgPSAiIjsKICAgICAgICAgdGhpcy5fZm9sZGVyVHlwZU1hcCA9IG5ldyBN YXA7CiAgICAgICAgIHRoaXMuX2ZvbGRlcml6ZVNldHRpbmdzTWFwID0gbmV3IE1hcDsKQEAgLTgw LDYgKzgxLDcgQEAgV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudCA9IGNsYXNzIEZv bGRlcml6ZWRUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3AKICAgICAgICAgZm9yICh2YXIgZm9s ZGVyIG9mIHRoaXMuX2ZvbGRlclR5cGVNYXAudmFsdWVzKCkpCiAgICAgICAgICAgICBmb2xkZXIu cmVtb3ZlQ2hpbGRyZW4oKTsKIAorICAgICAgICB0aGlzLl9mb2xkZXJFeHBhbmRlZFNldHRpbmdN YXAuY2xlYXIoKTsKICAgICAgICAgdGhpcy5fZm9sZGVyVHlwZU1hcC5jbGVhcigpOwogCiAgICAg ICAgIHRoaXMuX2dyb3VwZWRJbnRvRm9sZGVycyA9IGZhbHNlOwpAQCAtMjcyLDEwICsyNzQsMTMg QEAgV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudCA9IGNsYXNzIEZvbGRlcml6ZWRU cmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3AKIAogICAgICAgICBmdW5jdGlvbiBjcmVhdGVGb2xk ZXJUcmVlRWxlbWVudCh0eXBlLCBkaXNwbGF5TmFtZSkKICAgICAgICAgewotICAgICAgICAgICAg dmFyIGZvbGRlclRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVu dChkaXNwbGF5TmFtZSk7Ci0gICAgICAgICAgICBmb2xkZXJUcmVlRWxlbWVudC5fX2V4cGFuZGVk U2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZyh0eXBlICsgIi1mb2xkZXItZXhwYW5k ZWQtIiArIHRoaXMuX2ZvbGRlclNldHRpbmdzS2V5LCBmYWxzZSk7Ci0gICAgICAgICAgICBpZiAo Zm9sZGVyVHJlZUVsZW1lbnQuX19leHBhbmRlZFNldHRpbmcudmFsdWUpCisgICAgICAgICAgICBs ZXQgZm9sZGVyVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50 KGRpc3BsYXlOYW1lKTsKKyAgICAgICAgICAgIGxldCBmb2xkZXJFeHBhbmRlZFNldHRpbmcgPSBu ZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcodHlwZSArICItZm9sZGVyLWV4cGFuZGVkLSIgKyB0aGlz Ll9mb2xkZXJTZXR0aW5nc0tleSwgZmFsc2UpOworICAgICAgICAgICAgdGhpcy5fZm9sZGVyRXhw YW5kZWRTZXR0aW5nTWFwLnNldChmb2xkZXJUcmVlRWxlbWVudCwgZm9sZGVyRXhwYW5kZWRTZXR0 aW5nKTsKKworICAgICAgICAgICAgaWYgKGZvbGRlckV4cGFuZGVkU2V0dGluZy52YWx1ZSkKICAg ICAgICAgICAgICAgICBmb2xkZXJUcmVlRWxlbWVudC5leHBhbmQoKTsKKwogICAgICAgICAgICAg Zm9sZGVyVHJlZUVsZW1lbnQub25leHBhbmQgPSB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudEV4cGFu ZGVkU3RhdGVDaGFuZ2UuYmluZCh0aGlzKTsKICAgICAgICAgICAgIGZvbGRlclRyZWVFbGVtZW50 Lm9uY29sbGFwc2UgPSB0aGlzLl9mb2xkZXJUcmVlRWxlbWVudEV4cGFuZGVkU3RhdGVDaGFuZ2Uu YmluZCh0aGlzKTsKICAgICAgICAgICAgIHJldHVybiBmb2xkZXJUcmVlRWxlbWVudDsKQEAgLTI5 OCw4ICszMDMsMTIgQEAgV2ViSW5zcGVjdG9yLkZvbGRlcml6ZWRUcmVlRWxlbWVudCA9IGNsYXNz IEZvbGRlcml6ZWRUcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3AKIAogICAgIF9mb2xkZXJUcmVl RWxlbWVudEV4cGFuZGVkU3RhdGVDaGFuZ2UoZm9sZGVyVHJlZUVsZW1lbnQpCiAgICAgewotICAg ICAgICBjb25zb2xlLmFzc2VydChmb2xkZXJUcmVlRWxlbWVudC5fX2V4cGFuZGVkU2V0dGluZyk7 Ci0gICAgICAgIGZvbGRlclRyZWVFbGVtZW50Ll9fZXhwYW5kZWRTZXR0aW5nLnZhbHVlID0gZm9s ZGVyVHJlZUVsZW1lbnQuZXhwYW5kZWQ7CisgICAgICAgIGxldCBleHBhbmRlZFNldHRpbmcgPSB0 aGlzLl9mb2xkZXJFeHBhbmRlZFNldHRpbmdNYXAuZ2V0KGZvbGRlclRyZWVFbGVtZW50KTsKKyAg ICAgICAgY29uc29sZS5hc3NlcnQoZXhwYW5kZWRTZXR0aW5nLCAiTm8gZXhwYW5kZWQgc2V0dGlu ZyBmb3IgZm9sZGVyVHJlZUVsZW1lbnQiLCBmb2xkZXJUcmVlRWxlbWVudCk7CisgICAgICAgIGlm ICghZXhwYW5kZWRTZXR0aW5nKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGV4cGFu ZGVkU2V0dGluZy52YWx1ZSA9IGZvbGRlclRyZWVFbGVtZW50LmV4cGFuZGVkOwogICAgIH0KIAog ICAgIF9zZXR0aW5nc0ZvclJlcHJlc2VudGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0KQo=