42673 2010-07-20 14:35:14 -0700 make dump-as-markup work better on subframes and allow dumping a subtree 2010-07-20 15:39:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan darin eric rniwa oldest_to_newest 253920 0 ojan 2010-07-20 14:35:14 -0700 make dump-as-markup work better on subframes and allow dumping a subtree 253927 1 62114 ojan 2010-07-20 14:36:38 -0700 Created attachment 62114 Patch 253971 2 62114 darin 2010-07-20 15:15:07 -0700 Comment on attachment 62114 Patch > +// FIXME: Make description required Is this really important? > +/** > + * The description of what this test is testing. Gets prepended to the dumped markup. > + */ Why not use // comments everywhere as we do elsewhere in WebKit? All looks fine. 253992 3 ojan 2010-07-20 15:28:41 -0700 Thanks for the review. (In reply to comment #2) > (From update of attachment 62114 [details]) > > +// FIXME: Make description required > > Is this really important? I'm on the fence. On the one hand it makes the expected results from the test easier to make sense. On the other, it makes tests more of a pain to write. I'll remove the FIXME. > > +/** > > + * The description of what this test is testing. Gets prepended to the dumped markup. > > + */ > > Why not use // comments everywhere as we do elsewhere in WebKit? Ugh. Just habit from Google-style JavaScript. I'll change it over to // comments. 254030 4 ojan 2010-07-20 15:39:37 -0700 Committed r63781: <http://trac.webkit.org/changeset/63781> 62114 2010-07-20 14:36:38 -0700 2010-07-20 15:15:07 -0700 Patch bug-42673-20100720143637.patch text/plain 5982 ojan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyMWZlZTBmZWM3OWNkNjM3NDM3NmI2ZGFmYWM1OGM5NjZhNDcyZjk5Li40N2JlOTdj ZTIxZmFiNDViNTQ1YWQxODZmNjc5ZjIzMWJkZDJjZWQ1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAK IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBtYWtlIGR1 bXAtYXMtbWFya3VwIHdvcmsgYmV0dGVyIG9uIHN1YmZyYW1lcyBhbmQgYWxsb3cgZHVtcGluZyBh IHN1YnRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQyNjczCisKKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9kdW1wLWFzLW1hcmt1cC1leHBl Y3RlZC50eHQ6CisgICAgICAgICogZWRpdGluZy9zZWxlY3Rpb24vZHVtcC1hcy1tYXJrdXAuaHRt bDoKKyAgICAgICAgKiByZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanM6CisgICAgICAgIChNYXJr dXAuZGVzY3JpcHRpb24pOgorICAgICAgICAoTWFya3VwLl9nZXRTZWxlY3Rpb25Gcm9tTm9kZSk6 CisgICAgICAgIChNYXJrdXAuX2dldE1hcmt1cEZvclRleHROb2RlKToKKyAgICAgICAgKE1hcmt1 cC5fZ2V0U2VsZWN0aW9uTWFya2VyKToKKworMjAxMC0wNy0yMCAgT2phbiBWYWZhaSAgPG9qYW5A Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAg ICAgICAgIGZvY3VzaW5nIHRoZSBib2R5IG9mIGEgY29udGVudEVkaXRhYmxlIGlmcmFtZSByZXNl dHMgdGhlIHNlbGVjdGlvbgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDI2NDUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rp b24vZHVtcC1hcy1tYXJrdXAtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxl Y3Rpb24vZHVtcC1hcy1tYXJrdXAtZXhwZWN0ZWQudHh0CmluZGV4IDAzNjc0NWNhYWI0ZjQxNGJj MjdkZDVhNjZiOWE5MWI5YzEyYzQxMTYuLjQzZDE4ZTI1YjIyZGYzNjUxNTI0NzhiNDkzOGUxZDdh Mzc0Y2FkYzEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2R1bXAt YXMtbWFya3VwLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlv bi9kdW1wLWFzLW1hcmt1cC1leHBlY3RlZC50eHQKQEAgLTEsMyArMSw0IEBACitUZXN0cyBiYXNp YyBkdW1wLWFzLW1hcmt1cCBmdW5jdGlvbmFsaXR5LgogCiA8SFRNTD4KIDxIRUFEPgpAQCAtNTMs NiArNTQsNyBAQCBmb288LyN0ZXh0PgogCiA8LyN0ZXh0PgogPFNDUklQVD4KK01hcmt1cC5kZXNj cmlwdGlvbigiVGVzdHMgYmFzaWMgZHVtcC1hcy1tYXJrdXAgZnVuY3Rpb25hbGl0eS4iKTsKIHdp bmRvdy5nZXRTZWxlY3Rpb24oKS5zZWxlY3RBbGxDaGlsZHJlbihiYXIpCiA8L1NDUklQVD4KIDwj dGV4dD4KQEAgLTYxLDQgKzYzLDMxIEBAIHdpbmRvdy5nZXRTZWxlY3Rpb24oKS5zZWxlY3RBbGxD aGlsZHJlbihiYXIpCiA8L0hUTUw+CiAKIEZSQU1FIDA6Ci1GSVhNRTogQWRkIG1ldGhvZCB0byBs YXlvdXQgdGVzdCBjb250cm9sbGVyIHRvIGdldCBhY2Nlc3MgdG8gY3Jvc3Mtb3JpZ2luIGZyYW1l cy4KKworPEhUTUw+Cis8SEVBRD4KKzwjdGV4dD4KKzwvI3RleHQ+Cis8VElUTEU+Cis8I3RleHQ+ VGVzdDwvI3RleHQ+Cis8L1RJVExFPgorPCN0ZXh0PgorPC8jdGV4dD4KKzxTVFlMRSB0eXBlPSJ0 ZXh0L2NzcyI+Cis8L1NUWUxFPgorPCN0ZXh0PgorPC8jdGV4dD4KKzwvSEVBRD4KKzwjdGV4dD4K KzwvI3RleHQ+Cis8Qk9EWT4KKzwjdGV4dD4KKzwvI3RleHQ+Cis8UD4KKzwvUD4KKzwjdGV4dD4K KworCis8LyN0ZXh0PgorPC9CT0RZPgorPC9IVE1MPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZWRpdGluZy9zZWxlY3Rpb24vZHVtcC1hcy1tYXJrdXAuaHRtbCBiL0xheW91dFRlc3RzL2VkaXRp bmcvc2VsZWN0aW9uL2R1bXAtYXMtbWFya3VwLmh0bWwKaW5kZXggOTJjMjVhZjA1OTUzNzExMzNk YzYyYzA4YjQyZmQwMWM3ODNiZDZkOS4uMjhiZDgzNzVjZWZjYTYwMzUwODIzYWM1MWU1ZjUwZWJh MDI0Yzc4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vZHVtcC1h cy1tYXJrdXAuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9kdW1wLWFz LW1hcmt1cC5odG1sCkBAIC0xMSw1ICsxMSw2IEBACiA8aWZyYW1lIHNyYz0nZGF0YTp0ZXh0L2h0 bWw7Y2hhcnNldD11dGYtOCw8IURPQ1RZUEUlMjBIVE1MJTIwUFVCTElDJTIwIi0vL1czQy8vRFRE JTIwSFRNTCUyMDQuMC8vRU4iPiUwRCUwQTxodG1sJTIwbGFuZyUzRCJlbiI+JTBEJTBBJTIwPGhl YWQ+JTBEJTBBJTIwJTIwPHRpdGxlPlRlc3Q8L3RpdGxlPiUwRCUwQSUyMCUyMDxzdHlsZSUyMHR5 cGUlM0QidGV4dC9jc3MiPiUwRCUwQSUyMCUyMDwvc3R5bGU+JTBEJTBBJTIwPC9oZWFkPiUwRCUw QSUyMDxib2R5PiUwRCUwQSUyMCUyMDxwPjwvcD4lMEQlMEElMjA8L2JvZHk+JTBEJTBBPC9odG1s PiUwRCUwQSc+PC9pZnJhbWU+CiAKIDxzY3JpcHQ+CitNYXJrdXAuZGVzY3JpcHRpb24oIlRlc3Rz IGJhc2ljIGR1bXAtYXMtbWFya3VwIGZ1bmN0aW9uYWxpdHkuIik7CiB3aW5kb3cuZ2V0U2VsZWN0 aW9uKCkuc2VsZWN0QWxsQ2hpbGRyZW4oYmFyKQogPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAuanMgYi9MYXlvdXRUZXN0cy9yZXNvdXJj ZXMvZHVtcC1hcy1tYXJrdXAuanMKaW5kZXggMTY4NmZiMGQ3M2E1MzE1MmMzYWUxOWJkZDc3MWE0 MTdiYmJhYTNmMi4uMWVkYWY5MTMwMjRhMzc5OTM1YjliMDk1NDdhZmE3MmQ4NjMyZjlhZCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzCisrKyBiL0xh eW91dFRlc3RzL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1cC5qcwpAQCAtNiw2ICs2LDE1IEBAIGlm ICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKIC8vIE5hbWVzcGFjZQogdmFyIE1hcmt1 cCA9IHt9OwogCisvLyBGSVhNRTogTWFrZSBkZXNjcmlwdGlvbiByZXF1aXJlZAorLyoqCisgKiBU aGUgZGVzY3JpcHRpb24gb2Ygd2hhdCB0aGlzIHRlc3QgaXMgdGVzdGluZy4gR2V0cyBwcmVwZW5k ZWQgdG8gdGhlIGR1bXBlZCBtYXJrdXAuCisgKi8KK01hcmt1cC5kZXNjcmlwdGlvbiA9IGZ1bmN0 aW9uKGRlc2NyaXB0aW9uKQoreworCU1hcmt1cC5fZGVzY3JpcHRpb24gPSBkZXNjcmlwdGlvbjsK K30KKwogLyoqCiAgKiBEdW1wcyB0aGUgbWFya3VwIGZvciB0aGUgZ2l2ZW4gbm9kZSAoSFRNTCBl bGVtZW50IGlmIG5vIG5vZGUgaXMgZ2l2ZW4pLgogICogT3Zlci13cml0ZXMgdGhlIGJvZHkncyBj b250ZW50IHdpdGggdGhlIG1hcmt1cCBpbiBsYXlvdXQgdGVzdCBtb2RlLiBBcHBlbmRzCkBAIC0x Nyw3ICsyNiwxMSBAQCBNYXJrdXAuZHVtcCA9IGZ1bmN0aW9uKG9wdF9ub2RlKQogICAgIGlmIChv cHRfbm9kZSBpbnN0YW5jZW9mIEV2ZW50KQogICAgICAgICBvcHRfbm9kZSA9IHVuZGVmaW5lZDsK IAotICAgIHZhciBtYXJrdXAgPSBNYXJrdXAuZ2V0KG9wdF9ub2RlKTsKKyAgICB2YXIgbm9kZSA9 IG9wdF9ub2RlIHx8IGRvY3VtZW50LmJvZHkucGFyZW50RWxlbWVudAorCisgICAgdmFyIG1hcmt1 cCA9IE1hcmt1cC5fZGVzY3JpcHRpb24gPyBNYXJrdXAuX2Rlc2NyaXB0aW9uICsgJ1xuJyA6ICIi OworICAgIG1hcmt1cCArPSBNYXJrdXAuZ2V0KG5vZGUpOworCiAgICAgdmFyIGNvbnRhaW5lcjsK ICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQogICAgICAgICBjb250YWluZXIg PSBkb2N1bWVudC5ib2R5OwpAQCAtMzEsMTAgKzQ0LDEyIEBAIE1hcmt1cC5kdW1wID0gZnVuY3Rp b24ob3B0X25vZGUpCiAgICAgfQogCiAgICAgLy8gRklYTUU6IEhhdmUgdGhpcyByZXNwZWN0IGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBDaGlsZEZyYW1lc0FzVGV4dD8KLSAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHdpbmRvdy5mcmFtZXMubGVuZ3RoOyBpKyspIHsKKyAgICAvLyBGSVhNRTogU2hv dWxkIHdlIGNhcmUgYWJvdXQgZnJhbWVzZXRzPworICAgIHZhciBpZnJhbWVzID0gbm9kZS5nZXRF bGVtZW50c0J5VGFnTmFtZSgnaWZyYW1lJyk7CisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBpZnJh bWVzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgIG1hcmt1cCArPSAnXG5cbkZSQU1FICcgKyBpICsg JzpcbicKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIG1hcmt1cCArPSBNYXJrdXAuZ2V0KHdp bmRvdy5mcmFtZXNbaV0uY29udGVudERvY3VtZW50LmJvZHkucGFyZW50RWxlbWVudCk7CisgICAg ICAgICAgICBtYXJrdXAgKz0gTWFya3VwLmdldChpZnJhbWVzW2ldLmNvbnRlbnREb2N1bWVudC5i b2R5LnBhcmVudEVsZW1lbnQpOwogICAgICAgICB9IGNhdGNoIChlKSB7CiAgICAgICAgICAgICBt YXJrdXAgKz0gJ0ZJWE1FOiBBZGQgbWV0aG9kIHRvIGxheW91dCB0ZXN0IGNvbnRyb2xsZXIgdG8g Z2V0IGFjY2VzcyB0byBjcm9zcy1vcmlnaW4gZnJhbWVzLic7CiAgICAgICAgIH0KQEAgLTYwLDkg Kzc1LDggQEAgTWFya3VwLm5vdGlmeURvbmUgPSBmdW5jdGlvbigpCiAgKiBSZXR1cm5zIHRoZSBt YXJrdXAgZm9yIHRoZSBnaXZlbiBub2RlLiBUbyBiZSB1c2VkIGZvciBjYXNlcyB3aGVyZSBhIHRl c3QgbmVlZHMKICAqIHRvIGdldCB0aGUgbWFya3VwIGJ1dCBub3QgY2xvYmJlciB0aGUgd2hvbGUg cGFnZS4KICAqLwotTWFya3VwLmdldCA9IGZ1bmN0aW9uKG9wdF9ub2RlLCBvcHRfZGVwdGgpCitN YXJrdXAuZ2V0ID0gZnVuY3Rpb24obm9kZSwgb3B0X2RlcHRoKQogewotICAgIHZhciBub2RlID0g b3B0X25vZGUgfHwgZG9jdW1lbnQuYm9keS5wYXJlbnRFbGVtZW50CiAgICAgdmFyIGRlcHRoID0g b3B0X2RlcHRoIHx8IDA7CiAKICAgICB2YXIgYXR0cnMgPSBNYXJrdXAuX2dldEF0dHJpYnV0ZXMo bm9kZSk7CkBAIC0xNTEsMTIgKzE2NSwxNyBAQCBNYXJrdXAuX0ZPUkJJRFNfRU5EX1RBRyA9IHsK ICAgICAnREFUQUdSSURDT0wnOiAxCiB9CiAKK01hcmt1cC5fZ2V0U2VsZWN0aW9uRnJvbU5vZGUg PSBmdW5jdGlvbihub2RlKQoreworCXJldHVybiBub2RlLm93bmVyRG9jdW1lbnQuZGVmYXVsdFZp ZXcuZ2V0U2VsZWN0aW9uKCk7Cit9CisKIE1hcmt1cC5fZ2V0TWFya3VwRm9yVGV4dE5vZGUgPSBm dW5jdGlvbihub2RlKQogewogICAgIGlubmVyTWFya3VwID0gbm9kZS5ub2RlVmFsdWU7CiAgICAg dmFyIHN0YXJ0T2Zmc2V0LCBlbmRPZmZzZXQsIHN0YXJ0VGV4dCwgZW5kVGV4dDsKIAotICAgIHZh ciBzZWwgPSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCk7CisgICAgdmFyIHNlbCA9IE1hcmt1cC5fZ2V0 U2VsZWN0aW9uRnJvbU5vZGUobm9kZSk7CiAgICAgaWYgKG5vZGUgPT0gc2VsLmFuY2hvck5vZGUg JiYgbm9kZSA9PSBzZWwuZm9jdXNOb2RlKSB7CiAgICAgICAgIGlmIChzZWwuaXNDb2xsYXBzZWQp IHsKICAgICAgICAgICAgIHN0YXJ0T2Zmc2V0ID0gc2VsLmFuY2hvck9mZnNldDsKQEAgLTE5Miw3 ICsyMTEsNyBAQCBNYXJrdXAuX2dldE1hcmt1cEZvclRleHROb2RlID0gZnVuY3Rpb24obm9kZSkK IAogTWFya3VwLl9nZXRTZWxlY3Rpb25NYXJrZXIgPSBmdW5jdGlvbihub2RlLCBpbmRleCkKIHsK LSAgICB2YXIgc2VsID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgIHZhciBzZWwgPSBNYXJr dXAuX2dldFNlbGVjdGlvbkZyb21Ob2RlKG5vZGUpOzsKICAgICBpZiAoaW5kZXggPT0gc2VsLmFu Y2hvck9mZnNldCAmJiBub2RlID09IHNlbC5hbmNob3JOb2RlKSB7CiAgICAgICAgIGlmIChzZWwu aXNDb2xsYXBzZWQpCiAgICAgICAgICAgICByZXR1cm4gJzxzZWxlY3Rpb24tY2FyZXQ+JzsK