Changeset 255136 in webkit

Timestamp:

Jan 26, 2020 10:27:38 PM (4 years ago)

Author:

Darin Adler

Message:

Move DOMCacheEngine::errorToException back out of header and into .cpp file
​https://bugs.webkit.org/show_bug.cgi?id=206815

Reviewed by Mark Lam.

This is a follow-up to a recent build fix that moved a function, errorToException,
out of a .cpp file and into a header file. This reverses that since we don't need
this function to be inlined.

• Modules/cache/DOMCacheEngine.cpp:

(WebCore::DOMCacheEngine::convertToException): Moved this function from the header
and renamed it from errorToException to match the other function more closely. Also
use the pattern where the switch statement has no default, so we get a warning if
we don't cover all the enum values.
(WebCore::DOMCacheEngine::convertToExceptionAndLog): Updated for new function name.

• Modules/cache/DOMCacheEngine.h: Removed the definition of errorToException and

replaced it with the declaration of it under its new name, convertToException.

• Modules/cache/DOMCacheStorage.cpp:

(WebCore::DOMCacheStorage::retrieveCaches): Updated for new function name.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/cache/DOMCacheEngine.cpp (modified) (1 diff)
• Modules/cache/DOMCacheEngine.h (modified) (2 diffs)
• Modules/cache/DOMCacheStorage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-26  Darin Adler  <darin@apple.com>
+
+        Move DOMCacheEngine::errorToException back out of header and into .cpp file
+        https://bugs.webkit.org/show_bug.cgi?id=206815
+
+        Reviewed by Mark Lam.
+
+        This is a follow-up to a recent build fix that moved a function, errorToException,
+        out of a .cpp file and into a header file. This reverses that since we don't need
+        this function to be inlined.
+
+        * Modules/cache/DOMCacheEngine.cpp:
+        (WebCore::DOMCacheEngine::convertToException): Moved this function from the header
+        and renamed it from errorToException to match the other function more closely. Also
+        use the pattern where the switch statement has no default, so we get a warning if
+        we don't cover all the enum values.
+        (WebCore::DOMCacheEngine::convertToExceptionAndLog): Updated for new function name.
+
+        * Modules/cache/DOMCacheEngine.h: Removed the definition of errorToException and
+        replaced it with the declaration of it under its new name, convertToException.
+
+        * Modules/cache/DOMCacheStorage.cpp:
+        (WebCore::DOMCacheStorage::retrieveCaches): Updated for new function name.
+
 2020-01-26  youenn fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/cache/DOMCacheEngine.cpp

@@ -36 +36 @@
 namespace DOMCacheEngine {
 
+Exception convertToException(Error error)
+{
+    switch (error) {
+    case Error::NotImplemented:
+        return Exception { NotSupportedError, "Not implemented"_s };
+    case Error::ReadDisk:
+        return Exception { TypeError, "Failed reading data from the file system"_s };
+    case Error::WriteDisk:
+        return Exception { TypeError, "Failed writing data to the file system"_s };
+    case Error::QuotaExceeded:
+        return Exception { QuotaExceededError, "Quota exceeded"_s };
+    case Error::Internal:
+        return Exception { TypeError, "Internal error"_s };
+    case Error::Stopped:
+        return Exception { TypeError, "Context is stopped"_s };
+    }
+    ASSERT_NOT_REACHED();
+    return Exception { TypeError, "Connection stopped"_s };
+}
+
 Exception convertToExceptionAndLog(ScriptExecutionContext* context, Error error)
 {
-    auto exception = errorToException(error);
+    auto exception = convertToException(error);
     if (context)
         context->addConsoleMessage(MessageSource::JS, MessageLevel::Error, makeString("Cache API operation failed: ", exception.message()));

trunk/Source/WebCore/Modules/cache/DOMCacheEngine.h

@@ -31 +31 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#include "ScriptExecutionContext.h"
 #include "SharedBuffer.h"
 #include <wtf/CompletionHandler.h>
 
 namespace WebCore {
+
+class ScriptExecutionContext;
 
 struct CacheQueryOptions;
@@ -50 +51 @@
 };
 
-static inline Exception errorToException(Error error)
-{
-    switch (error) {
-    case Error::NotImplemented:
-        return Exception { NotSupportedError, "Not implemented"_s };
-    case Error::ReadDisk:
-        return Exception { TypeError, "Failed reading data from the file system"_s };
-    case Error::WriteDisk:
-        return Exception { TypeError, "Failed writing data to the file system"_s };
-    case Error::QuotaExceeded:
-        return Exception { QuotaExceededError, "Quota exceeded"_s };
-    case Error::Internal:
-        return Exception { TypeError, "Internal error"_s };
-    case Error::Stopped:
-        return Exception { TypeError, "Context is stopped"_s };
-    default:
-        ASSERT_NOT_REACHED();
-        return Exception { TypeError, "Connection stopped"_s };
-    }
-}
-
+Exception convertToException(Error);
 Exception convertToExceptionAndLog(ScriptExecutionContext*, Error);
 

trunk/Source/WebCore/Modules/cache/DOMCacheStorage.cpp

@@ -152 +152 @@
     m_connection->retrieveCaches(*origin, m_updateCounter, [this, callback = WTFMove(callback), pendingActivity = makePendingActivity(*this)](CacheInfosOrError&& result) mutable {
         if (m_isStopped) {
-            callback(DOMCacheEngine::errorToException(DOMCacheEngine::Error::Stopped));
+            callback(DOMCacheEngine::convertToException(DOMCacheEngine::Error::Stopped));
             return;
         }