Bug 38555 – Small code refactoring: move the logic to figure out the path to the databases directory to another method

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Ada Chan]

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.

[Ada Chan]

Created attachment 55071 [details]
Patch

[David Kilzer (:ddkilzer)]

Comment on attachment 55071 [details]
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

[Ada Chan]

Fixed in r58787

http://trac.webkit.org/changeset/58787

[WebKit Review Bot]

http://trac.webkit.org/changeset/58787 might have broken Qt Linux Release

[David Kilzer (:ddkilzer)]

(In reply to comment #4)
> http://trac.webkit.org/changeset/58787 might have broken Qt Linux Release

Lies.

[Eric Seidel (no email)]

"might"! :)