Bug 91631 – [Chromium] Call SQLiteFileSystem-related functions directly

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

[Mark Pilgrim (Google)]

[Chromium] Call SQLiteFileSystem-related functions directly

[Mark Pilgrim (Google)]

Created attachment 153028 [details]
Patch

[WebKit Review Bot]

Please wait for approval from [e-mail], [e-mail], [e-mail], [e-mail] or [e-mail] before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI.

[Adam Barth]

Comment on attachment 153028 [details]
Patch

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

> Source/Platform/chromium/public/Platform.h:120
> +    virtual FileHandle databaseOpenFile(
> +                                        const WebString& vfsFileName, int desiredFlags) { return FileHandle(); }

I would just merge these lines.

[Mark Pilgrim (Google)]

Created attachment 153061 [details]
Patch

[Mark Pilgrim (Google)]

Comment on attachment 153061 [details]
Patch

Nits addressed.

[WebKit Review Bot]

Comment on attachment 153061 [details]
Patch

Clearing flags on attachment: 153061

Committed r123014: <http://trac.webkit.org/changeset/123014>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Tony Chang]

This broke the windows compile:
11>..\platform\sql\chromium\SQLiteFileSystemChromiumWin.cpp(85): error C2660: 'WebKit::Platform::databaseDeleteFile' : function does not take 1 arguments

I tried to fix it in http://trac.webkit.org/changeset/123023 .  Please double check the change.

[Adam Barth]

> I tried to fix it in http://trac.webkit.org/changeset/123023 .  Please double check the change.

Thanks for fixing the build!  Yes, that's the right fix.

[Ryosuke Niwa]

Still broken:
http://build.webkit.org/builders/Chromium%20Win%20Release/builds/46439/steps/compile-webkit/logs/stdio
7>e:\google-windows-1\chromium-win-release\build\source\webkit\chromium\public\platform\../../../../Platform/chromium/public/Platform.h(74): error C2146: syntax error : missing ';' before identifier 'FileHandle'
7>e:\google-windows-1\chromium-win-release\build\source\webkit\chromium\public\platform\../../../../Platform/chromium/public/Platform.h(74): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

It's probably complaining that HANDLE isn't defined.

[Adam Barth]

> It's probably complaining that HANDLE isn't defined.

Maybe we should roll out the patch and try again.

[Ryosuke Niwa]

Landed another build fix in http://trac.webkit.org/changeset/123034.

Please be more careful in the future. In particular, if you're creating a patch with #if-def for Windows, then please build it on Windows.