QuotaExceededError: Update QuotaExceededError instances

ayuishii · Chromium LUCI CQ · commit a7bea0c1732f · 2025-05-20T17:36:07.000-07:00
This change updates services that use QuotaExceededError to use the new DOMException derived QuotaExceededError class when the flag is enabled. I've not been allowed to update external wpts until the webidl spec has been updated[0][1], so this change only updates tests for Chrome only wpts, and otherwise updates expectations for the external ones. External wpts will be updated when the webidl spec is merged and I am allowed to update the external wpts (as seen in chained CL). [0] Spec PR: whatwg/webidl#1465 [1] Discussion: web-platform-tests/wpt#52571 (comment) Bug: 406162261 Change-Id: Ie45d6095a3e4c21e21a35d2519d268580b8bc36b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6538066 Commit-Queue: Ayu Ishii <ayui@chromium.org> Reviewed-by: Daseul Lee <dslee@chromium.org> Cr-Commit-Position: refs/heads/main@{#1463139}
diff --git a/third_party/blink/renderer/core/dom/quota_exceeded_error.cc b/third_party/blink/renderer/core/dom/quota_exceeded_error.cc
@@ -56,6 +56,22 @@ void QuotaExceededError::Throw(ExceptionState& exception_state,
   }
 }
 
+// static
+void QuotaExceededError::Reject(ScriptPromiseResolverBase* resolver,
+                                const String& message,
+                                std::optional<double> quota,
+                                std::optional<double> requested) {
+  if (RuntimeEnabledFeatures::QuotaExceededErrorUpdateEnabled()) {
+    ScriptState* script_state = resolver->GetScriptState();
+    ScriptState::Scope scope(script_state);
+    v8::Isolate* isolate = script_state->GetIsolate();
+    resolver->Reject(Create(isolate, message, quota, requested));
+  } else {
+    resolver->RejectWithDOMException(DOMExceptionCode::kQuotaExceededError,
+                                     message);
+  }
+}
+
 QuotaExceededError::QuotaExceededError(const String& message,
                                        const QuotaExceededErrorOptions* options)
     : DOMException(DOMExceptionCode::kQuotaExceededError, message),
diff --git a/third_party/blink/renderer/core/dom/quota_exceeded_error.h b/third_party/blink/renderer/core/dom/quota_exceeded_error.h
@@ -7,6 +7,7 @@
 
 #include <optional>
 
+#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
@@ -37,6 +38,12 @@ class CORE_EXPORT QuotaExceededError : public DOMException {
                     std::optional<double> quota = std::nullopt,
                     std::optional<double> requested = std::nullopt);
 
+  // For throwing a QuotaExceededError from ScriptPromiseResolverBase::Reject.
+  static void Reject(ScriptPromiseResolverBase* resolver,
+                     const String& message,
+                     std::optional<double> quota = std::nullopt,
+                     std::optional<double> requested = std::nullopt);
+
   QuotaExceededError(const String& message,
                      const QuotaExceededErrorOptions* options);
   QuotaExceededError(const String& message,
diff --git a/third_party/blink/renderer/modules/ai/ai_writing_assistance_create_client.h b/third_party/blink/renderer/modules/ai/ai_writing_assistance_create_client.h
@@ -7,6 +7,7 @@
 
 #include "base/task/sequenced_task_runner.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_create_monitor_callback.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h"
 #include "third_party/blink/renderer/modules/ai/ai_context_observer.h"
@@ -137,9 +138,8 @@ class AIWritingAssistanceCreateClient
         break;
       }
       case AIManagerCreateClientError::kInitialInputTooLarge: {
-        this->GetResolver()->RejectWithDOMException(
-            DOMExceptionCode::kQuotaExceededError,
-            kExceptionMessageInputTooLarge);
+        QuotaExceededError::Reject(this->GetResolver(),
+                                   kExceptionMessageInputTooLarge);
         break;
       }
       case AIManagerCreateClientError::kUnsupportedLanguage: {
diff --git a/third_party/blink/renderer/modules/ai/exception_helpers.cc b/third_party/blink/renderer/modules/ai/exception_helpers.cc
@@ -8,12 +8,15 @@
 #include "base/notreached.h"
 #include "third_party/blink/public/mojom/ai/ai_manager.mojom-blink-forward.h"
 #include "third_party/blink/public/mojom/ai/ai_manager.mojom-shared.h"
+#include "third_party/blink/renderer/bindings/core/v8/v8_quota_exceeded_error_options.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/platform/bindings/exception_code.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/casting.h"
 
 namespace blink {
@@ -230,6 +233,11 @@ DOMException* ConvertModelStreamingResponseErrorToDOMException(
           kExceptionMessageSessionDestroyed,
           DOMException::GetErrorName(DOMExceptionCode::kInvalidStateError));
     case ModelStreamingResponseStatus::kErrorInputTooLarge:
+      if (RuntimeEnabledFeatures::QuotaExceededErrorUpdateEnabled()) {
+        return QuotaExceededError::Create(
+            kExceptionMessageInputTooLarge,
+            MakeGarbageCollected<QuotaExceededErrorOptions>());
+      }
       return DOMException::Create(
           kExceptionMessageInputTooLarge,
           DOMException::GetErrorName(DOMExceptionCode::kQuotaExceededError));
diff --git a/third_party/blink/renderer/modules/ai/language_model_create_client.cc b/third_party/blink/renderer/modules/ai/language_model_create_client.cc
@@ -9,6 +9,7 @@
 #include "third_party/blink/renderer/bindings/modules/v8/v8_language_model_prompt_dict.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_union_language_model_prompt_content.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_union_languagemodelpromptdict_string.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h"
 #include "third_party/blink/renderer/modules/ai/ai_interface_proxy.h"
@@ -181,9 +182,7 @@ void LanguageModelCreateClient::OnError(
       break;
     }
     case AIManagerCreateClientError::kInitialInputTooLarge: {
-      GetResolver()->RejectWithDOMException(
-          DOMExceptionCode::kQuotaExceededError,
-          kExceptionMessageInputTooLarge);
+      QuotaExceededError::Reject(GetResolver(), kExceptionMessageInputTooLarge);
       break;
     }
     case AIManagerCreateClientError::kUnsupportedLanguage: {
diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
@@ -15,6 +15,7 @@
 #include "third_party/blink/renderer/bindings/modules/v8/v8_background_fetch_options.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_image_resource.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/fetch/body.h"
 #include "third_party/blink/renderer/core/fetch/body_stream_buffer.h"
 #include "third_party/blink/renderer/core/fetch/request.h"
@@ -295,8 +296,7 @@ void BackgroundFetchManager::DidFetch(
           "There is no service worker available to service the fetch."));
       return;
     case mojom::blink::BackgroundFetchError::QUOTA_EXCEEDED:
-      resolver->RejectWithDOMException(DOMExceptionCode::kQuotaExceededError,
-                                       "Quota exceeded.");
+      QuotaExceededError::Reject(resolver, "Quota exceeded.");
       return;
     case mojom::blink::BackgroundFetchError::REGISTRATION_LIMIT_EXCEEDED:
       resolver->Reject(V8ThrowException::CreateTypeError(
diff --git a/third_party/blink/renderer/modules/buckets/storage_bucket_manager.cc b/third_party/blink/renderer/modules/buckets/storage_bucket_manager.cc
@@ -11,6 +11,7 @@
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_storage_bucket_options.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/execution_context/navigator_base.h"
 #include "third_party/blink/renderer/modules/buckets/storage_bucket.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
@@ -235,9 +236,7 @@ void StorageBucketManager::DidOpen(
             "Unknown error occured while creating a bucket."));
         return;
       case mojom::blink::BucketError::kQuotaExceeded:
-        resolver->Reject(MakeGarbageCollected<DOMException>(
-            DOMExceptionCode::kQuotaExceededError,
-            "Too many buckets created."));
+        QuotaExceededError::Reject(resolver, "Too many buckets created.");
         return;
       case mojom::blink::BucketError::kInvalidExpiration:
         resolver->Reject(V8ThrowException::CreateTypeError(
diff --git a/third_party/blink/renderer/modules/cache_storage/cache_storage_error.cc b/third_party/blink/renderer/modules/cache_storage/cache_storage_error.cc
@@ -7,6 +7,7 @@
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/modules/cache_storage/cache.h"
 #include "third_party/blink/renderer/platform/bindings/v8_throw_exception.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
@@ -48,7 +49,6 @@ void RejectCacheStorageWithError(ScriptPromiseResolverBase* resolver,
                                  mojom::blink::CacheStorageError web_error,
                                  const String& message) {
   String final_message =
-
       !message.empty() ? message : GetDefaultMessage(web_error);
   switch (web_error) {
     case mojom::CacheStorageError::kSuccess:
@@ -67,8 +67,7 @@ void RejectCacheStorageWithError(ScriptPromiseResolverBase* resolver,
                                        final_message);
       return;
     case mojom::CacheStorageError::kErrorQuotaExceeded:
-      resolver->RejectWithDOMException(DOMExceptionCode::kQuotaExceededError,
-                                       final_message);
+      QuotaExceededError::Reject(resolver, final_message);
       return;
     case mojom::CacheStorageError::kErrorCacheNameNotFound:
       resolver->RejectWithDOMException(DOMExceptionCode::kNotFoundError,
diff --git a/third_party/blink/renderer/modules/crypto/crypto.cc b/third_party/blink/renderer/modules/crypto/crypto.cc
@@ -29,6 +29,7 @@
 #include "third_party/blink/renderer/modules/crypto/crypto.h"
 
 #include "crypto/random.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_array_buffer_view.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/wtf/uuid.h"
@@ -65,8 +66,8 @@ NotShared<DOMArrayBufferView> Crypto::getRandomValues(
     return NotShared<DOMArrayBufferView>(nullptr);
   }
   if (array->byteLength() > 65536) {
-    exception_state.ThrowDOMException(
-        DOMExceptionCode::kQuotaExceededError,
+    QuotaExceededError::Throw(
+        exception_state,
         String::Format("The ArrayBufferView's byte length (%zu) exceeds the "
                        "number of bytes of entropy available via this API "
                        "(65536).",
diff --git a/third_party/blink/renderer/modules/encryptedmedia/content_decryption_module_result_promise.cc b/third_party/blink/renderer/modules/encryptedmedia/content_decryption_module_result_promise.cc
@@ -14,6 +14,7 @@
 #include "third_party/blink/renderer/bindings/core/v8/v8_throw_dom_exception.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
@@ -39,8 +40,7 @@ void WebCdmExceptionToPromiseRejection(
                                        message);
       return;
     case kWebContentDecryptionModuleExceptionQuotaExceededError:
-      resolver->RejectWithDOMException(DOMExceptionCode::kQuotaExceededError,
-                                       message);
+      QuotaExceededError::Reject(resolver, message);
       return;
   }
 
diff --git a/third_party/blink/renderer/modules/file_system_access/file_system_sync_access_handle.cc b/third_party/blink/renderer/modules/file_system_access/file_system_sync_access_handle.cc
@@ -7,6 +7,7 @@
 #include "base/files/file_error_or.h"
 #include "base/numerics/checked_math.h"
 #include "base/types/expected_macros.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/modules/file_system_access/file_system_access_file_delegate.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 
@@ -119,9 +120,8 @@ void FileSystemSyncAccessHandle::truncate(uint64_t size,
   RETURN_IF_ERROR(
       file_delegate()->SetLength(size), [&](base::File::Error error) {
         if (error == base::File::FILE_ERROR_NO_SPACE) {
-          exception_state.ThrowDOMException(
-              DOMExceptionCode::kQuotaExceededError,
-              "No space available for this operation");
+          QuotaExceededError::Throw(exception_state,
+                                    "No space available for this operation");
         } else if (error != base::File::FILE_OK) {
           exception_state.ThrowDOMException(
               DOMExceptionCode::kInvalidStateError, "truncate failed");
@@ -196,9 +196,8 @@ uint64_t FileSystemSyncAccessHandle::write(base::span<const uint8_t> buffer,
   int64_t write_end_offset;
   if (!base::CheckAdd(file_offset, write_size)
            .AssignIfValid(&write_end_offset)) {
-    exception_state.ThrowDOMException(
-        DOMExceptionCode::kQuotaExceededError,
-        "No capacity available for this operation");
+    QuotaExceededError::Throw(exception_state,
+                              "No capacity available for this operation");
     return 0;
   }
   DCHECK_GE(write_end_offset, 0);
@@ -208,9 +207,8 @@ uint64_t FileSystemSyncAccessHandle::write(base::span<const uint8_t> buffer,
       [&](base::File::Error error) {
         DCHECK_NE(error, base::File::FILE_OK);
         if (error == base::File::FILE_ERROR_NO_SPACE) {
-          exception_state.ThrowDOMException(
-              DOMExceptionCode::kQuotaExceededError,
-              "No space available for this operation");
+          QuotaExceededError::Throw(exception_state,
+                                    "No space available for this operation");
         } else {
           exception_state.ThrowDOMException(
               DOMExceptionCode::kInvalidStateError,
diff --git a/third_party/blink/renderer/modules/mediasource/media_source.cc b/third_party/blink/renderer/modules/mediasource/media_source.cc
@@ -184,6 +184,12 @@ void MediaSource::LogAndThrowDOMException(ExceptionState& exception_state,
   exception_state.ThrowDOMException(error, message);
 }
 
+void MediaSource::LogAndThrowQuotaExceededError(ExceptionState& exception_state,
+                                                const String& message) {
+  DVLOG(1) << __func__ << " (message=" << message << ")";
+  QuotaExceededError::Throw(exception_state, message);
+}
+
 void MediaSource::LogAndThrowTypeError(ExceptionState& exception_state,
                                        const String& message) {
   DVLOG(1) << __func__ << " (message=" << message << ")";
@@ -1676,11 +1682,11 @@ std::unique_ptr<WebSourceBuffer> MediaSource::CreateWebSourceBuffer(
       // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
       // Step 3: If the user agent can't handle any more SourceBuffer objects
       // then throw a QuotaExceededError exception and abort these steps.
-      LogAndThrowDOMException(exception_state,
-                              DOMExceptionCode::kQuotaExceededError,
-                              "This MediaSource has reached the limit of "
-                              "SourceBuffer objects it can handle. No "
-                              "additional SourceBuffer objects may be added.");
+      LogAndThrowQuotaExceededError(
+          exception_state,
+          "This MediaSource has reached the limit of "
+          "SourceBuffer objects it can handle. No "
+          "additional SourceBuffer objects may be added.");
       return nullptr;
   }
 
diff --git a/third_party/blink/renderer/modules/mediasource/media_source.h b/third_party/blink/renderer/modules/mediasource/media_source.h
@@ -67,6 +67,8 @@ class MediaSource final : public EventTarget,
   static void LogAndThrowDOMException(ExceptionState&,
                                       DOMExceptionCode error,
                                       const String& message);
+  static void LogAndThrowQuotaExceededError(ExceptionState&,
+                                            const String& message);
   static void LogAndThrowTypeError(ExceptionState&, const String&);
 
   // Web-exposed methods from media_source.idl
diff --git a/third_party/blink/renderer/modules/mediasource/source_buffer.cc b/third_party/blink/renderer/modules/mediasource/source_buffer.cc
@@ -1893,8 +1893,8 @@ bool SourceBuffer::PrepareAppend(double media_time,
     //    If the incoming data exceeds wtf_size_t::max, then our implementation
     //    cannot deal with it, so we also throw a QuotaExceededError.
     DVLOG(3) << __func__ << " this=" << this << " -> throw QuotaExceededError";
-    MediaSource::LogAndThrowDOMException(
-        exception_state, DOMExceptionCode::kQuotaExceededError,
+    MediaSource::LogAndThrowQuotaExceededError(
+        exception_state,
         "The SourceBuffer is full, and cannot free space to append additional "
         "buffers.");
     TRACE_EVENT_NESTABLE_ASYNC_END0("media", "SourceBuffer::prepareAppend",
@@ -1990,8 +1990,8 @@ void SourceBuffer::AppendBufferInternal_Locked(
   // just a single async segment parser loop run later, with nothing added to
   // the parser's input buffer here synchronously.
   if (!web_source_buffer_->AppendToParseBuffer(data)) {
-    MediaSource::LogAndThrowDOMException(
-        *exception_state, DOMExceptionCode::kQuotaExceededError,
+    MediaSource::LogAndThrowQuotaExceededError(
+        *exception_state,
         "Unable to allocate space required to buffer appended media.");
     TRACE_EVENT_NESTABLE_ASYNC_END0("media", "SourceBuffer::prepareAsyncAppend",
                                     TRACE_ID_LOCAL(this));
diff --git a/third_party/blink/renderer/modules/serial/serial_port.cc b/third_party/blink/renderer/modules/serial/serial_port.cc
@@ -15,6 +15,7 @@
 #include "third_party/blink/renderer/bindings/modules/v8/v8_serial_output_signals.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_serial_port_info.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/core/streams/readable_stream.h"
@@ -208,8 +209,7 @@ ReadableStream* SerialPort::readable(ScriptState* script_state,
   mojo::ScopedDataPipeProducerHandle producer;
   mojo::ScopedDataPipeConsumerHandle consumer;
   if (!CreateDataPipe(&producer, &consumer)) {
-    exception_state.ThrowDOMException(DOMExceptionCode::kQuotaExceededError,
-                                      kResourcesExhaustedReadBuffer);
+    QuotaExceededError::Throw(exception_state, kResourcesExhaustedReadBuffer);
     return nullptr;
   }
 
@@ -234,8 +234,7 @@ WritableStream* SerialPort::writable(ScriptState* script_state,
   mojo::ScopedDataPipeProducerHandle producer;
   mojo::ScopedDataPipeConsumerHandle consumer;
   if (!CreateDataPipe(&producer, &consumer)) {
-    exception_state.ThrowDOMException(DOMExceptionCode::kQuotaExceededError,
-                                      kResourcesExhaustedWriteBuffer);
+    QuotaExceededError::Throw(exception_state, kResourcesExhaustedWriteBuffer);
     return nullptr;
   }
 
diff --git a/third_party/blink/renderer/modules/storage/storage_area.cc b/third_party/blink/renderer/modules/storage/storage_area.cc
@@ -32,6 +32,7 @@
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/renderer/core/dom/document.h"
+#include "third_party/blink/renderer/core/dom/quota_exceeded_error.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/modules/storage/dom_window_storage.h"
@@ -128,9 +129,8 @@ NamedPropertySetterResult StorageArea::setItem(
     return NamedPropertySetterResult::kIntercepted;
   }
   if (!cached_area_->SetItem(key, value, this)) {
-    exception_state.ThrowDOMException(
-        DOMExceptionCode::kQuotaExceededError,
-        "Setting the value of '" + key + "' exceeded the quota.");
+    QuotaExceededError::Throw(exception_state, "Setting the value of '" + key +
+                                                   "' exceeded the quota.");
     return NamedPropertySetterResult::kIntercepted;
   }
   return NamedPropertySetterResult::kIntercepted;
diff --git a/third_party/blink/renderer/modules/webcodecs/codec_logger.h b/third_party/blink/renderer/modules/webcodecs/codec_logger.h
diff --git a/third_party/blink/renderer/modules/webcodecs/reclaimable_codec.cc b/third_party/blink/renderer/modules/webcodecs/reclaimable_codec.cc
diff --git a/third_party/blink/web_tests/http/tests/media/media-source/mediasource-addsourcebuffer-chrome.html b/third_party/blink/web_tests/http/tests/media/media-source/mediasource-addsourcebuffer-chrome.html
diff --git a/third_party/blink/web_tests/http/tests/resources/quota-exceeded-helper.js b/third_party/blink/web_tests/http/tests/resources/quota-exceeded-helper.js
diff --git a/third_party/blink/web_tests/platform/linux/external/wpt/background-fetch/fetch.https.window-expected.txt b/third_party/blink/web_tests/platform/linux/external/wpt/background-fetch/fetch.https.window-expected.txt
diff --git a/third_party/blink/web_tests/platform/mac/external/wpt/background-fetch/fetch.https.window-expected.txt b/third_party/blink/web_tests/platform/mac/external/wpt/background-fetch/fetch.https.window-expected.txt
