Changeset 269155 in webkit

Timestamp:

Oct 29, 2020, 10:53:22 AM (6 years ago)

Author:

Noam Rosenthal

Message:

REGRESSION(r268249): image-orientation:none is broken for local (​file://) urls
​https://bugs.webkit.org/show_bug.cgi?id=217808
<rdar://problem/70603407>

Reviewed by Myles C. Maxfield.

Source/WebCore:

Use isCORSSameOrigin() instead of isOriginClean(), it's a more accureate method
for this purpose.
Allow image-orientation: none overriding when the image is local or a data-url.

Test: fast/images/image-orientation-none-local.html

• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::allowsOrientationOverride const):

LayoutTests:

Added a tests that ensure image-orientation: none is supported in file and data URLs.

• fast/images/image-orientation-none-local-expected.txt: Added.
• fast/images/image-orientation-none-local.html: Added.
• fast/images/image-orientation-none-data-url-expected.txt: Added.
• fast/images/image-orientation-none-data-url.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/image-orientation-none-data-url-expected.txt (added)
• LayoutTests/fast/images/image-orientation-none-data-url.html (added)
• LayoutTests/fast/images/image-orientation-none-local-expected.txt (added)
• LayoutTests/fast/images/image-orientation-none-local.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLImageElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-29  Noam Rosenthal  <noam@webkit.org>
+
+        REGRESSION(r268249): image-orientation:none is broken for local (file://) urls
+        https://bugs.webkit.org/show_bug.cgi?id=217808
+        <rdar://problem/70603407>
+
+        Reviewed by Myles C. Maxfield.
+
+        Added a tests that ensure image-orientation: none is supported in file and data URLs.
+
+        * fast/images/image-orientation-none-local-expected.txt: Added.
+        * fast/images/image-orientation-none-local.html: Added.
+        * fast/images/image-orientation-none-data-url-expected.txt: Added.
+        * fast/images/image-orientation-none-data-url.html: Added.
+
 2020-10-29  Karl Rackler  <rackler@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-29  Noam Rosenthal  <noam@webkit.org>
+
+        REGRESSION(r268249): image-orientation:none is broken for local (file://) urls
+        https://bugs.webkit.org/show_bug.cgi?id=217808
+        <rdar://problem/70603407>
+
+        Reviewed by Myles C. Maxfield.
+
+        Use isCORSSameOrigin() instead of isOriginClean(), it's a more accureate method
+        for this purpose.
+        Allow image-orientation: none overriding when the image is local or a data-url.
+
+        Test: fast/images/image-orientation-none-local.html
+
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::allowsOrientationOverride const):
+
 2020-10-29  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -684 +684 @@
 bool HTMLImageElement::allowsOrientationOverride() const
 {
-    auto* image = cachedImage();
-    return !image || image->isOriginClean(&(document().securityOrigin()));
+    auto* cachedImage = this->cachedImage();
+    if (!cachedImage)
+        return true;
+
+    auto image = cachedImage->image();
+    return !image || image->sourceURL().protocolIsData() || cachedImage->isCORSSameOrigin();
 }