CodeGen: Wrap IDL enum dictionary members with an adapter

The new code generator will use V8Enum classes for IDL enum members in
IDL dictionaries.
However, in some cases, implicit conversion of IDL enum to String
doesn't work.
This CL wraps them with IDLEnumAsString() to make them workable with
both of old/new code generator.  They will be unwrapped after migrating
the code generators.


Bug: 839389, 1070871
Change-Id: Ide73bca4fb4f7785b0c243fa1c2e7c8bfc99e6d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2230588
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Auto-Submit: Hitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793525}

third_party/blink/renderer/core/imagebitmap/image_bitmap.cc

@@ -18,6 +18,7 @@
 #include "third_party/blink/renderer/core/html/canvas/image_data.h"
 #include "third_party/blink/renderer/core/html/media/html_video_element.h"
 #include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
 #include "third_party/blink/renderer/platform/graphics/canvas_color_params.h"
 #include "third_party/blink/renderer/platform/graphics/canvas_resource_provider.h"
@@ -112,7 +113,7 @@ ImageBitmap::ParsedOptions ParseOptions(const ImageBitmapOptions* options,
     } else {
       NOTREACHED()
           << "Invalid ImageBitmap creation attribute colorSpaceConversion: "
-          << options->colorSpaceConversion();
+          << IDLEnumAsString(options->colorSpaceConversion());
     }
   }
 

third_party/blink/renderer/core/workers/dedicated_worker.cc

@@ -44,6 +44,7 @@
 #include "third_party/blink/renderer/core/workers/worker_classic_script_loader.h"
 #include "third_party/blink/renderer/core/workers/worker_clients.h"
 #include "third_party/blink/renderer/core/workers/worker_global_scope.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.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/instrumentation/use_counter.h"
@@ -264,7 +265,7 @@ void DedicatedWorker::OnHostCreated(
                   String() /* source_code */, reject_coep_unsafe_none);
     return;
   }
-  NOTREACHED() << "Invalid type: " << options_->type();
+  NOTREACHED() << "Invalid type: " << IDLEnumAsString(options_->type());
 }
 
 void DedicatedWorker::terminate() {

third_party/blink/renderer/modules/credentialmanager/credential_manager_type_converters.cc

@@ -24,6 +24,7 @@
 #include "third_party/blink/renderer/modules/credentialmanager/federated_credential.h"
 #include "third_party/blink/renderer/modules/credentialmanager/password_credential.h"
 #include "third_party/blink/renderer/modules/credentialmanager/public_key_credential.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 
 namespace mojo {
 
@@ -306,8 +307,8 @@ TypeConverter<AuthenticatorSelectionCriteriaPtr,
   mojo_criteria->require_resident_key = criteria->requireResidentKey();
   mojo_criteria->user_verification = UserVerificationRequirement::PREFERRED;
   if (criteria->hasUserVerification()) {
-    mojo_criteria->user_verification =
-        ConvertTo<UserVerificationRequirement>(criteria->userVerification());
+    mojo_criteria->user_verification = ConvertTo<UserVerificationRequirement>(
+        blink::IDLEnumAsString(criteria->userVerification()));
   }
   return mojo_criteria;
 }
@@ -359,8 +360,8 @@ TypeConverter<PublicKeyCredentialDescriptorPtr,
     Convert(const blink::PublicKeyCredentialDescriptor* descriptor) {
   auto mojo_descriptor = PublicKeyCredentialDescriptor::New();
 
-  mojo_descriptor->type =
-      ConvertTo<PublicKeyCredentialType>(descriptor->type());
+  mojo_descriptor->type = ConvertTo<PublicKeyCredentialType>(
+      blink::IDLEnumAsString(descriptor->type()));
   mojo_descriptor->id = ConvertTo<Vector<uint8_t>>(descriptor->id());
   if (descriptor->hasTransports() && !descriptor->transports().IsEmpty()) {
     for (const auto& transport : descriptor->transports()) {
@@ -385,7 +386,8 @@ TypeConverter<PublicKeyCredentialParametersPtr,
               blink::PublicKeyCredentialParameters*>::
     Convert(const blink::PublicKeyCredentialParameters* parameter) {
   auto mojo_parameter = PublicKeyCredentialParameters::New();
-  mojo_parameter->type = ConvertTo<PublicKeyCredentialType>(parameter->type());
+  mojo_parameter->type = ConvertTo<PublicKeyCredentialType>(
+      blink::IDLEnumAsString(parameter->type()));
 
   // A COSEAlgorithmIdentifier's value is a number identifying a cryptographic
   // algorithm. Values are registered in the IANA COSE Algorithms registry.
@@ -577,8 +579,8 @@ TypeConverter<PublicKeyCredentialRequestOptionsPtr,
 
   mojo_options->user_verification = UserVerificationRequirement::PREFERRED;
   if (options->hasUserVerification()) {
-    mojo_options->user_verification =
-        ConvertTo<UserVerificationRequirement>(options->userVerification());
+    mojo_options->user_verification = ConvertTo<UserVerificationRequirement>(
+        blink::IDLEnumAsString(options->userVerification()));
   }
 
   if (options->hasExtensions()) {

third_party/blink/renderer/modules/indexeddb/idb_observer.cc

@@ -14,6 +14,7 @@
 #include "third_party/blink/renderer/modules/indexeddb/idb_database.h"
 #include "third_party/blink/renderer/modules/indexeddb/idb_observer_changes.h"
 #include "third_party/blink/renderer/modules/indexeddb/idb_transaction.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 
 namespace blink {
@@ -68,7 +69,8 @@ void IDBObserver::observe(IDBDatabase* database,
       types[static_cast<size_t>(mojom::IDBOperationType::Clear)] = true;
     } else {
       exception_state.ThrowTypeError(
-          "Unknown operation type in observe options: " + operation_type);
+          "Unknown operation type in observe options: " +
+          IDLEnumAsString(operation_type));
       return;
     }
   }

third_party/blink/renderer/modules/notifications/notification_data.cc

@@ -14,6 +14,7 @@
 #include "third_party/blink/renderer/modules/notifications/notification.h"
 #include "third_party/blink/renderer/modules/notifications/timestamp_trigger.h"
 #include "third_party/blink/renderer/modules/vibration/vibration_controller.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/instrumentation/use_counter.h"
 #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
@@ -22,7 +23,6 @@
 namespace blink {
 namespace {
 
-// TODO(crbug.com/1092328): Use V8NotificationDirection.
 mojom::blink::NotificationDirection ToDirectionEnumValue(
     const String& direction) {
   if (direction == "ltr")
@@ -128,12 +128,14 @@ mojom::blink::NotificationDataPtr CreateNotificationData(
     notification_action->action = action->action();
     notification_action->title = action->title();
 
-    if (action->type() == "button")
+    if (action->type() == "button") {
       notification_action->type = mojom::blink::NotificationActionType::BUTTON;
-    else if (action->type() == "text")
+    } else if (action->type() == "text") {
       notification_action->type = mojom::blink::NotificationActionType::TEXT;
-    else
-      NOTREACHED() << "Unknown action type: " << action->type();
+    } else {
+      NOTREACHED() << "Unknown action type: "
+                   << IDLEnumAsString(action->type());
+    }
 
     if (!action->placeholder().IsNull() &&
         notification_action->type ==

third_party/blink/renderer/modules/scheduler/dom_scheduler.cc

@@ -12,6 +12,7 @@
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/modules/scheduler/dom_task.h"
 #include "third_party/blink/renderer/modules/scheduler/dom_task_signal.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/scheduler/public/frame_scheduler.h"
 #include "third_party/blink/renderer/platform/scheduler/public/web_scheduling_priority.h"
 #include "third_party/blink/renderer/platform/scheduler/public/web_scheduling_task_queue.h"
@@ -90,7 +91,7 @@ ScriptPromise DOMScheduler::postTask(ScriptState* script_state,
     WebSchedulingPriority priority =
         options->hasPriorityNonNull()
             ? WebSchedulingPriorityFromString(
-                  AtomicString(options->priorityNonNull()))
+                  AtomicString(IDLEnumAsString(options->priorityNonNull())))
             : WebSchedulingPriority::kUserVisiblePriority;
     task_signal = MakeGarbageCollected<DOMTaskSignal>(
         GetSupplementable(), priority, DOMTaskSignal::Type::kImplicit);

third_party/blink/renderer/modules/shapedetection/barcode_detector.cc

@@ -15,6 +15,7 @@
 #include "third_party/blink/renderer/core/html/canvas/canvas_image_source.h"
 #include "third_party/blink/renderer/core/workers/worker_thread.h"
 #include "third_party/blink/renderer/modules/shapedetection/barcode_detector_statics.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/heap/heap.h"
 
 namespace blink {
@@ -72,7 +73,7 @@ BarcodeDetector::BarcodeDetector(ExecutionContext* context,
     // TODO(https://github.com/WICG/shape-detection-api/issues/66):
     // potentially process UNKNOWN as platform-specific formats.
     for (const auto& format_string : options->formats()) {
-      auto format = StringToBarcodeFormat(format_string);
+      auto format = StringToBarcodeFormat(IDLEnumAsString(format_string));
       if (format != shape_detection::mojom::blink::BarcodeFormat::UNKNOWN)
         barcode_detector_options->formats.push_back(format);
     }

third_party/blink/renderer/modules/webaudio/cross_thread_audio_worklet_processor_info.h

@@ -7,6 +7,7 @@
 
 #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_param_descriptor.h"
 #include "third_party/blink/renderer/modules/webaudio/audio_worklet_processor_definition.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 
 namespace blink {
 
@@ -18,7 +19,8 @@ class CrossThreadAudioParamInfo {
 
  public:
   explicit CrossThreadAudioParamInfo(const AudioParamDescriptor* descriptor)
-      : automation_rate_(descriptor->automationRate().IsolatedCopy()),
+      : automation_rate_(
+            IDLEnumAsString(descriptor->automationRate()).IsolatedCopy()),
         default_value_(descriptor->defaultValue()),
         max_value_(descriptor->maxValue()),
         min_value_(descriptor->minValue()),

third_party/blink/renderer/modules/webaudio/oscillator_node.cc

@@ -32,6 +32,7 @@
 #include "third_party/blink/renderer/modules/webaudio/periodic_wave.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
 #include "third_party/blink/renderer/platform/audio/vector_math.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/wtf/math_extras.h"
 #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
@@ -850,7 +851,7 @@ OscillatorNode* OscillatorNode::Create(BaseAudioContext* context,
 
   // TODO(crbug.com/1070871): Use periodicWaveOr(nullptr).
   OscillatorNode* node =
-      Create(*context, options->type(),
+      Create(*context, IDLEnumAsString(options->type()),
              options->hasPeriodicWave() ? options->periodicWave() : nullptr,
              exception_state);
 

third_party/blink/renderer/modules/webcodecs/video_encoder.cc

@@ -32,6 +32,7 @@
 #include "third_party/blink/renderer/core/streams/writable_stream.h"
 #include "third_party/blink/renderer/modules/webcodecs/encoded_video_chunk.h"
 #include "third_party/blink/renderer/modules/webcodecs/encoded_video_metadata.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.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/scheduler/public/thread.h"
@@ -258,7 +259,7 @@ void VideoEncoder::ProcessConfigure(Request* request) {
   }
 
   if (config->hasAcceleration()) {
-    std::string preference = config->acceleration().Utf8();
+    std::string preference = IDLEnumAsString(config->acceleration()).Utf8();
     if (preference == "deny") {
       acc_pref = AccelerationPreference::kDeny;
     } else if (preference == "require") {

third_party/blink/renderer/modules/xr/xr_session.cc

@@ -50,6 +50,7 @@
 #include "third_party/blink/renderer/modules/xr/xr_webgl_layer.h"
 #include "third_party/blink/renderer/modules/xr/xr_world_information.h"
 #include "third_party/blink/renderer/modules/xr/xr_world_tracking_state.h"
+#include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/bindings/v8_throw_exception.h"
 #include "third_party/blink/renderer/platform/geometry/float_point_3d.h"
 #include "third_party/blink/renderer/platform/heap/heap.h"
@@ -182,8 +183,8 @@ Vector<device::mojom::blink::EntityTypeForHitTest> GetEntityTypesForHitTest(
       if (maybe_entity_type) {
         result_set.insert(*maybe_entity_type);
       } else {
-        DVLOG(1) << __func__
-                 << ": entityTypes entry ignored:" << entity_type_string;
+        DVLOG(1) << __func__ << ": entityTypes entry ignored:"
+                 << IDLEnumAsString(entity_type_string);
       }
     }
   } else {

third_party/blink/renderer/platform/bindings/enumeration_base.h

@@ -131,6 +131,19 @@ operator==(const char* lhs, const EnumTypeClass& rhs) {
   return rhs == lhs;
 }
 
+// TODO(crbug.com/1092328): IDLEnumAsString is an adapter between the old and
+// new bindings generators.  The old bindings generator implements IDL
+// enumeration with String class, however, the new bindings generator implements
+// it with subclasses of EnumerationBase.  IDLEnumAsString resolves this
+// difference.
+inline const String& IDLEnumAsString(const String& value) {
+  return value;
+}
+
+inline String IDLEnumAsString(const bindings::EnumerationBase& value) {
+  return value.AsString();
+}
+
 }  // namespace blink
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_ENUMERATION_BASE_H_