Fix CSS/layout edge cases, improve routing, add ListView scrollByIndex

.github/workflows/release.yml

@@ -669,7 +669,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.38.0'
+          flutter-version: '3.29.0'
           channel: 'stable'
 
       - name: Setup Git configuration

bridge/core/css/blink_inline_style_validation_test.cc

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2022-present The WebF authors. All rights reserved.
+ */
+
+#include "gtest/gtest.h"
+
+#include <cstring>
+
+#include "foundation/native_string.h"
+#include "foundation/native_type.h"
+#include "foundation/string/wtf_string.h"
+#include "foundation/ui_command_buffer.h"
+#include "webf_test_env.h"
+
+using namespace webf;
+
+namespace {
+
+std::string CommandArg01ToUTF8(const UICommandItem& item) {
+  if (item.string_01 == 0 || item.args_01_length == 0) {
+    return "";
+  }
+  const auto* utf16 = reinterpret_cast<const UChar*>(static_cast<uintptr_t>(item.string_01));
+  return String(utf16, static_cast<size_t>(item.args_01_length)).ToUTF8String();
+}
+
+std::string SharedNativeStringToUTF8(const SharedNativeString* s) {
+  if (!s || !s->string() || s->length() == 0) {
+    return "";
+  }
+  return String(reinterpret_cast<const UChar*>(s->string()), static_cast<size_t>(s->length())).ToUTF8String();
+}
+
+bool HasSetStyleWithKeyValue(ExecutingContext* context, const std::string& key, const std::string& value) {
+  auto* pack = static_cast<UICommandBufferPack*>(context->uiCommandBuffer()->data());
+  auto* items = static_cast<UICommandItem*>(pack->data);
+  for (int64_t i = 0; i < pack->length; ++i) {
+    const UICommandItem& item = items[i];
+    if (item.type != static_cast<int32_t>(UICommand::kSetStyle)) {
+      continue;
+    }
+    if (CommandArg01ToUTF8(item) != key) {
+      continue;
+    }
+    auto* payload =
+        reinterpret_cast<NativeStyleValueWithHref*>(static_cast<uintptr_t>(item.nativePtr2));
+    if (!payload) {
+      continue;
+    }
+    if (SharedNativeStringToUTF8(payload->value) == value) {
+      return true;
+    }
+  }
+  return false;
+}
+
+}  // namespace
+
+TEST(BlinkCSSStyleDeclarationValidation, RejectsInvalidFontSize) {
+  bool static errorCalled = false;
+  webf::WebFPage::consoleMessageHandler = [](void*, const std::string&, int) {};
+
+  auto env = TEST_init([](double, const char* errmsg) {
+    WEBF_LOG(VERBOSE) << errmsg;
+    errorCalled = true;
+  }, nullptr, 0, /*enable_blink=*/1);
+
+  auto* context = env->page()->executingContext();
+
+  // Flush initial microtasks/style export and clear any bootstrap commands.
+  TEST_runLoop(context);
+  context->uiCommandBuffer()->clear();
+
+  // Set a valid value first.
+  const char* set_valid = "document.body.style.fontSize = '18px';";
+  env->page()->evaluateScript(set_valid, strlen(set_valid), "vm://", 0);
+  TEST_runLoop(context);
+  EXPECT_TRUE(HasSetStyleWithKeyValue(context, "fontSize", "18px"));
+
+  context->uiCommandBuffer()->clear();
+
+  // Invalid font-size should be rejected on the native (Blink) CSS side and
+  // thus should not be forwarded to Dart.
+  const char* set_invalid = "document.body.style.fontSize = '-1px';";
+  env->page()->evaluateScript(set_invalid, strlen(set_invalid), "vm://", 0);
+  TEST_runLoop(context);
+  EXPECT_FALSE(HasSetStyleWithKeyValue(context, "fontSize", "-1px"));
+  EXPECT_EQ(errorCalled, false);
+}

bridge/core/css/style_engine.cc

@@ -1195,20 +1195,30 @@ void StyleEngine::RecalcStyleForSubtree(Element& root_element) {
             }
             for (unsigned i = 0; i < pseudo_set->PropertyCount(); ++i) {
               auto prop = pseudo_set->PropertyAt(i);
+              CSSPropertyID id = prop.Id();
+              if (id == CSSPropertyID::kInvalid) {
+                continue;
+              }
+              const auto* value_ptr = prop.Value();
+              if (!value_ptr || !(*value_ptr)) {
+                continue;
+              }
               AtomicString prop_name = prop.Name().ToAtomicString();
-            String value_string = pseudo_set->GetPropertyValueWithHint(prop_name, i);
-            if (value_string.IsNull()) value_string = String("");
-            String base_href_string = pseudo_set->GetPropertyBaseHrefWithHint(prop_name, i);
-            auto key_ns = prop_name.ToStylePropertyNameNativeString();
-            auto* payload =
-                reinterpret_cast<NativePseudoStyleWithHref*>(dart_malloc(sizeof(NativePseudoStyleWithHref)));
-            payload->key = key_ns.release();
-            payload->value = stringToNativeString(value_string).release();
-            if (!base_href_string.IsEmpty()) {
-              payload->href = stringToNativeString(base_href_string.ToUTF8String()).release();
-            } else {
-              payload->href = nullptr;
-            }
+              String value_string = pseudo_set->GetPropertyValueWithHint(prop_name, i);
+              if (value_string.IsNull()) {
+                value_string = (*value_ptr)->CssTextForSerialization();
+              }
+              String base_href_string = pseudo_set->GetPropertyBaseHrefWithHint(prop_name, i);
+              auto key_ns = prop_name.ToStylePropertyNameNativeString();
+              auto* payload =
+                  reinterpret_cast<NativePseudoStyleWithHref*>(dart_malloc(sizeof(NativePseudoStyleWithHref)));
+              payload->key = key_ns.release();
+              payload->value = stringToNativeString(value_string).release();
+              if (!base_href_string.IsEmpty()) {
+                payload->href = stringToNativeString(base_href_string.ToUTF8String()).release();
+              } else {
+                payload->href = nullptr;
+              }
               auto pseudo_atom = AtomicString::CreateFromUTF8(pseudo_name);
               auto pseudo_ns = pseudo_atom.ToNativeString();
               ctx->uiCommandBuffer()->AddCommand(UICommand::kSetPseudoStyle, std::move(pseudo_ns),
@@ -1356,9 +1366,19 @@ void StyleEngine::RecalcStyleForSubtree(Element& root_element) {
           }
           for (unsigned i = 0; i < pseudo_set->PropertyCount(); ++i) {
             auto prop = pseudo_set->PropertyAt(i);
+            CSSPropertyID id = prop.Id();
+            if (id == CSSPropertyID::kInvalid) {
+              continue;
+            }
+            const auto* value_ptr = prop.Value();
+            if (!value_ptr || !(*value_ptr)) {
+              continue;
+            }
             AtomicString prop_name = prop.Name().ToAtomicString();
             String value_string = pseudo_set->GetPropertyValueWithHint(prop_name, i);
-            if (value_string.IsNull()) value_string = String("");
+            if (value_string.IsNull()) {
+              value_string = (*value_ptr)->CssTextForSerialization();
+            }
             String base_href_string = pseudo_set->GetPropertyBaseHrefWithHint(prop_name, i);
 
             auto key_ns = prop_name.ToStylePropertyNameNativeString();
@@ -1632,9 +1652,19 @@ void StyleEngine::RecalcStyleForElementOnly(Element& element) {
                                              el->bindingObject(), nullptr);
           for (unsigned i = 0; i < pseudo_set->PropertyCount(); ++i) {
             auto prop = pseudo_set->PropertyAt(i);
+            CSSPropertyID id = prop.Id();
+            if (id == CSSPropertyID::kInvalid) {
+              continue;
+            }
+            const auto* value_ptr = prop.Value();
+            if (!value_ptr || !(*value_ptr)) {
+              continue;
+            }
             AtomicString prop_name = prop.Name().ToAtomicString();
             String value_string = pseudo_set->GetPropertyValueWithHint(prop_name, i);
-            if (value_string.IsNull()) value_string = String("");
+            if (value_string.IsNull()) {
+              value_string = (*value_ptr)->CssTextForSerialization();
+            }
             String base_href_string = pseudo_set->GetPropertyBaseHrefWithHint(prop_name, i);
 
             auto key_ns = prop_name.ToStylePropertyNameNativeString();

bridge/core/dom/document.cc

@@ -3,6 +3,8 @@
  * Copyright (C) 2022-present The WebF authors. All rights reserved.
  */
 #include "document.h"
+#include <chrono>
+
 #include "../../foundation/string/ascii_types.h"
 #include "binding_call_methods.h"
 #include "bindings/qjs/exception_message.h"
@@ -29,6 +31,7 @@
 #include "element_traversal.h"
 #include "event_factory.h"
 #include "foundation/native_value_converter.h"
+#include "foundation/logging.h"
 #include "core/script_forbidden_scope.h"
 #include "html_element_factory.h"
 #include "svg_element_factory.h"
@@ -611,6 +614,8 @@ void Document::UpdateStyleForThisDocument() {
     return;
   }
 
+  auto start_time = std::chrono::steady_clock::now();
+
   // Ensure we have a StyleEngine instance before driving the Blink-style
   // style update sequence.
   StyleEngine& style_engine = EnsureStyleEngine();
@@ -621,6 +626,12 @@ void Document::UpdateStyleForThisDocument() {
   style_engine.InvalidateEnvDependentStylesIfNeeded();
   UpdateStyleInvalidationIfNeeded();
   UpdateStyle();
+
+  auto duration_ms =
+      std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - start_time).count();
+  if (duration_ms != 0) {
+    WEBF_LOG(VERBOSE) << "[Style] Document::UpdateStyleForThisDocument elapsed: " << duration_ms << "ms" << std::endl;
+  }
 }
 
 void Document::EvaluateMediaQueryListIfNeeded() {

bridge/core/dom/element.cc

@@ -1042,8 +1042,21 @@ void Element::SetInlineStyleFromString(const webf::AtomicString& new_style_strin
       GetExecutingContext()->uiCommandBuffer()->AddCommand(UICommand::kClearStyle, nullptr, bindingObject(), nullptr);
       for (unsigned i = 0; i < count; ++i) {
         auto property = inline_style->PropertyAt(i);
+        CSSPropertyID id = property.Id();
+        if (id == CSSPropertyID::kInvalid) {
+          continue;
+        }
+        const auto* value_ptr = property.Value();
+        if (!value_ptr || !(*value_ptr)) {
+          // Skip parse-error or missing values; they should not be forwarded to Dart.
+          continue;
+        }
         AtomicString prop_name = property.Name().ToAtomicString();
         String value_string = inline_style->GetPropertyValueWithHint(prop_name, i);
+        if (value_string.IsNull()) {
+          value_string = (*value_ptr)->CssTextForSerialization();
+        }
+        String base_href_string = inline_style->GetPropertyBaseHrefWithHint(prop_name, i);
 
         // Normalize CSS property names (e.g. background-color, text-align) to the
         // camelCase form expected by the Dart style engine before sending them
@@ -1052,7 +1065,11 @@ void Element::SetInlineStyleFromString(const webf::AtomicString& new_style_strin
         std::unique_ptr<SharedNativeString> args_01 = prop_name.ToStylePropertyNameNativeString();
         auto* payload = reinterpret_cast<NativeStyleValueWithHref*>(dart_malloc(sizeof(NativeStyleValueWithHref)));
         payload->value = stringToNativeString(value_string).release();
-        payload->href = nullptr;
+        if (!base_href_string.IsEmpty()) {
+          payload->href = stringToNativeString(base_href_string.ToUTF8String()).release();
+        } else {
+          payload->href = nullptr;
+        }
         GetExecutingContext()->uiCommandBuffer()->AddCommand(UICommand::kSetStyle, std::move(args_01), bindingObject(),
                                                              payload);
       }

bridge/polyfill/src/hybrid-history.ts

@@ -92,7 +92,7 @@ export interface HybridHistoryInterface {
    * @param result Optional result to pass back to the previous screen
    * @returns True if the route was popped, false otherwise
    */
-  maybePop(result?: any): boolean;
+  maybePop(result?: any): Promise<boolean>;
 
   /**
    * Pop the current route and push a new named route
@@ -269,8 +269,8 @@ class HybridHistory implements HybridHistoryInterface {
    * @param result Optional result to pass back to the previous screen
    * @returns True if the route was popped, false otherwise
    */
-  maybePop(result?: any): boolean {
-    return webf.invokeModule('HybridHistory', 'maybePop', result !== undefined ? result : null) === 'true';
+  async maybePop(result?: any): Promise<boolean> {
+    return (await webf.invokeModuleAsync('HybridHistory', 'maybePop', result !== undefined ? result : null)) === 'true';
   }
 
   /**