<!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>[56143] trunk: Media: Ensure that large images before the main query loop are counted towards lazy-loading threshold.</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/56143">56143</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/56143","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>2023-07-05 21:36:23 +0000 (Wed, 05 Jul 2023)</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: Ensure that large images before the main query loop are counted towards lazy-loading threshold.
Following <a href="https://core.trac.wordpress.org/changeset/55318">[55318]</a>, <a href="https://core.trac.wordpress.org/changeset/55847">[55847]</a>, and <a href="https://core.trac.wordpress.org/changeset/56142">[56142]</a>, certain images in the header of the page have received support for potentially receiving `fetchpriority="high"` and having the `loading="lazy"` attribute omitted. However, these images being present did not affect the "content media count" which counts the images towards a certain threshold so that the first ones are not lazy-loaded.
This changeset also increases that count for such header images if they are larger than a certain threshold. The threshold is used to avoid e.g. a header with lots of small images such as icon graphics to skew the lazy-loading behavior.
Props thekt12, spacedmonkey, flixos90.
Fixes <a href="https://core.trac.wordpress.org/ticket/58635">#58635</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.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 2023-07-05 19:28:02 UTC (rev 56142)
+++ trunk/src/wp-includes/media.php 2023-07-05 21:36:23 UTC (rev 56143)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5588,6 +5588,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $loading_attributes;
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Closure to increase media count for images with certain minimum threshold, mostly used for header images.
+ $maybe_increase_content_media_count = static function() use ( $attr ) {
+ /** This filter is documented in wp-admin/includes/media.php */
+ $wp_min_priority_img_pixels = apply_filters( 'wp_min_priority_img_pixels', 50000 );
+ // Images with a certain minimum size in the header of the page are also counted towards the threshold.
+ if ( $wp_min_priority_img_pixels <= $attr['width'] * $attr['height'] ) {
+ wp_increase_content_media_count();
+ }
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $loading_attrs = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5640,11 +5649,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $header_area = WP_TEMPLATE_PART_AREA_HEADER;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( "template_part_{$header_area}" === $context ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Increase media count if there are images in header above a certian minimum size threshold.
+ $maybe_increase_content_media_count();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $postprocess( $loading_attrs, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The custom header image is always expected to be in the header.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'get_header_image_tag' === $context ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Increase media count if there are images in header above a certian minimum size threshold.
+ $maybe_increase_content_media_count();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $postprocess( $loading_attrs, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5671,6 +5684,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> && did_action( 'get_header' ) && ! did_action( 'get_footer' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Increase media count if there are images in header above a certian minimum size threshold.
+ $maybe_increase_content_media_count();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $postprocess( $loading_attrs, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2023-07-05 19:28:02 UTC (rev 56142)
+++ trunk/tests/phpunit/tests/media.php 2023-07-05 21:36:23 UTC (rev 56143)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5095,6 +5095,55 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 58635
+ *
+ * @covers ::wp_get_loading_optimization_attributes
+ */
+ public function test_wp_get_loading_optimization_attributes_header_block_template_increase_media_count() {
+ $attr = $this->get_width_height_for_high_priority();
+ wp_get_loading_optimization_attributes( 'img', $attr, 'template_part_' . WP_TEMPLATE_PART_AREA_HEADER );
+
+ // Images with a certain minimum size in the header of the page are also counted towards the threshold.
+ $this->assertSame( 1, wp_increase_content_media_count( 0 ) );
+ }
+
+ /**
+ * @ticket 58635
+ *
+ * @covers ::wp_get_loading_optimization_attributes
+ */
+ public function test_wp_get_loading_optimization_attributes_header_image_tag_increase_media_count() {
+ $attr = $this->get_width_height_for_high_priority();
+ wp_get_loading_optimization_attributes( 'img', $attr, 'get_header_image_tag' );
+
+ // Images with a certain minimum size in the header of the page are also counted towards the threshold.
+ $this->assertSame( 1, wp_increase_content_media_count( 0 ) );
+ }
+
+ /**
+ * @ticket 58635
+ *
+ * @covers ::wp_get_loading_optimization_attributes
+ *
+ * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+ *
+ * @param string $context Context for the element for which the `loading` attribute value is requested.
+ */
+ public function test_wp_get_loading_optimization_attributes_image_before_loop_increase_media_count( $context ) {
+ global $wp_query;
+
+ $wp_query = $this->get_new_wp_query_for_published_post();
+ $this->set_main_query( $wp_query );
+ do_action( 'get_header' );
+
+ $attr = $this->get_width_height_for_high_priority();
+ wp_get_loading_optimization_attributes( 'img', $attr, $context );
+
+ // Images with a certain minimum size in the header of the page are also counted towards the threshold.
+ $this->assertSame( 1, wp_increase_content_media_count( 0 ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Helper method to keep track of the last context returned by the 'wp_get_attachment_image_context' filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The method parameter is passed by reference and therefore will always contain the last context value.
</span></span></pre>
</div>
</div>
</body>
</html>