Commit 7f26dc14 authored by hausmann@webkit.org's avatar hausmann@webkit.org

QtWebKit Windows CE compile fixes

Patch by Joerg Bornemann <joerg.bornemann@nokia.com> on 2009-09-18
Reviewed by Simon Hausmann.

Exclude certain pure-WINCE specific code paths from the Qt build.

* platform/graphics/BitmapImage.h:
* platform/graphics/FontCache.h:
* platform/graphics/MediaPlayer.cpp:
* platform/text/TextEncodingRegistry.cpp:
(WebCore::buildBaseTextCodecMaps):
(WebCore::extendTextCodecMaps):
* plugins/PluginView.cpp:
(WebCore::PluginView::stop): Guard this code block with NETSCAPE_PLUGIN_API as
the corresponding PluginViewWndProc has the same guard in the header file.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48508 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 59eabdbb
2009-09-18 Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed by Simon Hausmann.
QtWebKit Windows CE compile fixes
Exclude certain pure-WINCE specific code paths from the Qt build.
* platform/graphics/BitmapImage.h:
* platform/graphics/FontCache.h:
* platform/graphics/MediaPlayer.cpp:
* platform/text/TextEncodingRegistry.cpp:
(WebCore::buildBaseTextCodecMaps):
(WebCore::extendTextCodecMaps):
* plugins/PluginView.cpp:
(WebCore::PluginView::stop): Guard this code block with NETSCAPE_PLUGIN_API as
the corresponding PluginViewWndProc has the same guard in the header file.
2009-09-18 Steve Block <steveblock@google.com>
Reviewed by Dimitri Glazkov.
......@@ -166,7 +166,7 @@ protected:
#endif
virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator);
#if PLATFORM(WX) || PLATFORM(WINCE)
#if PLATFORM(WX) || (PLATFORM(WINCE) && !PLATFORM(QT))
virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform,
const FloatPoint& phase, CompositeOperator, const FloatRect& destRect);
#endif
......
......@@ -64,7 +64,7 @@ public:
// Also implemented by the platform.
void platformInit();
#if PLATFORM(WINCE)
#if PLATFORM(WINCE) && !PLATFORM(QT)
#if defined(IMLANG_FONT_LINK) && (IMLANG_FONT_LINK == 2)
IMLangFontLink2* getFontLinkInterface();
#else
......
......@@ -39,7 +39,7 @@
#if PLATFORM(MAC)
#include "MediaPlayerPrivateQTKit.h"
#elif PLATFORM(WINCE)
#elif PLATFORM(WINCE) && !PLATFORM(QT)
#include "MediaPlayerPrivateWince.h"
#elif PLATFORM(WIN)
#include "MediaPlayerPrivateQuickTimeWin.h"
......
......@@ -48,7 +48,7 @@
#if PLATFORM(QT)
#include "qt/TextCodecQt.h"
#endif
#if PLATFORM(WINCE)
#if PLATFORM(WINCE) && !PLATFORM(QT)
#include "TextCodecWince.h"
#endif
......@@ -194,7 +194,7 @@ static void buildBaseTextCodecMaps()
TextCodecICU::registerBaseCodecs(addToTextCodecMap);
#endif
#if PLATFORM(WINCE)
#if PLATFORM(WINCE) && !PLATFORM(QT)
TextCodecWince::registerBaseEncodingNames(addToTextEncodingNameMap);
TextCodecWince::registerBaseCodecs(addToTextCodecMap);
#endif
......@@ -217,7 +217,7 @@ static void extendTextCodecMaps()
TextCodecMac::registerCodecs(addToTextCodecMap);
#endif
#if PLATFORM(WINCE)
#if PLATFORM(WINCE) && !PLATFORM(QT)
TextCodecWince::registerExtendedEncodingNames(addToTextEncodingNameMap);
TextCodecWince::registerExtendedCodecs(addToTextCodecMap);
#endif
......
......@@ -289,6 +289,7 @@ void PluginView::stop()
JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
#if ENABLE(NETSCAPE_PLUGIN_API)
#if !PLATFORM(WX) // FIXME: Revisit this when implementing plugins for wx
#ifdef XP_WIN
// Unsubclass the window
......@@ -307,6 +308,7 @@ void PluginView::stop()
}
#endif // XP_WIN
#endif // !PLATFORM(WX)
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#if !defined(XP_MACOSX)
// Clear the window
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment