Bug 196281 – Resource Load Statistics: IPC to the WebsiteDataStore in the UI process from NetworkProcess::deleteWebsiteDataForRegistrableDomains()

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

[John Wilander]

The move of ITP to the network process requires that it calls the UI process when clearing website data (previously the other way around).

[John Wilander]

<rdar://problem/48938748>

[John Wilander]

Created attachment 366029 [details]
Patch

[EWS Watchlist]

Attachment 366029 [details] did not pass style-queue:


ERROR: Source/WebKit/Shared/WebsiteData/WebsiteData.h:42:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 1 in 25 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[John Wilander]

(In reply to Build Bot from comment #3)
> Attachment 366029 [details] did not pass style-queue:
> 
> 
> ERROR: Source/WebKit/Shared/WebsiteData/WebsiteData.h:42:  enum members
> should use InterCaps with an initial capital letter or initial 'k' for
> C-style enums.  [readability/enum_casing] [4]
> Total errors found: 1 in 25 files
> 
> 
> If any of these errors are false positives, please file a bug against
> check-webkit-style.

I belive the style checker is wrong, complaining about the capitalization of:

enum class WebsiteDataProcessType { Network, UI };

[John Wilander]

Non-Cocoa build failures seem to be about a new convenience function not being used. It’s currently only used in my code which is behind the Resource Load Statistics flag.

The mac-debug test failures are unrelated.

[John Wilander]

Created attachment 366088 [details]
Patch

[Alex Christensen]

Comment on attachment 366029 [details]
Patch

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

> Source/WebKit/NetworkProcess/NetworkProcess.cpp:1688
> +        parentProcessConnection()->send(Messages::NetworkProcessProxy::DeleteWebsiteDataInUIProcessForRegistrableDomains(sessionID, dataTypesForUIProcess, fetchOptions, domainsToDeleteAllButCookiesFor, callbackID), 0);

This seems like a prime candidate for sendWithAsyncReply.

> Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp:117
> +bool WebsiteDataRecord::matches(const RegistrableDomain& domain) const

This needs a WebCore:: or we need a using namespace WebCore inside the namespace WebKit.

> Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp:2075
> +    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("IsStatisticsHasLocalStorage"));

auto messageName = adoptWK(...)

> Tools/WebKitTestRunner/TestInvocation.cpp:1435
> +        WKRetainPtr<WKTypeRef> result(AdoptWK, WKBooleanCreate(hasLocalStorage));

auto result = adoptWK(...)

[EWS Watchlist]

Attachment 366088 [details] did not pass style-queue:


ERROR: Source/WebKit/Shared/WebsiteData/WebsiteData.h:42:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 1 in 24 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[John Wilander]

Sorry, I saw your comments after preparing the latest patch.

(In reply to Alex Christensen from comment #7)
> Comment on attachment 366029 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=366029&action=review
> 
> > Source/WebKit/NetworkProcess/NetworkProcess.cpp:1688
> > +        parentProcessConnection()->send(Messages::NetworkProcessProxy::DeleteWebsiteDataInUIProcessForRegistrableDomains(sessionID, dataTypesForUIProcess, fetchOptions, domainsToDeleteAllButCookiesFor, callbackID), 0);
> 
> This seems like a prime candidate for sendWithAsyncReply.

Yes. Chris pointed this out in-person. Fixed in the latest patch.

> > Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp:117
> > +bool WebsiteDataRecord::matches(const RegistrableDomain& domain) const
> 
> This needs a WebCore:: or we need a using namespace WebCore inside the
> namespace WebKit.

Will fix.

> > Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp:2075
> > +    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("IsStatisticsHasLocalStorage"));
> 
> auto messageName = adoptWK(...)

Will fix.

> > Tools/WebKitTestRunner/TestInvocation.cpp:1435
> > +        WKRetainPtr<WKTypeRef> result(AdoptWK, WKBooleanCreate(hasLocalStorage));
> 
> auto result = adoptWK(...)

Will fix.

Thanks!

[John Wilander]

Created attachment 366091 [details]
Patch

[EWS Watchlist]

Attachment 366091 [details] did not pass style-queue:


ERROR: Source/WebKit/Shared/WebsiteData/WebsiteData.h:42:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 1 in 24 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[John Wilander]

Non-Cocoa build failures are probably because of a missing header include.

[John Wilander]

Created attachment 366125 [details]
Patch

[EWS Watchlist]

Attachment 366125 [details] did not pass style-queue:


ERROR: Source/WebKit/Shared/WebsiteData/WebsiteData.h:43:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 1 in 24 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Alex Christensen]

Comment on attachment 366125 [details]
Patch

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

> Source/WebKit/Shared/WebsiteData/WebsiteData.cpp:98
> +    case WebsiteDataType::MemoryCache:
> +        return WebsiteDataProcessType::UI;

This is in the web process.

> Source/WebKit/Shared/WebsiteData/WebsiteData.cpp:106
> +    case WebsiteDataType::WebSQLDatabases:
> +        return WebsiteDataProcessType::UI;

I'm not sure if this is correct.  I thought this was in the Network process.

[Alex Christensen]

Comment on attachment 366125 [details]
Patch

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

> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:627
> +void WebsiteDataStore::fetchDataForRegistrableDomains(OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, const Vector<RegistrableDomain>& domains, CompletionHandler<void(Vector<WebsiteDataRecord>&&, HashSet<RegistrableDomain>&&)>&& completionHandler)

Same needing WebCore:: or using namespace WebCore here.

[John Wilander]

(In reply to Alex Christensen from comment #15)
> Comment on attachment 366125 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=366125&action=review
> 
> > Source/WebKit/Shared/WebsiteData/WebsiteData.cpp:98
> > +    case WebsiteDataType::MemoryCache:
> > +        return WebsiteDataProcessType::UI;
> 
> This is in the web process.

Sure. My thinking was that the WebsiteDataStore in the UI process manages removal of this type but you're absolutely right.

> > Source/WebKit/Shared/WebsiteData/WebsiteData.cpp:106
> > +    case WebsiteDataType::WebSQLDatabases:
> > +        return WebsiteDataProcessType::UI;
> 
> I'm not sure if this is correct.  I thought this was in the Network process.

Doesn't look like it. WebKit::NetworkProcess doesn't handle the type whereas WebKit::WebsiteDataStore does, like so:

    if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
        callbackAggregator->addPendingCallback();

        m_queue->dispatch([webSQLDatabaseDirectory = m_configuration->webSQLDatabaseDirectory().isolatedCopy(), callbackAggregator, modifiedSince] {
            WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory)->deleteDatabasesModifiedSince(modifiedSince);

            RunLoop::main().dispatch([callbackAggregator] {
                callbackAggregator->removePendingCallback();
            });
        });
    }

[John Wilander]

Created attachment 366198 [details]
Patch

[EWS Watchlist]

Attachment 366198 [details] did not pass style-queue:


ERROR: Source/WebKit/Shared/WebsiteData/WebsiteData.h:43:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 1 in 24 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[John Wilander]

Created attachment 366206 [details]
Patch

[John Wilander]

Trying to fix the Wincairo build failure. :/

[EWS Watchlist]

Attachment 366206 [details] did not pass style-queue:


ERROR: Source/WebKit/Shared/WebsiteData/WebsiteData.h:43:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 1 in 24 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[John Wilander]

Filed https://bugs.webkit.org/show_bug.cgi?id=196374 on the style checker issue.

[John Wilander]

Comment on attachment 366206 [details]
Patch

Thank you, Alex!

[WebKit Commit Bot]

Comment on attachment 366206 [details]
Patch

Clearing flags on attachment: 366206

Committed r243632: <https://trac.webkit.org/changeset/243632>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.