<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[57294] trunk: Media: Consider inline image CSS width to backfill `width` and `height` attributes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57294">57294</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57294","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-16 17:01:30 +0000 (Tue, 16 Jan 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Consider inline image CSS width to backfill `width` and `height` attributes.
Prior to this changeset, WordPress core would use the original image size, which in the particular case of inline images would be severely off, as they are usually very small. This could lead to incorrect application of `fetchpriority="high"` and other performance optimizations.
Props westonruter, flixos90, joemcgill, mukesh27.
Fixes <a href="https://core.trac.wordpress.org/ticket/59352">#59352</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmediawpImgTagAddWidthAndHeightAttrphp">trunk/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2024-01-16 16:09:50 UTC (rev 57293)
+++ trunk/src/wp-includes/media.php 2024-01-16 17:01:30 UTC (rev 57294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2117,6 +2117,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $size_array = wp_image_src_get_dimensions( $image_src, $image_meta, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $size_array ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the width is enforced through style (e.g. in an inline image), calculate the dimension attributes.
+ $style_width = preg_match( '/style="width:\s*(\d+)px;"/', $image, $match_width ) ? (int) $match_width[1] : 0;
+ if ( $style_width ) {
+ $size_array[1] = (int) round( $size_array[1] * $style_width / $size_array[0] );
+ $size_array[0] = $style_width;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $hw = trim( image_hwstring( $size_array[0], $size_array[1] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '<img', "<img {$hw}", $image );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmediawpImgTagAddWidthAndHeightAttrphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php (rev 0)
+++ trunk/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php 2024-01-16 17:01:30 UTC (rev 57294)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,85 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Tests for the `wp_img_tag_add_width_and_height_attr()` function.
+ *
+ * @group media
+ * @covers ::wp_img_tag_add_width_and_height_attr
+ */
+class Tests_Media_Wp_Img_Tag_Add_Width_And_Height_Attr extends WP_UnitTestCase {
+
+ protected static $attachment_id;
+ protected static $attachment_width;
+ protected static $attachment_height;
+
+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+ $file = DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG';
+ self::$attachment_id = $factory->attachment->create_upload_object( $file );
+ self::$attachment_width = 680;
+ self::$attachment_height = 1024;
+ }
+
+ public static function tear_down_after_class() {
+ wp_delete_attachment( self::$attachment_id, true );
+ parent::tear_down_after_class();
+ }
+
+ /**
+ * Tests that `wp_img_tag_add_width_and_height_attr()` adds dimension attributes to an image when they are missing.
+ *
+ * @ticket 50367
+ */
+ public function test_add_width_and_height_when_missing() {
+ $image_tag = '<img src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '">';
+
+ $this->assertSame(
+ '<img width="' . self::$attachment_width . '" height="' . self::$attachment_height . '" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '">',
+ wp_img_tag_add_width_and_height_attr( $image_tag, 'the_content', self::$attachment_id )
+ );
+ }
+
+ /**
+ * Tests that `wp_img_tag_add_width_and_height_attr()` does not add dimension attributes when disabled via filter.
+ *
+ * @ticket 50367
+ */
+ public function test_do_not_add_width_and_height_when_disabled_via_filter() {
+ add_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' );
+ $image_tag = '<img src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '">';
+
+ $this->assertSame(
+ $image_tag,
+ wp_img_tag_add_width_and_height_attr( $image_tag, 'the_content', self::$attachment_id )
+ );
+ }
+
+ /**
+ * Tests that `wp_img_tag_add_width_and_height_attr()` does not add dimension attributes to an image without src.
+ *
+ * @ticket 50367
+ */
+ public function test_do_not_add_width_and_height_without_src() {
+ $image_tag = '<img>';
+
+ $this->assertSame(
+ $image_tag,
+ wp_img_tag_add_width_and_height_attr( $image_tag, 'the_content', self::$attachment_id )
+ );
+ }
+
+ /**
+ * Tests that `wp_img_tag_add_width_and_height_attr()` respects the style attribute from the inline image format to
+ * correctly set width and height based on that.
+ *
+ * @ticket 59352
+ */
+ public function test_consider_inline_image_style_attr_to_set_width_and_height() {
+ // '85px' is the original width (680px) divided by 8, so the expected height is equivalently 1024/8=128.
+ $image_tag = '<img src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '" style="width: 85px;">';
+
+ $this->assertSame(
+ '<img width="85" height="128" src="' . wp_get_attachment_image_url( self::$attachment_id, 'full' ) . '" style="width: 85px;">',
+ wp_img_tag_add_width_and_height_attr( $image_tag, 'the_content', self::$attachment_id )
+ );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/media/wpImgTagAddWidthAndHeightAttr.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>