83452 2012-04-08 21:25:14 -0700 combine two arrays in SQLException.cpp into one 2012-04-09 22:54:33 -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 598124 0 guanqun.lu 2012-04-08 21:25:14 -0700 combine two arrays in SQLException.cpp into one, this helps to remove one FIXME in the file. 598126 1 136180 guanqun.lu 2012-04-08 21:29:14 -0700 Created attachment 136180 Patch 599037 2 136180 webkit.review.bot 2012-04-09 22:54:28 -0700 Comment on attachment 136180 Patch Clearing flags on attachment: 136180 Committed r113687: <http://trac.webkit.org/changeset/113687> 599038 3 webkit.review.bot 2012-04-09 22:54:33 -0700 All reviewed patches have been landed. Closing bug. 136180 2012-04-08 21:29:14 -0700 2012-04-09 22:54:28 -0700 Patch bug-83452-20120409123017.patch text/plain 3876 guanqun.lu U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNDEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjVjMDU0ODM4MTdjODM1 MGMxOGJiMWZmZWUxMTcyYjA4MjE2MmQ0ZS4uN2ZkNjNmYWNiM2NkNGU1OWEyYTUzYjkxZmY2YjU4 YTNkN2Y1YTI2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA0LTA4ICBMdSBH dWFucXVuICA8Z3VhbnF1bi5sdUBpbnRlbC5jb20+CisKKyAgICAgICAgY29tYmluZSB0d28gYXJy YXlzIGluIFNRTEV4Y2VwdGlvbi5jcHAgaW50byBvbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHJlcXVpcmVkLgorCisgICAgICAg ICogTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxFeGNlcHRpb24uY3BwOgorICAgICAgICAoU1FMRXhj ZXB0aW9uTmFtZURlc2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2Vi Q29yZTo6U1FMRXhjZXB0aW9uOjppbml0aWFsaXplRGVzY3JpcHRpb24pOgorCiAyMDEyLTA0LTA1 ICBMdSBHdWFucXVuICA8Z3VhbnF1bi5sdUBpbnRlbC5jb20+CiAKICAgICAgICAgY29tYmluZSB0 d28gYXJyYXlzIChjb3JlRXhjZXB0aW9uTmFtZXMgYW5kIGNvcmVFeGNlcHRpb25EZXNjcmlwdGlv bnMpIGludG8gb25lIGFycmF5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmRhdGFiYXNlL1NRTEV4Y2VwdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRh dGFiYXNlL1NRTEV4Y2VwdGlvbi5jcHAKaW5kZXggMGU3YmU4MjlmMWNkODA5Njg4ZWRiN2ZmMjkw YTA5MTU5MjVhZGRhMC4uYjlmNTk4MjBmNjJjNTc1ZjI0NDI4NDVjNzViY2ZlMTJjNTA2NWQwYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxFeGNlcHRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMRXhjZXB0 aW9uLmNwcApAQCAtMzQsMzEgKzM0LDIwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8g RklYTUU6IFRoaXMgc2hvdWxkIGJlIGFuIGFycmF5IG9mIHN0cnVjdHMgdG8gcGFpciB0aGUgbmFt ZXMgYW5kIGRlc2NyaXB0aW9ucy4KLXN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBleGNlcHRpb25O YW1lc1tdID0gewotICAgICJVTktOT1dOX0VSUiIsCi0gICAgIkRBVEFCQVNFX0VSUiIsCi0gICAg IlZFUlNJT05fRVJSIiwKLSAgICAiVE9PX0xBUkdFX0VSUiIsCi0gICAgIlFVT1RBX0VSUiIsCi0g ICAgIlNZTlRBWF9FUlIiLAotICAgICJDT05TVFJBSU5UX0VSUiIsCi0gICAgIlRJTUVPVVRfRVJS Igorc3RhdGljIHN0cnVjdCBTUUxFeGNlcHRpb25OYW1lRGVzY3JpcHRpb24geworICAgIGNvbnN0 IGNoYXIqIGNvbnN0IG5hbWU7CisgICAgY29uc3QgY2hhciogY29uc3QgZGVzY3JpcHRpb247Cit9 IGV4Y2VwdGlvbnNbXSA9IHsKKyAgICB7ICJVTktOT1dOX0VSUiIsICJUaGUgb3BlcmF0aW9uIGZh aWxlZCBmb3IgcmVhc29ucyB1bnJlbGF0ZWQgdG8gdGhlIGRhdGFiYXNlLiIgfSwKKyAgICB7ICJE QVRBQkFTRV9FUlIiLCAiVGhlIG9wZXJhdGlvbiBmYWlsZWQgZm9yIHNvbWUgcmVhc29uIHJlbGF0 ZWQgdG8gdGhlIGRhdGFiYXNlLiIgfSwKKyAgICB7ICJWRVJTSU9OX0VSUiIsICJUaGUgYWN0dWFs IGRhdGFiYXNlIHZlcnNpb24gZGlkIG5vdCBtYXRjaCB0aGUgZXhwZWN0ZWQgdmVyc2lvbi4iIH0s CisgICAgeyAiVE9PX0xBUkdFX0VSUiIsICJEYXRhIHJldHVybmVkIGZyb20gdGhlIGRhdGFiYXNl IGlzIHRvbyBsYXJnZS4iIH0sCisgICAgeyAiUVVPVEFfRVJSIiwgIlF1b3RhIHdhcyBleGNlZWRl ZC4iIH0sCisgICAgeyAiU1lOVEFYX0VSUiIsICJJbnZhbGlkIG9yIHVuYXV0aG9yaXplZCBzdGF0 ZW1lbnQ7IG9yIHRoZSBudW1iZXIgb2YgYXJndW1lbnRzIGRpZCBub3QgbWF0Y2ggdGhlIG51bWJl ciBvZiA/IHBsYWNlaG9sZGVycy4iIH0sCisgICAgeyAiQ09OU1RSQUlOVF9FUlIiLCAiQSBjb25z dHJhaW50IHdhcyB2aW9sYXRlZC4iIH0sCisgICAgeyAiVElNRU9VVF9FUlIiLCAiQSB0cmFuc2Fj dGlvbiBsb2NrIGNvdWxkIG5vdCBiZSBhY3F1aXJlZCBpbiBhIHJlYXNvbmFibGUgdGltZS4iIH0K IH07CiAKLXN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBleGNlcHRpb25EZXNjcmlwdGlvbnNbXSA9 IHsKLSAgICAiVGhlIG9wZXJhdGlvbiBmYWlsZWQgZm9yIHJlYXNvbnMgdW5yZWxhdGVkIHRvIHRo ZSBkYXRhYmFzZS4iLAotICAgICJUaGUgb3BlcmF0aW9uIGZhaWxlZCBmb3Igc29tZSByZWFzb24g cmVsYXRlZCB0byB0aGUgZGF0YWJhc2UuIiwKLSAgICAiVGhlIGFjdHVhbCBkYXRhYmFzZSB2ZXJz aW9uIGRpZCBub3QgbWF0Y2ggdGhlIGV4cGVjdGVkIHZlcnNpb24uIiwKLSAgICAiRGF0YSByZXR1 cm5lZCBmcm9tIHRoZSBkYXRhYmFzZSBpcyB0b28gbGFyZ2UuIiwKLSAgICAiUXVvdGEgd2FzIGV4 Y2VlZGVkLiIsCi0gICAgIkludmFsaWQgb3IgdW5hdXRob3JpemVkIHN0YXRlbWVudDsgb3IgdGhl IG51bWJlciBvZiBhcmd1bWVudHMgZGlkIG5vdCBtYXRjaCB0aGUgbnVtYmVyIG9mID8gcGxhY2Vo b2xkZXJzLiIsCi0gICAgIkEgY29uc3RyYWludCB3YXMgdmlvbGF0ZWQuIiwKLSAgICAiQSB0cmFu c2FjdGlvbiBsb2NrIGNvdWxkIG5vdCBiZSBhY3F1aXJlZCBpbiBhIHJlYXNvbmFibGUgdGltZS4i Ci19OwotCi1DT01QSUxFX0FTU0VSVChXVEZfQVJSQVlfTEVOR1RIKGV4Y2VwdGlvbk5hbWVzKSA9 PSBXVEZfQVJSQVlfTEVOR1RIKGV4Y2VwdGlvbkRlc2NyaXB0aW9ucyksIFNRTEV4Y2VwdGlvblRh Ymxlc011c3RNYXRjaCk7Ci0KIGJvb2wgU1FMRXhjZXB0aW9uOjppbml0aWFsaXplRGVzY3JpcHRp b24oRXhjZXB0aW9uQ29kZSBlYywgRXhjZXB0aW9uQ29kZURlc2NyaXB0aW9uKiBkZXNjcmlwdGlv bikKIHsKICAgICBpZiAoZWMgPCBTUUxFeGNlcHRpb25PZmZzZXQgfHwgZWMgPiBTUUxFeGNlcHRp b25NYXgpCkBAIC02OCwxMSArNTcsMTEgQEAgYm9vbCBTUUxFeGNlcHRpb246OmluaXRpYWxpemVE ZXNjcmlwdGlvbihFeGNlcHRpb25Db2RlIGVjLCBFeGNlcHRpb25Db2RlRGVzY3JpcHQKICAgICBk ZXNjcmlwdGlvbi0+Y29kZSA9IGVjIC0gU1FMRXhjZXB0aW9uT2Zmc2V0OwogICAgIGRlc2NyaXB0 aW9uLT50eXBlID0gU1FMRXhjZXB0aW9uVHlwZTsKIAotICAgIHNpemVfdCB0YWJsZVNpemUgPSBX VEZfQVJSQVlfTEVOR1RIKGV4Y2VwdGlvbk5hbWVzKTsKKyAgICBzaXplX3QgdGFibGVTaXplID0g V1RGX0FSUkFZX0xFTkdUSChleGNlcHRpb25zKTsKICAgICBzaXplX3QgdGFibGVJbmRleCA9IGVj IC0gVU5LTk9XTl9FUlI7CiAKLSAgICBkZXNjcmlwdGlvbi0+bmFtZSA9IHRhYmxlSW5kZXggPCB0 YWJsZVNpemUgPyBleGNlcHRpb25OYW1lc1t0YWJsZUluZGV4XSA6IDA7Ci0gICAgZGVzY3JpcHRp b24tPmRlc2NyaXB0aW9uID0gdGFibGVJbmRleCA8IHRhYmxlU2l6ZSA/IGV4Y2VwdGlvbkRlc2Ny aXB0aW9uc1t0YWJsZUluZGV4XSA6IDA7CisgICAgZGVzY3JpcHRpb24tPm5hbWUgPSB0YWJsZUlu ZGV4IDwgdGFibGVTaXplID8gZXhjZXB0aW9uc1t0YWJsZUluZGV4XS5uYW1lIDogMDsKKyAgICBk ZXNjcmlwdGlvbi0+ZGVzY3JpcHRpb24gPSB0YWJsZUluZGV4IDwgdGFibGVTaXplID8gZXhjZXB0 aW9uc1t0YWJsZUluZGV4XS5kZXNjcmlwdGlvbiA6IDA7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K