Bug 179063 – Add a FileSystem namespace to FileSystem.cpp

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Christopher Reid]

I am planning on moving FileSystem to PAL soon. Before work is done to move it, I'm working on cleaning up and updating the code.
The functions of filesystem are global to the WebCore namespace. Adding a FileSystem namespace will help avoid naming collisions with these functions.

[Christopher Reid]

Created attachment 325463 [details]
Patch

[Christopher Reid]

Created attachment 325473 [details]
Patch

Missed a namespace in FileSystemCoca.mm

[Christopher Reid]

Created attachment 325479 [details]
Patch

[Christopher Reid]

Created attachment 325493 [details]
patch

[Christopher Reid]

Created attachment 325504 [details]
Patch

Fixing some cases where FileSystem:: was wrongly added to functions with the same name as FileSystem functions.

[Christopher Reid]

Created attachment 325513 [details]
Patch

Fixing an enum using two FileSystem namespaces

[Christopher Reid]

Created attachment 325555 [details]
Patch

This should fix the remaining mac build issues

[Darin Adler]

Comment on attachment 325555 [details]
Patch

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

I’m not thrilled by this change; I don’t really know what specific name conflicts this is preventing. But I guess it’s OK.

> Source/WebCore/ChangeLog:12
> +        * Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp:

The file list in this change log is a mess. For example, it’s not great to just leave in all sorts of erroneous "deleted" lines for functions moved inside a namespace. The point of the change log generation tool is to start the change log for you. It’s not great to just leave all the lines in there without looking them over. For a global replace like this, might even want to leave out all the function names.

> Source/WebCore/Modules/indexeddb/server/IDBServer.cpp:469
> +    Vector<String> entries = WebCore::FileSystem::listDirectory(directory, ASCIILiteral("*"));

Do we really need the WebCore prefix here? This code is in a namespace nested inside the WebCore namespace. I’m surprised this is required.

[Christopher Reid]

(In reply to Darin Adler from comment #8)
> Comment on attachment 325555 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=325555&action=review
> 
> I’m not thrilled by this change; I don’t really know what specific name
> conflicts this is preventing. But I guess it’s OK.
> 
> > Source/WebCore/ChangeLog:12
> > +        * Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp:
> 
> The file list in this change log is a mess. For example, it’s not great to
> just leave in all sorts of erroneous "deleted" lines for functions moved
> inside a namespace. The point of the change log generation tool is to start
> the change log for you. It’s not great to just leave all the lines in there
> without looking them over. For a global replace like this, might even want
> to leave out all the function names.

That's good to know, I'll clean up the ChangeLogs and I can take out all the touched function names. 

> > Source/WebCore/Modules/indexeddb/server/IDBServer.cpp:469
> > +    Vector<String> entries = WebCore::FileSystem::listDirectory(directory, ASCIILiteral("*"));
> 
> Do we really need the WebCore prefix here? This code is in a namespace
> nested inside the WebCore namespace. I’m surprised this is required.

It actually looks fine without that WebCore namespace, I'll take it out.

[Christopher Reid]

Created attachment 325786 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 325786 [details]
Patch for landing

Clearing flags on attachment: 325786

Committed r224371: <https://trac.webkit.org/changeset/224371>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/35567651>