127443 2014-01-22 12:48:56 -0800 Web Inspector: Don't include a hidden Timeline selection in the navigation path components 2014-01-22 14:58:23 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy graouts joepeck timothy webkit-bug-importer oldest_to_newest 970834 0 timothy 2014-01-22 12:48:56 -0800 When filtering happens, we don't want to keep showing the selection in the navigation bar. 970835 1 webkit-bug-importer 2014-01-22 12:49:38 -0800 <rdar://problem/15883887> 970837 2 221895 timothy 2014-01-22 12:53:49 -0800 Created attachment 221895 Patch 970845 3 221895 joepeck 2014-01-22 13:10:42 -0800 Comment on attachment 221895 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221895&action=review r=me > Source/WebInspectorUI/UserInterface/GeneralTreeElementPathComponent.js:47 > + if (!previousSibling) > return null; This early return can be removed, since the loop below will check if previousSibling and do the right thing. > Source/WebInspectorUI/UserInterface/GeneralTreeElementPathComponent.js:62 > + if (!nextSibling) > return null; Ditto 970889 4 timothy 2014-01-22 14:58:23 -0800 https://trac.webkit.org/r162561 221895 2014-01-22 12:53:49 -0800 2014-01-22 13:12:38 -0800 Patch bug-127443-20140122125348.patch text/plain 7213 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 MmRlM2Q3MmU0ZDZjZTk3YTg3MTAzY2E4YzcxMGZmMDI1NzE2OGM0Li4yMDE5YWQ3MTIyMzRjNWFh ZTY3YzYzYzFiNDRiNDNkOTU5OGU2Nzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMSBAQAogMjAxNC0wMS0yMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgRG9uJ3QgaW5jbHVkZSBhIGhpZGRlbiBUaW1lbGluZSBzZWxlY3Rpb24g aW4gdGhlIG5hdmlnYXRpb24gcGF0aCBjb21wb25lbnRzLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc0NDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvR2VuZXJhbFRyZWVF bGVtZW50UGF0aENvbXBvbmVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5HZW5lcmFsVHJl ZUVsZW1lbnRQYXRoQ29tcG9uZW50LnByb3RvdHlwZS5nZXQgcHJldmlvdXNTaWJsaW5nKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50LnByb3Rv dHlwZS5nZXQgbmV4dFNpYmxpbmcpOgorICAgICAgICBTa2lwIGhpZGRlbiBzaWJsaW5ncy4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcucHJvdG90eXBlLnVwZGF0ZUxheW91 dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcucHJvdG90eXBl LmdldCBzZWxlY3Rpb25QYXRoQ29tcG9uZW50cyk6CisgICAgICAgIERvbid0IGluY2x1ZGUgaGlk ZGVuIHNlbGVjdGlvbiBhbmQgZGlzcGF0Y2ggU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFu Z2UgZXZlbnQgaWYgaGlkZGVuIGNoYW5nZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Rp bWVsaW5lQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250 ZW50Vmlldy5wcm90b3R5cGUuX3RpbWVSYW5nZVNlbGVjdGlvbkNoYW5nZWQpOgorICAgICAgICBE aXNwYXRjaCBTZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSBldmVudCBpZiBoaWRkZW4g Y2hhbmdlcyBvbiB0aGUgc2VsZWN0ZWQgdHJlZSBlbGVtZW50LgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9UaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVW aWV3LnByb3RvdHlwZS5nZXQgc2VsZWN0aW9uUGF0aENvbXBvbmVudHMpOgorICAgICAgICBEb24n dCBpbmNsdWRlIGhpZGRlbiBzZWxlY3Rpb24uCisKKzIwMTQtMDEtMjIgIFRpbW90aHkgSGF0Y2hl ciAgPHRpbW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIFN1cHBvcnQgY29sbGFwc2luZyBjYWxs IHNpdGUgcmVjb3JkcyBpbnRvIHRoZSByZXNvdXJjZSB0aW1lbGluZS4KIAogICAgICAgICBBbHNv IGZpeCBzb21lIGZpbHRlcmluZyBhbmQgZ3JhcGggaXNzdWVzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvR2VuZXJhbFRyZWVFbGVtZW50UGF0aENvbXBv bmVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0dlbmVyYWxUcmVl RWxlbWVudFBhdGhDb21wb25lbnQuanMKaW5kZXggMDI5MzQ5MmY2MWU4MmFmMzY0MDJhMzIwZGY2 YTcwNDljYzk4MjllZC4uNzJhOGQ1NTE1OWQ2ZGIwMjBkZTY3YjZlZGQxNzYxNWEzNjg0MWMzZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvR2VuZXJhbFRy ZWVFbGVtZW50UGF0aENvbXBvbmVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9HZW5lcmFsVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50LmpzCkBAIC00MiwxNiAr NDIsMzIgQEAgV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVudFBhdGhDb21wb25lbnQucHJv dG90eXBlID0gewogCiAgICAgZ2V0IHByZXZpb3VzU2libGluZygpCiAgICAgewotICAgICAgICBp ZiAoIXRoaXMuX2dlbmVyYWxUcmVlRWxlbWVudC5wcmV2aW91c1NpYmxpbmcpCisgICAgICAgIHZh ciBwcmV2aW91c1NpYmxpbmcgPSB0aGlzLl9nZW5lcmFsVHJlZUVsZW1lbnQucHJldmlvdXNTaWJs aW5nOworICAgICAgICBpZiAoIXByZXZpb3VzU2libGluZykKICAgICAgICAgICAgIHJldHVybiBu dWxsOwotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnRQ YXRoQ29tcG9uZW50KHRoaXMuX2dlbmVyYWxUcmVlRWxlbWVudC5wcmV2aW91c1NpYmxpbmcpOwor CisgICAgICAgIHdoaWxlIChwcmV2aW91c1NpYmxpbmcgJiYgcHJldmlvdXNTaWJsaW5nLmhpZGRl bikKKyAgICAgICAgICAgIHByZXZpb3VzU2libGluZyA9IHByZXZpb3VzU2libGluZy5wcmV2aW91 c1NpYmxpbmc7CisKKyAgICAgICAgaWYgKCFwcmV2aW91c1NpYmxpbmcpCisgICAgICAgICAgICBy ZXR1cm4gbnVsbDsKKworICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5HZW5lcmFsVHJl ZUVsZW1lbnRQYXRoQ29tcG9uZW50KHByZXZpb3VzU2libGluZyk7CiAgICAgfSwKIAogICAgIGdl dCBuZXh0U2libGluZygpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX2dlbmVyYWxUcmVlRWxl bWVudC5uZXh0U2libGluZykKKyAgICAgICAgdmFyIG5leHRTaWJsaW5nID0gdGhpcy5fZ2VuZXJh bFRyZWVFbGVtZW50Lm5leHRTaWJsaW5nOworICAgICAgICBpZiAoIW5leHRTaWJsaW5nKQogICAg ICAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkdl bmVyYWxUcmVlRWxlbWVudFBhdGhDb21wb25lbnQodGhpcy5fZ2VuZXJhbFRyZWVFbGVtZW50Lm5l eHRTaWJsaW5nKTsKKworICAgICAgICB3aGlsZSAobmV4dFNpYmxpbmcgJiYgbmV4dFNpYmxpbmcu aGlkZGVuKQorICAgICAgICAgICAgbmV4dFNpYmxpbmcgPSBuZXh0U2libGluZy5uZXh0U2libGlu ZzsKKworICAgICAgICBpZiAoIW5leHRTaWJsaW5nKQorICAgICAgICAgICAgcmV0dXJuIG51bGw7 CisKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50UGF0 aENvbXBvbmVudChuZXh0U2libGluZyk7CiAgICAgfSwKICAgICAKICAgICAvLyBQcml2YXRlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9PdmVydmlld1Rp bWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL092ZXJ2 aWV3VGltZWxpbmVWaWV3LmpzCmluZGV4IGM2YjU3ZTdmMDY1NDg5N2Q1ZWI5OGRiNGViYTM1YTRh Mzc1MDc2NjUuLjNhYmIyNTQ4NGZiNWVkMDA5NzUzYWYxM2ZiYzQxZTUzMGI4NDZjYWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL092ZXJ2aWV3VGltZWxp bmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL092ZXJ2 aWV3VGltZWxpbmVWaWV3LmpzCkBAIC0xMDEsOCArMTAxLDE0IEBAIFdlYkluc3BlY3Rvci5PdmVy dmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAo IXRoaXMuY3VycmVudFRpbWUgIT09IG9sZEN1cnJlbnRUaW1lKSB7CisgICAgICAgICAgICB2YXIg c2VsZWN0ZWRUcmVlRWxlbWVudCA9IHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5z ZWxlY3RlZFRyZWVFbGVtZW50OworICAgICAgICAgICAgdmFyIHNlbGVjdGlvbldhc0hpZGRlbiA9 IHNlbGVjdGVkVHJlZUVsZW1lbnQgJiYgc2VsZWN0ZWRUcmVlRWxlbWVudC5oaWRkZW47CisKICAg ICAgICAgICAgIC8vIENoZWNrIHRoZSBmaWx0ZXJzIGFnYWluIHNpbmNlIHRoZSBjdXJyZW50IHRp bWUgY2hhbmdlIG1pZ2h0IGhhdmUgcmV2ZWFsZWQgdGhpcyBub2RlLiBTdGFydCBhbmQgZW5kIHRp bWUgY2FuZ2VzIGFyZSBoYW5kbGVkIGJ5IFRpbWVsaW5lQ29udGVudFZpZXcuCiAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwudXBkYXRlRmlsdGVyKCk7CisKKyAg ICAgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50ICYmIHNlbGVjdGVkVHJlZUVsZW1lbnQu aGlkZGVuICE9PSBzZWxlY3Rpb25XYXNIaWRkZW4pCisgICAgICAgICAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5FdmVudC5TZWxl Y3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlz Ll90aW1lbGluZVJ1bGVyLnVwZGF0ZUxheW91dCgpOwpAQCAtMTI0LDYgKzEzMCw5IEBAIFdlYklu c3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBp ZiAoIXRyZWVFbGVtZW50KQogICAgICAgICAgICAgICAgIGJyZWFrOwogCisgICAgICAgICAgICBp ZiAodHJlZUVsZW1lbnQuaGlkZGVuKQorICAgICAgICAgICAgICAgIHJldHVybiBudWxsOworCiAg ICAgICAgICAgICB2YXIgcGF0aENvbXBvbmVudCA9IG5ldyBXZWJJbnNwZWN0b3IuR2VuZXJhbFRy ZWVFbGVtZW50UGF0aENvbXBvbmVudCh0cmVlRWxlbWVudCk7CiAgICAgICAgICAgICBwYXRoQ29t cG9uZW50LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21w b25lbnQuRXZlbnQuU2libGluZ1dhc1NlbGVjdGVkLCB0aGlzLnRyZWVFbGVtZW50UGF0aENvbXBv bmVudFNlbGVjdGVkLCB0aGlzKTsKICAgICAgICAgICAgIHBhdGhDb21wb25lbnRzLnVuc2hpZnQo cGF0aENvbXBvbmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5qcwppbmRleCBlNDBkMTMwZmNhYjgxNDVh OTVhODA5MmVmYTk4ZTNkMGEyM2IxNzU3Li4yMDBjMmMyMDc0ODMyNzVmMWVjODViZTVmYWJlOGVk NWRhY2VhZTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9UaW1lbGluZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanMKQEAgLTQwNCw2ICs0MDQsMTQgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Ll9jdXJyZW50VGltZWxpbmVWaWV3LmVuZFRpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNl bGVjdGlvblN0YXJ0VGltZSArIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uRHVyYXRp b247CiAKICAgICAgICAgLy8gRGVsYXkgdW50aWwgdGhlIG5leHQgZnJhbWUgdG8gc3RheSBpbiBz eW5jIHdpdGggdGhlIGN1cnJlbnQgdGltZWxpbmUgdmlldydzIHRpbWUtYmFzZWQgbGF5b3V0IGNo YW5nZXMuCi0gICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZShmdW5jdGlvbigpIHsgV2ViSW5z cGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLnVwZGF0ZUZpbHRlcigpOyB9KTsKKyAgICAgICAg cmVxdWVzdEFuaW1hdGlvbkZyYW1lKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgdmFyIHNlbGVj dGVkVHJlZUVsZW1lbnQgPSB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3ICYmIHRoaXMuX2N1cnJl bnRUaW1lbGluZVZpZXcubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZSA/IHRoaXMuX2N1cnJl bnRUaW1lbGluZVZpZXcubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVF bGVtZW50IDogbnVsbDsKKyAgICAgICAgICAgIHZhciBzZWxlY3Rpb25XYXNIaWRkZW4gPSBzZWxl Y3RlZFRyZWVFbGVtZW50ICYmIHNlbGVjdGVkVHJlZUVsZW1lbnQuaGlkZGVuOworCisgICAgICAg ICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwudXBkYXRlRmlsdGVyKCk7CisK KyAgICAgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50ICYmIHNlbGVjdGVkVHJlZUVsZW1l bnQuaGlkZGVuICE9PSBzZWxlY3Rpb25XYXNIaWRkZW4pCisgICAgICAgICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50LlNl bGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKKyAgICAgICAgfS5iaW5kKHRoaXMpKTsK ICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv VGltZWxpbmVWaWV3LmpzCmluZGV4IGYyYzdkZmFkNjEyMGJiYjM4ZWJkMDA4ZDFiYzNlMjU3ZTk1 NTk1OTguLjA4ZTgxOTFiMGVjZWU3MGRkN2UzMTBkZjhiZjhjOTUwNjQxNmVlMjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lVmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVZpZXcuanMK QEAgLTYzLDcgKzYzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7 CiAKICAgICBnZXQgc2VsZWN0aW9uUGF0aENvbXBvbmVudHMoKQogICAgIHsKLSAgICAgICAgaWYg KCF0aGlzLl9jb250ZW50VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCkKKyAgICAgICAg aWYgKCF0aGlzLl9jb250ZW50VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCB8fCB0aGlz Ll9jb250ZW50VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5oaWRkZW4pCiAgICAgICAg ICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICB2YXIgcGF0aENvbXBvbmVudCA9IG5ldyBXZWJJ bnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50UGF0aENvbXBvbmVudCh0aGlzLl9jb250ZW50VHJl ZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCk7Cg==