Changeset 47042 in webkit

Timestamp:

Aug 11, 2009 12:00:05 PM (15 years ago)

Author:

pkasting@chromium.org

Message:

WebCore: ​https://bugs.webkit.org/show_bug.cgi?id=28073
Treat icons with no bit count and no color count as 256-color for
purposes of quality ranking. Also fix a couple cases of a style
violation.

Reviewed by Eric Seidel.

Test: fast/images/icon-0colors.html

• platform/image-decoders/ico/ICOImageDecoder.cpp:

(WebCore::ICOImageDecoder::processDirectory):
(WebCore::ICOImageDecoder::readDirectoryEntry):

LayoutTests: ​https://bugs.webkit.org/show_bug.cgi?id=28073
Treat icons with no bit count and no color count as 256-color for
purposes of quality ranking.

Reviewed by Eric Seidel.

• fast/images/icon-0colors.html: Added.
• fast/images/resources/0colors.ico: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/icon-0colors.html (added)
• LayoutTests/fast/images/resources/0colors.ico (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-07  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28073
+        Treat icons with no bit count and no color count as 256-color for
+        purposes of quality ranking.
+
+        * fast/images/icon-0colors.html: Added.
+        * fast/images/resources/0colors.ico: Added.
+
 2009-08-11  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-07  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28073
+        Treat icons with no bit count and no color count as 256-color for
+        purposes of quality ranking.  Also fix a couple cases of a style
+        violation.
+
+        Test: fast/images/icon-0colors.html
+
+        * platform/image-decoders/ico/ICOImageDecoder.cpp:
+        (WebCore::ICOImageDecoder::processDirectory):
+        (WebCore::ICOImageDecoder::readDirectoryEntry):
+
 2009-08-11  Drew Wilson  <atwilson@google.com>
 

trunk/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp

@@ -250 +250 @@
         CURSOR = 2,
     };
-    if (((fileType != ICON) && (fileType != CURSOR)) || (idCount == 0)) {
+    if (((fileType != ICON) && (fileType != CURSOR)) || (!idCount)) {
         setFailed();
         return false;
@@ -304 +304 @@
     // what a zero byte really means).
     int width = static_cast<uint8_t>(m_data->data()[m_decodedOffset]);
-    if (width == 0)
+    if (!width)
         width = 256;
     int height = static_cast<uint8_t>(m_data->data()[m_decodedOffset + 1]);
-    if (height == 0)
+    if (!height)
         height = 256;
     IconDirectoryEntry entry;
@@ -319 +319 @@
     // this value to determine which icon entry is best.
     if (!entry.m_bitCount) {
-        uint8_t colorCount = m_data->data()[m_decodedOffset + 2];
-        if (colorCount) {
-            for (--colorCount; colorCount; colorCount >>= 1)
-                ++entry.m_bitCount;
-        }
+        int colorCount =
+            static_cast<uint8_t>(m_data->data()[m_decodedOffset + 2]);
+        if (!colorCount)
+            colorCount = 256;  // Vague in the spec, needed by real-world icons.
+        for (--colorCount; colorCount; colorCount >>= 1)
+            ++entry.m_bitCount;
     }