83449 2012-04-08 21:10:08 -0700 combine two arrays in FileException.cpp into one 2012-04-09 22:45:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83441 0 guanqun.lu webkit-unassigned abarth haraken webkit.review.bot oldest_to_newest 598118 0 guanqun.lu 2012-04-08 21:10:08 -0700 combine two arrays in FileException.cpp into one, this helps to fix one FIXME in the file. 598119 1 136177 guanqun.lu 2012-04-08 21:12:10 -0700 Created attachment 136177 Patch 599028 2 136177 webkit.review.bot 2012-04-09 22:45:43 -0700 Comment on attachment 136177 Patch Clearing flags on attachment: 136177 Committed r113683: <http://trac.webkit.org/changeset/113683> 599029 3 webkit.review.bot 2012-04-09 22:45:47 -0700 All reviewed patches have been landed. Closing bug. 136177 2012-04-08 21:12:10 -0700 2012-04-09 22:45:43 -0700 Patch 0001-combine-two-arrays-in-FileException.cpp-into-one.patch text/plain 5878 guanqun.lu RnJvbSA2YTRmZDg1OTdlNGMxOWU4MWQ4MDM0MDg5ODA2ZjliNjc3ZTQ0ZmJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdSBHdWFucXVuIDxndWFucXVuLmx1QGludGVsLmNvbT4KRGF0 ZTogTW9uLCA5IEFwciAyMDEyIDEyOjEwOjIzICswODAwClN1YmplY3Q6IFtQQVRDSF0gY29tYmlu ZSB0d28gYXJyYXlzIGluIEZpbGVFeGNlcHRpb24uY3BwIGludG8gb25lCgotLS0KIFNvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDE0ICsrKysrKysrCiBTb3VyY2Uv V2ViQ29yZS9maWxlYXBpL0ZpbGVFeGNlcHRpb24uY3BwIHwgICA1MyArKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgMzQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGI1YzA1NDguLjA0ZmE2NDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMi0wNC0wOCAgTHUgR3VhbnF1biAgPGd1YW5xdW4ubHVAaW50ZWwu Y29tPgorCisgICAgICAgIGNvbWJpbmUgdHdvIGFycmF5cyBpbiBGaWxlRXhjZXB0aW9uLmNwcCBp bnRvIG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODM0NDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAgKiBmaWxlYXBpL0ZpbGVFeGNlcHRpb24u Y3BwOgorICAgICAgICAoRmlsZUV4Y2VwdGlvbk5hbWVEZXNjcmlwdGlvbik6CisgICAgICAgIChX ZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVFeGNlcHRpb246OmluaXRpYWxpemVEZXNj cmlwdGlvbik6CisKIDIwMTItMDQtMDUgIEx1IEd1YW5xdW4gIDxndWFucXVuLmx1QGludGVsLmNv bT4KIAogICAgICAgICBjb21iaW5lIHR3byBhcnJheXMgKGNvcmVFeGNlcHRpb25OYW1lcyBhbmQg Y29yZUV4Y2VwdGlvbkRlc2NyaXB0aW9ucykgaW50byBvbmUgYXJyYXkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZUV4Y2VwdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9m aWxlYXBpL0ZpbGVFeGNlcHRpb24uY3BwCmluZGV4IDUwMDdmMWMuLjJlNDUzMTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZUV4Y2VwdGlvbi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvZmlsZWFwaS9GaWxlRXhjZXB0aW9uLmNwcApAQCAtMzQsMzkgKzM0LDI0IEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGFuIGFycmF5 IG9mIHN0cnVjdHMgdG8gcGFpciB0aGUgbmFtZXMgYW5kIGRlc2NyaXB0aW9ucy4KLXN0YXRpYyBj b25zdCBjaGFyKiBjb25zdCBleGNlcHRpb25OYW1lc1tdID0gewotICAgICJOT1RfRk9VTkRfRVJS IiwKLSAgICAiU0VDVVJJVFlfRVJSIiwKLSAgICAiQUJPUlRfRVJSIiwKLSAgICAiTk9UX1JFQURB QkxFX0VSUiIsCi0gICAgIkVOQ09ESU5HX0VSUiIsCi0gICAgIk5PX01PRElGSUNBVElPTl9BTExP V0VEX0VSUiIsCi0gICAgIklOVkFMSURfU1RBVEVfRVJSIiwKLSAgICAiU1lOVEFYX0VSUiIsCi0g ICAgIklOVkFMSURfTU9ESUZJQ0FUSU9OX0VSUiIsCi0gICAgIlFVT1RBX0VYQ0VFREVEX0VSUiIs Ci0gICAgIlRZUEVfTUlTTUFUQ0hfRVJSIiwKLSAgICAiUEFUSF9FWElTVFNfRVJSIgorc3RhdGlj IHN0cnVjdCBGaWxlRXhjZXB0aW9uTmFtZURlc2NyaXB0aW9uIHsKKyAgICBjb25zdCBjaGFyKiBj b25zdCBuYW1lOworICAgIGNvbnN0IGNoYXIqIGNvbnN0IGRlc2NyaXB0aW9uOworfSBleGNlcHRp b25zW10gPSB7CisgICAgeyAiTk9UX0ZPVU5EX0VSUiIsICJBIHJlcXVlc3RlZCBmaWxlIG9yIGRp cmVjdG9yeSBjb3VsZCBub3QgYmUgZm91bmQgYXQgdGhlIHRpbWUgYW4gb3BlcmF0aW9uIHdhcyBw cm9jZXNzZWQuIiB9LAorICAgIHsgIlNFQ1VSSVRZX0VSUiIsICJJdCB3YXMgZGV0ZXJtaW5lZCB0 aGF0IGNlcnRhaW4gZmlsZXMgYXJlIHVuc2FmZSBmb3IgYWNjZXNzIHdpdGhpbiBhIFdlYiBhcHBs aWNhdGlvbiwgb3IgdGhhdCB0b28gbWFueSBjYWxscyBhcmUgYmVpbmcgbWFkZSBvbiBmaWxlIHJl c291cmNlcy4iIH0sCisgICAgeyAiQUJPUlRfRVJSIiwgIkFuIG9uZ29pbmcgb3BlcmF0aW9uIHdh cyBhYm9ydGVkLCB0eXBpY2FsbHkgd2l0aCBhIGNhbGwgdG8gYWJvcnQoKS4iIH0sCisgICAgeyAi Tk9UX1JFQURBQkxFX0VSUiIsICJUaGUgcmVxdWVzdGVkIGZpbGUgY291bGQgbm90IGJlIHJlYWQs IHR5cGljYWxseSBkdWUgdG8gcGVybWlzc2lvbiBwcm9ibGVtcyB0aGF0IGhhdmUgb2NjdXJyZWQg YWZ0ZXIgYSByZWZlcmVuY2UgdG8gYSBmaWxlIHdhcyBhY3F1aXJlZC4iIH0sCisgICAgeyAiRU5D T0RJTkdfRVJSIiwgIkEgVVJJIHN1cHBsaWVkIHRvIHRoZSBBUEkgd2FzIG1hbGZvcm1lZCwgb3Ig dGhlIHJlc3VsdGluZyBEYXRhIFVSTCBoYXMgZXhjZWVkZWQgdGhlIFVSTCBsZW5ndGggbGltaXRh dGlvbnMgZm9yIERhdGEgVVJMcy4iIH0sCisgICAgeyAiTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURf RVJSIiwgIkFuIGF0dGVtcHQgd2FzIG1hZGUgdG8gd3JpdGUgdG8gYSBmaWxlIG9yIGRpcmVjdG9y eSB3aGljaCBjb3VsZCBub3QgYmUgbW9kaWZpZWQgZHVlIHRvIHRoZSBzdGF0ZSBvZiB0aGUgdW5k ZXJseWluZyBmaWxlc3lzdGVtLiIgfSwKKyAgICB7ICJJTlZBTElEX1NUQVRFX0VSUiIsICJBbiBv cGVyYXRpb24gdGhhdCBkZXBlbmRzIG9uIHN0YXRlIGNhY2hlZCBpbiBhbiBpbnRlcmZhY2Ugb2Jq ZWN0IHdhcyBtYWRlIGJ1dCB0aGUgc3RhdGUgaGFkIGNoYW5nZWQgc2luY2UgaXQgd2FzIHJlYWQg ZnJvbSBkaXNrLiIgfSwKKyAgICB7ICJTWU5UQVhfRVJSIiwgIkFuIGludmFsaWQgb3IgdW5zdXBw b3J0ZWQgYXJndW1lbnQgd2FzIGdpdmVuLCBsaWtlIGFuIGludmFsaWQgbGluZSBlbmRpbmcgc3Bl Y2lmaWVyLiIgfSwKKyAgICB7ICJJTlZBTElEX01PRElGSUNBVElPTl9FUlIiLCAiVGhlIG1vZGlm aWNhdGlvbiByZXF1ZXN0IHdhcyBpbGxlZ2FsLiIgfSwKKyAgICB7ICJRVU9UQV9FWENFRURFRF9F UlIiLCAiVGhlIG9wZXJhdGlvbiBmYWlsZWQgYmVjYXVzZSBpdCB3b3VsZCBjYXVzZSB0aGUgYXBw bGljYXRpb24gdG8gZXhjZWVkIGl0cyBzdG9yYWdlIHF1b3RhLiIgfSwKKyAgICB7ICJUWVBFX01J U01BVENIX0VSUiIsICJUaGUgcGF0aCBzdXBwbGllZCBleGlzdHMsIGJ1dCB3YXMgbm90IGFuIGVu dHJ5IG9mIHJlcXVlc3RlZCB0eXBlLiIgfSwKKyAgICB7ICJQQVRIX0VYSVNUU19FUlIiLCAiQW4g YXR0ZW1wdCB3YXMgbWFkZSB0byBjcmVhdGUgYSBmaWxlIG9yIGRpcmVjdG9yeSB3aGVyZSBhbiBl bGVtZW50IGFscmVhZHkgZXhpc3RzLiIgfQogfTsKIAotc3RhdGljIGNvbnN0IGNoYXIqIGNvbnN0 IGV4Y2VwdGlvbkRlc2NyaXB0aW9uc1tdID0gewotICAgICJBIHJlcXVlc3RlZCBmaWxlIG9yIGRp cmVjdG9yeSBjb3VsZCBub3QgYmUgZm91bmQgYXQgdGhlIHRpbWUgYW4gb3BlcmF0aW9uIHdhcyBw cm9jZXNzZWQuIiwKLSAgICAiSXQgd2FzIGRldGVybWluZWQgdGhhdCBjZXJ0YWluIGZpbGVzIGFy ZSB1bnNhZmUgZm9yIGFjY2VzcyB3aXRoaW4gYSBXZWIgYXBwbGljYXRpb24sIG9yIHRoYXQgdG9v IG1hbnkgY2FsbHMgYXJlIGJlaW5nIG1hZGUgb24gZmlsZSByZXNvdXJjZXMuIiwKLSAgICAiQW4g b25nb2luZyBvcGVyYXRpb24gd2FzIGFib3J0ZWQsIHR5cGljYWxseSB3aXRoIGEgY2FsbCB0byBh Ym9ydCgpLiIsCi0gICAgIlRoZSByZXF1ZXN0ZWQgZmlsZSBjb3VsZCBub3QgYmUgcmVhZCwgdHlw aWNhbGx5IGR1ZSB0byBwZXJtaXNzaW9uIHByb2JsZW1zIHRoYXQgaGF2ZSBvY2N1cnJlZCBhZnRl ciBhIHJlZmVyZW5jZSB0byBhIGZpbGUgd2FzIGFjcXVpcmVkLiIsCi0gICAgIkEgVVJJIHN1cHBs aWVkIHRvIHRoZSBBUEkgd2FzIG1hbGZvcm1lZCwgb3IgdGhlIHJlc3VsdGluZyBEYXRhIFVSTCBo YXMgZXhjZWVkZWQgdGhlIFVSTCBsZW5ndGggbGltaXRhdGlvbnMgZm9yIERhdGEgVVJMcy4iLAot ICAgICJBbiBhdHRlbXB0IHdhcyBtYWRlIHRvIHdyaXRlIHRvIGEgZmlsZSBvciBkaXJlY3Rvcnkg d2hpY2ggY291bGQgbm90IGJlIG1vZGlmaWVkIGR1ZSB0byB0aGUgc3RhdGUgb2YgdGhlIHVuZGVy bHlpbmcgZmlsZXN5c3RlbS4iLAotICAgICJBbiBvcGVyYXRpb24gdGhhdCBkZXBlbmRzIG9uIHN0 YXRlIGNhY2hlZCBpbiBhbiBpbnRlcmZhY2Ugb2JqZWN0IHdhcyBtYWRlIGJ1dCB0aGUgc3RhdGUg aGFkIGNoYW5nZWQgc2luY2UgaXQgd2FzIHJlYWQgZnJvbSBkaXNrLiIsCi0gICAgIkFuIGludmFs aWQgb3IgdW5zdXBwb3J0ZWQgYXJndW1lbnQgd2FzIGdpdmVuLCBsaWtlIGFuIGludmFsaWQgbGlu ZSBlbmRpbmcgc3BlY2lmaWVyLiIsCi0gICAgIlRoZSBtb2RpZmljYXRpb24gcmVxdWVzdCB3YXMg aWxsZWdhbC4iLAotICAgICJUaGUgb3BlcmF0aW9uIGZhaWxlZCBiZWNhdXNlIGl0IHdvdWxkIGNh dXNlIHRoZSBhcHBsaWNhdGlvbiB0byBleGNlZWQgaXRzIHN0b3JhZ2UgcXVvdGEuIiwKLSAgICAi VGhlIHBhdGggc3VwcGxpZWQgZXhpc3RzLCBidXQgd2FzIG5vdCBhbiBlbnRyeSBvZiByZXF1ZXN0 ZWQgdHlwZS4iLAotICAgICJBbiBhdHRlbXB0IHdhcyBtYWRlIHRvIGNyZWF0ZSBhIGZpbGUgb3Ig ZGlyZWN0b3J5IHdoZXJlIGFuIGVsZW1lbnQgYWxyZWFkeSBleGlzdHMuIgotfTsKLQotQ09NUElM RV9BU1NFUlQoV1RGX0FSUkFZX0xFTkdUSChleGNlcHRpb25OYW1lcykgPT0gV1RGX0FSUkFZX0xF TkdUSChleGNlcHRpb25EZXNjcmlwdGlvbnMpLCBGaWxlRXhjZXB0aW9uVGFibGVzTXVzdE1hdGNo KTsKLQogYm9vbCBGaWxlRXhjZXB0aW9uOjppbml0aWFsaXplRGVzY3JpcHRpb24oRXhjZXB0aW9u Q29kZSBlYywgRXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uKiBkZXNjcmlwdGlvbikKIHsKICAgICBp ZiAoZWMgPCBGaWxlRXhjZXB0aW9uT2Zmc2V0IHx8IGVjID4gRmlsZUV4Y2VwdGlvbk1heCkKQEAg LTc2LDExICs2MSwxMSBAQCBib29sIEZpbGVFeGNlcHRpb246OmluaXRpYWxpemVEZXNjcmlwdGlv bihFeGNlcHRpb25Db2RlIGVjLCBFeGNlcHRpb25Db2RlRGVzY3JpcAogICAgIGRlc2NyaXB0aW9u LT5jb2RlID0gZWMgLSBGaWxlRXhjZXB0aW9uT2Zmc2V0OwogICAgIGRlc2NyaXB0aW9uLT50eXBl ID0gRmlsZUV4Y2VwdGlvblR5cGU7CiAKLSAgICBzaXplX3QgdGFibGVTaXplID0gV1RGX0FSUkFZ X0xFTkdUSChleGNlcHRpb25OYW1lcyk7CisgICAgc2l6ZV90IHRhYmxlU2l6ZSA9IFdURl9BUlJB WV9MRU5HVEgoZXhjZXB0aW9ucyk7CiAgICAgc2l6ZV90IHRhYmxlSW5kZXggPSBlYyAtIE5PVF9G T1VORF9FUlI7CiAKLSAgICBkZXNjcmlwdGlvbi0+bmFtZSA9IHRhYmxlSW5kZXggPCB0YWJsZVNp emUgPyBleGNlcHRpb25OYW1lc1t0YWJsZUluZGV4XSA6IDA7Ci0gICAgZGVzY3JpcHRpb24tPmRl c2NyaXB0aW9uID0gdGFibGVJbmRleCA8IHRhYmxlU2l6ZSA/IGV4Y2VwdGlvbkRlc2NyaXB0aW9u c1t0YWJsZUluZGV4XSA6IDA7CisgICAgZGVzY3JpcHRpb24tPm5hbWUgPSB0YWJsZUluZGV4IDwg dGFibGVTaXplID8gZXhjZXB0aW9uc1t0YWJsZUluZGV4XS5uYW1lIDogMDsKKyAgICBkZXNjcmlw dGlvbi0+ZGVzY3JpcHRpb24gPSB0YWJsZUluZGV4IDwgdGFibGVTaXplID8gZXhjZXB0aW9uc1t0 YWJsZUluZGV4XS5kZXNjcmlwdGlvbiA6IDA7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KLS0gCjEu Ny43LjYKCg==