Merge pull request #328 from hzbhzb/main

fix: setting lazy loading for an image didn't work.
openwebf · May 8, 2023 · 2eb23c5 · 2eb23c5
2 parents e30edbb + 89bc04c
commit 2eb23c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bridge/core/dart_methods.cc b/bridge/core/dart_methods.cc
@@ -23,7 +23,7 @@ webf::DartMethodPointer::DartMethodPointer(const uint64_t* dart_methods, int32_t
   create_binding_object = reinterpret_cast<CreateBindingObject>(dart_methods[i++]);
 
 #if ENABLE_PROFILE
-  dartMethodPointer->getPerformanceEntries = reinterpret_cast<GetPerformanceEntries>(dart_methods[i++]);
+  getPerformanceEntries = reinterpret_cast<GetPerformanceEntries>(dart_methods[i++]);
 #else
   i++;
 #endif
@@ -33,4 +33,4 @@ webf::DartMethodPointer::DartMethodPointer(const uint64_t* dart_methods, int32_t
 
   assert_m(i == dart_methods_length, "Dart native methods count is not equal with C++ side method registrations.");
 }
-}  // namespace webf
+}  // namespace webf
diff --git a/webf/lib/src/html/img.dart b/webf/lib/src/html/img.dart
@@ -280,10 +280,10 @@ class ImageElement extends Element {
     if (entry.isIntersecting) {
       // Once appear remove the listener
       _removeIntersectionChangeListener();
+      _isInLazyRendering = false;
       await _decode();
       _loadImage();
       _listenToStream();
-      _isInLazyRendering = false;
     }
   }
 
@@ -402,7 +402,7 @@ class ImageElement extends Element {
   // If imageElement has property size or width/height property on [renderStyle],
   // The image will be encoded into a small size for better rasterization performance.
   Future<void> _decode({bool updateImageProvider = false}) async {
-    if (_isImageEncoding) return;
+    if (_isImageEncoding || _isInLazyLoading) return;
     Completer completer = Completer();
 
     // Make sure all style and properties are ready before decode begins.