Remove remaining Maybe references + roll of inspector_protocol

OrKoN · V8 LUCI CQ · commit 41d42cec13ea · 2024-11-27T12:09:19.000Z
Bug: 40276207 Change-Id: I947dcbcee8f0562e25a05bb6183f10e660075f0d Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6049648 Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Reviewed-by: Simon Zünd <szuend@chromium.org> Auto-Submit: Alex Rudenko <alexrudenko@chromium.org> Cr-Commit-Position: refs/heads/main@{#97443}
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -4011,7 +4011,6 @@ filegroup(
         "third_party/inspector_protocol/crdtp/glue.h",
         "third_party/inspector_protocol/crdtp/json.cc",
         "third_party/inspector_protocol/crdtp/json.h",
-        "third_party/inspector_protocol/crdtp/maybe.h",
         "third_party/inspector_protocol/crdtp/parser_handler.h",
         "third_party/inspector_protocol/crdtp/protocol_core.cc",
         "third_party/inspector_protocol/crdtp/protocol_core.h",
diff --git a/src/inspector/injected-script.cc b/src/inspector/injected-script.cc
@@ -65,7 +65,6 @@ bool isResolvableNumberLike(String16 query) {
 }  // namespace
 
 using protocol::Array;
-using protocol::Maybe;
 using protocol::Runtime::InternalPropertyDescriptor;
 using protocol::Runtime::PrivatePropertyDescriptor;
 using protocol::Runtime::PropertyDescriptor;
diff --git a/src/inspector/injected-script.h b/src/inspector/injected-script.h
@@ -52,7 +52,6 @@ class V8InspectorImpl;
 class V8InspectorSessionImpl;
 class ValueMirror;
 
-using protocol::Maybe;
 using protocol::Response;
 
 class EvaluateCallback {
diff --git a/src/inspector/string-util.h b/src/inspector/string-util.h
@@ -114,19 +114,6 @@ struct ProtocolTypeTraits<v8_inspector::protocol::Binary> {
                         std::vector<uint8_t>* bytes);
 };
 
-namespace detail {
-template <>
-struct MaybeTypedef<v8_inspector::String16> {
-  typedef std::optional<v8_inspector::String16> type;
-};
-
-template <>
-struct MaybeTypedef<v8_inspector::protocol::Binary> {
-  typedef std::optional<v8_inspector::protocol::Binary> type;
-};
-
-}  // namespace detail
-
 }  // namespace v8_crdtp
 
 #endif  // V8_INSPECTOR_STRING_UTIL_H_
diff --git a/src/inspector/v8-debugger-agent-impl.cc b/src/inspector/v8-debugger-agent-impl.cc
@@ -34,7 +34,6 @@
 namespace v8_inspector {
 
 using protocol::Array;
-using protocol::Maybe;
 using protocol::Debugger::BreakpointId;
 using protocol::Debugger::CallFrame;
 using protocol::Debugger::Scope;
diff --git a/src/inspector/v8-debugger-agent-impl.h b/src/inspector/v8-debugger-agent-impl.h
@@ -26,7 +26,6 @@ class V8InspectorImpl;
 class V8InspectorSessionImpl;
 class V8Regex;
 
-using protocol::Maybe;
 using protocol::Response;
 
 class V8DebuggerAgentImpl : public protocol::Debugger::Backend {
diff --git a/src/inspector/v8-heap-profiler-agent-impl.h b/src/inspector/v8-heap-profiler-agent-impl.h
@@ -19,7 +19,6 @@ namespace v8_inspector {
 
 class V8InspectorSessionImpl;
 
-using protocol::Maybe;
 using protocol::Response;
 
 class V8HeapProfilerAgentImpl : public protocol::HeapProfiler::Backend {
diff --git a/src/inspector/v8-profiler-agent-impl.h b/src/inspector/v8-profiler-agent-impl.h
@@ -21,7 +21,6 @@ namespace v8_inspector {
 
 class V8InspectorSessionImpl;
 
-using protocol::Maybe;
 using protocol::Response;
 
 class V8ProfilerAgentImpl : public protocol::Profiler::Backend {
diff --git a/src/inspector/v8-runtime-agent-impl.h b/src/inspector/v8-runtime-agent-impl.h
@@ -54,7 +54,6 @@ class V8InspectorImpl;
 class V8InspectorSessionImpl;
 
 using protocol::Response;
-using protocol::Maybe;
 
 class V8RuntimeAgentImpl : public protocol::Runtime::Backend {
  public:
diff --git a/third_party/inspector_protocol/BUILD.gn b/third_party/inspector_protocol/BUILD.gn
@@ -25,7 +25,6 @@ v8_source_set("crdtp") {
     "crdtp/find_by_first.h",
     "crdtp/json.cc",
     "crdtp/json.h",
-    "crdtp/maybe.h",
     "crdtp/parser_handler.h",
     "crdtp/protocol_core.cc",
     "crdtp/protocol_core.h",
diff --git a/third_party/inspector_protocol/README.v8 b/third_party/inspector_protocol/README.v8
@@ -2,7 +2,7 @@ Name: inspector protocol
 Short Name: inspector_protocol
 URL: https://chromium.googlesource.com/deps/inspector_protocol/
 Version: 0
-Revision: 0c3002eeb5fa69ea0efd07b005e4006b7ab7836f
+Revision: 69d69ddf3aa698b171886551a4a672c5af1ad902
 License: BSD
 License File: LICENSE
 Security Critical: yes
diff --git a/third_party/inspector_protocol/code_generator.py b/third_party/inspector_protocol/code_generator.py
@@ -544,6 +544,12 @@ def resolve_type(self, prop):
       return wrap_array_definition(self.resolve_type(prop["items"]))
     return self.type_definitions[prop["type"]]
 
+  def optional_type(self, prop):
+    type = self.resolve_type(prop)
+    template = ("std::optional<{}>"
+                if type.get('is_primitive', False) else "std::unique_ptr<{}>")
+    return template.format(type.get("raw_type"))
+
   def generate_command(self, domain, command):
     if not self.config.protocol.options:
       return domain in self.generate_domains
diff --git a/third_party/inspector_protocol/crdtp/maybe.h b/third_party/inspector_protocol/crdtp/maybe.h
diff --git a/third_party/inspector_protocol/crdtp/protocol_core.h b/third_party/inspector_protocol/crdtp/protocol_core.h
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "cbor.h"
-#include "maybe.h"
 #include "serializable.h"
 #include "span.h"
 #include "status.h"
diff --git a/third_party/inspector_protocol/crdtp/protocol_core_test.cc b/third_party/inspector_protocol/crdtp/protocol_core_test.cc
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "cbor.h"
-#include "maybe.h"
 #include "status_test_support.h"
 #include "test_platform.h"
 #include "test_string_traits.h"
@@ -370,9 +369,9 @@ class TestTypeOptional : public ProtocolObject<TestTypeOptional> {
  private:
   DECLARE_SERIALIZATION_SUPPORT();
 
-  Maybe<int> int_field_;
-  Maybe<std::string> str_field_;
-  Maybe<TestTypeBasic> test_type_basic_field_;
+  std::optional<int> int_field_;
+  std::optional<std::string> str_field_;
+  std::unique_ptr<TestTypeBasic> test_type_basic_field_;
 };
 
 // clang-format off
diff --git a/third_party/inspector_protocol/lib/Forward_h.template b/third_party/inspector_protocol/lib/Forward_h.template
@@ -54,9 +54,6 @@ class StringValue;
 class Value;
 {% endif %}
 
-template<typename T>
-using Maybe = {{config.crdtp.namespace}}::Maybe<T>;
-
 namespace detail {
 
 template <typename T>
diff --git a/third_party/inspector_protocol/roll.py b/third_party/inspector_protocol/roll.py
@@ -30,7 +30,6 @@
     'crdtp/find_by_first.h',
     'crdtp/find_by_first_test.cc',
     'crdtp/frontend_channel.h',
-    'crdtp/maybe.h',
     'crdtp/maybe_test.cc',
     'crdtp/json.cc',
     'crdtp/json.h',
diff --git a/third_party/inspector_protocol/templates/TypeBuilder_cpp.template b/third_party/inspector_protocol/templates/TypeBuilder_cpp.template
@@ -116,7 +116,7 @@ const char* {{ literal | to_title_case}} = "{{literal}}";
 void Frontend::{{event.name | to_method_case}}(
     {%- for parameter in event.parameters %}
       {% if "optional" in parameter -%}
-        Maybe<{{protocol.resolve_type(parameter).raw_type}}>
+        {{protocol.optional_type(parameter)}}
       {%- else -%}
         {{protocol.resolve_type(parameter).pass_type}}
       {%- endif %} {{parameter.name}}{%- if not loop.last -%}, {% endif -%}
@@ -215,7 +215,7 @@ public:
     void sendSuccess(
       {%- for parameter in command.returns -%}
         {%- if "optional" in parameter -%}
-        Maybe<{{protocol.resolve_type(parameter).raw_type}}> {{parameter.name}}
+        {{protocol.optional_type(parameter)}} {{parameter.name}}
         {%- else -%}
         {{protocol.resolve_type(parameter).pass_type}} {{parameter.name}}
         {%- endif -%}
@@ -249,7 +249,7 @@ struct {{command.name}}Params : public {{config.crdtp.namespace}}::Deserializabl
       {% for parameter in command.parameters %}
         {% set parameter_type = protocol.resolve_type(parameter) %}
         {% if parameter.optional %}
-    Maybe<{{parameter_type.raw_type}}> {{parameter.name}};
+    {{protocol.optional_type(parameter)}} {{parameter.name}};
         {% else %}
     {{parameter_type.type}} {{parameter.name}};
         {% endif %}
@@ -286,7 +286,7 @@ void DomainDispatcherImpl::{{command.name}}(const {{config.crdtp.namespace}}::Di
     // Declare output parameters.
       {% for parameter in command.returns %}
         {% if "optional" in parameter %}
-    Maybe<{{protocol.resolve_type(parameter).raw_type}}> out_{{parameter.name}};
+    {{protocol.optional_type(parameter)}} out_{{parameter.name}};
         {% else %}
     {{protocol.resolve_type(parameter).type}} out_{{parameter.name}};
         {% endif %}
diff --git a/third_party/inspector_protocol/templates/TypeBuilder_h.template b/third_party/inspector_protocol/templates/TypeBuilder_h.template
@@ -99,6 +99,9 @@ public:
        return {{property_field}} ? {{property_field}}.get() : defaultValue;
     }
     {% endif %}
+    const {{protocol.optional_type(property)}}& {{"get" | to_method_case}}{{property_name}}() const {
+       return {{property_field}};
+    }
       {% else %}
     {{property_type.raw_return_type}} {{"get" | to_method_case}}{{property_name}}() { return {{property_type.to_raw_type % property_field}}; }
       {% endif %}
@@ -175,7 +178,7 @@ private:
 
     {% for property in type.properties %}
       {% if property.optional %}
-    Maybe<{{protocol.resolve_type(property).raw_type}}> m_{{property.name}};
+    {{protocol.optional_type(property)}} m_{{property.name}};
       {% else %}
     {{protocol.resolve_type(property).type}} m_{{property.name}};
       {% endif %}
@@ -199,7 +202,7 @@ public:
         virtual void sendSuccess(
       {%- for parameter in command.returns -%}
         {%- if "optional" in parameter -%}
-            Maybe<{{protocol.resolve_type(parameter).raw_type}}> {{parameter.name}}
+            {{protocol.optional_type(parameter)}} {{parameter.name}}
         {%- else -%}
                 {{protocol.resolve_type(parameter).pass_type}} {{parameter.name}}
         {%- endif -%}
@@ -219,7 +222,7 @@ public:
     {%- for parameter in command.parameters -%}
       {%- if not loop.first -%}, {% endif -%}
       {%- if "optional" in parameter -%}
-        Maybe<{{protocol.resolve_type(parameter).raw_type}}> in_{{parameter.name}}
+        {{protocol.optional_type(parameter)}} in_{{parameter.name}}
       {%- else -%}
         {{protocol.resolve_type(parameter).pass_type}} in_{{parameter.name}}
       {%- endif -%}
@@ -231,7 +234,7 @@ public:
       {%- for parameter in command.returns -%}
         {%- if (not loop.first) or command.parameters -%}, {% endif -%}
         {%- if "optional" in parameter -%}
-        Maybe<{{protocol.resolve_type(parameter).raw_type}}>* out_{{parameter.name}}
+        {{protocol.optional_type(parameter)}}* out_{{parameter.name}}
         {%- else -%}
         {{protocol.resolve_type(parameter).type}}* out_{{parameter.name}}
         {%- endif -%}
@@ -258,7 +261,7 @@ public:
     void {{event.name | to_method_case}}(
     {%- for parameter in event.parameters -%}
       {%- if "optional" in parameter -%}
-        Maybe<{{protocol.resolve_type(parameter).raw_type}}> {{parameter.name}} = Maybe<{{protocol.resolve_type(parameter).raw_type}}>()
+        {{protocol.optional_type(parameter)}} {{parameter.name}} = {}
       {%- else -%}
         {{protocol.resolve_type(parameter).pass_type}} {{parameter.name}}
       {%- endif -%}{%- if not loop.last -%}, {% endif -%}
