From 7f2a45f61044bfc3aaa13af7f7dfc089b0e04681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 12 Jul 2019 22:00:25 +0000
Subject: [PATCH] When inferring an aspect ratio from an image's width and
 height attribute, only honor it if we don't have the real image aspect-ratio.

Since people like to get wrong attribute values on their images (see the
regressions from bug 1547231).

Differential Revision: https://phabricator.services.mozilla.com/D37936

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1565690
gecko-commit: aa0016d9f9f827f86bb82d632998b2d5706fe851
gecko-integration-branch: autoland
gecko-reviewers: dholbert
---
 .../img-aspect-ratio.tentative.html                           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.tentative.html b/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.tentative.html
index 04ac273cbd77b7..ae266882b19570 100644
--- a/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.tentative.html
+++ b/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.tentative.html
@@ -10,8 +10,8 @@
   }
 </style>
 <img src=broken width=100 height=125>
-<img src="/images/green.png" width=100 height=125>
 <img src="/images/green.png">
+<img src="/images/green.png" width=100 height=125>
 <script>
 let t = async_test("Image width and height attributes are used to infer aspect-ratio");
 function assert_ratio(img, expected) {
@@ -21,7 +21,7 @@
 onload = t.step_func_done(function() {
   let images = document.querySelectorAll("img");
   assert_ratio(images[0], 0.8);
-  assert_ratio(images[1], 0.8);
   assert_ratio(images[2], 2.0); // 2.0 is the original aspect ratio of green.png
+  assert_ratio(images[1], 2.0); // Loaded image's aspect ratio, at least by default, overrides width / height ratio.
 });
 </script>