42668 2010-07-20 14:25:42 -0700 Fix fast/dom/title-content-write-set.html for HTML5 tree builder 2010-07-20 16:03:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 abarth abarth commit-queue eric oldest_to_newest 253912 0 abarth 2010-07-20 14:25:42 -0700 Fix fast/dom/title-content-write-set.html for HTML5 tree builder 253925 1 62113 abarth 2010-07-20 14:36:12 -0700 Created attachment 62113 Patch 253934 2 62113 darin 2010-07-20 14:50:49 -0700 Comment on attachment 62113 Patch > -PassRefPtr<StringImpl> CharacterData::parserAppendData(const String& arg) > +PassRefPtr<StringImpl> CharacterData::appendDataCommon(const String& arg) > +void CharacterData::parserAppendData(const String& arg) > + PassRefPtr<StringImpl> appendDataCommon(const String& arg); Please omit the name "arg" here. It doesn't add anything. 253935 3 62113 darin 2010-07-20 14:51:18 -0700 Comment on attachment 62113 Patch > -PassRefPtr<StringImpl> CharacterData::parserAppendData(const String& arg) > +PassRefPtr<StringImpl> CharacterData::appendDataCommon(const String& arg) > +void CharacterData::parserAppendData(const String& arg) I meant to say. Are you willing to use a word, such as "data" here, instead of an abbreviation, "arg"? 253936 4 62113 eric 2010-07-20 14:51:36 -0700 Comment on attachment 62113 Patch It seems the main cause of this bug is that dispatchModifiedEvent has a bad name. It really should say something about calling childrenChanged, or be split into two functions or something. 253941 5 abarth 2010-07-20 15:00:13 -0700 > I meant to say. Are you willing to use a word, such as "data" here, instead of an abbreviation, "arg"? Yeah, data is a better name. I brought the name forward from the code originally with out thinking about it. 253956 6 62121 abarth 2010-07-20 15:11:20 -0700 Created attachment 62121 Patch for landing 253959 7 62113 commit-queue 2010-07-20 15:12:34 -0700 Comment on attachment 62113 Patch Clearing flags on attachment: 62113 Committed r63779: <http://trac.webkit.org/changeset/63779> 253960 8 commit-queue 2010-07-20 15:12:38 -0700 All reviewed patches have been landed. Closing bug. 253965 9 abarth 2010-07-20 15:13:42 -0700 Darn, the commit bot picked up the patch before I removed cq+. I'll land a followup patch. 253981 10 62122 abarth 2010-07-20 15:18:01 -0700 Created attachment 62122 Patch for landing 253985 11 abarth 2010-07-20 15:18:42 -0700 Reopening so the commit bot can land the updated patch. 254043 12 62122 commit-queue 2010-07-20 16:03:08 -0700 Comment on attachment 62122 Patch for landing Clearing flags on attachment: 62122 Committed r63782: <http://trac.webkit.org/changeset/63782> 254045 13 commit-queue 2010-07-20 16:03:13 -0700 All reviewed patches have been landed. Closing bug. 62113 2010-07-20 14:36:12 -0700 2010-07-20 15:12:34 -0700 Patch bug-42668-20100720143611.patch text/plain 3139 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjQ0ZjdmMTc3YjEzZTcxYmMzZjY2ZDU5OGQ5YWNhMGZlMDQwYTZmNy4uM2U1N2M4ZDgxYzkzNzM5 YjFjN2QwZDU0ZjY3YzZlYzFiOWZkOThjYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMyBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIEZpeCBmYXN0L2RvbS90aXRsZS1jb250 ZW50LXdyaXRlLXNldC5odG1sIGZvciBIVE1MNSB0cmVlIGJ1aWxkZXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNjY4CisKKyAgICAgICAgV2hlbiBJ IHNwbGl0IHBhcnNlckFwcGVuZERhdGEgZnJvbSBhcHBlbmREYXRhLCBpdCB3YXMgdGVtcHRpbmcg dG8gY3V0CisgICAgICAgIHRoZSBmdW5jdGlvbiBhdCBkaXNwYXRjaE1vZGlmaWVkRXZlbnQsIGJ1 dCB0aGF0J3Mgbm90IHF1aXRlIHJpZ2h0LiAgV2UKKyAgICAgICAgc3RpbGwgbmVlZCB0byBub3Rp ZnkgdGhlIHBhcmVudCB0aGF0IGl0J3MgY2hpbGRyZW4gaGF2ZSBjaGFuZ2VkLgorCisgICAgICAg ICogZG9tL0NoYXJhY3RlckRhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hhcmFjdGVyRGF0 YTo6YXBwZW5kRGF0YUNvbW1vbik6CisgICAgICAgIChXZWJDb3JlOjpDaGFyYWN0ZXJEYXRhOjpw YXJzZXJBcHBlbmREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNoYXJhY3RlckRhdGE6OmFwcGVu ZERhdGEpOgorICAgICAgICAqIGRvbS9DaGFyYWN0ZXJEYXRhLmg6CisKKzIwMTAtMDctMjAgIEFk YW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKwogICAgICAgICBIVE1MNSB0cmVlIGJ1aWxkZXIgbmVlZHMgdG8gY2FsbCBk aXNwYXRjaERvY3VtZW50RWxlbWVudEF2YWlsYWJsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI2NTQKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20v Q2hhcmFjdGVyRGF0YS5jcHAgYi9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmNwcAppbmRleCA1 ZmJiNmYyMTBlNmRlYTljNGZkZTYzY2E3ZTM3NDUzMGJkMGQ4Mzg3Li40MDgyODFlOWI2MzJiNWQ4 NzY1NDcwNDUzMDA1ZTRjYzVmZDE0NzAxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9DaGFyYWN0 ZXJEYXRhLmNwcAorKysgYi9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmNwcApAQCAtNTksNyAr NTksNyBAQCBTdHJpbmcgQ2hhcmFjdGVyRGF0YTo6c3Vic3RyaW5nRGF0YSh1bnNpZ25lZCBvZmZz ZXQsIHVuc2lnbmVkIGNvdW50LCBFeGNlcHRpb25DbwogICAgIHJldHVybiBtX2RhdGEtPnN1YnN0 cmluZyhvZmZzZXQsIGNvdW50KTsKIH0KIAotUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBDaGFyYWN0 ZXJEYXRhOjpwYXJzZXJBcHBlbmREYXRhKGNvbnN0IFN0cmluZyYgYXJnKQorUGFzc1JlZlB0cjxT dHJpbmdJbXBsPiBDaGFyYWN0ZXJEYXRhOjphcHBlbmREYXRhQ29tbW9uKGNvbnN0IFN0cmluZyYg YXJnKQogewogICAgIFN0cmluZyBuZXdTdHIgPSBtX2RhdGE7CiAgICAgbmV3U3RyLmFwcGVuZChh cmcpOwpAQCAtNzYsOSArNzYsMTggQEAgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBDaGFyYWN0ZXJE YXRhOjpwYXJzZXJBcHBlbmREYXRhKGNvbnN0IFN0cmluZyYgYXJnKQogICAgIHJldHVybiBvbGRT dHIucmVsZWFzZSgpOwogfQogCit2b2lkIENoYXJhY3RlckRhdGE6OnBhcnNlckFwcGVuZERhdGEo Y29uc3QgU3RyaW5nJiBhcmcpCit7CisgICAgYXBwZW5kRGF0YUNvbW1vbihhcmcpOworICAgIC8v IFdlIGRvbid0IGNhbGwgZGlzcGF0Y2hNb2RpZmllZEV2ZW50IGhlcmUgYmVjYXVzZSB3ZSBkb24n dCB3YW50IHRoZQorICAgIC8vIHBhcnNlciB0byBkaXNwYXRjaCBET00gbXV0YXRpb24gZXZlbnRz LgorICAgIGlmIChwYXJlbnROb2RlKCkpCisgICAgICAgIHBhcmVudE5vZGUoKS0+Y2hpbGRyZW5D aGFuZ2VkKCk7Cit9CisKIHZvaWQgQ2hhcmFjdGVyRGF0YTo6YXBwZW5kRGF0YShjb25zdCBTdHJp bmcmIGFyZywgRXhjZXB0aW9uQ29kZSYpCiB7Ci0gICAgUmVmUHRyPFN0cmluZ0ltcGw+IG9sZFN0 ciA9IHBhcnNlckFwcGVuZERhdGEoYXJnKTsKKyAgICBSZWZQdHI8U3RyaW5nSW1wbD4gb2xkU3Ry ID0gYXBwZW5kRGF0YUNvbW1vbihhcmcpOwogICAgIGRpc3BhdGNoTW9kaWZpZWRFdmVudChvbGRT dHIuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmgg Yi9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmgKaW5kZXggZWNjMGNmNzliZjAzODk3YjJmZjlh NGJhOThlYTFkZjE4YzVlOTg1MS4uMDNmMzVjYTQxNTVkYzhjNTg5NDExNGI2Nzg0Yjk1MmQ0ODE2 ZGVlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0YS5oCisrKyBiL1dlYkNv cmUvZG9tL0NoYXJhY3RlckRhdGEuaApAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAgICAgU3Ry aW5nSW1wbCogZGF0YUltcGwoKSB7IHJldHVybiBtX2RhdGEuZ2V0KCk7IH0KIAogICAgIC8vIExp a2UgYXBwZW5kRGF0YSwgYnV0IG9wdGltaXplZCBmb3IgdGhlIHBhcnNlciAoZS5nLiwgbm8gbXV0 YXRpb24gZXZlbnRzKS4KLSAgICBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IHBhcnNlckFwcGVuZERh dGEoY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBwYXJzZXJBcHBlbmREYXRhKGNvbnN0IFN0cmlu ZyYpOwogCiBwcm90ZWN0ZWQ6CiAgICAgQ2hhcmFjdGVyRGF0YShEb2N1bWVudCogZG9jdW1lbnQs IGNvbnN0IFN0cmluZyYgdGV4dCwgQ29uc3RydWN0aW9uVHlwZSB0eXBlKQpAQCAtNjYsNiArNjYs NyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBvZmZzZXRJbkNoYXJhY3RlcnMoKSBjb25z dDsKIAogICAgIHZvaWQgY2hlY2tDaGFyRGF0YU9wZXJhdGlvbih1bnNpZ25lZCBvZmZzZXQsIEV4 Y2VwdGlvbkNvZGUmKTsKKyAgICBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IGFwcGVuZERhdGFDb21t b24oY29uc3QgU3RyaW5nJiBhcmcpOwogCiAgICAgUmVmUHRyPFN0cmluZ0ltcGw+IG1fZGF0YTsK IH07Cg== 62121 2010-07-20 15:11:20 -0700 2010-07-20 15:17:49 -0700 Patch for landing bug-42668-20100720151119.patch text/plain 4794 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzc3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDctMjAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBGaXggZmFz dC9kb20vdGl0bGUtY29udGVudC13cml0ZS1zZXQuaHRtbCBmb3IgSFRNTDUgdHJlZSBidWlsZGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjY2OAor CisgICAgICAgIFdoZW4gSSBzcGxpdCBwYXJzZXJBcHBlbmREYXRhIGZyb20gYXBwZW5kRGF0YSwg aXQgd2FzIHRlbXB0aW5nIHRvIGN1dAorICAgICAgICB0aGUgZnVuY3Rpb24gYXQgZGlzcGF0Y2hN b2RpZmllZEV2ZW50LCBidXQgdGhhdCdzIG5vdCBxdWl0ZSByaWdodC4gIFdlCisgICAgICAgIHN0 aWxsIG5lZWQgdG8gbm90aWZ5IHRoZSBwYXJlbnQgdGhhdCBpdCdzIGNoaWxkcmVuIGhhdmUgY2hh bmdlZC4KKworICAgICAgICAqIGRvbS9DaGFyYWN0ZXJEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNoYXJhY3RlckRhdGE6OmFwcGVuZERhdGFDb21tb24pOgorICAgICAgICAoV2ViQ29yZTo6 Q2hhcmFjdGVyRGF0YTo6cGFyc2VyQXBwZW5kRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDaGFy YWN0ZXJEYXRhOjphcHBlbmREYXRhKToKKyAgICAgICAgKiBkb20vQ2hhcmFjdGVyRGF0YS5oOgor CiAyMDEwLTA3LTIwICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQmV0aCBEYWtpbi4KSW5kZXg6IFdlYkNvcmUvZG9tL0NoYXJhY3Rl ckRhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuY3BwCShy ZXZpc2lvbiA2Mzc3OCkKKysrIFdlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01OSwxMCArNTksMTAgQEAgU3RyaW5nIENoYXJhY3RlckRhdGE6OnN1YnN0cmlu Z0RhdGEodW5zaQogICAgIHJldHVybiBtX2RhdGEtPnN1YnN0cmluZyhvZmZzZXQsIGNvdW50KTsK IH0KIAotUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBDaGFyYWN0ZXJEYXRhOjpwYXJzZXJBcHBlbmRE YXRhKGNvbnN0IFN0cmluZyYgYXJnKQorUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBDaGFyYWN0ZXJE YXRhOjphcHBlbmREYXRhQ29tbW9uKGNvbnN0IFN0cmluZyYgZGF0YSkKIHsKICAgICBTdHJpbmcg bmV3U3RyID0gbV9kYXRhOwotICAgIG5ld1N0ci5hcHBlbmQoYXJnKTsKKyAgICBuZXdTdHIuYXBw ZW5kKGRhdGEpOwogCiAgICAgUmVmUHRyPFN0cmluZ0ltcGw+IG9sZFN0ciA9IG1fZGF0YTsKICAg ICBtX2RhdGEgPSBuZXdTdHIuaW1wbCgpOwpAQCAtNzYsMjAgKzc2LDI5IEBAIFBhc3NSZWZQdHI8 U3RyaW5nSW1wbD4gQ2hhcmFjdGVyRGF0YTo6cGEKICAgICByZXR1cm4gb2xkU3RyLnJlbGVhc2Uo KTsKIH0KIAotdm9pZCBDaGFyYWN0ZXJEYXRhOjphcHBlbmREYXRhKGNvbnN0IFN0cmluZyYgYXJn LCBFeGNlcHRpb25Db2RlJikKK3ZvaWQgQ2hhcmFjdGVyRGF0YTo6cGFyc2VyQXBwZW5kRGF0YShj b25zdCBTdHJpbmcmIGRhdGEpCiB7Ci0gICAgUmVmUHRyPFN0cmluZ0ltcGw+IG9sZFN0ciA9IHBh cnNlckFwcGVuZERhdGEoYXJnKTsKKyAgICBhcHBlbmREYXRhQ29tbW9uKGRhdGEpOworICAgIC8v IFdlIGRvbid0IGNhbGwgZGlzcGF0Y2hNb2RpZmllZEV2ZW50IGhlcmUgYmVjYXVzZSB3ZSBkb24n dCB3YW50IHRoZQorICAgIC8vIHBhcnNlciB0byBkaXNwYXRjaCBET00gbXV0YXRpb24gZXZlbnRz LgorICAgIGlmIChwYXJlbnROb2RlKCkpCisgICAgICAgIHBhcmVudE5vZGUoKS0+Y2hpbGRyZW5D aGFuZ2VkKCk7Cit9CisKK3ZvaWQgQ2hhcmFjdGVyRGF0YTo6YXBwZW5kRGF0YShjb25zdCBTdHJp bmcmIGRhdGEsIEV4Y2VwdGlvbkNvZGUmKQoreworICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBvbGRT dHIgPSBhcHBlbmREYXRhQ29tbW9uKGRhdGEpOwogICAgIGRpc3BhdGNoTW9kaWZpZWRFdmVudChv bGRTdHIuZ2V0KCkpOwogfQogCi12b2lkIENoYXJhY3RlckRhdGE6Omluc2VydERhdGEodW5zaWdu ZWQgb2Zmc2V0LCBjb25zdCBTdHJpbmcmIGFyZywgRXhjZXB0aW9uQ29kZSYgZWMpCit2b2lkIENo YXJhY3RlckRhdGE6Omluc2VydERhdGEodW5zaWduZWQgb2Zmc2V0LCBjb25zdCBTdHJpbmcmIGRh dGEsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGNoZWNrQ2hhckRhdGFPcGVyYXRpb24ob2Zm c2V0LCBlYyk7CiAgICAgaWYgKGVjKQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJpbmcgbmV3 U3RyID0gbV9kYXRhOwotICAgIG5ld1N0ci5pbnNlcnQoYXJnLCBvZmZzZXQpOworICAgIG5ld1N0 ci5pbnNlcnQoZGF0YSwgb2Zmc2V0KTsKIAogICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBvbGRTdHIg PSBtX2RhdGE7CiAgICAgbV9kYXRhID0gbmV3U3RyLmltcGwoKTsKQEAgLTEwMiw3ICsxMTEsNyBA QCB2b2lkIENoYXJhY3RlckRhdGE6Omluc2VydERhdGEodW5zaWduZWQgCiAKICAgICBkaXNwYXRj aE1vZGlmaWVkRXZlbnQob2xkU3RyLmdldCgpKTsKICAgICAKLSAgICBkb2N1bWVudCgpLT50ZXh0 SW5zZXJ0ZWQodGhpcywgb2Zmc2V0LCBhcmcubGVuZ3RoKCkpOworICAgIGRvY3VtZW50KCktPnRl eHRJbnNlcnRlZCh0aGlzLCBvZmZzZXQsIGRhdGEubGVuZ3RoKCkpOwogfQogCiB2b2lkIENoYXJh Y3RlckRhdGE6OmRlbGV0ZURhdGEodW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBjb3VudCwgRXhj ZXB0aW9uQ29kZSYgZWMpCkBAIC0xMzQsNyArMTQzLDcgQEAgdm9pZCBDaGFyYWN0ZXJEYXRhOjpk ZWxldGVEYXRhKHVuc2lnbmVkIAogICAgIGRvY3VtZW50KCktPnRleHRSZW1vdmVkKHRoaXMsIG9m ZnNldCwgcmVhbENvdW50KTsKIH0KIAotdm9pZCBDaGFyYWN0ZXJEYXRhOjpyZXBsYWNlRGF0YSh1 bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGNvdW50LCBjb25zdCBTdHJpbmcmIGFyZywgRXhjZXB0 aW9uQ29kZSYgZWMpCit2b2lkIENoYXJhY3RlckRhdGE6OnJlcGxhY2VEYXRhKHVuc2lnbmVkIG9m ZnNldCwgdW5zaWduZWQgY291bnQsIGNvbnN0IFN0cmluZyYgZGF0YSwgRXhjZXB0aW9uQ29kZSYg ZWMpCiB7CiAgICAgY2hlY2tDaGFyRGF0YU9wZXJhdGlvbihvZmZzZXQsIGVjKTsKICAgICBpZiAo ZWMpCkBAIC0xNDgsNyArMTU3LDcgQEAgdm9pZCBDaGFyYWN0ZXJEYXRhOjpyZXBsYWNlRGF0YSh1 bnNpZ25lZAogCiAgICAgU3RyaW5nIG5ld1N0ciA9IG1fZGF0YTsKICAgICBuZXdTdHIucmVtb3Zl KG9mZnNldCwgcmVhbENvdW50KTsKLSAgICBuZXdTdHIuaW5zZXJ0KGFyZywgb2Zmc2V0KTsKKyAg ICBuZXdTdHIuaW5zZXJ0KGRhdGEsIG9mZnNldCk7CiAKICAgICBSZWZQdHI8U3RyaW5nSW1wbD4g b2xkU3RyID0gbV9kYXRhOwogICAgIG1fZGF0YSA9IG5ld1N0ci5pbXBsKCk7CkBAIC0xNjMsNyAr MTcyLDcgQEAgdm9pZCBDaGFyYWN0ZXJEYXRhOjpyZXBsYWNlRGF0YSh1bnNpZ25lZAogICAgIAog ICAgIC8vIHVwZGF0ZSB0aGUgbWFya2VycyBmb3Igc3BlbGwgY2hlY2tpbmcgYW5kIGdyYW1tYXIg Y2hlY2tpbmcKICAgICBkb2N1bWVudCgpLT50ZXh0UmVtb3ZlZCh0aGlzLCBvZmZzZXQsIHJlYWxD b3VudCk7Ci0gICAgZG9jdW1lbnQoKS0+dGV4dEluc2VydGVkKHRoaXMsIG9mZnNldCwgYXJnLmxl bmd0aCgpKTsKKyAgICBkb2N1bWVudCgpLT50ZXh0SW5zZXJ0ZWQodGhpcywgb2Zmc2V0LCBkYXRh Lmxlbmd0aCgpKTsKIH0KIAogU3RyaW5nIENoYXJhY3RlckRhdGE6Om5vZGVWYWx1ZSgpIGNvbnN0 CkluZGV4OiBXZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9kb20vQ2hhcmFjdGVyRGF0YS5oCShyZXZpc2lvbiA2Mzc3OCkKKysrIFdlYkNvcmUvZG9tL0No YXJhY3RlckRhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAg ICAgU3RyaW5nSW1wbCogZGF0YUltcGwoKSB7IHJldHVybiBtX2RhdGEuZ2V0KCk7IH0KIAogICAg IC8vIExpa2UgYXBwZW5kRGF0YSwgYnV0IG9wdGltaXplZCBmb3IgdGhlIHBhcnNlciAoZS5nLiwg bm8gbXV0YXRpb24gZXZlbnRzKS4KLSAgICBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IHBhcnNlckFw cGVuZERhdGEoY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBwYXJzZXJBcHBlbmREYXRhKGNvbnN0 IFN0cmluZyYpOwogCiBwcm90ZWN0ZWQ6CiAgICAgQ2hhcmFjdGVyRGF0YShEb2N1bWVudCogZG9j dW1lbnQsIGNvbnN0IFN0cmluZyYgdGV4dCwgQ29uc3RydWN0aW9uVHlwZSB0eXBlKQpAQCAtNjYs NiArNjYsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBvZmZzZXRJbkNoYXJhY3RlcnMo KSBjb25zdDsKIAogICAgIHZvaWQgY2hlY2tDaGFyRGF0YU9wZXJhdGlvbih1bnNpZ25lZCBvZmZz ZXQsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IGFwcGVuZERh dGFDb21tb24oY29uc3QgU3RyaW5nJik7CiAKICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gbV9kYXRh OwogfTsK 62122 2010-07-20 15:18:01 -0700 2010-07-20 16:03:08 -0700 Patch for landing bug-42668-20100720151759.patch text/plain 4478 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzc3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDctMjAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBVbnJldmlld2VkLgorCisgICAgICAgIEZpeCBmYXN0L2RvbS90aXRsZS1j b250ZW50LXdyaXRlLXNldC5odG1sIGZvciBIVE1MNSB0cmVlIGJ1aWxkZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNjY4CisKKyAgICAgICAgQWRk cmVzcyBzb21lIGxhdGUtYnJlYWtpbmcgcmV2aWV3IGNvbW1lbnRzLgorCisgICAgICAgICogZG9t L0NoYXJhY3RlckRhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hhcmFjdGVyRGF0YTo6YXBw ZW5kRGF0YUNvbW1vbik6CisgICAgICAgIChXZWJDb3JlOjpDaGFyYWN0ZXJEYXRhOjpwYXJzZXJB cHBlbmREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNoYXJhY3RlckRhdGE6OmFwcGVuZERhdGEp OgorICAgICAgICAoV2ViQ29yZTo6Q2hhcmFjdGVyRGF0YTo6aW5zZXJ0RGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpDaGFyYWN0ZXJEYXRhOjpyZXBsYWNlRGF0YSk6CisgICAgICAgICogZG9tL0No YXJhY3RlckRhdGEuaDoKKwogMjAxMC0wNy0yMCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9k b20vQ2hhcmFjdGVyRGF0YS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vQ2hhcmFjdGVy RGF0YS5jcHAJKHJldmlzaW9uIDYzNzc5KQorKysgV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0YS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDEwICs1OSwxMCBAQCBTdHJpbmcgQ2hhcmFjdGVyRGF0 YTo6c3Vic3RyaW5nRGF0YSh1bnNpCiAgICAgcmV0dXJuIG1fZGF0YS0+c3Vic3RyaW5nKG9mZnNl dCwgY291bnQpOwogfQogCi1QYXNzUmVmUHRyPFN0cmluZ0ltcGw+IENoYXJhY3RlckRhdGE6OmFw cGVuZERhdGFDb21tb24oY29uc3QgU3RyaW5nJiBhcmcpCitQYXNzUmVmUHRyPFN0cmluZ0ltcGw+ IENoYXJhY3RlckRhdGE6OmFwcGVuZERhdGFDb21tb24oY29uc3QgU3RyaW5nJiBkYXRhKQogewog ICAgIFN0cmluZyBuZXdTdHIgPSBtX2RhdGE7Ci0gICAgbmV3U3RyLmFwcGVuZChhcmcpOworICAg IG5ld1N0ci5hcHBlbmQoZGF0YSk7CiAKICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gb2xkU3RyID0g bV9kYXRhOwogICAgIG1fZGF0YSA9IG5ld1N0ci5pbXBsKCk7CkBAIC03NiwyOSArNzYsMjkgQEAg UGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBDaGFyYWN0ZXJEYXRhOjphcAogICAgIHJldHVybiBvbGRT dHIucmVsZWFzZSgpOwogfQogCi12b2lkIENoYXJhY3RlckRhdGE6OnBhcnNlckFwcGVuZERhdGEo Y29uc3QgU3RyaW5nJiBhcmcpCit2b2lkIENoYXJhY3RlckRhdGE6OnBhcnNlckFwcGVuZERhdGEo Y29uc3QgU3RyaW5nJiBkYXRhKQogewotICAgIGFwcGVuZERhdGFDb21tb24oYXJnKTsKKyAgICBh cHBlbmREYXRhQ29tbW9uKGRhdGEpOwogICAgIC8vIFdlIGRvbid0IGNhbGwgZGlzcGF0Y2hNb2Rp ZmllZEV2ZW50IGhlcmUgYmVjYXVzZSB3ZSBkb24ndCB3YW50IHRoZQogICAgIC8vIHBhcnNlciB0 byBkaXNwYXRjaCBET00gbXV0YXRpb24gZXZlbnRzLgogICAgIGlmIChwYXJlbnROb2RlKCkpCiAg ICAgICAgIHBhcmVudE5vZGUoKS0+Y2hpbGRyZW5DaGFuZ2VkKCk7CiB9CiAKLXZvaWQgQ2hhcmFj dGVyRGF0YTo6YXBwZW5kRGF0YShjb25zdCBTdHJpbmcmIGFyZywgRXhjZXB0aW9uQ29kZSYpCit2 b2lkIENoYXJhY3RlckRhdGE6OmFwcGVuZERhdGEoY29uc3QgU3RyaW5nJiBkYXRhLCBFeGNlcHRp b25Db2RlJikKIHsKLSAgICBSZWZQdHI8U3RyaW5nSW1wbD4gb2xkU3RyID0gYXBwZW5kRGF0YUNv bW1vbihhcmcpOworICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBvbGRTdHIgPSBhcHBlbmREYXRhQ29t bW9uKGRhdGEpOwogICAgIGRpc3BhdGNoTW9kaWZpZWRFdmVudChvbGRTdHIuZ2V0KCkpOwogfQog Ci12b2lkIENoYXJhY3RlckRhdGE6Omluc2VydERhdGEodW5zaWduZWQgb2Zmc2V0LCBjb25zdCBT dHJpbmcmIGFyZywgRXhjZXB0aW9uQ29kZSYgZWMpCit2b2lkIENoYXJhY3RlckRhdGE6Omluc2Vy dERhdGEodW5zaWduZWQgb2Zmc2V0LCBjb25zdCBTdHJpbmcmIGRhdGEsIEV4Y2VwdGlvbkNvZGUm IGVjKQogewogICAgIGNoZWNrQ2hhckRhdGFPcGVyYXRpb24ob2Zmc2V0LCBlYyk7CiAgICAgaWYg KGVjKQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJpbmcgbmV3U3RyID0gbV9kYXRhOwotICAg IG5ld1N0ci5pbnNlcnQoYXJnLCBvZmZzZXQpOworICAgIG5ld1N0ci5pbnNlcnQoZGF0YSwgb2Zm c2V0KTsKIAogICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBvbGRTdHIgPSBtX2RhdGE7CiAgICAgbV9k YXRhID0gbmV3U3RyLmltcGwoKTsKQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIENoYXJhY3RlckRh dGE6Omluc2VydERhdGEodW5zaWduZWQgCiAKICAgICBkaXNwYXRjaE1vZGlmaWVkRXZlbnQob2xk U3RyLmdldCgpKTsKICAgICAKLSAgICBkb2N1bWVudCgpLT50ZXh0SW5zZXJ0ZWQodGhpcywgb2Zm c2V0LCBhcmcubGVuZ3RoKCkpOworICAgIGRvY3VtZW50KCktPnRleHRJbnNlcnRlZCh0aGlzLCBv ZmZzZXQsIGRhdGEubGVuZ3RoKCkpOwogfQogCiB2b2lkIENoYXJhY3RlckRhdGE6OmRlbGV0ZURh dGEodW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBjb3VudCwgRXhjZXB0aW9uQ29kZSYgZWMpCkBA IC0xNDMsNyArMTQzLDcgQEAgdm9pZCBDaGFyYWN0ZXJEYXRhOjpkZWxldGVEYXRhKHVuc2lnbmVk IAogICAgIGRvY3VtZW50KCktPnRleHRSZW1vdmVkKHRoaXMsIG9mZnNldCwgcmVhbENvdW50KTsK IH0KIAotdm9pZCBDaGFyYWN0ZXJEYXRhOjpyZXBsYWNlRGF0YSh1bnNpZ25lZCBvZmZzZXQsIHVu c2lnbmVkIGNvdW50LCBjb25zdCBTdHJpbmcmIGFyZywgRXhjZXB0aW9uQ29kZSYgZWMpCit2b2lk IENoYXJhY3RlckRhdGE6OnJlcGxhY2VEYXRhKHVuc2lnbmVkIG9mZnNldCwgdW5zaWduZWQgY291 bnQsIGNvbnN0IFN0cmluZyYgZGF0YSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgY2hlY2tD aGFyRGF0YU9wZXJhdGlvbihvZmZzZXQsIGVjKTsKICAgICBpZiAoZWMpCkBAIC0xNTcsNyArMTU3 LDcgQEAgdm9pZCBDaGFyYWN0ZXJEYXRhOjpyZXBsYWNlRGF0YSh1bnNpZ25lZAogCiAgICAgU3Ry aW5nIG5ld1N0ciA9IG1fZGF0YTsKICAgICBuZXdTdHIucmVtb3ZlKG9mZnNldCwgcmVhbENvdW50 KTsKLSAgICBuZXdTdHIuaW5zZXJ0KGFyZywgb2Zmc2V0KTsKKyAgICBuZXdTdHIuaW5zZXJ0KGRh dGEsIG9mZnNldCk7CiAKICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gb2xkU3RyID0gbV9kYXRhOwog ICAgIG1fZGF0YSA9IG5ld1N0ci5pbXBsKCk7CkBAIC0xNzIsNyArMTcyLDcgQEAgdm9pZCBDaGFy YWN0ZXJEYXRhOjpyZXBsYWNlRGF0YSh1bnNpZ25lZAogICAgIAogICAgIC8vIHVwZGF0ZSB0aGUg bWFya2VycyBmb3Igc3BlbGwgY2hlY2tpbmcgYW5kIGdyYW1tYXIgY2hlY2tpbmcKICAgICBkb2N1 bWVudCgpLT50ZXh0UmVtb3ZlZCh0aGlzLCBvZmZzZXQsIHJlYWxDb3VudCk7Ci0gICAgZG9jdW1l bnQoKS0+dGV4dEluc2VydGVkKHRoaXMsIG9mZnNldCwgYXJnLmxlbmd0aCgpKTsKKyAgICBkb2N1 bWVudCgpLT50ZXh0SW5zZXJ0ZWQodGhpcywgb2Zmc2V0LCBkYXRhLmxlbmd0aCgpKTsKIH0KIAog U3RyaW5nIENoYXJhY3RlckRhdGE6Om5vZGVWYWx1ZSgpIGNvbnN0CkluZGV4OiBXZWJDb3JlL2Rv bS9DaGFyYWN0ZXJEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0 YS5oCShyZXZpc2lvbiA2Mzc3OSkKKysrIFdlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuaAkod29y a2luZyBjb3B5KQpAQCAtNjYsNyArNjYsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBv ZmZzZXRJbkNoYXJhY3RlcnMoKSBjb25zdDsKIAogICAgIHZvaWQgY2hlY2tDaGFyRGF0YU9wZXJh dGlvbih1bnNpZ25lZCBvZmZzZXQsIEV4Y2VwdGlvbkNvZGUmKTsKLSAgICBQYXNzUmVmUHRyPFN0 cmluZ0ltcGw+IGFwcGVuZERhdGFDb21tb24oY29uc3QgU3RyaW5nJiBhcmcpOworICAgIFBhc3NS ZWZQdHI8U3RyaW5nSW1wbD4gYXBwZW5kRGF0YUNvbW1vbihjb25zdCBTdHJpbmcmKTsKIAogICAg IFJlZlB0cjxTdHJpbmdJbXBsPiBtX2RhdGE7CiB9Owo=