75998 2012-01-10 15:26:53 -0800 line height test for CSS3 calc 2012-01-11 15:27:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 16662 1 mikelawther mikelawther dbates webkit.review.bot oldest_to_newest 533414 0 mikelawther 2012-01-10 15:26:53 -0800 line height test for CSS3 calc 533415 1 121919 mikelawther 2012-01-10 15:29:15 -0800 Created attachment 121919 Patch 533417 2 121920 mikelawther 2012-01-10 15:33:39 -0800 Created attachment 121920 Patch 533504 3 121920 dbates 2012-01-10 17:12:20 -0800 Comment on attachment 121920 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121920&action=review For completeness, you may want to consider looking into using LayoutTests/fast/js/resources/js-test-{pre, post}.js, which provide convenience functions for writing PASS/FAIL tests. > LayoutTests/css3/calc/line-height-expected.txt:3 > +The line height of these lines should be identical > +The line height of these lines should be identical > +The line height of these lines should be identical I suggest that we omit this text when the test is run using DRT so as to make the expected results straight forward to interpret for PASS/FAIL. An example of a test case that omits such support text when run using DRT is <http://trac.webkit.org/browser/trunk/LayoutTests/fast/css/button-height.html>. Notice, when button-height.html is run in DRT (i.e. window.layoutTestController exists) it removes the element with id "test-container", which contains the test text/support structures. > LayoutTests/css3/calc/line-height-expected.txt:5 > +FAIL > +Computed line heights do not match: 32px, normal, normal I suggest concatenating these two lines such that line 4 prefixes line 5 since line 5 describes the failure alluded to by line 4. > LayoutTests/css3/calc/line-height.html:27 > + if (heights.length != 0) Nit: I would write this as: if (heights.length) ... 533629 4 121974 mikelawther 2012-01-10 21:56:01 -0800 Created attachment 121974 Patch 533630 5 mikelawther 2012-01-10 21:58:20 -0800 Hi Daniel - thanks for the review. I've rewritten the test to use js-test-{pre, post}. 533654 6 121974 dbates 2012-01-10 22:51:35 -0800 Comment on attachment 121974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121974&action=review Thanks Mike for the updated patch! This looks good. I have some minor nits. > LayoutTests/css3/calc/line-height.html:4 > + span { font-size: 16px;} Nit: The spacing in this line is inconsistent with the spacing used in the lines below. In particular, the curly braces on this line aren't aligned with the curly braces of subsequent lines. I prefer a single space between the identifier and the '{'. Regardless, I suggest that we choose a notation and stick with it so as to be consistent. > LayoutTests/css3/calc/line-height.html:18 > + if (window.layoutTestController) > + layoutTestController.dumpAsText(); Nit: This is unnecessary by line 2 of LayoutTests/fast/js/resources/js-test-pre.js, <http://trac.webkit.org/browser/trunk/LayoutTests/fast/js/resources/js-test-pre.js?rev=102918#L2>. 534301 7 122102 mikelawther 2012-01-11 15:06:10 -0800 Created attachment 122102 Patch for landing 534304 8 121974 mikelawther 2012-01-11 15:09:15 -0800 Comment on attachment 121974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121974&action=review >> LayoutTests/css3/calc/line-height.html:4 >> + span { font-size: 16px;} > > Nit: The spacing in this line is inconsistent with the spacing used in the lines below. In particular, the curly braces on this line aren't aligned with the curly braces of subsequent lines. I prefer a single space between the identifier and the '{'. Regardless, I suggest that we choose a notation and stick with it so as to be consistent. Done. >> LayoutTests/css3/calc/line-height.html:18 >> + layoutTestController.dumpAsText(); > > Nit: This is unnecessary by line 2 of LayoutTests/fast/js/resources/js-test-pre.js, <http://trac.webkit.org/browser/trunk/LayoutTests/fast/js/resources/js-test-pre.js?rev=102918#L2>. Done. 534334 9 122102 webkit.review.bot 2012-01-11 15:27:44 -0800 Comment on attachment 122102 Patch for landing Clearing flags on attachment: 122102 Committed r104752: <http://trac.webkit.org/changeset/104752> 534335 10 webkit.review.bot 2012-01-11 15:27:48 -0800 All reviewed patches have been landed. Closing bug. 121919 2012-01-10 15:29:15 -0800 2012-01-10 15:33:32 -0800 Patch bug-75998-20120111102913.patch text/plain 3326 mikelawther U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDEyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDhiYzYxYjI1Y2ZlNzI4ZTQ5NDM5 Y2Y0NWExYjUxYTc4MmM3ODM3Mi4uMzczNWIxZGExZDg0YzYxNjlkNWNiM2QwNjM1MGIwZTIwZTMw NjI0MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTEwICBNaWtlIExhd3RoZXIgIDxt aWtlbGF3dGhlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbGluZSBoZWlnaHQgdGVzdCBmb3Ig Q1NTMyBjYWxjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NTk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3RzIGZvciBmdXR1cmUgaW1wbGVtZW50YXRpb24gb2YgQ1NTMyBjYWxjKCkgKHNlZSBodHRw Oi8vd2Via2l0Lm9yZy9iLzE2NjYyKQorCisgICAgICAgIFRoZXNlIHRlc3RzIGFyZSBleHBlY3Rl ZCB0byAnZmFpbCcsIGFuZCB3aWxsIHBhc3Mgb25jZSBjYWxjKCkgZnVuY3Rpb25hbGl0eSBpcyBs YW5kZWQuCisgICAgICAgIEZvciBub3csIHRoZXkgc2VydmUgdG8gZGVtb25zdHJhdGUgdGhhdCB0 aGUgY3VycmVudCBjb2RlIGRvZXNuJ3QgY3Jhc2ggb24gdGhlc2UgdGVzdHMuCisKKyAgICAgICAg KiBjc3MzL2NhbGMvbGluZS1oZWlnaHQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBj c3MzL2NhbGMvbGluZS1oZWlnaHQuaHRtbDogQWRkZWQuCisKIDIwMTItMDEtMDggIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxMDQ0MDMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2NhbGMv bGluZS1oZWlnaHQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xpbmUtaGVp Z2h0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zZDY1MGRjYTlmZTBiZjdjY2U2MzQwMzZlMGJh NjA3MTc0YWVmNDgwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xp bmUtaGVpZ2h0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1RoZSBsaW5lIGhlaWdodCBv ZiB0aGVzZSBsaW5lcyBzaG91bGQgYmUgaWRlbnRpY2FsCitUaGUgbGluZSBoZWlnaHQgb2YgdGhl c2UgbGluZXMgc2hvdWxkIGJlIGlkZW50aWNhbAorVGhlIGxpbmUgaGVpZ2h0IG9mIHRoZXNlIGxp bmVzIHNob3VsZCBiZSBpZGVudGljYWwKK0ZBSUwKK0NvbXB1dGVkIGxpbmUgaGVpZ2h0cyBkbyBu b3QgbWF0Y2g6IDMycHgsIG5vcm1hbCwgbm9ybWFsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9j c3MzL2NhbGMvbGluZS1oZWlnaHQuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9saW5lLWhl aWdodC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjExNmZkZjczMTRkZWI1N2ZiYTQxYjRiMmY2MTFiYWJkMjFk NTRhNGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbGluZS1oZWln aHQuaHRtbApAQCAtMCwwICsxLDQzIEBACis8RE9DVFlQRSBodG1sPgorPHN0eWxlPiAKKyAgICBz cGFuIHsgZm9udC1zaXplOiAxNnB4O30KKyAgICAjY29udHJvbCAgICAgICAgICAgICB7IGxpbmUt aGVpZ2h0OiAyMDAlOyB9CisgICAgI2NhbGMtcGVyY2VudCAgICAgICAgeyBsaW5lLWhlaWdodDog LXdlYmtpdC1jYWxjKDEwMCUgKiAyKTsgfQorICAgICNjYWxjLXBlcmNlbnQtcGl4ZWxzIHsgbGlu ZS1oZWlnaHQ6IC13ZWJraXQtY2FsYygxMDAlICsgMTZweCk7IH0KKzwvc3R5bGU+CisKKzxkaXY+ CisgICAgPHNwYW4gaWQ9ImNvbnRyb2wiPlRoZSBsaW5lIGhlaWdodCBvZiB0aGVzZSBsaW5lcyBz aG91bGQgYmUgaWRlbnRpY2FsPC9zcGFuPjxoci8+CisgICAgPHNwYW4gaWQ9ImNhbGMtcGVyY2Vu dCI+VGhlIGxpbmUgaGVpZ2h0IG9mIHRoZXNlIGxpbmVzIHNob3VsZCBiZSBpZGVudGljYWw8L3Nw YW4+PGhyLz4KKyAgICA8c3BhbiBpZD0iY2FsYy1wZXJjZW50LXBpeGVscyI+VGhlIGxpbmUgaGVp Z2h0IG9mIHRoZXNlIGxpbmVzIHNob3VsZCBiZSBpZGVudGljYWw8L3NwYW4+PGhyLz4KKzwvZGl2 PgorPGRpdiBpZD0icmVzdWx0cyI+PC9kaXY+CisKKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5s YXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFz VGV4dCgpOworICAgIHZhciBjb250cm9sSGVpZ2h0ID0gZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgiY29udHJvbCIpLCBudWxsKS5saW5lSGVpZ2h0OworICAgIHZhciBo ZWlnaHRzID0gIiI7CisKKyAgICB2YXIgc3BhbnMgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFn TmFtZSgic3BhbiIpOworICAgIHZhciBzYW1lSGVpZ2h0ID0gdHJ1ZTsKKyAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHNwYW5zLmxlbmd0aDsgKytpKSB7CisgICAgICAgIHZhciBjdXJyZW50ID0gc3Bh bnNbaV07CisgICAgICAgIHZhciBjdXJyZW50SGVpZ2h0ID0gZ2V0Q29tcHV0ZWRTdHlsZShjdXJy ZW50LCBudWxsKS5saW5lSGVpZ2h0OworICAgICAgICBpZiAoaGVpZ2h0cy5sZW5ndGggIT0gMCkK KyAgICAgICAgICAgIGhlaWdodHMgPSBoZWlnaHRzICsgIiwgIjsKKyAgICAgICAgaGVpZ2h0cyA9 IGhlaWdodHMgKyBjdXJyZW50SGVpZ2h0OworICAgICAgICBpZiAoc2FtZUhlaWdodCkKKyAgICAg ICAgICAgIHNhbWVIZWlnaHQgPSBjdXJyZW50SGVpZ2h0ID09IGNvbnRyb2xIZWlnaHQ7CisgICAg fQorCisgICAgdmFyIHJlc3VsdHMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0cyIp OworICAgIGlmIChzYW1lSGVpZ2h0KSB7CisgICAgICAgIHJlc3VsdHMuc3R5bGUuY29sb3IgPSAi Z3JlZW4iOworICAgICAgICByZXN1bHRzLmlubmVySFRNTCA9ICJQQVNTIjsKKyAgICB9IGVsc2Ug eworICAgICAgICByZXN1bHRzLnN0eWxlLmNvbG9yID0gInJlZCI7CisgICAgICAgIHJlc3VsdHMu aW5uZXJIVE1MID0gIkZBSUwiOyAgICAKKyAgICAgICAgcmVzdWx0cy5pbm5lckhUTUwgKz0gIjxw PkNvbXB1dGVkIGxpbmUgaGVpZ2h0cyBkbyBub3QgbWF0Y2g6ICIgKyBoZWlnaHRzICsgIjwvcD4i OworICAgIH0KKzwvc2NyaXB0Pgo= 121920 2012-01-10 15:33:39 -0800 2012-01-10 21:55:54 -0800 Patch bug-75998-20120111103337.patch text/plain 3327 mikelawther U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDEyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDhiYzYxYjI1Y2ZlNzI4ZTQ5NDM5 Y2Y0NWExYjUxYTc4MmM3ODM3Mi4uMzczNWIxZGExZDg0YzYxNjlkNWNiM2QwNjM1MGIwZTIwZTMw NjI0MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTEwICBNaWtlIExhd3RoZXIgIDxt aWtlbGF3dGhlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbGluZSBoZWlnaHQgdGVzdCBmb3Ig Q1NTMyBjYWxjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NTk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3RzIGZvciBmdXR1cmUgaW1wbGVtZW50YXRpb24gb2YgQ1NTMyBjYWxjKCkgKHNlZSBodHRw Oi8vd2Via2l0Lm9yZy9iLzE2NjYyKQorCisgICAgICAgIFRoZXNlIHRlc3RzIGFyZSBleHBlY3Rl ZCB0byAnZmFpbCcsIGFuZCB3aWxsIHBhc3Mgb25jZSBjYWxjKCkgZnVuY3Rpb25hbGl0eSBpcyBs YW5kZWQuCisgICAgICAgIEZvciBub3csIHRoZXkgc2VydmUgdG8gZGVtb25zdHJhdGUgdGhhdCB0 aGUgY3VycmVudCBjb2RlIGRvZXNuJ3QgY3Jhc2ggb24gdGhlc2UgdGVzdHMuCisKKyAgICAgICAg KiBjc3MzL2NhbGMvbGluZS1oZWlnaHQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBj c3MzL2NhbGMvbGluZS1oZWlnaHQuaHRtbDogQWRkZWQuCisKIDIwMTItMDEtMDggIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxMDQ0MDMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2NhbGMv bGluZS1oZWlnaHQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xpbmUtaGVp Z2h0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zZDY1MGRjYTlmZTBiZjdjY2U2MzQwMzZlMGJh NjA3MTc0YWVmNDgwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xp bmUtaGVpZ2h0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1RoZSBsaW5lIGhlaWdodCBv ZiB0aGVzZSBsaW5lcyBzaG91bGQgYmUgaWRlbnRpY2FsCitUaGUgbGluZSBoZWlnaHQgb2YgdGhl c2UgbGluZXMgc2hvdWxkIGJlIGlkZW50aWNhbAorVGhlIGxpbmUgaGVpZ2h0IG9mIHRoZXNlIGxp bmVzIHNob3VsZCBiZSBpZGVudGljYWwKK0ZBSUwKK0NvbXB1dGVkIGxpbmUgaGVpZ2h0cyBkbyBu b3QgbWF0Y2g6IDMycHgsIG5vcm1hbCwgbm9ybWFsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9j c3MzL2NhbGMvbGluZS1oZWlnaHQuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9saW5lLWhl aWdodC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjcyZDM1YzIwZmUzYzlkZTBjZmZlNDE3YjAwZWFlZTk5YThm ZTY3MjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbGluZS1oZWln aHQuaHRtbApAQCAtMCwwICsxLDQzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4gCisgICAg c3BhbiB7IGZvbnQtc2l6ZTogMTZweDt9CisgICAgI2NvbnRyb2wgICAgICAgICAgICAgeyBsaW5l LWhlaWdodDogMjAwJTsgfQorICAgICNjYWxjLXBlcmNlbnQgICAgICAgIHsgbGluZS1oZWlnaHQ6 IC13ZWJraXQtY2FsYygxMDAlICogMik7IH0KKyAgICAjY2FsYy1wZXJjZW50LXBpeGVscyB7IGxp bmUtaGVpZ2h0OiAtd2Via2l0LWNhbGMoMTAwJSArIDE2cHgpOyB9Cis8L3N0eWxlPgorCis8ZGl2 PgorICAgIDxzcGFuIGlkPSJjb250cm9sIj5UaGUgbGluZSBoZWlnaHQgb2YgdGhlc2UgbGluZXMg c2hvdWxkIGJlIGlkZW50aWNhbDwvc3Bhbj48aHIvPgorICAgIDxzcGFuIGlkPSJjYWxjLXBlcmNl bnQiPlRoZSBsaW5lIGhlaWdodCBvZiB0aGVzZSBsaW5lcyBzaG91bGQgYmUgaWRlbnRpY2FsPC9z cGFuPjxoci8+CisgICAgPHNwYW4gaWQ9ImNhbGMtcGVyY2VudC1waXhlbHMiPlRoZSBsaW5lIGhl aWdodCBvZiB0aGVzZSBsaW5lcyBzaG91bGQgYmUgaWRlbnRpY2FsPC9zcGFuPjxoci8+Cis8L2Rp dj4KKzxkaXYgaWQ9InJlc3VsdHMiPjwvZGl2PgorCis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBB c1RleHQoKTsKKyAgICB2YXIgY29udHJvbEhlaWdodCA9IGdldENvbXB1dGVkU3R5bGUoZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImNvbnRyb2wiKSwgbnVsbCkubGluZUhlaWdodDsKKyAgICB2YXIg aGVpZ2h0cyA9ICIiOworCisgICAgdmFyIHNwYW5zID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRh Z05hbWUoInNwYW4iKTsKKyAgICB2YXIgc2FtZUhlaWdodCA9IHRydWU7CisgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBzcGFucy5sZW5ndGg7ICsraSkgeworICAgICAgICB2YXIgY3VycmVudCA9IHNw YW5zW2ldOworICAgICAgICB2YXIgY3VycmVudEhlaWdodCA9IGdldENvbXB1dGVkU3R5bGUoY3Vy cmVudCwgbnVsbCkubGluZUhlaWdodDsKKyAgICAgICAgaWYgKGhlaWdodHMubGVuZ3RoICE9IDAp CisgICAgICAgICAgICBoZWlnaHRzID0gaGVpZ2h0cyArICIsICI7CisgICAgICAgIGhlaWdodHMg PSBoZWlnaHRzICsgY3VycmVudEhlaWdodDsKKyAgICAgICAgaWYgKHNhbWVIZWlnaHQpCisgICAg ICAgICAgICBzYW1lSGVpZ2h0ID0gY3VycmVudEhlaWdodCA9PSBjb250cm9sSGVpZ2h0OworICAg IH0KKworICAgIHZhciByZXN1bHRzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdHMi KTsKKyAgICBpZiAoc2FtZUhlaWdodCkgeworICAgICAgICByZXN1bHRzLnN0eWxlLmNvbG9yID0g ImdyZWVuIjsKKyAgICAgICAgcmVzdWx0cy5pbm5lckhUTUwgPSAiUEFTUyI7CisgICAgfSBlbHNl IHsKKyAgICAgICAgcmVzdWx0cy5zdHlsZS5jb2xvciA9ICJyZWQiOworICAgICAgICByZXN1bHRz LmlubmVySFRNTCA9ICJGQUlMIjsgICAgCisgICAgICAgIHJlc3VsdHMuaW5uZXJIVE1MICs9ICI8 cD5Db21wdXRlZCBsaW5lIGhlaWdodHMgZG8gbm90IG1hdGNoOiAiICsgaGVpZ2h0cyArICI8L3A+ IjsKKyAgICB9Cis8L3NjcmlwdD4K 121974 2012-01-10 21:56:01 -0800 2012-01-11 15:09:15 -0800 Patch bug-75998-20120111165559.patch text/plain 3437 mikelawther U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDEyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDhiYzYxYjI1Y2ZlNzI4ZTQ5NDM5 Y2Y0NWExYjUxYTc4MmM3ODM3Mi4uMzczNWIxZGExZDg0YzYxNjlkNWNiM2QwNjM1MGIwZTIwZTMw NjI0MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTEwICBNaWtlIExhd3RoZXIgIDxt aWtlbGF3dGhlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbGluZSBoZWlnaHQgdGVzdCBmb3Ig Q1NTMyBjYWxjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NTk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3RzIGZvciBmdXR1cmUgaW1wbGVtZW50YXRpb24gb2YgQ1NTMyBjYWxjKCkgKHNlZSBodHRw Oi8vd2Via2l0Lm9yZy9iLzE2NjYyKQorCisgICAgICAgIFRoZXNlIHRlc3RzIGFyZSBleHBlY3Rl ZCB0byAnZmFpbCcsIGFuZCB3aWxsIHBhc3Mgb25jZSBjYWxjKCkgZnVuY3Rpb25hbGl0eSBpcyBs YW5kZWQuCisgICAgICAgIEZvciBub3csIHRoZXkgc2VydmUgdG8gZGVtb25zdHJhdGUgdGhhdCB0 aGUgY3VycmVudCBjb2RlIGRvZXNuJ3QgY3Jhc2ggb24gdGhlc2UgdGVzdHMuCisKKyAgICAgICAg KiBjc3MzL2NhbGMvbGluZS1oZWlnaHQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBj c3MzL2NhbGMvbGluZS1oZWlnaHQuaHRtbDogQWRkZWQuCisKIDIwMTItMDEtMDggIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxMDQ0MDMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2NhbGMv bGluZS1oZWlnaHQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xpbmUtaGVp Z2h0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lMTJkNTg0Yzc2MjQzYmE3NTRjN2I1N2U5Nzcz ODgxNjNmYzYzMWFjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xp bmUtaGVpZ2h0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBACitUZXN0cyB0aGF0IENTUzMg Y2FsYygpIGNhbiBiZSB1c2VkIGZvciB0aGUgbGluZS1oZWlnaHQgcHJvcGVydHkKKworT24gc3Vj Y2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQg YnkgIlRFU1QgQ09NUExFVEUiLgorCisKK0ZBSUwgZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiY2FsYy1wZXJjZW50IiksIG51bGwpLmxpbmVIZWlnaHQgc2hvdWxkIGJl IDMycHguIFdhcyBub3JtYWwuCitGQUlMIGdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImNhbGMtcGVyY2VudC1waXhlbHMiKSwgbnVsbCkubGluZUhlaWdodCBzaG91bGQg YmUgMzJweC4gV2FzIG5vcm1hbC4KK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKwor VEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbGluZS1o ZWlnaHQuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9saW5lLWhlaWdodC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjRmYmE2MDM3ZTg3OTZkOWZhNDNiYWRiOTVhODAyMjIwMWQyZmI5OGUKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbGluZS1oZWlnaHQuaHRtbApAQCAtMCww ICsxLDI5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jl c291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+IAorICAgIHNwYW4geyBm b250LXNpemU6IDE2cHg7fQorICAgICNjb250cm9sICAgICAgICAgICAgIHsgbGluZS1oZWlnaHQ6 IDIwMCU7IH0KKyAgICAjY2FsYy1wZXJjZW50ICAgICAgICB7IGxpbmUtaGVpZ2h0OiAtd2Via2l0 LWNhbGMoMTAwJSAqIDIpOyB9CisgICAgI2NhbGMtcGVyY2VudC1waXhlbHMgeyBsaW5lLWhlaWdo dDogLXdlYmtpdC1jYWxjKDEwMCUgKyAxNnB4KTsgfQorPC9zdHlsZT4KKzxkaXYgaWQ9InRlc3Qt Y29udGFpbmVyIj4KKyAgICA8c3BhbiBpZD0iY29udHJvbCI+VGhlIGxpbmUgaGVpZ2h0IG9mIHRo ZXNlIGxpbmVzIHNob3VsZCBiZSBpZGVudGljYWw8L3NwYW4+PGhyLz4KKyAgICA8c3BhbiBpZD0i Y2FsYy1wZXJjZW50Ij5UaGUgbGluZSBoZWlnaHQgb2YgdGhlc2UgbGluZXMgc2hvdWxkIGJlIGlk ZW50aWNhbDwvc3Bhbj48aHIvPgorICAgIDxzcGFuIGlkPSJjYWxjLXBlcmNlbnQtcGl4ZWxzIj5U aGUgbGluZSBoZWlnaHQgb2YgdGhlc2UgbGluZXMgc2hvdWxkIGJlIGlkZW50aWNhbDwvc3Bhbj48 aHIvPgorPC9kaXY+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJUZXN0cyB0aGF0IENTUzMg Y2FsYygpIGNhbiBiZSB1c2VkIGZvciB0aGUgbGluZS1oZWlnaHQgcHJvcGVydHkiKTsKKworICAg IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250 cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgCisgICAgc2hvdWxkRXZhbHVhdGVUbygnZ2V0 Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FsYy1wZXJjZW50IiksIG51 bGwpLmxpbmVIZWlnaHQnLCAnZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgiY29udHJvbCIpLCBudWxsKS5saW5lSGVpZ2h0Jyk7CisgICAgc2hvdWxkRXZhbHVhdGVUbygn Z2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FsYy1wZXJjZW50LXBp eGVscyIpLCBudWxsKS5saW5lSGVpZ2h0JywgJ2dldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImNvbnRyb2wiKSwgbnVsbCkubGluZUhlaWdodCcpOworCisgICAgaWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICB2YXIgdGVzdENvbnRhaW5lciA9 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0LWNvbnRhaW5lciIpOworICAgICAgICBpZiAo dGVzdENvbnRhaW5lcikKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQodGVz dENvbnRhaW5lcik7ICAgCisgICAgfSAgICAKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+ClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQo= 122102 2012-01-11 15:06:10 -0800 2012-01-11 15:27:44 -0800 Patch for landing bug-75998-20120112100608.patch text/plain 3325 mikelawther U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDEyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDhiYzYxYjI1Y2ZlNzI4ZTQ5NDM5 Y2Y0NWExYjUxYTc4MmM3ODM3Mi4uZWM4ODlmMDcxOGVhNTY3ZmZkMzkwYmRkYmUwMjBjZmFjYTdh YTMyYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTEwICBNaWtlIExhd3RoZXIgIDxt aWtlbGF3dGhlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgbGluZSBoZWlnaHQgdGVzdCBmb3Ig Q1NTMyBjYWxjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NTk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRlcy4KKworICAgICAgICBU ZXN0cyBmb3IgZnV0dXJlIGltcGxlbWVudGF0aW9uIG9mIENTUzMgY2FsYygpIChzZWUgaHR0cDov L3dlYmtpdC5vcmcvYi8xNjY2MikKKworICAgICAgICBUaGVzZSB0ZXN0cyBhcmUgZXhwZWN0ZWQg dG8gJ2ZhaWwnLCBhbmQgd2lsbCBwYXNzIG9uY2UgY2FsYygpIGZ1bmN0aW9uYWxpdHkgaXMgbGFu ZGVkLgorICAgICAgICBGb3Igbm93LCB0aGV5IHNlcnZlIHRvIGRlbW9uc3RyYXRlIHRoYXQgdGhl IGN1cnJlbnQgY29kZSBkb2Vzbid0IGNyYXNoIG9uIHRoZXNlIHRlc3RzLgorCisgICAgICAgICog Y3NzMy9jYWxjL2xpbmUtaGVpZ2h0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY3Nz My9jYWxjL2xpbmUtaGVpZ2h0Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTAxLTA4ICBTaGVyaWZmIEJv dCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBy b2xsaW5nIG91dCByMTA0NDAzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xp bmUtaGVpZ2h0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9saW5lLWhlaWdo dC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTEyZDU4NGM3NjI0M2JhNzU0YzdiNTdlOTc3Mzg4 MTYzZmM2MzFhYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvY2FsYy9saW5l LWhlaWdodC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorVGVzdHMgdGhhdCBDU1MzIGNh bGMoKSBjYW4gYmUgdXNlZCBmb3IgdGhlIGxpbmUtaGVpZ2h0IHByb3BlcnR5CisKK09uIHN1Y2Nl c3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5 ICJURVNUIENPTVBMRVRFIi4KKworCitGQUlMIGdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImNhbGMtcGVyY2VudCIpLCBudWxsKS5saW5lSGVpZ2h0IHNob3VsZCBiZSAz MnB4LiBXYXMgbm9ybWFsLgorRkFJTCBnZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJjYWxjLXBlcmNlbnQtcGl4ZWxzIiksIG51bGwpLmxpbmVIZWlnaHQgc2hvdWxkIGJl IDMycHguIFdhcyBub3JtYWwuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xpbmUtaGVp Z2h0Lmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL2NhbGMvbGluZS1oZWlnaHQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi45NzExNDk4ZDcxNzU3ZDk3MGFhMDFhNGZiM2JlZmY5NWZkNWNlMjFiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9jYWxjL2xpbmUtaGVpZ2h0Lmh0bWwKQEAgLTAsMCAr MSwyNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9qcy9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHN0eWxlPiAKKyAgICBzcGFuIHsgZm9u dC1zaXplOiAxNnB4OyB9CisgICAgI2NvbnRyb2wgeyBsaW5lLWhlaWdodDogMjAwJTsgfQorICAg ICNjYWxjLXBlcmNlbnQgeyBsaW5lLWhlaWdodDogLXdlYmtpdC1jYWxjKDEwMCUgKiAyKTsgfQor ICAgICNjYWxjLXBlcmNlbnQtcGl4ZWxzIHsgbGluZS1oZWlnaHQ6IC13ZWJraXQtY2FsYygxMDAl ICsgMTZweCk7IH0KKzwvc3R5bGU+Cis8ZGl2IGlkPSJ0ZXN0LWNvbnRhaW5lciI+CisgICAgPHNw YW4gaWQ9ImNvbnRyb2wiPlRoZSBsaW5lIGhlaWdodCBvZiB0aGVzZSBsaW5lcyBzaG91bGQgYmUg aWRlbnRpY2FsPC9zcGFuPjxoci8+CisgICAgPHNwYW4gaWQ9ImNhbGMtcGVyY2VudCI+VGhlIGxp bmUgaGVpZ2h0IG9mIHRoZXNlIGxpbmVzIHNob3VsZCBiZSBpZGVudGljYWw8L3NwYW4+PGhyLz4K KyAgICA8c3BhbiBpZD0iY2FsYy1wZXJjZW50LXBpeGVscyI+VGhlIGxpbmUgaGVpZ2h0IG9mIHRo ZXNlIGxpbmVzIHNob3VsZCBiZSBpZGVudGljYWw8L3NwYW4+PGhyLz4KKzwvZGl2PgorPHNjcmlw dD4KKyAgICBkZXNjcmlwdGlvbigiVGVzdHMgdGhhdCBDU1MzIGNhbGMoKSBjYW4gYmUgdXNlZCBm b3IgdGhlIGxpbmUtaGVpZ2h0IHByb3BlcnR5Iik7CisKKyAgICBzaG91bGRFdmFsdWF0ZVRvKCdn ZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjYWxjLXBlcmNlbnQiKSwg bnVsbCkubGluZUhlaWdodCcsICdnZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJjb250cm9sIiksIG51bGwpLmxpbmVIZWlnaHQnKTsKKyAgICBzaG91bGRFdmFsdWF0ZVRv KCdnZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjYWxjLXBlcmNlbnQt cGl4ZWxzIiksIG51bGwpLmxpbmVIZWlnaHQnLCAnZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgiY29udHJvbCIpLCBudWxsKS5saW5lSGVpZ2h0Jyk7CisKKyAgICBpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgIHZhciB0ZXN0Q29udGFpbmVy ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3QtY29udGFpbmVyIik7CisgICAgICAgIGlm ICh0ZXN0Q29udGFpbmVyKQorICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZCh0 ZXN0Q29udGFpbmVyKTsgICAKKyAgICB9ICAgIAorPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4v Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KXCBObyBuZXds aW5lIGF0IGVuZCBvZiBmaWxlCg==