Merge pull request #759 from openkraken/fix/image-stream-compeleter

Fix/image stream compeleter
openkraken · Nov 1, 2021 · e2bc0d6 · e2bc0d6
2 parents 25edf15 + 6484274
commit e2bc0d6
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 31 deletions.
diff --git a/bridge/bindings/qjs/dom/element.cc b/bridge/bindings/qjs/dom/element.cc
@@ -327,8 +327,7 @@ JSValue Element::toBlob(QjsContext *ctx, JSValue this_val, int argc, JSValue *ar
     } else {
       JSValue errorObject = JS_NewError(ctx);
       JSValue errorMessage = JS_NewString(ctx, error);
-      JS_DefinePropertyValueStr(ctx, errorObject, "message", errorMessage,
-                                JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+      JS_SetPropertyStr(ctx, errorObject, "message", errorMessage);
       JSValue ret = JS_Call(ctx, promiseContext->rejectFunc, promiseContext->promise, 1, &errorObject);
       JS_FreeValue(ctx, errorObject);
       JS_FreeValue(ctx, errorMessage);

diff --git a/bridge/bindings/qjs/js_context.cc b/bridge/bindings/qjs/js_context.cc
@@ -247,28 +247,35 @@ JSRuntime *JSContext::runtime() {
 void JSContext::reportError(JSValueConst error) {
   if (!JS_IsError(m_ctx, error)) return;
 
-  const char *title = JS_ToCString(m_ctx, error);
+  JSValue messageValue = JS_GetPropertyStr(m_ctx, error, "message");
+  JSValue errorTypeValue = JS_GetPropertyStr(m_ctx, error, "name");
+  const char *title = JS_ToCString(m_ctx, messageValue);
+  const char *type = JS_ToCString(m_ctx, errorTypeValue);
   const char *stack = nullptr;
   JSValue stackValue = JS_GetPropertyStr(m_ctx, error, "stack");
   if (!JS_IsUndefined(stackValue)) {
     stack = JS_ToCString(m_ctx, stackValue);
   }
 
-  uint32_t messageLength = strlen(title) + 2;
+  uint32_t messageLength = strlen(type) + strlen(title);
   if (stack != nullptr) {
-    messageLength += strlen(stack);
+    messageLength += 4 + strlen(stack);
     char message[messageLength];
-    sprintf(message, "%s\n%s", title, stack);
+    sprintf(message, "%s: %s\n%s", type, title, stack);
     _handler(contextId, message);
   } else {
+    messageLength += 3;
     char message[messageLength];
-    sprintf(message, "%s", title);
+    sprintf(message, "%s: %s", type, title);
     _handler(contextId, message);
   }
 
+  JS_FreeValue(m_ctx, errorTypeValue);
+  JS_FreeValue(m_ctx, messageValue);
   JS_FreeValue(m_ctx, stackValue);
   JS_FreeCString(m_ctx, title);
   JS_FreeCString(m_ctx, stack);
+  JS_FreeCString(m_ctx, type);
 }
 
 void JSContext::drainPendingPromiseJobs() {

diff --git a/integration_tests/lib/bridge/match_snapshots.dart b/integration_tests/lib/bridge/match_snapshots.dart
@@ -58,6 +58,10 @@ num diffBetweenPixels(firstPixel, secondPixel, ignoreAlpha) {
 }
 
 bool matchImage(Uint8List imageA, List<int> imageB, String filename) {
+  if (imageA.length == 0 || imageB.length == 0) {
+    return false;
+  }
+
   Image a = decodeImage(imageA.toList())!;
   Image b = decodeImage(imageB.toList())!;
   if (!haveSameSize(a, b)) {

diff --git a/integration_tests/snapshots/dom/elements/img.ts.ff77830b2.png b/integration_tests/snapshots/dom/elements/img.ts.ff77830b2.png
diff --git a/integration_tests/specs/css/css-flexbox/css-flexbox.ts b/integration_tests/specs/css/css-flexbox/css-flexbox.ts
@@ -60,7 +60,7 @@ describe('css-flexbox', () => {
     BODY.appendChild(p);
     BODY.appendChild(flexbox);
 
-    await snapshot(0.5);
+    await snapshot(1);
   });
   it('row-ref', async () => {
     let p;

diff --git a/kraken/lib/src/dom/element.dart b/kraken/lib/src/dom/element.dart
@@ -1441,19 +1441,21 @@ class Element extends Node
     dispatchEvent(clickEvent);
   }
 
-  Future<Uint8List> toBlob({double? devicePixelRatio}) {
+  Future<Uint8List> toBlob({ double? devicePixelRatio }) {
     devicePixelRatio ??= window.devicePixelRatio;
 
     Completer<Uint8List> completer = Completer();
-    if (nodeName != 'HTML') {
+    if (targetId != HTML_ID) {
       convertToRepaintBoundary();
     }
     renderBoxModel!.owner!.flushLayout();
 
     SchedulerBinding.instance!.addPostFrameCallback((_) async {
       Uint8List captured;
-      RenderBoxModel? renderObject = nodeName == 'HTML' ? elementManager.viewportElement.renderBoxModel : renderBoxModel;
-      if (renderObject!.hasSize && renderObject.size == Size.zero) {
+      RenderBoxModel? renderObject = targetId == HTML_ID
+          ? elementManager.viewportElement.renderBoxModel
+          : renderBoxModel;
+      if (renderObject!.hasSize && renderObject.size.isEmpty) {
         // Return a blob with zero length.
         captured = Uint8List(0);
       } else {

diff --git a/kraken/lib/src/dom/elements/img.dart b/kraken/lib/src/dom/elements/img.dart
@@ -107,7 +107,6 @@ class ImageElement extends Element {
     _imageProvider?.evict();
     _imageProvider = null;
 
-    _removeStreamListener();
     _renderImage?.image = null;
   }
 
@@ -118,7 +117,8 @@ class ImageElement extends Element {
     _imageProvider?.evict();
     _imageProvider = null;
 
-    _removeStreamListener();
+    _imageStream?.removeListener(_renderStreamListener);
+    _imageStream = null;
 
     _renderImage = null;
   }
@@ -197,6 +197,8 @@ class ImageElement extends Element {
   @override
   bool get shouldConvertToRepaintBoundary => _frameCount > 2 || super.shouldConvertToRepaintBoundary;
 
+  bool get shouldConvertToNonRepaintBoundary => _frameCount == 1;
+
   void _renderImageStream(ImageInfo imageInfo, bool synchronousCall) {
     _frameCount++;
     _imageInfo = imageInfo;
@@ -213,17 +215,19 @@ class ImageElement extends Element {
       }
     }
 
-    // @HACK Flutter image cache will cause image steam listener to trigger twice when page reload
-    // so use two frames to tell multi frame image from static image, note this optimization will fail
-    // at multi frame image with only two frames which is not common.
-    if (shouldConvertToRepaintBoundary) {
-      convertToRepaintBoundary();
-    } else {
-      convertToNonRepaintBoundary();
-    }
+    if (isRendererAttached) {
+      // @HACK Flutter image cache will cause image steam listener to trigger twice when page reload
+      // so use two frames to tell multi frame image from static image, note this optimization will fail
+      // at multi frame image with only two frames which is not common.
+      if (shouldConvertToRepaintBoundary) {
+        convertToRepaintBoundary();
+      } else if (shouldConvertToNonRepaintBoundary) {
+        convertToNonRepaintBoundary();
+      }
 
-    _resize();
-    _renderImage?.image = image;
+      _resize();
+      _renderImage?.image = image;
+    }
   }
 
   // Mark if the same src loaded.
@@ -298,11 +302,6 @@ class ImageElement extends Element {
     }
   }
 
-  void _removeStreamListener() {
-    _imageStream?.removeListener(_renderStreamListener);
-    _imageStream = null;
-  }
-
   RenderImage createRenderImageBox() {
     RenderStyle renderStyle = renderBoxModel!.renderStyle;
     BoxFit objectFit = renderStyle.objectFit;
@@ -377,8 +376,6 @@ class ImageElement extends Element {
     _resetImage();
 
     if (_source != null) {
-      _removeStreamListener();
-
       Uri base = Uri.parse(elementManager.controller.href);
       Uri resolvedUri = elementManager.controller.uriParser!.resolve(base, Uri.parse(_source!));