36719 2010-03-28 03:12:18 -0700 Web Inspector: Consolidate Tree Hierarchy Attribute HTML Generation 2010-03-28 03:36:35 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 joepeck webkit-unassigned bweinstein joepeck keishi pfeldman pmuellr rik timothy oldest_to_newest 205128 0 joepeck 2010-03-28 03:12:18 -0700 Attribute HTML is generated in 3 different places: - updateTitle the core location (name+value, linkifies, and tooltips) - _addNewAttribute (blank name+value, no equals or quotes) - regenerateStyledAttribute (when tabbing, name+value, no linkify) These can become out of sync. They should be consolidated. 205129 1 51854 joepeck 2010-03-28 03:14:35 -0700 Created attachment 51854 [PATCH] Consolidate to _attributeHTML 205135 2 joepeck 2010-03-28 03:36:35 -0700 Committed r56688 M WebCore/ChangeLog M WebCore/inspector/front-end/ElementsTreeOutline.js r56688 = 0b5ebc1a1afceb39553d882c9e6fb64e4bb8cb72 (trunk) http://trac.webkit.org/changeset/56688 51854 2010-03-28 03:14:35 -0700 2010-03-28 03:22:18 -0700 [PATCH] Consolidate to _attributeHTML attr-consolidate text/plain 6427 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWJmMmE1Mi4uYzE4MmI3MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMiBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvbnNvbGlkYXRlIFRyZWUg SGllcmFyY2h5IEF0dHJpYnV0ZSBIVE1MIEdlbmVyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NzE5CisKKyAgICAgICAgICBDb25zb2xpZGF0 ZXMgdGhlIGdlbmVyYXRpb24gb2YgRWxlbWVudCBUcmVlIEhpZXJhcmNoeSBhdHRyaWJ1dGUgY29k ZQorICAgICAgICAgIGdlbmVyYXRpb24gdG8gYSBzaW5nbGUgZnVuY3Rpb246IF9hdHRyaWJ1dGVI VE1MLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5l LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBl Ll9hZGROZXdBdHRyaWJ1dGUpOiBjb252ZXJ0IHRvIHVzZSBhdHRyaWJ1dGVIVE1MLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLl9hdHRyaWJ1dGVF ZGl0aW5nQ29tbWl0dGVkLnJlZ2VuZXJhdGVTdHlsZWRBdHRyaWJ1dGUpOiBjb252ZXJ0IHRvIHVz ZSBhdHRyaWJ1dGVIVE1MLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1l bnQucHJvdG90eXBlLl9hdHRyaWJ1dGVFZGl0aW5nQ29tbWl0dGVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZS5fYXR0cmlidXRlSFRNTCk6IGEg c2luZ2xlIHBvaW50IGZvciBnZW5lcmF0aW5nIHRoZSBodG1sIGZvciBhdHRyaWJ1dGVzLgorCisy MDEwLTAzLTI4ICBKb3NlcGggUGVjb3Jhcm8gIDxqb2VwZWNrQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgV2ViIEluc3BlY3Rvcjog RWRpdCBUYWcgTmFtZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM2NDgxCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1RyZWVPdXRsaW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1l bnRzVHJlZU91dGxpbmUuanMKaW5kZXggNTU1ODhmZC4uMDJkNDcyNCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKQEAgLTc4Niwx NyArNzg2LDEzIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKIAogICAgIF9hZGROZXdBdHRyaWJ1dGU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZh ciBhdHRyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICBhdHRyLmNs YXNzTmFtZSA9ICJ3ZWJraXQtaHRtbC1hdHRyaWJ1dGUiOworICAgICAgICAvLyBDYW5ub3QganVz dCBjb252ZXJ0IHRoZSB0ZXh0dWFsIGh0bWwgaW50byBhbiBlbGVtZW50IHdpdGhvdXQKKyAgICAg ICAgLy8gYSBwYXJlbnQgbm9kZS4gVXNlIGEgdGVtcG9yYXJ5IHNwYW4gY29udGFpbmVyIGZvciB0 aGUgSFRNTC4KKyAgICAgICAgdmFyIGNvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo InNwYW4iKTsKKyAgICAgICAgY29udGFpbmVyLmlubmVySFRNTCA9IHRoaXMuX2F0dHJpYnV0ZUhU TUwoIiAiLCAiIik7CisgICAgICAgIHZhciBhdHRyID0gY29udGFpbmVyLmZpcnN0Q2hpbGQ7CiAg ICAgICAgIGF0dHIuc3R5bGUubWFyZ2luTGVmdCA9ICIycHgiOyAvLyBvdmVycmlkZXMgdGhlIC5l ZGl0aW5nIG1hcmdpbiBydWxlCiAgICAgICAgIGF0dHIuc3R5bGUubWFyZ2luUmlnaHQgPSAiMnB4 IjsgLy8gb3ZlcnJpZGVzIHRoZSAuZWRpdGluZyBtYXJnaW4gcnVsZQotICAgICAgICB2YXIgbmFt ZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgbmFtZS5jbGFzc05h bWUgPSAid2Via2l0LWh0bWwtYXR0cmlidXRlLW5hbWUgbmV3LWF0dHJpYnV0ZSI7Ci0gICAgICAg IG5hbWUudGV4dENvbnRlbnQgPSAiICI7Ci0gICAgICAgIHZhciB2YWx1ZSA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgdmFsdWUuY2xhc3NOYW1lID0gIndlYmtpdC1o dG1sLWF0dHJpYnV0ZS12YWx1ZSI7Ci0gICAgICAgIGF0dHIuYXBwZW5kQ2hpbGQobmFtZSk7Ci0g ICAgICAgIGF0dHIuYXBwZW5kQ2hpbGQodmFsdWUpOwogCiAgICAgICAgIHZhciB0YWcgPSB0aGlz Lmxpc3RJdGVtRWxlbWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJ3ZWJraXQtaHRtbC10YWci KVswXTsKICAgICAgICAgdGhpcy5faW5zZXJ0SW5MYXN0QXR0cmlidXRlUG9zaXRpb24odGFnLCBh dHRyKTsKQEAgLTEwMjQsMTAgKzEwMjAsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgcHJldmlvdXMgPSBlbGVtZW50LnBy ZXZpb3VzU2libGluZzsKICAgICAgICAgICAgIGlmICghcHJldmlvdXMgfHwgcHJldmlvdXMubm9k ZVR5cGUgIT09IE5vZGUuVEVYVF9OT0RFKQogICAgICAgICAgICAgICAgIGVsZW1lbnQucGFyZW50 Tm9kZS5pbnNlcnRCZWZvcmUoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiAiKSwgZWxlbWVudCk7 Ci0gICAgICAgICAgICBlbGVtZW50Lm91dGVySFRNTCA9ICI8c3BhbiBjbGFzcz1cIndlYmtpdC1o dG1sLWF0dHJpYnV0ZVwiPiIgKwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICI8 c3BhbiBjbGFzcz1cIndlYmtpdC1odG1sLWF0dHJpYnV0ZS1uYW1lXCI+IiArIGF0dHIubmFtZS5l c2NhcGVIVE1MKCkgKyAiPC9zcGFuPj0mIzgyMDM7XCIiICsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC1hdHRyaWJ1dGUtdmFsdWVc Ij4iICsgYXR0ci52YWx1ZS5lc2NhcGVIVE1MKCkgKyAiPC9zcGFuPiYjODIwMztcIiIgKwotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiPC9zcGFuPiI7CisgICAgICAgICAgICBlbGVt ZW50Lm91dGVySFRNTCA9IHRoaXMuX2F0dHJpYnV0ZUhUTUwobmFtZSwgdmFsdWUpOwogICAgICAg ICB9CiAKICAgICAgICAgdmFyIHBhcnNlQ29udGFpbmVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsKQEAgLTEwNTIsNyArMTA0NSw3IEBAIFdlYkluc3BlY3Rvci5FbGVt ZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGZvdW5kT3JpZ2luYWxB dHRyaWJ1dGUgPSBmb3VuZE9yaWdpbmFsQXR0cmlidXRlIHx8IGF0dHIubmFtZSA9PT0gYXR0cmli dXRlTmFtZTsKICAgICAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAgICAgdGhpcy5yZXByZXNl bnRlZE9iamVjdC5zZXRBdHRyaWJ1dGUoYXR0ci5uYW1lLCBhdHRyLnZhbHVlKTsKLSAgICAgICAg ICAgICAgICByZWdlbmVyYXRlU3R5bGVkQXR0cmlidXRlKGF0dHIubmFtZSwgYXR0ci52YWx1ZSk7 CisgICAgICAgICAgICAgICAgcmVnZW5lcmF0ZVN0eWxlZEF0dHJpYnV0ZS5jYWxsKHRoaXMsIGF0 dHIubmFtZSwgYXR0ci52YWx1ZSk7CiAgICAgICAgICAgICB9IGNhdGNoKGUpIHt9IC8vIGlnbm9y ZSBpbnZhbGlkIGF0dHJpYnV0ZSAoaW5uZXJIVE1MIGRvZXNuJ3QgdGhyb3cgZXJyb3JzLCBidXQg dGhpcyBjYW4pCiAgICAgICAgIH0KIApAQCAtMTIxNCw2ICsxMjA3LDI5IEBAIFdlYkluc3BlY3Rv ci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIGhyZWZW YWx1ZTsKICAgICB9LAogCisgICAgX2F0dHJpYnV0ZUhUTUw6IGZ1bmN0aW9uKG5hbWUsIHZhbHVl LCBub2RlLCBsaW5raWZ5LCB0b29sdGlwVGV4dCkKKyAgICB7CisgICAgICAgIHZhciBoYXNUZXh0 ID0gKHZhbHVlLmxlbmd0aCA+IDApOworICAgICAgICB2YXIgaHRtbCA9ICI8c3BhbiBjbGFzcz1c IndlYmtpdC1odG1sLWF0dHJpYnV0ZVwiPjxzcGFuIGNsYXNzPVwid2Via2l0LWh0bWwtYXR0cmli dXRlLW5hbWVcIj4iICsgbmFtZS5lc2NhcGVIVE1MKCkgKyAiPC9zcGFuPiI7CisKKyAgICAgICAg aWYgKGhhc1RleHQpCisgICAgICAgICAgICBodG1sICs9ICI9JiM4MjAzO1wiIjsKKworICAgICAg ICBpZiAobGlua2lmeSAmJiAobmFtZSA9PT0gInNyYyIgfHwgbmFtZSA9PT0gImhyZWYiKSkgewor ICAgICAgICAgICAgdmFsdWUgPSB2YWx1ZS5yZXBsYWNlKC8oW1wvOzpcKVxdXH1dKS9nLCAiJDFc dTIwMEIiKTsKKyAgICAgICAgICAgIGh0bWwgKz0gbGlua2lmeSh0aGlzLl9yZXdyaXRlQXR0ckhy ZWYobm9kZSwgdmFsdWUpLCB2YWx1ZSwgIndlYmtpdC1odG1sLWF0dHJpYnV0ZS12YWx1ZSIsIG5v ZGUubm9kZU5hbWUudG9Mb3dlckNhc2UoKSA9PT0gImEiLCB0b29sdGlwVGV4dCk7CisgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICB2YWx1ZSA9IHZhbHVlLmVzY2FwZUhUTUwoKS5yZXBsYWNl KC8oW1wvOzpcKVxdXH1dKS9nLCAiJDEmIzgyMDM7Iik7CisgICAgICAgICAgICBodG1sICs9ICI8 c3BhbiBjbGFzcz1cIndlYmtpdC1odG1sLWF0dHJpYnV0ZS12YWx1ZVwiPiIgKyB2YWx1ZSArICI8 L3NwYW4+IjsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChoYXNUZXh0KQorICAgICAgICAgICAg aHRtbCArPSAiXCIiOworCisgICAgICAgIGh0bWwgKz0gIjwvc3Bhbj4iOworICAgICAgICByZXR1 cm4gaHRtbDsKKyAgICB9LAorCiAgICAgX25vZGVUaXRsZUluZm86IGZ1bmN0aW9uKGxpbmtpZnks IHRvb2x0aXBUZXh0KQogICAgIHsKICAgICAgICAgdmFyIG5vZGUgPSB0aGlzLnJlcHJlc2VudGVk T2JqZWN0OwpAQCAtMTIzNSwxOCArMTI1MSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBpZiAobm9kZS5oYXNBdHRyaWJ1 dGVzKCkpIHsKICAgICAgICAgICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBub2RlLmF0 dHJpYnV0ZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBhdHRy ID0gbm9kZS5hdHRyaWJ1dGVzW2ldOwotICAgICAgICAgICAgICAgICAgICAgICAgaW5mby50aXRs ZSArPSAiIDxzcGFuIGNsYXNzPVwid2Via2l0LWh0bWwtYXR0cmlidXRlXCI+PHNwYW4gY2xhc3M9 XCJ3ZWJraXQtaHRtbC1hdHRyaWJ1dGUtbmFtZVwiPiIgKyBhdHRyLm5hbWUuZXNjYXBlSFRNTCgp ICsgIjwvc3Bhbj49JiM4MjAzO1wiIjsKLQotICAgICAgICAgICAgICAgICAgICAgICAgdmFyIHZh bHVlID0gYXR0ci52YWx1ZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChsaW5raWZ5ICYm IChhdHRyLm5hbWUgPT09ICJzcmMiIHx8IGF0dHIubmFtZSA9PT0gImhyZWYiKSkgewotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHZhciB2YWx1ZSA9IHZhbHVlLnJlcGxhY2UoLyhbXC87Olwp XF1cfV0pL2csICIkMVx1MjAwQiIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZm8u dGl0bGUgKz0gbGlua2lmeSh0aGlzLl9yZXdyaXRlQXR0ckhyZWYobm9kZSwgYXR0ci52YWx1ZSks IHZhbHVlLCAid2Via2l0LWh0bWwtYXR0cmlidXRlLXZhbHVlIiwgbm9kZS5ub2RlTmFtZS50b0xv d2VyQ2FzZSgpID09ICJhIiwgdG9vbHRpcFRleHQpOwotICAgICAgICAgICAgICAgICAgICAgICAg fSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YXIgdmFsdWUgPSB2YWx1ZS5l c2NhcGVIVE1MKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFsdWUgPSB2YWx1ZS5y ZXBsYWNlKC8oW1wvOzpcKVxdXH1dKS9nLCAiJDEmIzgyMDM7Iik7Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgaW5mby50aXRsZSArPSAiPHNwYW4gY2xhc3M9XCJ3ZWJraXQtaHRtbC1hdHRy aWJ1dGUtdmFsdWVcIj4iICsgdmFsdWUgKyAiPC9zcGFuPiI7Ci0gICAgICAgICAgICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlICs9ICJcIjwvc3Bhbj4i OworICAgICAgICAgICAgICAgICAgICAgICAgaW5mby50aXRsZSArPSAiICIgKyB0aGlzLl9hdHRy aWJ1dGVIVE1MKGF0dHIubmFtZSwgYXR0ci52YWx1ZSwgbm9kZSwgbGlua2lmeSwgdG9vbHRpcFRl eHQpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgIGluZm8udGl0bGUgKz0gIiZndDs8L3NwYW4+JiM4MjAzOyI7Cg==