Attachment 339211 Details for Bug 185170 – Patch

[patch] Patch

bug-185170-20180501115542.patch (text/plain), 7.36 KB, created by Daniel Bates on 2018-05-01 11:56:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-05-01 11:56:31 PDT

Size: 7.36 KB

patch

obsolete

>Subversion Revision: 231201
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2a5ab73430be9982cec3adf5efbe9e40c45dd816..fc07cdc7cfed0886ee54a708868f36ad73c2bc99 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-05-01  Daniel Bates  <dabates@apple.com>
>+
>+        Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
>+        https://bugs.webkit.org/show_bug.cgi?id=185170
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rename CrossOriginPreflightResultCache::empty() to CrossOriginPreflightResultCache::clear() make
>+        it consistent with the terminology we use in WebKit to signify a function that clears a collection.
>+        A member function named "empty" is expected to return an instance of a class in its "empty state".
>+        For example, StringImpl::empty() returns a StringImpl instance that represents the empty string.
>+        However CrossOriginPreflightResultCache::empty() clears out the cache in-place. We should rename
>+        this function to better describe its purpose.
>+
>+        * loader/CrossOriginPreflightResultCache.cpp:
>+        (WebCore::CrossOriginPreflightResultCache::clear):
>+        (WebCore::CrossOriginPreflightResultCache::empty): Deleted.
>+        * loader/CrossOriginPreflightResultCache.h:
>+
> 2018-05-01  Oleksandr Skachkov  <gskachkov@gmail.com>
> 
>         WebAssembly: add support for stream APIs - JavaScript API
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b75bdca967a5084ed26fee01d9e79d5870869531..a17076d0c4fe154419e30b8e186e755e1ca6717e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-01  Daniel Bates  <dabates@apple.com>
>+
>+        Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
>+        https://bugs.webkit.org/show_bug.cgi?id=185170
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/WebProcess.cpp:
>+        (WebKit::WebProcess::clearResourceCaches):
>+        (WebKit::WebProcess::deleteWebsiteData):
>+
> 2018-05-01  Oleksandr Skachkov  <gskachkov@gmail.com>
> 
>         WebAssembly: add support for stream APIs - JavaScript API
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 3676e65a3ed703707de0044039e0201ca5f72df5..f4e9b16f9427f3ddf007e441ee3940f13c703eb2 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-01  Daniel Bates  <dabates@apple.com>
>+
>+        Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
>+        https://bugs.webkit.org/show_bug.cgi?id=185170
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Misc/WebCache.mm:
>+        (+[WebCache empty]):
>+
> 2018-05-01  Eric Carlson  <eric.carlson@apple.com>
> 
>         [MediaStream] remove WK1 support
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 70736275658d8ef17affc49f35eeb1a5e77133fd..243ca380f54bc258ffae84d82bddbda04589f6dd 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-01  Daniel Bates  <dabates@apple.com>
>+
>+        Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
>+        https://bugs.webkit.org/show_bug.cgi?id=185170
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCache.cpp:
>+        (WebCache::empty):
>+
> 2018-04-27  Chris Dumez  <cdumez@apple.com>
> 
>         Use WindowProxy instead of DOMWindow in our IDL
>diff --git a/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp b/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp
>index 7087ab032307b7a81adba3c02889f1e18ee794ef..632b68daa8085982d212a472ce74ed5cff578f4c 100644
>--- a/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp
>+++ b/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp
>@@ -145,7 +145,7 @@ bool CrossOriginPreflightResultCache::canSkipPreflight(const String& origin, con
>     return false;
> }
> 
>-void CrossOriginPreflightResultCache::empty()
>+void CrossOriginPreflightResultCache::clear()
> {
>     ASSERT(isMainThread());
>     m_preflightHashMap.clear();
>diff --git a/Source/WebCore/loader/CrossOriginPreflightResultCache.h b/Source/WebCore/loader/CrossOriginPreflightResultCache.h
>index af2a5f1821d72c106f2bf81659e6a625ff6fb8e1..dc07130a1b14653bd1df5beee98809e3b72efbe3 100644
>--- a/Source/WebCore/loader/CrossOriginPreflightResultCache.h
>+++ b/Source/WebCore/loader/CrossOriginPreflightResultCache.h
>@@ -62,14 +62,11 @@ private:
> 
> class CrossOriginPreflightResultCache {
>     WTF_MAKE_NONCOPYABLE(CrossOriginPreflightResultCache); WTF_MAKE_FAST_ALLOCATED;
>-
> public:
>     WEBCORE_EXPORT static CrossOriginPreflightResultCache& singleton();
>-
>     WEBCORE_EXPORT void appendEntry(const String& origin, const URL&, std::unique_ptr<CrossOriginPreflightResultCacheItem>);
>     WEBCORE_EXPORT bool canSkipPreflight(const String& origin, const URL&, StoredCredentialsPolicy, const String& method, const HTTPHeaderMap& requestHeaders);
>-
>-    WEBCORE_EXPORT void empty();
>+    WEBCORE_EXPORT void clear();
> 
> private:
>     friend NeverDestroyed<CrossOriginPreflightResultCache>;
>diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
>index 239705db6d95fead7e9721ace0e54b089067ede3..aaa6034b79e99e57390a99aa5266c8f7ec78a081 100644
>--- a/Source/WebKit/WebProcess/WebProcess.cpp
>+++ b/Source/WebKit/WebProcess/WebProcess.cpp
>@@ -797,7 +797,7 @@ void WebProcess::clearResourceCaches(ResourceCachesToClear resourceCachesToClear
>     MemoryCache::singleton().evictResources();
> 
>     // Empty the cross-origin preflight cache.
>-    CrossOriginPreflightResultCache::singleton().empty();
>+    CrossOriginPreflightResultCache::singleton().clear();
> }
> 
> static inline void addCaseFoldedCharacters(StringHasher& hasher, const String& string)
>@@ -1310,7 +1310,7 @@ void WebProcess::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDa
>         PageCache::singleton().pruneToSizeNow(0, PruningReason::None);
>         MemoryCache::singleton().evictResources(sessionID);
> 
>-        CrossOriginPreflightResultCache::singleton().empty();
>+        CrossOriginPreflightResultCache::singleton().clear();
>     }
> 
>     if (websiteDataTypes.contains(WebsiteDataType::Credentials)) {
>diff --git a/Source/WebKitLegacy/mac/Misc/WebCache.mm b/Source/WebKitLegacy/mac/Misc/WebCache.mm
>index 241909735661c56d6aaec562e4d2c74df6bca42a..1bd56cb784c75ea2855145e7f74f48348b2f18bc 100644
>--- a/Source/WebKitLegacy/mac/Misc/WebCache.mm
>+++ b/Source/WebKitLegacy/mac/Misc/WebCache.mm
>@@ -118,7 +118,7 @@ + (void)empty
>     webApplicationCacheStorage().empty();
> 
>     // Empty the Cross-Origin Preflight cache
>-    WebCore::CrossOriginPreflightResultCache::singleton().empty();
>+    WebCore::CrossOriginPreflightResultCache::singleton().clear();
> }
> 
> #if PLATFORM(IOS)
>diff --git a/Source/WebKitLegacy/win/WebCache.cpp b/Source/WebKitLegacy/win/WebCache.cpp
>index 75632df021ada25693d70b5ecf45a0bce1606f97..4bf8ef06994ab5764d4586e45545a757508d8c66 100644
>--- a/Source/WebKitLegacy/win/WebCache.cpp
>+++ b/Source/WebKitLegacy/win/WebCache.cpp
>@@ -223,7 +223,7 @@ HRESULT WebCache::empty()
>     WebApplicationCache::storage().empty();
> 
>     // Empty the Cross-Origin Preflight cache
>-    WebCore::CrossOriginPreflightResultCache::singleton().empty();
>+    WebCore::CrossOriginPreflightResultCache::singleton().clear();
> 
>     return S_OK;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 185170: 339211