Bug 112571 – [Chromium] Create WebFileSystemType enum to allow easier filesystem refactoring

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

[Mark Pilgrim (Google)]

[Chromium] Create WebFileSystemType enum to allow easier filesystem refactoring

[Mark Pilgrim (Google)]

Created attachment 193557 [details]
WIP Patch

[Mark Pilgrim (Google)]

Comment on attachment 193557 [details]
WIP Patch

Pretty sure this will break Chromium build. Still working on it.

[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.

[Mark Pilgrim (Google)]

Nope, this definitely needs to be behind a #define so we don't break Chromium.

[Mark Pilgrim (Google)]

Created attachment 193603 [details]
Patch

[Mark Pilgrim (Google)]

Comment on attachment 193603 [details]
Patch

OK, this version puts all changes behind #ifdefs so we can make the changes in Chromium and then turn on everything at once.

[Adam Barth]

Comment on attachment 193603 [details]
Patch

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

> Source/Platform/chromium/public/WebFileSystemType.h:35
> +// #define USE_NEW_WEBFILESYSTEMTYPE

USE_NEW_WEBFILESYSTEMTYPE -> WEBKIT_USE_NEW_WEBFILESYSTEMTYPE

> Source/WebKit/chromium/public/WebCommonWorkerClient.h:67
> +#ifdef USE_NEW_WEBFILESYSTEMTYPE
> +    virtual void openFileSystem(WebFileSystemType, long long size, bool create, WebFileSystemCallbacks*)
> +#else
>      virtual void openFileSystem(WebFileSystem::Type, long long size, bool create, WebFileSystemCallbacks*)
> +#endif

Can you use a typedef to avoid adding this ifdef everywhere?

[Mark Pilgrim (Google)]

(In reply to comment #7)
> (From update of attachment 193603 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=193603&action=review
> 
> > Source/Platform/chromium/public/WebFileSystemType.h:35
> > +// #define USE_NEW_WEBFILESYSTEMTYPE
> 
> USE_NEW_WEBFILESYSTEMTYPE -> WEBKIT_USE_NEW_WEBFILESYSTEMTYPE

Grr.

> > Source/WebKit/chromium/public/WebCommonWorkerClient.h:67
> > +#ifdef USE_NEW_WEBFILESYSTEMTYPE
> > +    virtual void openFileSystem(WebFileSystemType, long long size, bool create, WebFileSystemCallbacks*)
> > +#else
> >      virtual void openFileSystem(WebFileSystem::Type, long long size, bool create, WebFileSystemCallbacks*)
> > +#endif
> 
> Can you use a typedef to avoid adding this ifdef everywhere?

Couldn't figure it out. Enlisted help from several C++ gurus. Enums can't define casting operators, enum names don't match because of WebKit* prefixing. The whole mess will be resolved after one Chromium patch lands, so it's not really worth any more time trying to be clever.

[Mark Pilgrim (Google)]

Created attachment 193607 [details]
Patch

[Mark Pilgrim (Google)]

Comment on attachment 193607 [details]
Patch

Now with WEBKIT_USE_NEW_WEBFILESYSTEMTYPE

[Adam Barth]

Comment on attachment 193607 [details]
Patch

ok

[Mark Pilgrim (Google)]

Comment on attachment 193607 [details]
Patch

Nope, turns out there's two more files (in DumpRenderTree) that need munging.

[Mark Pilgrim (Google)]

Created attachment 193627 [details]
Patch

[Mark Pilgrim (Google)]

Comment on attachment 193627 [details]
Patch

Now with necessary DumpRenderTree changes.

[WebKit Review Bot]

Comment on attachment 193627 [details]
Patch

Clearing flags on attachment: 193627

Committed r146111: <http://trac.webkit.org/changeset/146111>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.