2008-11-20 Joerg Bornemann <joerg.bornemann@trolltech.com>

        Reviewed by Simon Hausmann.

        Steps towards making the the Qt port of WebKit compile on Windows CE

        https://bugs.webkit.org/show_bug.cgi?id=20746

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@38618 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ff55c74..738e21d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-09  Joerg Bornemann  <joerg.bornemann@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        Steps towards making the Qt port of WebKit compile on Windows CE
+
+        https://bugs.webkit.org/show_bug.cgi?id=20746
+
+        * WebKit.pro: don't build DumpRenderTree on all Win32 platforms
+
 2008-11-17  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 
         Reviewed by George Staikos.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 516e123..59f01aa 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2008-11-20  Joerg Bornemann  <joerg.bornemann@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        Steps towards making the the Qt port of WebKit compile on Windows CE
+
+        https://bugs.webkit.org/show_bug.cgi?id=20746
+
+        * WebCore.pro: Various fixes to include windows specific build options
+        also in the Windows CE build.
+        * loader/icon/IconDatabase.cpp: Removed unnecessary errno.h inclusion.
+        * platform/FileSystem.h: Changed Q_OS_WIN32 to Q_OS_WIN to include CE.
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::getWindowsContext): SetWorldTransform is
+        not available on CE.
+        * platform/graphics/qt/PathQt.cpp: Added local definition of M_PI.
+        * platform/qt/FileSystemQt.cpp: Changed Q_OS_WIN32 to Q_OS_WIN to include CE.
+        * platform/qt/KeyboardCodes.h: Extend #idefs to define the missing OEM
+        constants on CE.
+        * platform/qt/TemporaryLinkStubs.cpp: Added stubs for plugins.
+        * platform/text/RegularExpression.cpp: Removed unused sys/types.h and
+        pcre.h inclusions.
+        * platform/win/SystemTimeWin.cpp:
+        (WebCore::userIdleTime): Don't use GetLastInputInfo on CE, it does not
+        exist.
+
 2008-11-20  Antti Koivisto  <antti@apple.com>
 
         Reviewed by Maciej Stachowiak.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index ec99a9c..5642033 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -18,7 +18,7 @@ CONFIG(QTDIR_build) {
 
 isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
 GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR/
-win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
+win32-*|wince*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
 
 !CONFIG(QTDIR_build) {
      OBJECTS_DIR = tmp
@@ -50,6 +50,14 @@ DEFINES += BUILD_WEBKIT
 
 !CONFIG(QTDIR_build):win32-*: DEFINES += ENABLE_ICONDATABASE=0 ENABLE_DATABASE=0
 win32-*: DEFINES += _HAS_TR1=0
+wince* {
+#    DEFINES += ENABLE_SVG=0 ENABLE_XPATH=0 ENABLE_XBL=0 \
+#               ENABLE_SVG_ANIMATION=0 ENABLE_SVG_USE=0  \
+#               ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_AS_IMAGE=0
+
+    INCLUDEPATH += $$PWD/../JavaScriptCore/os-wince
+    INCLUDEPATH += $$PWD/../JavaScriptCore/os-win32
+}
 
 # Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
 win32-g++ {
@@ -1121,7 +1129,7 @@ SOURCES += \
     ../WebKit/qt/Api/qwebdatabase.cpp
 
 
-    win32-*: SOURCES += platform/win/SystemTimeWin.cpp
+    win32-*|wince*: SOURCES += platform/win/SystemTimeWin.cpp
     else: SOURCES += platform/qt/SystemTimeQt.cpp
 
     mac {
@@ -1962,7 +1970,7 @@ addExtraCompilerWithHeader(xpathbison)
 
     VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
-    win32-* {
+    win32-*|wince* {
         DLLDESTDIR = $$OUTPUT_DIR/bin
 
         dlltarget.commands = $(COPY_FILE) $(DESTDIR)$(TARGET) $$[QT_INSTALL_BINS]

diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp
index 5b03959..4c316cb 100644 (file)
--- a/WebCore/loader/icon/IconDatabase.cpp
+++ b/WebCore/loader/icon/IconDatabase.cpp
@@ -57,8 +57,6 @@
 #include <pthread.h>
 #endif
 
-#include <errno.h>
-
 // For methods that are meant to support API from the main thread - should not be called internally
 #define ASSERT_NOT_SYNC_THREAD() ASSERT(!m_syncThreadRunning || !IS_ICON_SYNC_THREAD())
 

diff --git a/WebCore/platform/FileSystem.h b/WebCore/platform/FileSystem.h
index 34bcfa0..66dbc20 100644 (file)
--- a/WebCore/platform/FileSystem.h
+++ b/WebCore/platform/FileSystem.h
@@ -100,7 +100,7 @@ typedef unsigned PlatformModuleVersion;
 #elif defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_WS_S60)
 typedef QLibrary* PlatformModule;
 typedef unsigned PlatformModuleVersion;
-#elif defined(Q_OS_WIN32)
+#elif defined(Q_OS_WIN)
 typedef HMODULE PlatformModule;
 struct PlatformModuleVersion {
     unsigned leastSig;

diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index d54d94e..870a688 100644 (file)
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1109,6 +1109,7 @@ HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlpha
         memset(bmpInfo.bmBits, 0, bufferSize);
     }
 
+#if !PLATFORM(WIN_CE)
     // Make sure we can do world transforms.
     SetGraphicsMode(bitmapDC, GM_ADVANCED);
 
@@ -1121,7 +1122,7 @@ HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlpha
     xform.eDx = -dstRect.x();
     xform.eDy = -dstRect.y();
     ::SetWorldTransform(bitmapDC, &xform);
-
+#endif
 
     return bitmapDC;
 }

diff --git a/WebCore/platform/graphics/qt/PathQt.cpp b/WebCore/platform/graphics/qt/PathQt.cpp
index 76f375c..339c2d4 100644 (file)
--- a/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/WebCore/platform/graphics/qt/PathQt.cpp
@@ -39,6 +39,10 @@
 #define _USE_MATH_DEFINES
 #include <math.h>
 
+#ifndef M_PI
+#   define M_PI 3.14159265358979323846
+#endif
+
 namespace WebCore {
 
 Path::Path()

diff --git a/WebCore/platform/qt/FileSystemQt.cpp b/WebCore/platform/qt/FileSystemQt.cpp
index 6b56070..eeb664a 100644 (file)
--- a/WebCore/platform/qt/FileSystemQt.cpp
+++ b/WebCore/platform/qt/FileSystemQt.cpp
@@ -163,7 +163,7 @@ bool unloadModule(PlatformModule module)
 }
 #endif
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN)
 bool unloadModule(PlatformModule module)
 {
     return ::FreeLibrary(module);

diff --git a/WebCore/platform/qt/KeyboardCodes.h b/WebCore/platform/qt/KeyboardCodes.h
index 21d3c67..61bc9fe 100644 (file)
--- a/WebCore/platform/qt/KeyboardCodes.h
+++ b/WebCore/platform/qt/KeyboardCodes.h
@@ -472,6 +472,10 @@ const int VK_MEDIA_LAUNCH_APP1 = 0xB6;
 // VK_LAUNCH_APP2 (B7) Windows 2000/XP: Start Application 2 key
 const int VK_MEDIA_LAUNCH_APP2 = 0xB7;
 
+#endif // !PLATFORM(WIN_OS)
+
+#if !PLATFORM(WIN_OS) || PLATFORM(WIN_CE)
+
 // VK_OEM_1 (BA) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the ';:' key
 const int VK_OEM_1 = 0xBA;
 
@@ -508,6 +512,10 @@ const int VK_OEM_7 = 0xDE;
 // VK_OEM_8 (DF) Used for miscellaneous characters; it can vary by keyboard.
 const int VK_OEM_8 = 0xDF;
 
+#endif // !PLATFORM(WIN_OS) || PLATFORM(WIN_CE)
+
+#if !PLATFORM(WIN_OS)
+
 // VK_OEM_102 (E2) Windows 2000/XP: Either the angle bracket key or the backslash key on the RT 102-key keyboard
 const int VK_OEM_102 = 0xE2;
 

diff --git a/WebCore/platform/qt/TemporaryLinkStubs.cpp b/WebCore/platform/qt/TemporaryLinkStubs.cpp
index 6963dbb..9b6f34f 100644 (file)
--- a/WebCore/platform/qt/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/qt/TemporaryLinkStubs.cpp
@@ -107,6 +107,12 @@ NPError PluginView::getValueStatic(NPNVariable, void*) { return NPERR_GENERIC_ER
 PluginView::~PluginView() {}
 #endif
 
+#if defined(Q_OS_WINCE)
+Vector<String> PluginDatabase::defaultPluginDirectories() { notImplemented(); return Vector<String>(); }
+void PluginDatabase::getPluginPathsInDirectories(HashSet<String>& paths) const { notImplemented(); }
+bool PluginDatabase::isPreferredPluginDirectory(const String& directory) { notImplemented(); return false; }
+#endif
+
 namespace WebCore {
 
 void getSupportedKeySizes(Vector<String>&) { notImplemented(); }

diff --git a/WebCore/platform/text/RegularExpression.cpp b/WebCore/platform/text/RegularExpression.cpp
index 1b933ff..cbe8d08 100644 (file)
--- a/WebCore/platform/text/RegularExpression.cpp
+++ b/WebCore/platform/text/RegularExpression.cpp
@@ -30,8 +30,6 @@
 #include "PlatformString.h"
 #include "Logging.h"
 #include <wtf/RefCounted.h>
-#include <pcre/pcre.h>
-#include <sys/types.h>
 
 namespace WebCore {
 

diff --git a/WebCore/platform/win/SystemTimeWin.cpp b/WebCore/platform/win/SystemTimeWin.cpp
index 473e8de..defc00e 100644 (file)
--- a/WebCore/platform/win/SystemTimeWin.cpp
+++ b/WebCore/platform/win/SystemTimeWin.cpp
@@ -46,10 +46,12 @@ double currentTime()
 
 float userIdleTime()
 {
+#if !PLATFORM(WIN_CE)
     LASTINPUTINFO lastInputInfo = {0};
     lastInputInfo.cbSize = sizeof(LASTINPUTINFO);
     if (::GetLastInputInfo(&lastInputInfo))
         return (GetTickCount() - lastInputInfo.dwTime) * 0.001; // ::GetTickCount returns ms of uptime valid for up to 49.7 days.
+#endif
     return FLT_MAX; // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed. 
 }
 

diff --git a/WebKit.pro b/WebKit.pro
index 82aab37..1cf103d 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -8,5 +8,5 @@ SUBDIRS += \
         WebKit/qt/QtLauncher \
         WebKit/qt/tests
 
-!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+!win32: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro