diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/platform/graphics/qt')
5 files changed, 22 insertions, 15 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp index 50627b7..29e7718 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp @@ -32,16 +32,23 @@ namespace WebCore { FontFallbackList::FontFallbackList() - : m_familyIndex(0) + : m_pageZero(0) + , m_cachedPrimarySimpleFontData(0) + , m_fontSelector(0) + , m_familyIndex(0) , m_pitch(UnknownPitch) , m_loadingCustomFonts(false) - , m_fontSelector(0) , m_generation(0) { } void FontFallbackList::invalidate(WTF::PassRefPtr<WebCore::FontSelector> fontSelector) { + releaseFontData(); + m_fontList.clear(); + m_pageZero = 0; + m_pages.clear(); + m_cachedPrimarySimpleFontData = 0; m_familyIndex = 0; m_pitch = UnknownPitch; m_loadingCustomFonts = false; @@ -58,7 +65,7 @@ void FontFallbackList::releaseFontData() void FontFallbackList::determinePitch(const WebCore::Font* font) const { - const FontData* fontData = primaryFont(font); + const FontData* fontData = primaryFontData(font); if (!fontData->isSegmented()) m_pitch = static_cast<const SimpleFontData*>(fontData)->pitch(); else { @@ -101,7 +108,7 @@ const FontData* FontFallbackList::fontDataAt(const WebCore::Font* _font, unsigne const FontData* FontFallbackList::fontDataForCharacters(const WebCore::Font* font, const UChar*, int) const { - return primaryFont(font); + return primaryFontData(font); } void FontFallbackList::setPlatformFont(const WebCore::FontPlatformData& platformData) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index ed7ac47..8503fb5 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -763,7 +763,6 @@ void GraphicsContext::clipPath(WindRule clipRule) * RenderTheme handles drawing focus on widgets which * need it. */ -Color focusRingColor() { return Color(0, 0, 0); } void GraphicsContext::drawFocusRing(const Color& color) { if (paintingDisabled()) @@ -1229,7 +1228,7 @@ HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlpha memset(bmpInfo.bmBits, 0, bufferSize); } -#if !PLATFORM(WIN_CE) +#if !PLATFORM(WINCE) // Make sure we can do world transforms. SetGraphicsMode(bitmapDC, GM_ADVANCED); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp index cd32428..9a7fd75 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp @@ -217,9 +217,7 @@ void ImageDecoderQt::reset() m_failed = false; m_imageList.clear(); m_pixmapCache.clear(); - m_sizeAvailable = false; m_loopCount = cAnimationNone; - m_size = IntSize(-1, -1); } void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived) @@ -247,8 +245,8 @@ void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived) case ReadContext::ReadComplete: // Did we read anything - try to set the size. if (hasFirstImageHeader()) { - m_sizeAvailable = true; - m_size = m_imageList[0].m_image.size(); + QSize imgSize = m_imageList[0].m_image.size(); + setSize(imgSize.width(), imgSize.height()); if (readContext.reader()->supportsAnimation()) { if (readContext.reader()->loopCount() != -1) @@ -262,11 +260,11 @@ void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived) } -bool ImageDecoderQt::isSizeAvailable() const +bool ImageDecoderQt::isSizeAvailable() { if (debugImageDecoderQt) - qDebug() << " ImageDecoderQt::isSizeAvailable() returns" << m_sizeAvailable; - return m_sizeAvailable; + qDebug() << " ImageDecoderQt::isSizeAvailable() returns" << ImageDecoder::isSizeAvailable(); + return ImageDecoder::isSizeAvailable(); } int ImageDecoderQt::frameCount() const diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.h b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.h index b8c3edd..ece0e48 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.h @@ -45,7 +45,7 @@ public: typedef Vector<char> IncomingData; virtual void setData(const IncomingData& data, bool allDataReceived); - virtual bool isSizeAvailable() const; + virtual bool isSizeAvailable(); virtual int frameCount() const; virtual int repetitionCount() const; virtual RGBA32Buffer* frameBufferAtIndex(size_t index); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp index c80d73b..896e3b8 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp @@ -36,7 +36,10 @@ #include <QMetaEnum> #include <QUrl> #include <QEvent> -#include <phonon> + +#include <Phonon/AudioOutput> +#include <Phonon/MediaObject> +#include <Phonon/VideoWidget> using namespace Phonon; |