fix: remove logs and fix normal cases.

openwebf · Jul 11, 2024 · 21cbb0f · 21cbb0f
1 parent 6feb3f0
commit 21cbb0f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/bridge/core/api/api.cc b/bridge/core/api/api.cc
@@ -128,7 +128,6 @@ void evaluateWbcInternal(void* page_,
       WEBF_LOG(VERBOSE) << "LZ4 decompression success! " << decompressedSize << std::endl;
 #endif
       is_success = page->evaluateByteCode(reinterpret_cast<uint8_t*>(decompressedBytes.data()), decompressedSize);
-      WEBF_LOG(VERBOSE) << " SUCCESS: " << is_success;
     }
   }
 

diff --git a/bridge/core/html/parser/html_parser.cc b/bridge/core/html/parser/html_parser.cc
@@ -103,7 +103,7 @@ void HTMLParser::traverseHTML(Node* root_node, GumboNode* node) {
   auto* html_element = DynamicTo<Element>(root_node);
   if (html_element != nullptr && html_element->localName() == html_names::khtml) {
     bool _ = false;
-    parseProperty(html_element, &node->v.element, &_);
+    parseProperty(html_element, &node->v.element, &_, &_);
   }
 
   const GumboVector* children = &node->v.element.children;
@@ -136,9 +136,10 @@ void HTMLParser::traverseHTML(Node* root_node, GumboNode* node) {
         }
 
         bool is_script_element = child->v.element.tag == GumboTag::GUMBO_TAG_SCRIPT;
+        bool is_standard_script_element = false;
         bool is_wbc_script_element;
-        parseProperty(element, &child->v.element, &is_wbc_script_element);
-        if (is_script_element) {
+        parseProperty(element, &child->v.element, &is_wbc_script_element, &is_standard_script_element);
+        if (is_script_element && child->v.element.children.length > 0) {
           auto& gumbo_script_element = child->v.element;
           assert(gumbo_script_element.children.length == 1);
           auto* script_text_node = (GumboNode*)gumbo_script_element.children.data[0];
@@ -246,19 +247,25 @@ void HTMLParser::freeSVGResult(GumboOutput* svgTree) {
   gumbo_destroy_output(&kGumboDefaultOptions, svgTree);
 }
 
-void HTMLParser::parseProperty(Element* element, GumboElement* gumboElement, bool* is_wbc_scripts_element) {
+void HTMLParser::parseProperty(Element* element, GumboElement* gumboElement, bool* is_wbc_scripts_element, bool* is_standard_script_element) {
   auto* context = element->GetExecutingContext();
   JSContext* ctx = context->ctx();
 
+  bool is_script_element = gumboElement->tag == GumboTag::GUMBO_TAG_SCRIPT;
+
   GumboVector* attributes = &gumboElement->attributes;
   for (int j = 0; j < attributes->length; ++j) {
     auto* attribute = (GumboAttribute*)attributes->data[j];
 
     std::string strName = attribute->name;
     std::string strValue = attribute->value;
 
-    if (strName == "type" && strValue == "application/vnd.webf.bc1") {
-      *is_wbc_scripts_element = true;
+    if (is_script_element) {
+      if (strName == "type" && strValue == "application/vnd.webf.bc1") {
+        *is_wbc_scripts_element = true;
+      } else {
+        *is_standard_script_element = true;
+      }
     }
 
     element->setAttribute(AtomicString(ctx, strName), AtomicString(ctx, strValue), ASSERT_NO_EXCEPTION());

diff --git a/bridge/core/html/parser/html_parser.h b/bridge/core/html/parser/html_parser.h
@@ -29,7 +29,7 @@ class HTMLParser {
  private:
   ExecutingContext* context_;
   static void traverseHTML(Node* root, GumboNode* node);
-  static void parseProperty(Element* element, GumboElement* gumboElement, bool* is_wbc_scripts_element);
+  static void parseProperty(Element* element, GumboElement* gumboElement, bool* is_wbc_scripts_element, bool* is_standard_script_element);
 
   static bool parseHTML(const std::string& html, Node* rootNode, bool isHTMLFragment);
 };

diff --git a/webf/example/assets/bundle.bhtml b/webf/example/assets/bundle.bhtml
diff --git a/webf/example/lib/main.dart b/webf/example/lib/main.dart
@@ -44,7 +44,7 @@ class FirstPageState extends State<FirstPage> {
       context,
       devToolsService: ChromeDevToolsService(),
     );
-    controller.preload(WebFBundle.fromUrl('assets:assets/bundle.html'));
+    controller.preload(WebFBundle.fromUrl('assets:assets/bundle.bhtml'));
   }
 
   @override

diff --git a/webf/lib/src/html/script.dart b/webf/lib/src/html/script.dart
@@ -46,12 +46,11 @@ class ScriptRunner {
   static Future<void> _evaluateScriptBundle(double contextId, WebFBundle bundle, {bool async = false, EvaluateOpItem? profileOp}) async {
     // Evaluate bundle.
     if (bundle.isJavascript) {
-      assert(isValidUTF8String(bundle.data!), 'The JavaScript codes should be in UTF-8 encoding format');
-
       bool result;
       if (bundle.isRemoteId) {
         result = await evaluateScriptsById(contextId, bundle.scriptId!, profileOp: profileOp);
       } else {
+        assert(isValidUTF8String(bundle.data!), 'The JavaScript codes should be in UTF-8 encoding format');
         result = await evaluateScripts(contextId, bundle.data!, url: bundle.url, cacheKey: bundle.cacheKey, profileOp: profileOp);
       }
       if (!result) {