From 7f26dc14318f279357127827049b9473cf6eb7f1 Mon Sep 17 00:00:00 2001
From: "hausmann@webkit.org"
 <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 18 Sep 2009 14:28:13 +0000
Subject: [PATCH] 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
---
 WebCore/ChangeLog                              | 18 ++++++++++++++++++
 WebCore/platform/graphics/BitmapImage.h        |  2 +-
 WebCore/platform/graphics/FontCache.h          |  2 +-
 WebCore/platform/graphics/MediaPlayer.cpp      |  2 +-
 WebCore/platform/text/TextEncodingRegistry.cpp |  6 +++---
 WebCore/plugins/PluginView.cpp                 |  2 ++
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df38b060899..ca7c3f2e623 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+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.
diff --git a/WebCore/platform/graphics/BitmapImage.h b/WebCore/platform/graphics/BitmapImage.h
index cc3d775e256..0f3f9aa4a23 100644
--- a/WebCore/platform/graphics/BitmapImage.h
+++ b/WebCore/platform/graphics/BitmapImage.h
@@ -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
diff --git a/WebCore/platform/graphics/FontCache.h b/WebCore/platform/graphics/FontCache.h
index a59147429ac..b88305f8dec 100644
--- a/WebCore/platform/graphics/FontCache.h
+++ b/WebCore/platform/graphics/FontCache.h
@@ -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
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 20dbc0020bf..23410b2ec4c 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -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"
diff --git a/WebCore/platform/text/TextEncodingRegistry.cpp b/WebCore/platform/text/TextEncodingRegistry.cpp
index 5ab1c875fca..5d825115805 100644
--- a/WebCore/platform/text/TextEncodingRegistry.cpp
+++ b/WebCore/platform/text/TextEncodingRegistry.cpp
@@ -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
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index c28e586b169..28572a45cf6 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -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
-- 
GitLab