1 files changed, 21 insertions, 1 deletions
diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/templates/css_properties.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/templates/css_properties.cc.tmpl
index 2118a3c88f0..b902908c055 100644
--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/templates/css_properties.cc.tmpl
+++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/templates/css_properties.cc.tmpl
@@ -22,6 +22,7 @@
 #include "third_party/blink/renderer/core/css/resolver/font_builder.h"
 #include "third_party/blink/renderer/core/css/resolver/style_builder_converter.h"
 #include "third_party/blink/renderer/core/css/resolver/style_resolver_state.h"
+#include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/style/computed_style.h"
 #include "third_party/blink/renderer/core/style/style_svg_resource.h"
 #include "third_party/blink/renderer/core/style/svg_computed_style.h"
@@ -35,7 +36,7 @@ namespace {{namespace}} {
 {% set is_alias = property.alias_for %}
 // {{property.name}}
 
-  {% if property.is_internal or property.runtime_flag %}
+  {% if property.is_internal or property.runtime_flag and not property.in_origin_trial%}
 CSSExposure {{class_name}}::Exposure() const {
     {% if property.runtime_flag %}
   if (!RuntimeEnabledFeatures::{{property.runtime_flag}}Enabled())
@@ -49,6 +50,14 @@ CSSExposure {{class_name}}::Exposure() const {
 }
   {% endif %}
 
+  {% if property.in_origin_trial %}
+CSSExposure {{class_name}}::Exposure(const ExecutionContext* execution_context) const {
+  if (!RuntimeEnabledFeatures::{{property.runtime_flag}}Enabled(execution_context))
+    return CSSExposure::kNone;
+  return CSSExposure::kWeb;
+}
+  {% endif %}
+
 const char* {{class_name}}::GetPropertyName() const {
   return "{{property.name}}";
 }
@@ -73,10 +82,21 @@ const CSSProperty* {{class_name}}::GetUnvisitedProperty() const {
 }
   {% endif %}
 
+  {% if property.surrogate_for %}
+const CSSProperty* {{class_name}}::SurrogateFor(TextDirection direction,
+    blink::WritingMode writing_mode) const {
+  return &GetCSSProperty{{property.surrogate_for.name.to_upper_camel_case()}}();
+}
+  {% endif %}
   {% if property.direction_aware_options %}
     {% set options = property.direction_aware_options %}
     {% set resolver_name = options.resolver_name.to_upper_camel_case() %}
     {% set physical_group_name = options.physical_group_name.to_upper_camel_case() %}
+const CSSProperty* {{class_name}}::SurrogateFor(TextDirection direction,
+    blink::WritingMode writing_mode) const {
+  return &ResolveDirectionAwareProperty(direction, writing_mode);
+}
+
 const CSSProperty& {{class_name}}::ResolveDirectionAwareProperty(
     TextDirection direction,
     blink::WritingMode writing_mode) const {