diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/platform/graphics/cg | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/platform/graphics/cg')
| -rw-r--r-- | WebCore/platform/graphics/cg/FontPlatformData.h | 5 | ||||
| -rw-r--r-- | WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp | 3 | ||||
| -rw-r--r-- | WebCore/platform/graphics/cg/ImageSourceCG.cpp | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/cg/FontPlatformData.h b/WebCore/platform/graphics/cg/FontPlatformData.h index b261f87..e21b444 100644 --- a/WebCore/platform/graphics/cg/FontPlatformData.h +++ b/WebCore/platform/graphics/cg/FontPlatformData.h @@ -24,6 +24,7 @@ #ifndef FontPlatformData_h #define FontPlatformData_h +#include "FontOrientation.h" #include "RefCountedGDIHandle.h" #include "StringImpl.h" #include <wtf/Forward.h> @@ -66,6 +67,8 @@ public: bool syntheticOblique() const { return m_syntheticOblique; } bool useGDI() const { return m_useGDI; } + FontOrientation orientation() const { return Horizontal; } // FIXME: Implement. + unsigned hash() const { return m_font->hash(); @@ -97,6 +100,6 @@ private: bool m_useGDI; }; -} +} // namespace WebCore #endif diff --git a/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp b/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp index 0c6acf9..7a58eed 100644 --- a/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp +++ b/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp @@ -91,6 +91,7 @@ bool GraphicsContext3D::getImageData(Image* image, unsigned int format, unsigned int type, bool premultiplyAlpha, + bool ignoreGammaAndColorProfile, Vector<uint8_t>& outputVector) { if (!image) @@ -98,7 +99,7 @@ bool GraphicsContext3D::getImageData(Image* image, CGImageRef cgImage; RetainPtr<CGImageRef> decodedImage; if (image->data()) { - ImageSource decoder(false); + ImageSource decoder(false, ignoreGammaAndColorProfile); decoder.setData(image->data(), true); if (!decoder.frameCount()) return false; diff --git a/WebCore/platform/graphics/cg/ImageSourceCG.cpp b/WebCore/platform/graphics/cg/ImageSourceCG.cpp index 5fa4896..f01c442 100644 --- a/WebCore/platform/graphics/cg/ImageSourceCG.cpp +++ b/WebCore/platform/graphics/cg/ImageSourceCG.cpp @@ -63,10 +63,11 @@ void sharedBufferRelease(void* info) } #endif -ImageSource::ImageSource(bool premultiplyAlpha) +ImageSource::ImageSource(bool premultiplyAlpha, bool ignoreGammaAndColorProfile) : m_decoder(0) // FIXME: m_premultiplyAlpha is ignored in cg at the moment. , m_premultiplyAlpha(premultiplyAlpha) + , m_ignoreGammaAndColorProfile(ignoreGammaAndColorProfile) { } |