122926 2013-10-16 16:46:57 -0700 Web Inspector: [CSS Regions] A page with many flows should collapse the resources tree 2013-11-25 18:18:36 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 57312 122760 1 achicu achicu commit-queue graouts joepeck timothy webkit-bug-importer WebkitBugTracker oldest_to_newest 940580 0 achicu 2013-10-16 16:46:57 -0700 The resources tree should use the flows count to collapse the resources tree into subfolders when too manu items are displayed. 940581 1 webkit-bug-importer 2013-10-16 16:47:28 -0700 <rdar://problem/15247028> 954175 2 217851 achicu 2013-11-25 17:26:13 -0800 Created attachment 217851 Patch V1 954190 3 217851 commit-queue 2013-11-25 18:18:34 -0800 Comment on attachment 217851 Patch V1 Clearing flags on attachment: 217851 Committed r159777: <http://trac.webkit.org/changeset/159777> 954191 4 commit-queue 2013-11-25 18:18:36 -0800 All reviewed patches have been landed. Closing bug. 217851 2013-11-25 17:26:13 -0800 2013-11-25 18:18:34 -0800 Patch V1 bug122926.v1.patch text/plain 6273 achicu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDg3NjgyMDkuLjE0ZjUwMjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTExLTI1ICBBbGV4YW5kcnUgQ2hp Y3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbQ1NT IFJlZ2lvbnNdIEEgcGFnZSB3aXRoIG1hbnkgZmxvd3Mgc2hvdWxkIGNvbGxhcHNlIHRoZSByZXNv dXJjZXMgdHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIyOTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVmYWN0b3JlZCB0aGUgY29kZSBpbiBGcmFtZVRyZWVFbGVtZW50Ll9zaG91bGRHcm91cElu dG9Gb2xkZXJzIHRvIG1ha2UgaXQgZWFzeSB0byB0cmFjaworICAgICAgICBtb3JlIHR5cGVzIG9m IHJlc291cmNlcy4gQWRkZWQgdGhlIGNvbnRlbnQgZmxvd3MgYXMgYW5vdGhlciB0eXBlIG9mIHJl c291cmNlIHRoYXQgd291bGQgdHJpZ2dlciB0aGUKKyAgICAgICAgY29sbGFwc2luZy4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvRE9NVHJlZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLm5hbWVkRmxvd1JlbW92ZWQpOiBBZGRlZCBj b2RlIHRvIHJlbW92ZSB0aGUgY29udGVudCBub2RlcyBmcm9tCisgICAgICAgIGEgZmxvdyB0aGF0 IGhhcyBiZWVuIHJlbW92ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9GcmFtZVRyZWVFbGVt ZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBl Ll9zaG91bGRHcm91cEludG9Gb2xkZXJzLnB1c2hDYXRlZ29yeSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuX3Nob3VsZEdyb3VwSW50b0ZvbGRlcnMu cHVzaFJlc291cmNlVHlwZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVu dC5wcm90b3R5cGUuX3Nob3VsZEdyb3VwSW50b0ZvbGRlcnMpOgorCiAyMDEzLTExLTI1ICBEYW4g QmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0IHRoZSBzdm46aWdub3Jl IHByb3BlcnR5IG9uIHRoZSBYY29kZSBwcm9qZWN0IHRvIGlnbm9yZSB0aGUgd29ya3NwYWNlIGFu ZCB1c2VyIGRhdGEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9ET01UcmVlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0RPTVRyZWVNYW5hZ2VyLmpzCmluZGV4IDk1YzA2OGMuLjgxNzQyZmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RPTVRyZWVNYW5hZ2VyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RPTVRyZWVNYW5hZ2VyLmpz CkBAIC02MDEsNiArNjAxLDExIEBAIFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHZhciBjb250ZW50RmxvdyA9IHRoaXMuX2Zsb3dzLmdldChmbG93S2V5 KTsKICAgICAgICAgY29uc29sZS5hc3NlcnQoY29udGVudEZsb3cpOwogICAgICAgICB0aGlzLl9m bG93cy5kZWxldGUoZmxvd0tleSk7CisKKyAgICAgICAgLy8gUmVtb3ZlIGFueSBiYWNrIGxpbmtz IHRvIHRoaXMgZmxvdyBmcm9tIHRoZSBjb250ZW50IG5vZGVzLgorICAgICAgICBmb3IgKHZhciBj b250ZW50Tm9kZSBvZiBjb250ZW50Rmxvdy5jb250ZW50Tm9kZXMpCisgICAgICAgICAgICB0aGlz Ll9jb250ZW50Tm9kZXNUb0Zsb3dzTWFwLmRlbGV0ZShjb250ZW50Tm9kZS5pZCk7CisKICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5h Z2VyLkV2ZW50LkNvbnRlbnRGbG93V2FzUmVtb3ZlZCwge2Zsb3c6IGNvbnRlbnRGbG93fSk7CiAg ICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv RnJhbWVUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0ZyYW1lVHJlZUVsZW1lbnQuanMKaW5kZXggOWY0N2RhNy4uMjRkNjlmMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRnJhbWVUcmVlRWxlbWVudC5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9GcmFtZVRyZWVFbGVtZW50 LmpzCkBAIC00MzMsNyArNDMzLDcgQEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJv dG90eXBlID0gewogICAgICAgICAgICAgLy8gV2hlbiBib3RoIGNvbXBvbmVudHMgYXJlIG5vdCBy ZXNvdXJjZXMgdGhlbiBqdXN0IGNvbXBhcmUgdGhlIHRpdGxlcy4KICAgICAgICAgICAgIHJldHVy biBhLm1haW5UaXRsZS5sb2NhbGVDb21wYXJlKGIubWFpblRpdGxlKTsKICAgICAgICAgfQotICAg ICAgICAKKwogICAgICAgICAvLyBOb24tcmVzb3VyY2VzIHNob3VsZCBhcHBlYXIgYmVmb3JlIHRo ZSByZXNvdXJjZXMuCiAgICAgICAgIC8vIEZJWE1FOiBUaGVyZSBzaG91bGQgYmUgYSBiZXR0ZXIg d2F5IHRvIGdyb3VwIHRoZSBlbGVtZW50cyBieSB0aGVpciB0eXBlLgogICAgICAgICByZXR1cm4g YUlzUmVzb3VyY2UgPyAxIDogLTE7CkBAIC01MzYsMzUgKzUzNiwyOCBAQCBXZWJJbnNwZWN0b3Iu RnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBudW1iZXJPZlNtYWxs Q2F0ZWdvcmllcyA9IDA7CiAgICAgICAgIHZhciBudW1iZXJPZk1lZGl1bUNhdGVnb3JpZXMgPSAw OwogICAgICAgICB2YXIgZm91bmRMYXJnZUNhdGVnb3J5ID0gZmFsc2U7CisgICAgICAgIHZhciBm cmFtZSA9IHRoaXMuX2ZyYW1lOwogCi0gICAgICAgIC8vIEZJWE1FOiBVc2UgdGhpcy5fZnJhbWUu ZG9tVHJlZS5mbG93c0NvdW50IHRvIGNvdW50IHRoZSBudW1iZXIgb2YgZmxvd3MgaW4gYSBmcmFt ZS4KLSAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy MjkyNgotCi0gICAgICAgIGlmICh0aGlzLl9mcmFtZS5jaGlsZEZyYW1lcy5sZW5ndGggPj0gV2Vi SW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQuTGFyZ2VDaGlsZENvdW50VGhyZXNob2xkKQotICAg ICAgICAgICAgZm91bmRMYXJnZUNhdGVnb3J5ID0gdHJ1ZTsKLSAgICAgICAgZWxzZSBpZiAodGhp cy5fZnJhbWUuY2hpbGRGcmFtZXMubGVuZ3RoID49IFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVt ZW50Lk1lZGl1bUNoaWxkQ291bnRUaHJlc2hvbGQpCi0gICAgICAgICAgICArK251bWJlck9mTWVk aXVtQ2F0ZWdvcmllczsKLSAgICAgICAgZWxzZSBpZiAodGhpcy5fZnJhbWUuY2hpbGRGcmFtZXMu bGVuZ3RoKQotICAgICAgICAgICAgKytudW1iZXJPZlNtYWxsQ2F0ZWdvcmllczsKLQotICAgICAg ICAvLyBJdGVyYXRlIG92ZXIgYWxsIHRoZSBhdmFpbGFibGUgcmVzb3VyY2UgdHlwZXMuIFRoZXJl IGFyZSBzb21lIG90aGVyIHByb3BlcnRpZXMgb24KLSAgICAgICAgLy8gV2ViSW5zcGVjdG9yLlJl c291cmNlLlR5cGUgdGhhdCB3ZSBuZWVkIHRvIHNraXAsIGxpa2UgcHJpdmF0ZSBkYXRhIGFuZCBm dW5jdGlvbnMuCi0gICAgICAgIGZvciAodmFyIHR5cGUgaW4gV2ViSW5zcGVjdG9yLlJlc291cmNl LlR5cGUpIHsKLSAgICAgICAgICAgIC8vIFNraXAgcHJpdmF0ZSBkYXRhLgorICAgICAgICBmdW5j dGlvbiBwdXNoUmVzb3VyY2VUeXBlKHR5cGUpIHsKKyAgICAgICAgICAgIC8vIFRoZXJlIGFyZSBz b21lIG90aGVyIHByb3BlcnRpZXMgb24gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUgdGhhdCB3 ZSBuZWVkIHRvIHNraXAsIGxpa2UgcHJpdmF0ZSBkYXRhIGFuZCBmdW5jdGlvbnMKICAgICAgICAg ICAgIGlmICh0eXBlLmNoYXJBdCgwKSA9PT0gIl8iKQotICAgICAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgLy8gT25seSBj YXJlIGFib3V0IHRoZSB2YWx1ZXMgdGhhdCBhcmUgc3RyaW5ncywgbm90IGZ1bmN0aW9ucywgZXRj LgogICAgICAgICAgICAgdmFyIHR5cGVWYWx1ZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBl W3R5cGVdOwogICAgICAgICAgICAgaWYgKHR5cGVvZiB0eXBlVmFsdWUgIT09ICJzdHJpbmciKQot ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgICAgICAgICAgdmFyIHJlc291cmNlQ291bnQgPSB0aGlzLl9mcmFtZS5yZXNvdXJjZXNX aXRoVHlwZSh0eXBlVmFsdWUpLmxlbmd0aDsKKyAgICAgICAgICAgIHJldHVybiBwdXNoQ2F0ZWdv cnkoZnJhbWUucmVzb3VyY2VzV2l0aFR5cGUodHlwZVZhbHVlKS5sZW5ndGgpOworICAgICAgICB9 CisKKyAgICAgICAgZnVuY3Rpb24gcHVzaENhdGVnb3J5KHJlc291cmNlQ291bnQpCisgICAgICAg IHsKICAgICAgICAgICAgIGlmICghcmVzb3VyY2VDb3VudCkKLSAgICAgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIC8vIElm IHRoaXMgdHlwZSBoYXMgYW55IHJlc291cmNlcyBhbmQgdGhlcmUgaXMgYSBrbm93biBsYXJnZSBj YXRlZ29yeSwgbWFrZSBmb2xkZXJzLgotICAgICAgICAgICAgaWYgKHJlc291cmNlQ291bnQgJiYg Zm91bmRMYXJnZUNhdGVnb3J5KQorICAgICAgICAgICAgaWYgKGZvdW5kTGFyZ2VDYXRlZ29yeSkK ICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAgICAgICAgLy8gSWYgdGhlcmUg YXJlIGxvdHMgb2YgdGhpcyByZXNvdXJjZSB0eXBlLCB0aGVuIGNvdW50IGl0IGFzIGEgbGFyZ2Ug Y2F0ZWdvcnkuCkBAIC01NzQsMjQgKzU2NywyMiBAQCBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCiAg ICAgICAgICAgICAgICAgZm91bmRMYXJnZUNhdGVnb3J5ID0gdHJ1ZTsKLSAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIC8vIENoZWNrIGlmIHRoaXMgaXMgYSBtZWRpdW0gY2F0ZWdvcnkuCiAg ICAgICAgICAgICBpZiAocmVzb3VyY2VDb3VudCA+PSBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxl bWVudC5NZWRpdW1DaGlsZENvdW50VGhyZXNob2xkKSB7Ci0gICAgICAgICAgICAgICAgKytudW1i ZXJPZk1lZGl1bUNhdGVnb3JpZXM7Ci0KICAgICAgICAgICAgICAgICAvLyBJZiB0aGlzIGlzIHRo ZSBtZWRpdW0gY2F0ZWdvcnkgdGhhdCBwdXRzIHVzIG92ZXIgdGhlIG1heGltdW0gYWxsb3dlZCwg bWFrZSBmb2xkZXJzLgotICAgICAgICAgICAgICAgIGlmIChudW1iZXJPZk1lZGl1bUNhdGVnb3Jp ZXMgPj0gV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQuTnVtYmVyT2ZNZWRpdW1DYXRlZ29y aWVzVGhyZXNob2xkKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4gKytudW1iZXJPZk1lZGl1 bUNhdGVnb3JpZXMgPj0gV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQuTnVtYmVyT2ZNZWRp dW1DYXRlZ29yaWVzVGhyZXNob2xkOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBU aGlzIGlzIGEgc21hbGwgY2F0ZWdvcnkuCiAgICAgICAgICAgICArK251bWJlck9mU21hbGxDYXRl Z29yaWVzOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKLSAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAvLyBJdGVyYXRlIG92ZXIgYWxsIHRoZSBhdmFpbGFibGUg cmVzb3VyY2UgdHlwZXMuCisgICAgICAgIHJldHVybiBwdXNoQ2F0ZWdvcnkoZnJhbWUuY2hpbGRG cmFtZXMubGVuZ3RoKSB8fCBwdXNoQ2F0ZWdvcnkoZnJhbWUuZG9tVHJlZS5mbG93c0NvdW50KSB8 fCBPYmplY3Qua2V5cyhXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZSkuc29tZShwdXNoUmVzb3Vy Y2VUeXBlKTsKICAgICB9LAogCiAgICAgX3JlbG9hZFBhZ2VDbGlja2VkOiBmdW5jdGlvbihldmVu dCkK