135780 2014-08-08 17:12:40 -0700 Load the layout test result image diff HTML from a file, rather than having it inline in webkitpy 2014-08-08 17:24:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue dbates ddkilzer dfarler glenn simon.fraser oldest_to_newest 1028016 0 simon.fraser 2014-08-08 17:12:40 -0700 Load the layout test result image diff HTML from a file, rather than having it inline in webkitpy 1028017 1 236326 simon.fraser 2014-08-08 17:13:42 -0700 Created attachment 236326 Patch 1028018 2 236326 thorton 2014-08-08 17:14:58 -0700 Comment on attachment 236326 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236326&action=review > LayoutTests/fast/harness/image-diff-template.html:15 > +var preloadedImageCount = 0; indentationplz > LayoutTests/fast/harness/image-diff-template.html:26 > +image.addEventListener('load', preloadComplete); here too 1028019 3 236326 dbates 2014-08-08 17:15:31 -0700 Comment on attachment 236326 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236326&action=review > Tools/ChangeLog:8 > + Pull the HTML the image diff file into a separate file, for easier hackability. This sentence doesn't read well. 1028020 4 236326 dbates 2014-08-08 17:17:08 -0700 Comment on attachment 236326 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236326&action=review > LayoutTests/fast/harness/image-diff-template.html:10 > +<div class=imageText></div> > +<div class=imageContainer data-prefix="%(prefix)s">Loading...</div> Nit: I know you are just copying and pasting this markup. We should add quotes are the value of the HTML class attribute. 1028021 5 dbates 2014-08-08 17:17:52 -0700 (In reply to comment #4) > (From update of attachment 236326 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=236326&action=review > > > LayoutTests/fast/harness/image-diff-template.html:10 > > +<div class=imageText></div> > > +<div class=imageContainer data-prefix="%(prefix)s">Loading...</div> > > Nit: [...] We should add quotes are the value of the HTML class attribute. * We should add quotes around the value of the HTML class attribute. 1028023 6 simon.fraser 2014-08-08 17:24:12 -0700 https://trac.webkit.org/r172368 236326 2014-08-08 17:13:42 -0700 2014-08-08 17:17:08 -0700 Patch bug-135780-20140808171330.patch text/plain 6733 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMzY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjBiZDA0ZDRhODYyOGY3NzViNDNhN2NjOTEzMGQxNGI1 MmZjNjM2Zi4uYzU3MjRjNjMxOGUzNzhiMjQxYmFiYjk1ZDBlNmQxZGQwMTVmMmIzZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE0LTA4LTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIExvYWQgdGhlIGxheW91dCB0ZXN0IHJlc3VsdCBpbWFnZSBkaWZmIEhUTUwgZnJv bSBhIGZpbGUsIHJhdGhlciB0aGFuIGhhdmluZyBpdCBpbmxpbmUgaW4gd2Via2l0cHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTc4MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgUHVsbCB0 aGUgSFRNTCB0aGUgaW1hZ2UgZGlmZiBmaWxlIGludG8gYSBzZXBhcmF0ZSBmaWxlLCBmb3IgZWFz aWVyIGhhY2thYmlsaXR5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5OgorICAgICAgICAoVGVzdFJlc3Vs dFdyaXRlci53cml0ZV9pbWFnZV9kaWZmX2ZpbGVzKToKKwogMjAxNC0wOC0wOCAgTWFyayBMYW0g IDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgR2FyZGVuaW5nOiBmaXggV2luZG93cyBi dWlsZCBhZnRlciByMTcyMjU5LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVy LnB5CmluZGV4IDkzMmIyMmU1N2ZkMDI4ZDdkMzM0MmE5YjQwZGVjYjhmYzcxMzIxYzAuLmI0NDRk ZWZlZDA0ZDZhN2Y1YTQ5M2QyMGNlYTgzZjZjNmUxNDM1ZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRl ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy90ZXN0X3Jlc3VsdF93cml0ZXIucHkKQEAgLTE2OCw2MCArMTY4LDE4IEBAIGNsYXNzIFRlc3RS ZXN1bHRXcml0ZXIob2JqZWN0KToKICAgICAgICAgZGlmZl9maWxlbmFtZSA9IHNlbGYub3V0cHV0 X2ZpbGVuYW1lKHNlbGYuRklMRU5BTUVfU1VGRklYX0lNQUdFX0RJRkYpCiAgICAgICAgIHNlbGYu X3dyaXRlX2JpbmFyeV9maWxlKGRpZmZfZmlsZW5hbWUsIGltYWdlX2RpZmYpCiAKLSAgICAgICAg ZGlmZnNfaHRtbF9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKHNlbGYuRklMRU5BTUVf U1VGRklYX0lNQUdFX0RJRkZTX0hUTUwpCisgICAgICAgIGJhc2VfZGlyID0gc2VsZi5fcG9ydC5w YXRoX2Zyb21fd2Via2l0X2Jhc2UoJ0xheW91dFRlc3RzJywgJ2Zhc3QnLCAnaGFybmVzcycpCisg ICAgICAgIGltYWdlX2RpZmZfZmlsZSA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUo c2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2VfZGlyLCAnaW1hZ2UtZGlmZi10ZW1wbGF0ZS5odG1s JykpCisKICAgICAgICAgIyBGSVhNRTogb2xkLXJ1bi13ZWJraXQtdGVzdHMgc2hvd3MgdGhlIGRp ZmYgcGVyY2VudGFnZSBhcyB0aGUgdGV4dCBjb250ZW50cyBvZiB0aGUgImRpZmYiIGxpbmsuCiAg ICAgICAgICMgRklYTUU6IG9sZC1ydW4td2Via2l0LXRlc3RzIGluY2x1ZGUgYSBsaW5rIHRvIHRo ZSB0ZXN0IGZpbGUuCi0gICAgICAgIGh0bWwgPSAiIiI8IURPQ1RZUEUgSFRNTD4KLTxodG1sPgot PGhlYWQ+Ci08dGl0bGU+JSh0aXRsZSlzPC90aXRsZT4KLTxzdHlsZT4ubGFiZWx7Zm9udC13ZWln aHQ6Ym9sZH08L3N0eWxlPgotPC9oZWFkPgotPGJvZHk+Ci1EaWZmZXJlbmNlIGJldHdlZW4gaW1h Z2VzOiA8YSBocmVmPSIlKGRpZmZfZmlsZW5hbWUpcyI+ZGlmZjwvYT48YnI+Ci08ZGl2IGNsYXNz PWltYWdlVGV4dD48L2Rpdj4KLTxkaXYgY2xhc3M9aW1hZ2VDb250YWluZXIgZGF0YS1wcmVmaXg9 IiUocHJlZml4KXMiPkxvYWRpbmcuLi48L2Rpdj4KLTxzY3JpcHQ+Ci0oZnVuY3Rpb24oKSB7Ci0g ICAgdmFyIHByZWxvYWRlZEltYWdlQ291bnQgPSAwOwotICAgIGZ1bmN0aW9uIHByZWxvYWRDb21w bGV0ZSgpIHsKLSAgICAgICAgKytwcmVsb2FkZWRJbWFnZUNvdW50OwotICAgICAgICBpZiAocHJl bG9hZGVkSW1hZ2VDb3VudCA8IDIpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRvZ2ds ZUltYWdlcygpOwotICAgICAgICBzZXRJbnRlcnZhbCh0b2dnbGVJbWFnZXMsIDIwMDApCi0gICAg fQotCi0gICAgZnVuY3Rpb24gcHJlbG9hZEltYWdlKHVybCkgewotICAgICAgICBpbWFnZSA9IG5l dyBJbWFnZSgpOwotICAgICAgICBpbWFnZS5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgcHJlbG9h ZENvbXBsZXRlKTsKLSAgICAgICAgaW1hZ2Uuc3JjID0gdXJsOwotICAgICAgICByZXR1cm4gaW1h Z2U7Ci0gICAgfQotCi0gICAgZnVuY3Rpb24gdG9nZ2xlSW1hZ2VzKCkgewotICAgICAgICBpZiAo dGV4dC50ZXh0Q29udGVudCA9PSAnRXhwZWN0ZWQgSW1hZ2UnKSB7Ci0gICAgICAgICAgICB0ZXh0 LnRleHRDb250ZW50ID0gJ0FjdHVhbCBJbWFnZSc7Ci0gICAgICAgICAgICBjb250YWluZXIucmVw bGFjZUNoaWxkKGFjdHVhbEltYWdlLCBjb250YWluZXIuZmlyc3RDaGlsZCk7Ci0gICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICB0ZXh0LnRleHRDb250ZW50ID0gJ0V4cGVjdGVkIEltYWdlJzsK LSAgICAgICAgICAgIGNvbnRhaW5lci5yZXBsYWNlQ2hpbGQoZXhwZWN0ZWRJbWFnZSwgY29udGFp bmVyLmZpcnN0Q2hpbGQpOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgdmFyIHRleHQgPSBkb2N1 bWVudC5xdWVyeVNlbGVjdG9yKCcuaW1hZ2VUZXh0Jyk7Ci0gICAgdmFyIGNvbnRhaW5lciA9IGRv Y3VtZW50LnF1ZXJ5U2VsZWN0b3IoJy5pbWFnZUNvbnRhaW5lcicpOwotICAgIHZhciBhY3R1YWxJ bWFnZSA9IHByZWxvYWRJbWFnZShjb250YWluZXIuZ2V0QXR0cmlidXRlKCdkYXRhLXByZWZpeCcp ICsgJy1hY3R1YWwucG5nJyk7Ci0gICAgdmFyIGV4cGVjdGVkSW1hZ2UgPSBwcmVsb2FkSW1hZ2Uo Y29udGFpbmVyLmdldEF0dHJpYnV0ZSgnZGF0YS1wcmVmaXgnKSArICctZXhwZWN0ZWQucG5nJyk7 Ci19KSgpOwotPC9zY3JpcHQ+Ci08L2JvZHk+Ci08L2h0bWw+Ci0iIiIgJSB7CisgICAgICAgIGh0 bWwgPSBpbWFnZV9kaWZmX2ZpbGUgJSB7CiAgICAgICAgICAgICAndGl0bGUnOiBzZWxmLl90ZXN0 X25hbWUsCiAgICAgICAgICAgICAnZGlmZl9maWxlbmFtZSc6IHNlbGYuX291dHB1dF90ZXN0bmFt ZShzZWxmLkZJTEVOQU1FX1NVRkZJWF9JTUFHRV9ESUZGKSwKICAgICAgICAgICAgICdwcmVmaXgn OiBzZWxmLl9vdXRwdXRfdGVzdG5hbWUoJycpLAogICAgICAgICB9CisKKyAgICAgICAgZGlmZnNf aHRtbF9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKHNlbGYuRklMRU5BTUVfU1VGRklY X0lNQUdFX0RJRkZTX0hUTUwpCiAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9m aWxlKGRpZmZzX2h0bWxfZmlsZW5hbWUsIGh0bWwpCiAKICAgICBkZWYgd3JpdGVfcmVmdGVzdChz ZWxmLCBzcmNfZmlsZXBhdGgpOgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDk4NGFiNDFlOGFjOWQ4Yjk3YjRiYjQxNDdlZWVh MDhkNjM4ZjY3MTAuLjA0YWYzNWNiZTk3ZmZhODViOTU0NjFkMDVkODIzYTY5NjhlOTgxNzkgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsNSArMSwxOCBAQAogMjAxNC0wOC0wOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBMb2FkIHRoZSBsYXlvdXQgdGVzdCByZXN1bHQgaW1h Z2UgZGlmZiBIVE1MIGZyb20gYSBmaWxlLCByYXRoZXIgdGhhbiBoYXZpbmcgaXQgaW5saW5lIGlu IHdlYmtpdHB5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzU3ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAg CisgICAgICAgIEFkZCBpbWFnZS1kaWZmLXRlbXBsYXRlLmh0bWwgYW5kIGV4cGVjdGVkIHJlc3Vs dCAoY3JhenksIGJ1dCB0aGlzIGlzIHdoYXQgd2UgZG8KKyAgICAgICAgZm9yIHJlc3VsdHMuaHRt bCB0b28pLgorCisgICAgICAgICogZmFzdC9oYXJuZXNzL2ltYWdlLWRpZmYtdGVtcGxhdGUtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2hhcm5lc3MvaW1hZ2UtZGlmZi10ZW1w bGF0ZS5odG1sOiBBZGRlZC4KKworMjAxNC0wOC0wOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBbV0syXSBTY3JvbGxpbmcgZG9lcyBub3Qgd29yayBp bnNpZGUgbmVzdGVkIGZyYW1lcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM1Nzc1CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzk1OTg5Nj4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaGFybmVzcy9pbWFnZS1kaWZmLXRlbXBsYXRlLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvaGFybmVzcy9pbWFnZS1kaWZmLXRlbXBsYXRl LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44MjY5OWIzZmQ5YzRhMWI3NDJkOGNiY2VmNzc5N2Yx ODYwMDcwYmUzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL2lt YWdlLWRpZmYtdGVtcGxhdGUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMiBAQAorRGlmZmVyZW5j ZSBiZXR3ZWVuIGltYWdlczogZGlmZgorTG9hZGluZy4uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9oYXJuZXNzL2ltYWdlLWRpZmYtdGVtcGxhdGUuaHRtbCBiL0xheW91dFRlc3RzL2Zh c3QvaGFybmVzcy9pbWFnZS1kaWZmLXRlbXBsYXRlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDJjZjkxM2M0 YmYxZGQ0ZDFmZWNhYWE1MDQ4ZGE1ZDk0MzZhYTRmOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvaGFybmVzcy9pbWFnZS1kaWZmLXRlbXBsYXRlLmh0bWwKQEAgLTAsMCArMSw0 OCBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPiUodGl0bGUpczwv dGl0bGU+Cis8c3R5bGU+LmxhYmVse2ZvbnQtd2VpZ2h0OmJvbGR9PC9zdHlsZT4KKzwvaGVhZD4K Kzxib2R5PgorRGlmZmVyZW5jZSBiZXR3ZWVuIGltYWdlczogPGEgaHJlZj0iJShkaWZmX2ZpbGVu YW1lKXMiPmRpZmY8L2E+PGJyPgorPGRpdiBjbGFzcz1pbWFnZVRleHQ+PC9kaXY+Cis8ZGl2IGNs YXNzPWltYWdlQ29udGFpbmVyIGRhdGEtcHJlZml4PSIlKHByZWZpeClzIj5Mb2FkaW5nLi4uPC9k aXY+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVt cEFzVGV4dCgpOworKGZ1bmN0aW9uKCkgewordmFyIHByZWxvYWRlZEltYWdlQ291bnQgPSAwOwor ZnVuY3Rpb24gcHJlbG9hZENvbXBsZXRlKCkgeworKytwcmVsb2FkZWRJbWFnZUNvdW50OworaWYg KHByZWxvYWRlZEltYWdlQ291bnQgPCAyKQorICAgIHJldHVybjsKK3RvZ2dsZUltYWdlcygpOwor c2V0SW50ZXJ2YWwodG9nZ2xlSW1hZ2VzLCAyMDAwKQorfQorCitmdW5jdGlvbiBwcmVsb2FkSW1h Z2UodXJsKSB7CitpbWFnZSA9IG5ldyBJbWFnZSgpOworaW1hZ2UuYWRkRXZlbnRMaXN0ZW5lcign bG9hZCcsIHByZWxvYWRDb21wbGV0ZSk7CitpbWFnZS5zcmMgPSB1cmw7CityZXR1cm4gaW1hZ2U7 Cit9CisKK2Z1bmN0aW9uIHRvZ2dsZUltYWdlcygpIHsKK2lmICh0ZXh0LnRleHRDb250ZW50ID09 ICdFeHBlY3RlZCBJbWFnZScpIHsKKyAgICB0ZXh0LnRleHRDb250ZW50ID0gJ0FjdHVhbCBJbWFn ZSc7CisgICAgY29udGFpbmVyLnJlcGxhY2VDaGlsZChhY3R1YWxJbWFnZSwgY29udGFpbmVyLmZp cnN0Q2hpbGQpOworfSBlbHNlIHsKKyAgICB0ZXh0LnRleHRDb250ZW50ID0gJ0V4cGVjdGVkIElt YWdlJzsKKyAgICBjb250YWluZXIucmVwbGFjZUNoaWxkKGV4cGVjdGVkSW1hZ2UsIGNvbnRhaW5l ci5maXJzdENoaWxkKTsKK30KK30KKwordmFyIHRleHQgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9y KCcuaW1hZ2VUZXh0Jyk7Cit2YXIgY29udGFpbmVyID0gZG9jdW1lbnQucXVlcnlTZWxlY3Rvcign LmltYWdlQ29udGFpbmVyJyk7Cit2YXIgYWN0dWFsSW1hZ2UgPSBwcmVsb2FkSW1hZ2UoY29udGFp bmVyLmdldEF0dHJpYnV0ZSgnZGF0YS1wcmVmaXgnKSArICctYWN0dWFsLnBuZycpOwordmFyIGV4 cGVjdGVkSW1hZ2UgPSBwcmVsb2FkSW1hZ2UoY29udGFpbmVyLmdldEF0dHJpYnV0ZSgnZGF0YS1w cmVmaXgnKSArICctZXhwZWN0ZWQucG5nJyk7Cit9KSgpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8 L2h0bWw+Cg==