Bug 225768 - Rename FileSystem::directoryName() to FileSystem::parentPath()
Summary: Rename FileSystem::directoryName() to FileSystem::parentPath()
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Web Template Framework (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Chris Dumez
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2021-05-13 09:23 PDT by Chris Dumez
Modified: 2021-05-13 13:48 PDT (History)
27 users (show)

See Also:


Attachments
Patch (38.88 KB, patch)
2021-05-13 09:55 PDT, Chris Dumez
no flags Details | Formatted Diff | Diff
Patch (31.32 KB, patch)
2021-05-13 12:40 PDT, Chris Dumez
no flags Details | Formatted Diff | Diff
Patch (30.12 KB, patch)
2021-05-13 12:45 PDT, Chris Dumez
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Dumez 2021-05-13 09:23:24 PDT
Rename FileSystem::directoryName() to FileSystem::parentPath() for clarity and consistency with std::filesystem::parent_path() which is used internally.
Comment 1 Chris Dumez 2021-05-13 09:55:00 PDT
Created attachment 428523 [details]
Patch
Comment 2 EWS Watchlist 2021-05-13 09:56:26 PDT
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
Comment 3 Darin Adler 2021-05-13 12:21:48 PDT
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.
Comment 4 Chris Dumez 2021-05-13 12:40:47 PDT
Created attachment 428546 [details]
Patch
Comment 5 Darin Adler 2021-05-13 12:41:53 PDT
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.
Comment 6 Chris Dumez 2021-05-13 12:45:36 PDT
Created attachment 428548 [details]
Patch
Comment 7 EWS 2021-05-13 13:47:46 PDT
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].
Comment 8 Radar WebKit Bug Importer 2021-05-13 13:48:16 PDT
<rdar://problem/77984809>