1 files changed, 61 insertions, 9 deletions

diff --git a/chromium/third_party/blink/renderer/core/layout/custom/css_layout_definition.cc b/chromium/third_party/blink/renderer/core/layout/custom/css_layout_definition.cc
index 6e690135457..e4ae9b6e270 100644
--- a/chromium/third_party/blink/renderer/core/layout/custom/css_layout_definition.cc
+++ b/chromium/third_party/blink/renderer/core/layout/custom/css_layout_definition.cc
@@ -8,6 +8,7 @@
 #include "third_party/blink/renderer/bindings/core/v8/idl_types.h"
 #include "third_party/blink/renderer/bindings/core/v8/native_value_traits_impl.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_iterator.h"
+#include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_fragment_result_options.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_layout_fragment_request.h"
@@ -24,6 +25,24 @@
 
 namespace blink {
 
+namespace {
+
+bool IsLogicalHeightDefinite(const LayoutCustom& layout_custom) {
+  if (layout_custom.HasOverrideLogicalHeight())
+    return true;
+
+  // In quirks mode the document and body element stretch to the viewport.
+  if (layout_custom.StretchesToViewport())
+    return true;
+
+  if (layout_custom.HasDefiniteLogicalHeight())
+    return true;
+
+  return false;
+}
+
+}  // namespace
+
 CSSLayoutDefinition::CSSLayoutDefinition(
     ScriptState* script_state,
     v8::Local<v8::Function> constructor,
@@ -53,7 +72,8 @@ CSSLayoutDefinition::Instance::Instance(CSSLayoutDefinition* definition,
 
 bool CSSLayoutDefinition::Instance::Layout(
     const LayoutCustom& layout_custom,
-    FragmentResultOptions* fragment_result_options) {
+    FragmentResultOptions* fragment_result_options,
+    scoped_refptr<SerializedScriptValue>* fragment_result_data) {
   ScriptState* script_state = definition_->GetScriptState();
   ExecutionContext* execution_context = ExecutionContext::From(script_state);
 
@@ -92,8 +112,17 @@ bool CSSLayoutDefinition::Instance::Layout(
       return false;
   }
 
-  CustomLayoutConstraints* constraints =
-      new CustomLayoutConstraints(layout_custom.LogicalWidth());
+  LayoutUnit fixed_block_size(-1);
+  if (IsLogicalHeightDefinite(layout_custom)) {
+    LayoutBox::LogicalExtentComputedValues computed_values;
+    layout_custom.ComputeLogicalHeight(LayoutUnit(-1), LayoutUnit(),
+                                       computed_values);
+    fixed_block_size = computed_values.extent_;
+  }
+
+  CustomLayoutConstraints* constraints = new CustomLayoutConstraints(
+      layout_custom.LogicalWidth(), fixed_block_size,
+      layout_custom.GetConstraintData(), isolate);
 
   // TODO(ikilpatrick): Instead of creating a new style_map each time here,
   // store on LayoutCustom, and update when the style changes.
@@ -142,7 +171,7 @@ bool CSSLayoutDefinition::Instance::Layout(
       CustomLayoutFragmentRequest* fragment_request =
           V8LayoutFragmentRequest::ToImpl(v8::Local<v8::Object>::Cast(value));
 
-      CustomLayoutFragment* fragment = fragment_request->PerformLayout();
+      CustomLayoutFragment* fragment = fragment_request->PerformLayout(isolate);
       if (!fragment) {
         execution_context->AddConsoleMessage(ConsoleMessage::Create(
             kJSMessageSource, kInfoMessageLevel,
@@ -168,7 +197,7 @@ bool CSSLayoutDefinition::Instance::Layout(
       v8::Local<v8::Array> results = v8::Array::New(isolate, requests.size());
       uint32_t index = 0;
       for (const auto& request : requests) {
-        CustomLayoutFragment* fragment = request->PerformLayout();
+        CustomLayoutFragment* fragment = request->PerformLayout(isolate);
 
         if (!fragment) {
           execution_context->AddConsoleMessage(ConsoleMessage::Create(
@@ -224,6 +253,28 @@ bool CSSLayoutDefinition::Instance::Layout(
     return false;
   }
 
+  // Serialize any extra data provided by the web-developer to potentially pass
+  // up to the parent custom layout.
+  if (fragment_result_options->hasData()) {
+    // We serialize "kForStorage" so that SharedArrayBuffers can't be shared
+    // between LayoutWorkletGlobalScopes.
+    *fragment_result_data = SerializedScriptValue::Serialize(
+        isolate, fragment_result_options->data().V8Value(),
+        SerializedScriptValue::SerializeOptions(
+            SerializedScriptValue::kForStorage),
+        exception_state);
+  }
+
+  if (exception_state.HadException()) {
+    V8ScriptRunner::ReportException(isolate, exception_state.GetException());
+    exception_state.ClearException();
+    execution_context->AddConsoleMessage(
+        ConsoleMessage::Create(kJSMessageSource, kInfoMessageLevel,
+                               "Unable to serialize the data provided in the "
+                               "result, falling back to block layout."));
+    return false;
+  }
+
   return true;
 }
 
@@ -274,10 +325,11 @@ void CSSLayoutDefinition::Instance::Trace(blink::Visitor* visitor) {
   visitor->Trace(definition_);
 }
 
-void CSSLayoutDefinition::TraceWrappers(ScriptWrappableVisitor* visitor) const {
-  visitor->TraceWrappers(constructor_.Cast<v8::Value>());
-  visitor->TraceWrappers(intrinsic_sizes_.Cast<v8::Value>());
-  visitor->TraceWrappers(layout_.Cast<v8::Value>());
+void CSSLayoutDefinition::Trace(Visitor* visitor) {
+  visitor->Trace(constructor_.Cast<v8::Value>());
+  visitor->Trace(intrinsic_sizes_.Cast<v8::Value>());
+  visitor->Trace(layout_.Cast<v8::Value>());
+  visitor->Trace(script_state_);
 }
 
 }  // namespace blink