fix: fix parse HTML.

openkraken · May 17, 2022 · 65d6f89 · 65d6f89
1 parent 5ff9df6
commit 65d6f89
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/bridge/bindings/qjs/cppgc/member.h b/bridge/bindings/qjs/cppgc/member.h
@@ -46,11 +46,7 @@ class Member {
       return;
     auto* wrappable = To<ScriptWrappable>(raw_);
     // Record the free operation to avoid JSObject had been freed immediately.
-    if (LIKELY(wrappable->GetExecutingContext()->HasMutationScope())) {
-      wrappable->GetExecutingContext()->mutationScope()->RecordFree(wrappable);
-    } else {
-      JS_FreeValue(wrappable->ctx(), wrappable->ToQuickJSUnsafe());
-    }
+    wrappable->GetExecutingContext()->mutationScope()->RecordFree(wrappable);
     raw_ = nullptr;
   }
 
@@ -86,6 +82,8 @@ class Member {
   void SetRaw(T* p) {
     if (p != nullptr) {
       auto* wrappable = To<ScriptWrappable>(p);
+      assert_m(wrappable->GetExecutingContext()->HasMutationScope(),
+               "Member must be used after MemberMutationScope allcated.");
       runtime_ = wrappable->runtime();
       JS_DupValue(wrappable->ctx(), wrappable->ToQuickJSUnsafe());
     }

diff --git a/bridge/bindings/qjs/script_wrappable.h b/bridge/bindings/qjs/script_wrappable.h
@@ -80,7 +80,7 @@ Local<T>::~Local<T>() {
   if (LIKELY(wrappable->GetExecutingContext()->HasMutationScope())) {
     wrappable->GetExecutingContext()->mutationScope()->RecordFree(wrappable);
   } else {
-    assert_m(false, "LocalHandle must be used before MemberMutationScope allcated.");
+    assert_m(false, "LocalHandle must be used after MemberMutationScope allcated.");
   }
 }
 

diff --git a/bridge/core/dom/node_test.cc b/bridge/core/dom/node_test.cc
@@ -36,6 +36,7 @@ TEST(Node, childNodes) {
   };
   auto bridge = TEST_init([](int32_t contextId, const char* errmsg) { errorCalled = true; });
   auto context = bridge->GetExecutingContext();
+  MemberMutationScope scope{context};
   const char* code =
       "let div1 = document.createElement('div');"
       "let div2 = document.createElement('div');"

diff --git a/bridge/core/page.cc b/bridge/core/page.cc
@@ -38,6 +38,8 @@ bool KrakenPage::parseHTML(const char* code, size_t length) {
   if (!context_->IsValid())
     return false;
 
+  MemberMutationScope scope{context_};
+
   // Remove all Nodes including body and head.
   context_->document()->documentElement()->RemoveChildren();
 

diff --git a/kraken/example/lib/main.dart b/kraken/example/lib/main.dart
@@ -94,7 +94,7 @@ class _MyHomePageState extends State<MyBrowser> {
           devToolsService: ChromeDevToolsService(),
           viewportWidth: viewportSize.width - queryData.padding.horizontal,
           viewportHeight: viewportSize.height - appBar.preferredSize.height - queryData.padding.vertical,
-          bundle: KrakenBundle.fromUrl('assets:assets/bundle.js'),
+          bundle: KrakenBundle.fromUrl('assets:assets/bundle.html'),
         ),
     ));
   }