| Summary: | [Chromium] Call SQLiteFileSystem-related functions directly | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Mark Pilgrim (Google) <pilgrim> | ||||||
| Component: | WebKit Misc. | Assignee: | Mark Pilgrim (Google) <pilgrim> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | abarth, dglazkov, fishd, haraken, jamesr, rniwa, tkent+wkapi, tony, webkit.review.bot | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Bug Depends on: | |||||||||
| Bug Blocks: | 82948 | ||||||||
| Attachments: |
|
||||||||
|
Description
Mark Pilgrim (Google)
2012-07-18 09:26:26 PDT
Created attachment 153028 [details]
Patch
Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 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. Created attachment 153061 [details]
Patch
Comment on attachment 153061 [details]
Patch
Nits addressed.
Comment on attachment 153061 [details] Patch Clearing flags on attachment: 153061 Committed r123014: <http://trac.webkit.org/changeset/123014> All reviewed patches have been landed. Closing bug. 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. > 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.
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. > It's probably complaining that HANDLE isn't defined.
Maybe we should roll out the patch and try again.
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. |