Re: master 5f9b5803bea: Fix zooming images in SHR

[Jim Porter <jporterbugs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

On 6/26/2024 9:04 AM, Eli Zaretskii wrote:
>> Date: Wed, 26 Jun 2024 08:58:29 -0700
>> Cc: jm@pub.pink, emacs-devel@gnu.org
>> From: Jim Porter <jporterbugs@gmail.com>
>>
>> Here you go.
> 
> Thanks.  The result:
[snip]
>      (error "Timed out waiting for initial load")

Odd. It never loaded the first image (we just got the placeholder). 
Here's a patch with some additional trace statements. (I'd also be ok 
with just disabling these tests on MS-Windows if we can't figure out 
what's happening, though I'm not aware of any reason it should fail.)

[-- Attachment #2: shr-test.diff --]
[-- Type: text/plain, Size: 3220 bytes --]

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 3dadcb9a09b..4959001d656 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1057,6 +1057,7 @@ shr-store-contents
 				      directory)))))
 
 (defun shr-image-fetched (status buffer start end &optional flags)
+  (message "shr-image-fetched: status = %S" status)
   (let ((image-buffer (current-buffer)))
     (when (and (buffer-name buffer)
 	       (not (plist-get status :error)))
@@ -1875,6 +1876,7 @@ shr-tag-img
                (or (string-trim alt) ""))
             ;; No SVG support.  Just use a space as our placeholder.
             (insert " "))
+          (message "shr-img-tag: calling `url-queue-retrieve'")
 	  (url-queue-retrieve
            url #'shr-image-fetched
 	   (list (current-buffer) start (set-marker (make-marker) (point))
diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
index 4864fc488e2..f4fbe8de68b 100644
--- a/test/lisp/net/shr-tests.el
+++ b/test/lisp/net/shr-tests.el
@@ -138,7 +138,8 @@ shr-test/zoom-image
   (skip-unless (bound-and-true-p image-types))
   (let ((image (expand-file-name "data/image/blank-100x200.png"
                                  (getenv "EMACS_TEST_DIRECTORY"))))
-    (dolist (alt '(nil "" "nothing to see here"))
+    (dolist (alt '(nil ;; "" "nothing to see here"
+                       ))
       (with-temp-buffer
         (ert-info ((format "image with alt=%S" alt))
           (let ((attrs (if alt (format " alt=\"%s\"" alt) "")))
@@ -147,6 +148,7 @@ shr-test/zoom-image
                      ((symbol-function 'display-graphic-p) #'always)
                      ((symbol-function 'url-queue-retrieve)
                       (lambda (&rest args)
+                        (message "calling fake `url-queue-retrieve'")
                         (apply #'run-at-time 0 nil #'url-retrieve args)))
                      (put-image-calls 0)
                      (shr-put-image-function
@@ -156,16 +158,21 @@ shr-test/zoom-image
                      (shr-width 80)
                      (shr-use-fonts nil)
                      (shr-image-animate nil)
-                     (inhibit-message t)
+                     ;; (inhibit-message t)
                      (dom (libxml-parse-html-region (point-min) (point-max))))
             ;; Render the document.
             (erase-buffer)
             (shr-insert-document dom)
-            (shr-test-wait-for (lambda () (= put-image-calls 1)))
+            (message "Initial buffer contents:\n%S\n\n" (buffer-string))
+            (shr-test-wait-for (lambda () (= put-image-calls 1))
+                               "Timed out waiting for initial load")
+            (message "Fully-loaded buffer contents:\n%S\n\n" (buffer-string))
             ;; Now zoom the image.
             (goto-char (point-min))
             (shr-zoom-image)
-            (shr-test-wait-for (lambda () (= put-image-calls 2)))
+            (shr-test-wait-for (lambda () (= put-image-calls 2))
+                               "Timed out waiting to zoom image")
+            (message "Final buffer contents:\n%S\n\n" (buffer-string))
             ;; Check that we got a sliced image.
             (let ((slice-count 0))
               (goto-char (point-min))