Rename FileSystem::directoryName() to FileSystem::parentPath()

• Component: Web Template Framework
• Status: RESOLVED FIXED

[Chris Dumez]

Rename FileSystem::directoryName() to FileSystem::parentPath() for clarity and consistency with std::filesystem::parent_path() which is used internally.

[Chris Dumez]

Created attachment 428523 [details]
Patch

[EWS Watchlist]

Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API

[Darin Adler]

Comment on attachment 428523 [details]
Patch

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

> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:505
> +        m_queue->dispatch([fetchOptions, applicationCacheDirectory = m_configuration->applicationCacheDirectory().isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_configuration->applicationCacheFlatFileSubparentPath().isolatedCopy(), callbackAggregator] {

We shouldn't do this one.

> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:730
> +        m_queue->dispatch([applicationCacheDirectory = m_configuration->applicationCacheDirectory().isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_configuration->applicationCacheFlatFileSubparentPath().isolatedCopy(), callbackAggregator] {

Ditto.

> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:901
> +        m_queue->dispatch([origins = WTFMove(origins), applicationCacheDirectory = m_configuration->applicationCacheDirectory().isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_configuration->applicationCacheFlatFileSubparentPath().isolatedCopy(), callbackAggregator] {

Ditto.

> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:242
> +    const String& applicationCacheFlatFileSubparentPath() const { return m_configuration->applicationCacheFlatFileSubparentPath(); }

Ditto.

> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:122
> +    const String& applicationCacheFlatFileSubparentPath() const { return m_applicationCacheFlatFileSubdirectoryName; }
> +    void setApplicationCacheFlatFileSubparentPath(String&& directory) { m_applicationCacheFlatFileSubdirectoryName = WTFMove(directory); }

Ditto.

[Chris Dumez]

Created attachment 428546 [details]
Patch

[Darin Adler]

Comment on attachment 428546 [details]
Patch

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

> Source/WebKit/ChangeLog:41
> +        * UIProcess/WebsiteData/WebsiteDataStore.h:
> +        (WebKit::WebsiteDataStore::applicationCacheFlatFileSubparentPath const):
> +        (WebKit::WebsiteDataStore::applicationCacheFlatFileSubdirectoryName const): Deleted.
> +        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
> +        (WebKit::WebsiteDataStoreConfiguration::applicationCacheFlatFileSubparentPath const):
> +        (WebKit::WebsiteDataStoreConfiguration::setApplicationCacheFlatFileSubparentPath):
> +        (WebKit::WebsiteDataStoreConfiguration::applicationCacheFlatFileSubdirectoryName const): Deleted.
> +        (WebKit::WebsiteDataStoreConfiguration::setApplicationCacheFlatFileSubdirectoryName): Deleted.

Left over from the old version of the patch.

[Chris Dumez]

Created attachment 428548 [details]
Patch

[EWS]

Committed r277449 (237697@main): <https://commits.webkit.org/237697@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 428548 [details].

[Radar WebKit Bug Importer]

<rdar://problem/77984809>