Changeset 60927 in webkit

Timestamp:

Jun 9, 2010 6:48:02 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-09 Yong Li <​yoli@rim.com>

Reviewed by George Staikos.

​https://bugs.webkit.org/show_bug.cgi?id=40252
Make image down-sampling threshold runtime adjustable.

No new test needed.

• platform/graphics/ImageSource.cpp: (WebCore::ImageSource::setData):
• platform/graphics/ImageSource.h: (WebCore::ImageSource::maxPixelsPerDecodedImage): (WebCore::ImageSource::setMaxPixelsPerDecodedImage):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageSource.cpp (modified) (2 diffs)
• platform/graphics/ImageSource.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-09  Yong Li  <yoli@rim.com>
+
+        Reviewed by George Staikos.
+
+        https://bugs.webkit.org/show_bug.cgi?id=40252
+        Make image down-sampling threshold runtime adjustable.
+
+        No new test needed.
+
+        * platform/graphics/ImageSource.cpp:
+        (WebCore::ImageSource::setData):
+        * platform/graphics/ImageSource.h:
+        (WebCore::ImageSource::maxPixelsPerDecodedImage):
+        (WebCore::ImageSource::setMaxPixelsPerDecodedImage):
+
 2010-06-09  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/platform/graphics/ImageSource.cpp

@@ -38 +38 @@
 namespace WebCore {
 
+#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
+unsigned ImageSource::s_maxPixelsPerDecodedImage = 1024 * 1024;
+#endif
+
 ImageSource::ImageSource()
     : m_decoder(0)
@@ -76 +80 @@
         m_decoder = static_cast<NativeImageSourcePtr>(ImageDecoder::create(*data));
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
-#ifndef IMAGE_DECODER_DOWN_SAMPLING_MAX_NUMBER_OF_PIXELS
-#define IMAGE_DECODER_DOWN_SAMPLING_MAX_NUMBER_OF_PIXELS (1024 * 1024)
-#endif
-        if (m_decoder)
-            m_decoder->setMaxNumPixels(IMAGE_DECODER_DOWN_SAMPLING_MAX_NUMBER_OF_PIXELS);
+        if (m_decoder && s_maxPixelsPerDecodedImage)
+            m_decoder->setMaxNumPixels(s_maxPixelsPerDecodedImage);
 #endif
     }

trunk/WebCore/platform/graphics/ImageSource.h

@@ -164 +164 @@
     bool frameIsCompleteAtIndex(size_t); // Whether or not the frame is completely decoded.
 
+#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
+    static unsigned maxPixelsPerDecodedImage() { return s_maxPixelsPerDecodedImage; }
+    static void setMaxPixelsPerDecodedImage(unsigned maxPixels) { s_maxPixelsPerDecodedImage = maxPixels; }
+#endif
+
 private:
     NativeImageSourcePtr m_decoder;
+#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
+    static unsigned s_maxPixelsPerDecodedImage;
+#endif
 };