38555 2010-05-04 16:45:10 -0700 Small code refactoring: move the logic to figure out the path to the databases directory to another method 2010-05-04 18:43:13 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 adachan adachan abarth ddkilzer eric webkit.review.bot oldest_to_newest 220871 0 adachan 2010-05-04 16:45:10 -0700 Move the logic to figure out the path to the databases directory to another method, so new code that needs that information doesn't need to duplicate that code. 220872 1 55071 adachan 2010-05-04 16:47:11 -0700 Created attachment 55071 Patch 220874 2 55071 ddkilzer 2010-05-04 16:50:15 -0700 Comment on attachment 55071 Patch > Index: WebKit/mac/Storage/WebDatabaseManager.mm > +static NSString *databasesDirectoryPath(); I don't think static is needed here. Also, this definition isn't needed unless the method appears after the first use (IIRC). > @@ -119,6 +121,16 @@ - (BOOL)deleteDatabase:(NSString *)datab > +NSString *databasesDirectoryPath() But "static" should definitely be added above. > +{ > + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; > + NSString *databasesDirectory = [defaults objectForKey:WebDatabaseDirectoryDefaultsKey]; > + if (!databasesDirectory || ![databasesDirectory isKindOfClass:[NSString class]]) > + databasesDirectory = @"~/Library/WebKit/Databases"; > + > + return [databasesDirectory stringByStandardizingPath]; > +} r=me Dave 220878 3 adachan 2010-05-04 16:58:38 -0700 Fixed in r58787 http://trac.webkit.org/changeset/58787 220903 4 webkit.review.bot 2010-05-04 17:48:36 -0700 http://trac.webkit.org/changeset/58787 might have broken Qt Linux Release 220912 5 ddkilzer 2010-05-04 18:01:25 -0700 (In reply to comment #4) > http://trac.webkit.org/changeset/58787 might have broken Qt Linux Release Lies. 220929 6 eric 2010-05-04 18:43:13 -0700 "might"! :) 55071 2010-05-04 16:47:11 -0700 2010-05-04 16:50:15 -0700 Patch 38555.patch.txt text/plain 2631 adachan SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1ODc4NikKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUtMDQgIEFkYSBDaGFuICA8YWRhY2hhbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NTU1CisgICAgICAg IAorICAgICAgICBTbWFsbCBjb2RlIHJlZmFjdG9yaW5nOiBtb3ZlIHRoZSBsb2dpYyB0byBmaWd1 cmUgb3V0IHRoZSBwYXRoIHRvIHRoZSAKKyAgICAgICAgZGF0YWJhc2VzIGRpcmVjdG9yeSB0byBh bm90aGVyIG1ldGhvZC4KKworICAgICAgICAqIFN0b3JhZ2UvV2ViRGF0YWJhc2VNYW5hZ2VyLm1t OgorICAgICAgICAoZGF0YWJhc2VzRGlyZWN0b3J5UGF0aCk6CisgICAgICAgIChXZWJLaXRJbml0 aWFsaXplRGF0YWJhc2VzSWZOZWNlc3NhcnkpOgorCiAyMDEwLTA1LTA0ICBCZXRoIERha2luICA8 YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNaWtlIFRob2xlLgpJbmRl eDogV2ViS2l0L21hYy9TdG9yYWdlL1dlYkRhdGFiYXNlTWFuYWdlci5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvbWFjL1N0b3JhZ2UvV2ViRGF0YWJhc2VNYW5hZ2VyLm1tCShyZXZpc2lvbiA1ODc4 MCkKKysrIFdlYktpdC9tYWMvU3RvcmFnZS9XZWJEYXRhYmFzZU1hbmFnZXIubW0JKHdvcmtpbmcg Y29weSkKQEAgLTQ5LDYgKzQ5LDggQEAgTlNTdHJpbmcgKldlYkRhdGFiYXNlRGlkTW9kaWZ5T3Jp Z2luTm90aQogTlNTdHJpbmcgKldlYkRhdGFiYXNlRGlkTW9kaWZ5RGF0YWJhc2VOb3RpZmljYXRp b24gPSBAIldlYkRhdGFiYXNlRGlkTW9kaWZ5RGF0YWJhc2VOb3RpZmljYXRpb24iOwogTlNTdHJp bmcgKldlYkRhdGFiYXNlSWRlbnRpZmllcktleSA9IEAiV2ViRGF0YWJhc2VJZGVudGlmaWVyS2V5 IjsKIAorc3RhdGljIE5TU3RyaW5nICpkYXRhYmFzZXNEaXJlY3RvcnlQYXRoKCk7CisKIEBpbXBs ZW1lbnRhdGlvbiBXZWJEYXRhYmFzZU1hbmFnZXIKIAogKyAoV2ViRGF0YWJhc2VNYW5hZ2VyICop IHNoYXJlZFdlYkRhdGFiYXNlTWFuYWdlcgpAQCAtMTE5LDYgKzEyMSwxNiBAQCAtIChCT09MKWRl bGV0ZURhdGFiYXNlOihOU1N0cmluZyAqKWRhdGFiCiAKIEBlbmQKIAorTlNTdHJpbmcgKmRhdGFi YXNlc0RpcmVjdG9yeVBhdGgoKQoreworICAgIE5TVXNlckRlZmF1bHRzICpkZWZhdWx0cyA9IFtO U1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c107CisgICAgTlNTdHJpbmcgKmRhdGFi YXNlc0RpcmVjdG9yeSA9IFtkZWZhdWx0cyBvYmplY3RGb3JLZXk6V2ViRGF0YWJhc2VEaXJlY3Rv cnlEZWZhdWx0c0tleV07CisgICAgaWYgKCFkYXRhYmFzZXNEaXJlY3RvcnkgfHwgIVtkYXRhYmFz ZXNEaXJlY3RvcnkgaXNLaW5kT2ZDbGFzczpbTlNTdHJpbmcgY2xhc3NdXSkKKyAgICAgICAgZGF0 YWJhc2VzRGlyZWN0b3J5ID0gQCJ+L0xpYnJhcnkvV2ViS2l0L0RhdGFiYXNlcyI7CisgICAgCisg ICAgcmV0dXJuIFtkYXRhYmFzZXNEaXJlY3Rvcnkgc3RyaW5nQnlTdGFuZGFyZGl6aW5nUGF0aF07 Cit9CisKIHZvaWQgV2ViS2l0SW5pdGlhbGl6ZURhdGFiYXNlc0lmTmVjZXNzYXJ5KCkKIHsKICAg ICBzdGF0aWMgQk9PTCBpbml0aWFsaXplZCA9IE5POwpAQCAtMTI2LDEzICsxMzgsNyBAQCB2b2lk IFdlYktpdEluaXRpYWxpemVEYXRhYmFzZXNJZk5lY2Vzc2FyCiAgICAgICAgIHJldHVybjsKIAog ICAgIC8vIFNldCB0aGUgZGF0YWJhc2Ugcm9vdCBwYXRoIGluIFdlYkNvcmUKLSAgICBOU1VzZXJE ZWZhdWx0cyAqZGVmYXVsdHMgPSBbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNd OwotCi0gICAgTlNTdHJpbmcgKmRhdGFiYXNlc0RpcmVjdG9yeSA9IFtkZWZhdWx0cyBvYmplY3RG b3JLZXk6V2ViRGF0YWJhc2VEaXJlY3RvcnlEZWZhdWx0c0tleV07Ci0gICAgaWYgKCFkYXRhYmFz ZXNEaXJlY3RvcnkgfHwgIVtkYXRhYmFzZXNEaXJlY3RvcnkgaXNLaW5kT2ZDbGFzczpbTlNTdHJp bmcgY2xhc3NdXSkKLSAgICAgICAgZGF0YWJhc2VzRGlyZWN0b3J5ID0gQCJ+L0xpYnJhcnkvV2Vi S2l0L0RhdGFiYXNlcyI7Ci0KLSAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5zZXREYXRh YmFzZURpcmVjdG9yeVBhdGgoW2RhdGFiYXNlc0RpcmVjdG9yeSBzdHJpbmdCeVN0YW5kYXJkaXpp bmdQYXRoXSk7CisgICAgRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuc2V0RGF0YWJhc2VEaXJl Y3RvcnlQYXRoKGRhdGFiYXNlc0RpcmVjdG9yeVBhdGgoKSk7CiAKICAgICAvLyBTZXQgdGhlIERh dGFiYXNlVHJhY2tlckNsaWVudAogICAgIERhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLnNldENs aWVudChXZWJEYXRhYmFzZVRyYWNrZXJDbGllbnQ6OnNoYXJlZFdlYkRhdGFiYXNlVHJhY2tlckNs aWVudCgpKTsK