From ad66f7561bb3ea2b30c73eba2e4a4e6a98eb0690 Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Fri, 14 Feb 2020 11:11:27 +0000 Subject: [PATCH] Bug 1607667 - Change initial value of image-orientation to from-image. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D62826 --HG-- extra : moz-landing-system : lando --- dom/html/reftests/bug917595-1-ref.html | 2 +- dom/html/reftests/reftest.list | 2 +- layout/style/nsStyleStruct.cpp | 3 ++- layout/style/test/property_database.js | 4 ++-- .../style/properties/longhands/inherited_box.mako.rs | 2 +- .../web-platform/meta/css/css-images/inheritance.html.ini | 6 ------ 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dom/html/reftests/bug917595-1-ref.html b/dom/html/reftests/bug917595-1-ref.html index 821b8410ed18..b777751ff8b4 100644 --- a/dom/html/reftests/bug917595-1-ref.html +++ b/dom/html/reftests/bug917595-1-ref.html @@ -12,6 +12,6 @@ () => document.documentElement.removeAttribute('class')); - + diff --git a/dom/html/reftests/reftest.list b/dom/html/reftests/reftest.list index 15d1b89fde44..0ddaca1a3c74 100644 --- a/dom/html/reftests/reftest.list +++ b/dom/html/reftests/reftest.list @@ -43,7 +43,7 @@ skip-if(Android) == 649134-2.html 649134-2-ref.html # image-orientation when determining the size of the image. # (Fuzzy necessary due to pixel-wise comparison of different JPEGs. # The vast majority of the fuzziness comes from Linux and WinXP.) -fuzzy(0-1,0-149) == bug917595-iframe-1.html bug917595-1-ref.html +fuzzy(0-2,0-830) == bug917595-iframe-1.html bug917595-1-ref.html fuzzy(0-3,0-640) fuzzy-if(skiaContent,0-3,0-7544) fuzzy-if(webrender&&!geckoview,2-3,3092-7544) == bug917595-exif-rotated.jpg bug917595-pixel-rotated.jpg # bug 1060869 # Test support for SVG-as-image in elements. diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index ac9487d01213..dce8f3adefca 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -2710,7 +2710,8 @@ nsChangeHint nsStyleDisplay::CalcDifference( // nsStyleVisibility::nsStyleVisibility(const Document& aDocument) - : mDirection(aDocument.GetBidiOptions() == IBMBIDI_TEXTDIRECTION_RTL + : mImageOrientation(StyleImageOrientation::FromImage), + mDirection(aDocument.GetBidiOptions() == IBMBIDI_TEXTDIRECTION_RTL ? StyleDirection::Rtl : StyleDirection::Ltr), mVisible(StyleVisibility::Visible), diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index d7945370d5dd..2ac3ca1eb077 100644 --- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -8821,8 +8821,8 @@ var gCSSProperties = { domProp: "imageOrientation", inherited: true, type: CSS_TYPE_LONGHAND, - initial_values: ["none"], - other_values: ["from-image"], + initial_values: ["from-image"], + other_values: ["none"], invalid_values: ["0", "0deg"], }, "image-rendering": { diff --git a/servo/components/style/properties/longhands/inherited_box.mako.rs b/servo/components/style/properties/longhands/inherited_box.mako.rs index e8f3a0a45d91..d2b66dc6a1f2 100644 --- a/servo/components/style/properties/longhands/inherited_box.mako.rs +++ b/servo/components/style/properties/longhands/inherited_box.mako.rs @@ -85,7 +85,7 @@ ${helpers.single_keyword( ${helpers.single_keyword( "image-orientation", - "none from-image", + "from-image none", engines="gecko", gecko_enum_prefix="StyleImageOrientation", animation_value_type="discrete", diff --git a/testing/web-platform/meta/css/css-images/inheritance.html.ini b/testing/web-platform/meta/css/css-images/inheritance.html.ini index 536463b1daa5..26fe5019d5cc 100644 --- a/testing/web-platform/meta/css/css-images/inheritance.html.ini +++ b/testing/web-platform/meta/css/css-images/inheritance.html.ini @@ -2,9 +2,3 @@ [Property image-rendering inherits] expected: FAIL - [Property image-orientation has initial value from-image] - expected: FAIL - - [Property image-orientation inherits] - expected: FAIL -