[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dimich at chromium.org
dimich at chromium.org
Wed Dec 22 15:21:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 55372123a85d05e39cc18d4cb879527eae0a6671
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 23:25:50 2010 +0000
2010-11-01 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r71065.
http://trac.webkit.org/changeset/71065
https://bugs.webkit.org/show_bug.cgi?id=48801
Seem to breake a lot of tests on Chromium bots (Requested by
dimich on #webkit).
* platform/image-decoders/ImageDecoder.cpp:
* platform/image-decoders/ImageDecoder.h:
* platform/image-decoders/cg/ImageDecoderCG.cpp:
(WebCore::RGBA32Buffer::asNewNativeImage):
* platform/image-decoders/png/PNGImageDecoder.cpp:
(WebCore::PNGImageDecoder::headerAvailable):
(WebCore::PNGImageDecoder::rowAvailable):
* platform/image-decoders/qt/RGBA32BufferQt.cpp:
* platform/image-decoders/skia/ImageDecoderSkia.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71071 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aae0bb8..ee81caf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-01 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r71065.
+ http://trac.webkit.org/changeset/71065
+ https://bugs.webkit.org/show_bug.cgi?id=48801
+
+ Seem to breake a lot of tests on Chromium bots (Requested by
+ dimich on #webkit).
+
+ * platform/image-decoders/ImageDecoder.cpp:
+ * platform/image-decoders/ImageDecoder.h:
+ * platform/image-decoders/cg/ImageDecoderCG.cpp:
+ (WebCore::RGBA32Buffer::asNewNativeImage):
+ * platform/image-decoders/png/PNGImageDecoder.cpp:
+ (WebCore::PNGImageDecoder::headerAvailable):
+ (WebCore::PNGImageDecoder::rowAvailable):
+ * platform/image-decoders/qt/RGBA32BufferQt.cpp:
+ * platform/image-decoders/skia/ImageDecoderSkia.cpp:
+
2010-11-01 Matthew Delaney <mdelaney at apple.com>
Reviewed by Simon Fraser.
diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp
index a4aa630..9ffbbf5 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/ImageDecoder.cpp
@@ -189,11 +189,6 @@ void RGBA32Buffer::setHasAlpha(bool alpha)
m_hasAlpha = alpha;
}
-void RGBA32Buffer::setColorProfile(const ColorProfile& colorProfile)
-{
- m_colorProfile = colorProfile;
-}
-
void RGBA32Buffer::setStatus(FrameStatus status)
{
m_status = status;
diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h
index 995b240..b07c72b 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.h
+++ b/WebCore/platform/image-decoders/ImageDecoder.h
@@ -46,9 +46,6 @@
namespace WebCore {
- // FIXME: Do we want better encapsulation?
- typedef Vector<char> ColorProfile;
-
// The RGBA32Buffer object represents the decoded image data in RGBA32
// format. This buffer is what all decoders write a single frame into.
// Frames are then instantiated for drawing by being handed this buffer.
@@ -128,7 +125,6 @@ namespace WebCore {
bool premultiplyAlpha() const { return m_premultiplyAlpha; }
void setHasAlpha(bool alpha);
- void setColorProfile(const ColorProfile&);
void setRect(const IntRect& r) { m_rect = r; }
void setStatus(FrameStatus status);
void setDuration(unsigned duration) { m_duration = duration; }
@@ -196,7 +192,6 @@ namespace WebCore {
// same as ImageDecoder::m_size.
bool m_hasAlpha; // Whether or not any of the pixels in the buffer
// have transparency.
- ColorProfile m_colorProfile;
#endif
IntRect m_rect; // The rect of the original specified frame within
// the overall buffer. This will always just be
@@ -349,7 +344,6 @@ namespace WebCore {
RefPtr<SharedBuffer> m_data; // The encoded data.
Vector<RGBA32Buffer> m_frameBufferCache;
- ColorProfile m_colorProfile;
bool m_scaled;
Vector<int> m_scaledColumns;
Vector<int> m_scaledRows;
diff --git a/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp b/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp
index ce6e27c..2fac7da 100644
--- a/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp
+++ b/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp
@@ -64,30 +64,15 @@ bool RGBA32Buffer::setSize(int newWidth, int newHeight)
return true;
}
-static CGColorSpaceRef createColorSpace(const ColorProfile& colorProfile)
-{
- if (colorProfile.isEmpty())
- return CGColorSpaceCreateDeviceRGB();
-
- RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(colorProfile.data()), colorProfile.size()));
-#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
- return CGColorSpaceCreateWithICCProfile(data.get());
-#else
- RetainPtr<CGColorSpaceRef> deviceColorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
- RetainPtr<CGDataProviderRef> profileDataProvider(AdoptCF, CGDataProviderCreateWithCFData(data.get()));
- CGFloat ranges[] = {0.0, 255.0, 0.0, 255.0, 0.0, 255.0};
- return CGColorSpaceCreateICCBased(3, ranges, profileDataProvider.get(), deviceColorSpace.get());
-#endif
-}
-
NativeImagePtr RGBA32Buffer::asNewNativeImage() const
{
- RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, createColorSpace(m_colorProfile));
+ // FIXME: Figure out the right color space.
+ DEFINE_STATIC_LOCAL(RetainPtr<CGColorSpaceRef>, deviceColorSpace, (AdoptCF, CGColorSpaceCreateDeviceRGB()));
RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithCFData(m_backingStore.get()));
CGImageAlphaInfo alphaInfo = m_premultiplyAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaFirst;
- return CGImageCreate(width(), height(), 8, 32, width() * sizeof(PixelData), colorSpace.get(),
+ return CGImageCreate(width(), height(), 8, 32, width() * sizeof(PixelData), deviceColorSpace.get(),
alphaInfo | kCGBitmapByteOrder32Host, dataProvider.get(), 0, false, kCGRenderingIntentDefault);
}
diff --git a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
index 39040ed..940e4c4 100644
--- a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -220,23 +220,6 @@ bool PNGImageDecoder::setFailed()
return ImageDecoder::setFailed();
}
-static ColorProfile readColorProfile(png_structp png, png_infop info)
-{
-#ifdef PNG_iCCP_SUPPORTED
- char* profileName;
- int compressionType;
- char* profile;
- png_uint_32 profileLength;
- png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength);
- if (profile) {
- ColorProfile colorProfile;
- colorProfile.append(profile, profileLength);
- return colorProfile;
- }
-#endif
- return ColorProfile();
-}
-
void PNGImageDecoder::headerAvailable()
{
png_structp png = m_reader->pngPtr();
@@ -266,8 +249,6 @@ void PNGImageDecoder::headerAvailable()
int bitDepth, colorType, interlaceType, compressionType, filterType, channels;
png_get_IHDR(png, info, &width, &height, &bitDepth, &colorType, &interlaceType, &compressionType, &filterType);
- m_colorProfile = readColorProfile(png, info);
-
// The options we set here match what Mozilla does.
// Expand to ensure we use 24-bit for RGB and 32-bit for RGBA.
@@ -330,7 +311,6 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex,
}
buffer.setStatus(RGBA32Buffer::FramePartial);
buffer.setHasAlpha(false);
- buffer.setColorProfile(m_colorProfile);
// For PNGs, the frame always fills the entire image.
buffer.setRect(IntRect(IntPoint(), size()));
diff --git a/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp b/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp
index 998234f..a782373 100644
--- a/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp
+++ b/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp
@@ -28,8 +28,6 @@
#include "config.h"
#include "ImageDecoder.h"
-#include "NotImplemented.h"
-
#include <QPixmap>
#include <stdio.h>
@@ -126,11 +124,6 @@ void RGBA32Buffer::setHasAlpha(bool alpha)
m_hasAlpha = alpha;
}
-void RGBA32Buffer::setColorProfile(const ColorProfile& colorProfile)
-{
- notImplemented();
-}
-
void RGBA32Buffer::setStatus(FrameStatus status)
{
m_status = status;
diff --git a/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp b/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
index 94d6e82..3f435e4 100644
--- a/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
+++ b/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
@@ -27,8 +27,6 @@
#include "config.h"
#include "ImageDecoder.h"
-#include "NotImplemented.h"
-
namespace WebCore {
RGBA32Buffer::RGBA32Buffer()
@@ -111,11 +109,6 @@ void RGBA32Buffer::setHasAlpha(bool alpha)
m_bitmap.setIsOpaque(!alpha);
}
-void RGBA32Buffer::setColorProfile(const ColorProfile& colorProfile)
-{
- notImplemented();
-}
-
void RGBA32Buffer::setStatus(FrameStatus status)
{
m_status = status;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list