Changeset 215803 in webkit

Timestamp:

Apr 26, 2017, 9:13:02 AM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r215767.

The LayoutTest for this change is a flaky failure.

Reverted changeset:

"Restrict WebKit image formats to a known whitelist"
​https://bugs.webkit.org/show_bug.cgi?id=170700
​http://trac.webkit.org/changeset/215767

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/image-formats-support-expected.txt (deleted)
• LayoutTests/fast/images/image-formats-support.html (deleted)
• LayoutTests/fast/images/resources/100x100-red-psd-renamed.png (deleted)
• LayoutTests/fast/images/resources/100x100-red-tga-renamed.png (deleted)
• LayoutTests/fast/images/resources/100x100-red.psd (deleted)
• LayoutTests/fast/images/resources/100x100-red.tga (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedImage.cpp (modified) (4 diffs)
• Source/WebCore/loader/cache/CachedImage.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-26  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r215767.
+
+        The LayoutTest for this change is a flaky failure.
+
+        Reverted changeset:
+
+        "Restrict WebKit image formats to a known whitelist"
+        https://bugs.webkit.org/show_bug.cgi?id=170700
+        http://trac.webkit.org/changeset/215767
+
 2017-04-24  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-26  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r215767.
+
+        The LayoutTest for this change is a flaky failure.
+
+        Reverted changeset:
+
+        "Restrict WebKit image formats to a known whitelist"
+        https://bugs.webkit.org/show_bug.cgi?id=170700
+        http://trac.webkit.org/changeset/215767
+
 2017-04-26  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -52 +52 @@
 #if USE(CG)
 #include "PDFDocumentImage.h"
-#include "UTIRegistry.h"
 #endif
 
@@ -403 +402 @@
     // It will not do anything now, but will delay decoding until
     // queried for info (like size or specific image frames).
-    EncodedDataStatus encodedDataStatus = setImageDataBuffer(&data, false);
+    EncodedDataStatus encodedDataStatus = m_image->setData(&data, false);
     if (encodedDataStatus > EncodedDataStatus::Error && encodedDataStatus < EncodedDataStatus::SizeAvailable)
         return;
@@ -426 +425 @@
 }
 
-EncodedDataStatus CachedImage::setImageDataBuffer(SharedBuffer* data, bool allDataReceived)
-{
-    EncodedDataStatus encodedDataStatus = m_image ? m_image->setData(data, allDataReceived) : EncodedDataStatus::Error;
-#if USE(CG)
-    if (encodedDataStatus >= EncodedDataStatus::TypeAvailable && m_image->isBitmapImage() && !isAllowedImageUTI(m_image->uti()))
-        return EncodedDataStatus::Error;
-#endif
-    return encodedDataStatus;
-}
-
 void CachedImage::addDataBuffer(SharedBuffer& data)
 {
@@ -456 +445 @@
         createImage();
 
-    EncodedDataStatus encodedDataStatus = setImageDataBuffer(data, true);
+    EncodedDataStatus encodedDataStatus = m_image ? m_image->setData(data, true) : EncodedDataStatus::Error;
 
     if (encodedDataStatus == EncodedDataStatus::Error || m_image->isNull()) {

trunk/Source/WebCore/loader/cache/CachedImage.h

@@ -108 +108 @@
     void destroyDecodedData() override;
 
-    EncodedDataStatus setImageDataBuffer(SharedBuffer*, bool allDataReceived);
     void addData(const char* data, unsigned length) override;
     void error(CachedResource::Status) override;