Attachment 370514 Details for Bug 198050 – Patch

[patch] Patch

bug-198050-20190523115022.patch (text/plain), 3.52 KB, created by Sihui Liu on 2019-05-23 11:50:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-05-23 11:50:24 PDT

Size: 3.52 KB

patch

obsolete

>Subversion Revision: 245660
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 430d4903961737e296b871de5ee0362775823f6e..704f56bfdfd3a97b8046583ef3037ae2dd3bf11f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-05-23  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  Tim Horton  <timothy_horton@apple.com>
> 
>         REGRESSION (r240552): PDF contents are not exposed to Accessibility (VO, etc.)
>diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>index f5ff16add45d2f60f677def51278ef1d5b27f976..0bf5112a9e4dbe64b0784650c1912916e0919533 100644
>--- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>+++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
>@@ -212,44 +212,14 @@ enum class ProcessAccessType {
> 
> static ProcessAccessType computeNetworkProcessAccessTypeForDataFetch(OptionSet<WebsiteDataType> dataTypes, bool isNonPersistentStore)
> {
>-    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)
>+                return ProcessAccessType::OnlyIfLaunched;
>+            return ProcessAccessType::Launch;
>+        }
>     }
>-
>-    // 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;
>+    return ProcessAccessType::None;
> }
> 
> static ProcessAccessType computeWebProcessAccessTypeForDataFetch(OptionSet<WebsiteDataType> dataTypes, bool isNonPersistentStore)

Actions: View | Formatted Diff | Diff

Attachments on bug 198050: 370465 | 370514