Attachment 370465 Details for Bug 198050 – Patch

[patch] Patch

bug-198050-20190522163835.patch (text/plain), 3.41 KB, created by Sihui Liu on 2019-05-22 16:38:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-05-22 16:38:36 PDT

Size: 3.41 KB

patch

obsolete

>Subversion Revision: 245643
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 68ab6ecd00ff0bf2959c0b125a2b9442b7b75b59..4091014d940f52c3bf79fad9d2478b1c9b612467 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-05-22  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Handling for non-persistent data should be consistent in computeNetworkProcessAccessTypeForDataFetch
>+        https://bugs.webkit.org/show_bug.cgi?id=198050
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
>+        (WebKit::computeNetworkProcessAccessTypeForDataFetch):
>+
> 2019-05-22  Antoine Quint  <graouts@apple.com>
> 
>         [iOS] Compatibility mouse events aren't prevented by calling preventDefault() on pointerdown
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>index f5ff16add45d2f60f677def51278ef1d5b27f976..ffabd7ac3efb1ad6d52cb28d049f1fe4cbe25d93 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>@@ -214,41 +214,16 @@ static ProcessAccessType computeNetworkProcessAccessTypeForDataFetch(OptionSet<W
> {
>     ProcessAccessType processAccessType = ProcessAccessType::None;
> 
>-    if (dataTypes.contains(WebsiteDataType::Cookies)) {
>-        if (isNonPersistentStore)
>-            processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
>-        else
>-            processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
>-    }
>-
>-    if (dataTypes.contains(WebsiteDataType::Credentials) && isNonPersistentStore)
>-        processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
>-
>-    if (dataTypes.contains(WebsiteDataType::DiskCache) && !isNonPersistentStore)
>-        processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
>-
>-    if (dataTypes.contains(WebsiteDataType::SessionStorage))
>-        processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
>-    
>-    if (dataTypes.contains(WebsiteDataType::LocalStorage)) {
>-        if (isNonPersistentStore)
>-            processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
>-        else
>-            processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
>+    for (auto dataType : dataTypes) {
>+        if (WebsiteData::ownerProcess(dataType) == WebsiteDataProcessType::Network) {
>+            if (isNonPersistentStore)
>+                processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
>+            else
>+                processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
>+            break;
>+        }
>     }
> 
>-    // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198050.
>-    if (dataTypes.contains(WebsiteDataType::DOMCache))
>-        processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
>-    
>-    if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && !isNonPersistentStore)
>-        processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
>-
>-#if ENABLE(SERVICE_WORKER)
>-    if (dataTypes.contains(WebsiteDataType::ServiceWorkerRegistrations) && !isNonPersistentStore)
>-        processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
>-#endif
>-
>     return processAccessType;
> }
>

Flags:

youennf: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198050: 370465 | 370514