-If SPEC is an image display property, this function is equivalent
-to `image-size'. If SPEC is a list of properties containing
-`image' and `slice' properties, return the display size taking
-the slice property into account. If the list contains `image'
-but not `slice', return the `image-size' of the specified image."
- (if (eq (car spec) 'image)
- (image-size spec pixels frame)
- (let ((image (assoc 'image spec))
- (slice (assoc 'slice spec)))
- (cond ((and image slice)
- (if pixels
- (cons (nth 3 slice) (nth 4 slice))
- (cons (/ (float (nth 3 slice)) (frame-char-width frame))
- (/ (float (nth 4 slice)) (frame-char-height frame)))))
- (image
- (image-size image pixels frame))
- (t
- (error "Invalid image specification: %s" spec))))))
+If SPEC is an image display property, this function is equivalent to
+`image-size'. If SPEC represents an xwidget object, defer to `xwidget-info'.
+If SPEC is a list of properties containing `image' and `slice' properties,
+return the display size taking the slice property into account. If the list
+contains `image' but not `slice', return the `image-size' of the specified
+image."
+ (cond ((eq (car spec) 'xwidget)
+ (let ((xwi (xwidget-info (xwidget-at (point-min)))))
+ (cons (aref xwi 2) (aref xwi 3))))
+ ((eq (car spec) 'image)
+ (image-size spec pixels frame))
+ (t (let ((image (assoc 'image spec))
+ (slice (assoc 'slice spec)))
+ (cond ((and image slice)
+ (if pixels
+ (cons (nth 3 slice) (nth 4 slice))
+ (cons (/ (float (nth 3 slice)) (frame-char-width frame))
+ (/ (float (nth 4 slice))
+ (frame-char-height frame)))))
+ (image
+ (image-size image pixels frame))
+ (t
+ (error "Invalid image specification: %s" spec)))))))