Bug 124804 – Add DatabaseProcessCreationParameters, starting with the database path.

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Brady Eidson]

Add DatabaseProcessCreationParameters, starting with the database path.

[Brady Eidson]

Created attachment 217732 [details]
Patch v1

[WebKit Commit Bot]

Attachment 217732 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp', u'Source/WebKit2/DatabaseProcess/DatabaseProcess.h', u'Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in', u'Source/WebKit2/Scripts/webkit2/messages.py', u'Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.cpp', u'Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h', u'Source/WebKit2/UIProcess/WebContext.cpp', u'Source/WebKit2/WebKit2.xcodeproj/project.pbxproj']" exit_code: 1
Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h:35:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
Total errors found: 1 in 9 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Brady Eidson]

Stylebot will complain:
Source/WebKit2/Shared/Databases/DatabaseProcessCreationParameters.h:35:  Code inside a namespace should not be indented.  [whitespace/indent] [4]

And I've fixed locally.

[EFL EWS Bot]

Comment on attachment 217732 [details]
Patch v1

Attachment 217732 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/35208037

[Brady Eidson]

Created attachment 217733 [details]
Patch v2

[EFL EWS Bot]

Comment on attachment 217733 [details]
Patch v2

Attachment 217733 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/35288032

[Brady Eidson]

Will, of course, continue figuring out the other build failures, but they shouldn't hold up review of the patch at this point.

[Dean Jackson]

Comment on attachment 217733 [details]
Patch v2

View in context: https://bugs.webkit.org/attachment.cgi?id=217733&action=review

> Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp:32
> +#include "SecurityOriginData.h"

Not sure why you need this, but I guess you do.

> Source/WebKit2/DatabaseProcess/DatabaseProcess.h:38
> +struct SecurityOriginData;

... and here.

> Source/WebKit2/UIProcess/WebContext.cpp:422
> +    // Indexed databases exist in a subdirectory of the "database directory path"

Nit: .

[Benjamin Poulain]

View in context: https://bugs.webkit.org/attachment.cgi?id=217733&action=review

r+ from me too. Some comments:

> Source/WebKit2/UIProcess/WebContext.cpp:425
> +    // Indexed databases exist in a subdirectory of the "database directory path"
> +    // The top level of that directory contains entities related to WebSQL databases, but an entity name
> +    // prefixed with three underscores will not conflict with any of those entities.
> +    parameters.indexedDatabaseDirectory = pathByAppendingComponent(databaseDirectory(), "___IndexedDB");

That is awful. Can't we put WebSQL and IndexedDB in different subdirectories of the databaseDirectory()? (with a migration path for existing databases).

> Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:5765
>  				330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
> +				515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */,
>  				33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */,

Please move the build sections alphabetically (the next one too).

[Brady Eidson]

(In reply to comment #9)
> View in context: https://bugs.webkit.org/attachment.cgi?id=217733&action=review
> 
> r+ from me too. Some comments:
> 
> > Source/WebKit2/UIProcess/WebContext.cpp:425
> > +    // Indexed databases exist in a subdirectory of the "database directory path"
> > +    // The top level of that directory contains entities related to WebSQL databases, but an entity name
> > +    // prefixed with three underscores will not conflict with any of those entities.
> > +    parameters.indexedDatabaseDirectory = pathByAppendingComponent(databaseDirectory(), "___IndexedDB");
> 
> That is awful. Can't we put WebSQL and IndexedDB in different subdirectories of the databaseDirectory()? (with a migration path for existing databases).

Absolutely we can - I want to migrate WebSQL over to a different subdirectory of the databaseDirectory!  I should've filed a bug and made that clear in the comment, which I will do before landing.

> 
> > Source/WebKit2/WebKit2.xcodeproj/project.pbxproj:5765
> >  				330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
> > +				515E772C184008B90007203F /* DatabaseProcessCreationParameters.h in Headers */,
> >  				33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */,
> 
> Please move the build sections alphabetically (the next one too).

These two are Xcode's random placement in non-UI-visible sections of the project file which are not in any human-sensible order.  We don't try to keep these sections manually sorted, which can be demonstrated by opening the project file in a text editor and taking a look at these sections.
(In reply to comment #8)
> (From update of attachment 217733 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=217733&action=review
> 
> > Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp:32
> > +#include "SecurityOriginData.h"
> 
> Not sure why you need this, but I guess you do.
> 
> > Source/WebKit2/DatabaseProcess/DatabaseProcess.h:38
> > +struct SecurityOriginData;
> 
> ... and here.

Was working on a much larger patch and broke this one out for separate review - Probably isn't needed.

Thanks for the review(s)!

[Brady Eidson]

Filed https://bugs.webkit.org/show_bug.cgi?id=124807 for the WebSQL migration.

[Brady Eidson]

Created attachment 217740 [details]
Patch for landing.

[Brady Eidson]

Think I fixed other platforms - Will let EWS churn on this, then cq+ from here.

[WebKit Commit Bot]

Comment on attachment 217740 [details]
Patch for landing.

Clearing flags on attachment: 217740

Committed r159728: <http://trac.webkit.org/changeset/159728>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.