141874 2015-02-21 18:20:13 -0800 Web Inspector: Give ObjectPreviewView a showTitle/showPreview toggle 2015-02-22 08:48:13 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1071033 0 joepeck 2015-02-21 18:20:13 -0800 * SUMMARY Refactor to give ObjectPreviewView a showTitle/showPreview toggle. This will simplify other places that want to show a Preview and toggle between the simple title and complete preview contents. 1071034 1 247070 joepeck 2015-02-21 18:22:44 -0800 Created attachment 247070 [PATCH] Proposed Fix 1071074 2 247070 commit-queue 2015-02-22 08:48:10 -0800 Comment on attachment 247070 [PATCH] Proposed Fix Clearing flags on attachment: 247070 Committed r180485: <http://trac.webkit.org/changeset/180485> 1071075 3 commit-queue 2015-02-22 08:48:13 -0800 All reviewed patches have been landed. Closing bug. 247070 2015-02-21 18:22:44 -0800 2015-02-22 08:48:10 -0800 [PATCH] Proposed Fix previewview2.patch text/plain 6672 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE4MDMwZTEuLjgyYTdiMmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE1LTAyLTIxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogR2l2ZSBP YmplY3RQcmV2aWV3VmlldyBhIHNob3dUaXRsZS9zaG93UHJldmlldyB0b2dnbGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTg3NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIE9iamVjdFRy ZWUvT2JqZWN0UHJldmlldyBhIGJpdCB0byBtYWtlIGl0IGVhc2llcgorICAgICAgICB0byB1c2Ug ZXhwYW5kaW5nL2NvbGxhcHNpbmcgcHJldmlld3MgaW4gb3RoZXIgcGxhY2VzLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RQcmV2aWV3Vmlldy5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5PYmplY3RQcmV2aWV3Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2Jq ZWN0UHJldmlld1ZpZXcucHJvdG90eXBlLnNob3dUaXRsZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuT2JqZWN0UHJldmlld1ZpZXcucHJvdG90eXBlLnNob3dQcmV2aWV3KToKKyAgICAgICAgTWFp bnRhaW4gYm90aCBhIHRpdGxlRWxlbWVudCBhbmQgcHJldmlld0VsZW1lbnQuIFNob3cgb25seQor ICAgICAgICBvbmUgYXQgYSB0aW1lIGJhc2VkIG9uIHNob3dUaXRsZS9zaG93UHJldmlldyBBUElz LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5jc3M6Cisg ICAgICAgICgub2JqZWN0LXRyZWUuZXhwYW5kZWQgLm9iamVjdC1wcmV2aWV3KToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk9iamVjdFRyZWVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RUcmVl Vmlldy5wcm90b3R5cGUuZXhwYW5kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RUcmVl Vmlldy5wcm90b3R5cGUuY29sbGFwc2UpOgorICAgICAgICBJZiB3ZSBoYXZlIGEgcHJldmlldywg bGV0IFByZXZpZXdWaWV3IGhhbmRsZSB0b2dnbGluZworICAgICAgICBiZXR3ZWVuIGEgdGl0bGUg YW5kIHByZXZpZXcgZGlzcGxheS4KKworMjAxNS0wMi0yMSAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IExhemlseSBDcmVhdGUg R2VuZXJhbFRyZWVFbGVtZW50IFN0YXR1cyBFbGVtZW50cwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxODczCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFByZXZpZXdWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJldmlld1Zp ZXcuanMKaW5kZXggMDdiYjNlZS4uM2M3MDQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJldmlld1ZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJldmlld1ZpZXcu anMKQEAgLTM0LDcgKzM0LDE1IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcmV2aWV3VmlldyA9IGZ1 bmN0aW9uKHByZXZpZXcsIG1vZGUpCiAKICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgic3BhbiIpOwogICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gIm9iamVj dC1wcmV2aWV3IjsKLSAgICB0aGlzLl9sb3NzbGVzcyA9IHRoaXMuX2FwcGVuZFByZXZpZXcodGhp cy5fZWxlbWVudCwgdGhpcy5fcHJldmlldyk7CisKKyAgICB0aGlzLl9wcmV2aWV3RWxlbWVudCA9 IHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIp KTsKKyAgICB0aGlzLl9wcmV2aWV3RWxlbWVudC5jbGFzc05hbWUgPSAicHJldmlldyI7CisgICAg dGhpcy5fbG9zc2xlc3MgPSB0aGlzLl9hcHBlbmRQcmV2aWV3KHRoaXMuX3ByZXZpZXdFbGVtZW50 LCB0aGlzLl9wcmV2aWV3KTsKKworICAgIHRoaXMuX3RpdGxlRWxlbWVudCA9IHRoaXMuX2VsZW1l bnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpKTsKKyAgICB0aGlz Ll90aXRsZUVsZW1lbnQuY2xhc3NOYW1lID0gInRpdGxlIjsKKyAgICB0aGlzLl90aXRsZUVsZW1l bnQudGV4dENvbnRlbnQgPSBwcmV2aWV3LmRlc2NyaXB0aW9uIHx8ICIiOworICAgIHRoaXMuX3Rp dGxlRWxlbWVudC5oaWRkZW4gPSB0cnVlOwogCiAgICAgaWYgKHRoaXMuX2xvc3NsZXNzKQogICAg ICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoImxvc3NsZXNzIik7CkBAIC03MSw2ICs3 OSwxOCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJldmlld1ZpZXcucHJvdG90eXBlID0gewogICAg ICAgICByZXR1cm4gdGhpcy5fbG9zc2xlc3M7CiAgICAgfSwKIAorICAgIHNob3dUaXRsZTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdGl0bGVFbGVtZW50LmhpZGRlbiA9IGZhbHNl OworICAgICAgICB0aGlzLl9wcmV2aWV3RWxlbWVudC5oaWRkZW4gPSB0cnVlOworICAgIH0sCisK KyAgICBzaG93UHJldmlldzogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdGl0bGVF bGVtZW50LmhpZGRlbiA9IHRydWU7CisgICAgICAgIHRoaXMuX3ByZXZpZXdFbGVtZW50LmhpZGRl biA9IGZhbHNlOworICAgIH0sCisKICAgICAvLyBQcml2YXRlCiAKICAgICBfbnVtYmVyT2ZQcm9w ZXJ0aWVzVG9TaG93SW5Nb2RlOiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5jc3MgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5jc3MKaW5k ZXggNTJhZTA5MC4uZjNjOGYxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmNzcwpAQCAtNTUsNiAr NTUsMTAgQEAKICAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWNhbnZhcyhkaXNjbG9zdXJl LXRyaWFuZ2xlLXRpbnktb3Blbi1ub3JtYWwpOwogfQogCisub2JqZWN0LXRyZWUuZXhwYW5kZWQg Lm9iamVjdC1wcmV2aWV3IHsKKyAgICBmb250LXN0eWxlOiBub3JtYWw7Cit9CisKIC5vYmplY3Qt dHJlZS5sb3NzbGVzcy1wcmV2aWV3ID4gOm1hdGNoZXMoLnRpdGxlLCAub2JqZWN0LXByZXZpZXcp OjpiZWZvcmUgewogICAgIGJhY2tncm91bmQ6IG5vbmU7CiAgICAgd2lkdGg6IDBweDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRy ZWVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2Jq ZWN0VHJlZVZpZXcuanMKaW5kZXggYzFhMTY1Ny4uYWI0ZjAxMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZp ZXcuanMKQEAgLTM4LDI2ICszOCwyMiBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVZpZXcgPSBm dW5jdGlvbihvYmplY3QsIG1vZGUsIGZvcmNlRXhwYW5kaW5nKQogICAgIHRoaXMuX2VsZW1lbnQu Y2xhc3NOYW1lID0gIm9iamVjdC10cmVlIjsKIAogICAgIGlmICh0aGlzLl9vYmplY3QucHJldmll dykgewotICAgICAgICB2YXIgcHJldmlld1ZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFBy ZXZpZXdWaWV3KHRoaXMuX29iamVjdC5wcmV2aWV3KTsKLSAgICAgICAgdGhpcy5fcHJldmlld0Vs ZW1lbnQgPSBwcmV2aWV3Vmlldy5lbGVtZW50OwotICAgICAgICB0aGlzLl9wcmV2aWV3RWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2hhbmRsZVByZXZpZXdPclRpdGxlRWxl bWVudENsaWNrLmJpbmQodGhpcykpOwotICAgICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX3ByZXZpZXdFbGVtZW50KTsKKyAgICAgICAgdGhpcy5fcHJldmlld1ZpZXcgPSBuZXcg V2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3KHRoaXMuX29iamVjdC5wcmV2aWV3KTsKKyAg ICAgICAgdGhpcy5fcHJldmlld1ZpZXcuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIs IHRoaXMuX2hhbmRsZVByZXZpZXdPclRpdGxlRWxlbWVudENsaWNrLmJpbmQodGhpcykpOworICAg ICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3ByZXZpZXdWaWV3LmVsZW1lbnQp OwogCi0gICAgICAgIGlmIChwcmV2aWV3Vmlldy5sb3NzbGVzcyAmJiAhZm9yY2VFeHBhbmRpbmcp IHsKKyAgICAgICAgaWYgKHRoaXMuX3ByZXZpZXdWaWV3Lmxvc3NsZXNzICYmICFmb3JjZUV4cGFu ZGluZykgewogICAgICAgICAgICAgdGhpcy5faGFzTG9zc2xlc3NQcmV2aWV3ID0gdHJ1ZTsKICAg ICAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJsb3NzbGVzcy1wcmV2aWV3Iik7 CiAgICAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgIHRoaXMuX3RpdGxlRWxlbWVu dC5jbGFzc05hbWUgPSAidGl0bGUiOworICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQudGV4dENv bnRlbnQgPSB0aGlzLl9vYmplY3QuZGVzY3JpcHRpb24gfHwgIiI7CisgICAgICAgIHRoaXMuX3Rp dGxlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2hhbmRsZVByZXZpZXdP clRpdGxlRWxlbWVudENsaWNrLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9lbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuX3RpdGxlRWxlbWVudCk7CiAgICAgfQogCi0gICAgdGhpcy5fdGl0bGVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgIHRoaXMuX3RpdGxl RWxlbWVudC5jbGFzc05hbWUgPSAidGl0bGUiOwotICAgIHRoaXMuX3RpdGxlRWxlbWVudC50ZXh0 Q29udGVudCA9IHRoaXMuX29iamVjdC5kZXNjcmlwdGlvbiB8fCAiIjsKLSAgICB0aGlzLl90aXRs ZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9oYW5kbGVQcmV2aWV3T3JU aXRsZUVsZW1lbnRDbGljay5iaW5kKHRoaXMpKTsKLSAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENo aWxkKHRoaXMuX3RpdGxlRWxlbWVudCk7Ci0KLSAgICBpZiAodGhpcy5fb2JqZWN0LnByZXZpZXcp Ci0gICAgICAgIHRoaXMuX3RpdGxlRWxlbWVudC5oaWRkZW4gPSB0cnVlOwotCiAgICAgdGhpcy5f b3V0bGluZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvbCIpOwogICAgIHRoaXMu X291dGxpbmVFbGVtZW50LmNsYXNzTmFtZSA9ICJvYmplY3QtdHJlZS1vdXRsaW5lIjsKICAgICB0 aGlzLl9vdXRsaW5lID0gbmV3IFRyZWVPdXRsaW5lKHRoaXMuX291dGxpbmVFbGVtZW50KTsKQEAg LTE1MywxMCArMTQ5LDggQEAgV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSB0cnVlOwogICAgICAgICB0aGlzLl9lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImV4cGFuZGVkIik7CiAKLSAgICAgICAgaWYgKHRoaXMuX3ByZXZpZXdF bGVtZW50KSB7Ci0gICAgICAgICAgICB0aGlzLl9wcmV2aWV3RWxlbWVudC5oaWRkZW4gPSB0cnVl OwotICAgICAgICAgICAgdGhpcy5fdGl0bGVFbGVtZW50LmhpZGRlbiA9IGZhbHNlOwotICAgICAg ICB9CisgICAgICAgIGlmICh0aGlzLl9wcmV2aWV3VmlldykKKyAgICAgICAgICAgIHRoaXMuX3By ZXZpZXdWaWV3LnNob3dUaXRsZSgpOwogCiAgICAgICAgIHRoaXMudXBkYXRlKCk7CiAgICAgfSwK QEAgLTE2OSwxMCArMTYzLDggQEAgV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fZWxl bWVudC5jbGFzc0xpc3QucmVtb3ZlKCJleHBhbmRlZCIpOwogCi0gICAgICAgIGlmICh0aGlzLl9w cmV2aWV3RWxlbWVudCkgewotICAgICAgICAgICAgdGhpcy5fcHJldmlld0VsZW1lbnQuaGlkZGVu ID0gZmFsc2U7Ci0gICAgICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQuaGlkZGVuID0gdHJ1ZTsK LSAgICAgICAgfQorICAgICAgICBpZiAodGhpcy5fcHJldmlld1ZpZXcpCisgICAgICAgICAgICB0 aGlzLl9wcmV2aWV3Vmlldy5zaG93UHJldmlldygpOwogICAgIH0sCiAKICAgICAvLyBQcm90ZWN0 ZWQK