[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[sfalken at apple.com]

The following commit has been merged in the debian/unstable branch:
commit 37b3725617de1bbbf28a11312f5ecf3769d0ae6a
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 18:56:33 2010 +0000

    Windows build fixes.
    Add forward declarations and additional includes of windows.h.
    
    * platform/Cursor.h: Add forward declaration of HCURSOR. Move destructor implementation into cpp.
    * platform/graphics/transforms/TransformationMatrix.h: Add forward declaration of XFORM. Remove windows.h include.
    * platform/graphics/win/TransformationMatrixWin.cpp: Add include of windows.h.
    * platform/win/CursorWin.cpp: Moved destructor of SharedCursor here.
    (WebCore::SharedCursor::~SharedCursor): Moved here.
    * platform/win/EventLoopWin.cpp: Add include of windows.h.
    * platform/win/SystemInfo.cpp: Add include of windows.h.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 536adc0..39f72d4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-14  Steve Falkenburg  <sfalken at apple.com>
+
+        Windows build fixes.
+        Add forward declarations and additional includes of windows.h.
+
+        * platform/Cursor.h: Add forward declaration of HCURSOR. Move destructor implementation into cpp.
+        * platform/graphics/transforms/TransformationMatrix.h: Add forward declaration of XFORM. Remove windows.h include.
+        * platform/graphics/win/TransformationMatrixWin.cpp: Add include of windows.h.
+        * platform/win/CursorWin.cpp: Moved destructor of SharedCursor here.
+        (WebCore::SharedCursor::~SharedCursor): Moved here.
+        * platform/win/EventLoopWin.cpp: Add include of windows.h.
+        * platform/win/SystemInfo.cpp: Add include of windows.h.
+
 2010-01-14  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/Cursor.h b/WebCore/platform/Cursor.h
index 2d041d2..ae8043e 100644
--- a/WebCore/platform/Cursor.h
+++ b/WebCore/platform/Cursor.h
@@ -56,6 +56,11 @@ class NSCursor;
 class wxCursor;
 #endif
 
+#if PLATFORM(WIN)
+typedef struct HICON__ *HICON;
+typedef HICON HCURSOR;
+#endif
+
 namespace WebCore {
 
     class Image;
@@ -65,7 +70,7 @@ namespace WebCore {
     class SharedCursor : public RefCounted<SharedCursor> {
     public:
         static PassRefPtr<SharedCursor> create(HCURSOR nativeCursor) { return adoptRef(new SharedCursor(nativeCursor)); }
-        ~SharedCursor() { DestroyIcon(m_nativeCursor); }
+        ~SharedCursor();
         HCURSOR nativeCursor() const { return m_nativeCursor; }
     private:
         SharedCursor(HCURSOR nativeCursor) : m_nativeCursor(nativeCursor) { }
diff --git a/WebCore/platform/graphics/transforms/TransformationMatrix.h b/WebCore/platform/graphics/transforms/TransformationMatrix.h
index c0ac972..028294c 100644
--- a/WebCore/platform/graphics/transforms/TransformationMatrix.h
+++ b/WebCore/platform/graphics/transforms/TransformationMatrix.h
@@ -43,8 +43,8 @@
 #include <wx/graphics.h>
 #endif
 
-#if OS(WINDOWS)
-#include <windows.h>
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
+typedef struct tagXFORM XFORM;
 #endif
 
 namespace WebCore {
diff --git a/WebCore/platform/graphics/win/TransformationMatrixWin.cpp b/WebCore/platform/graphics/win/TransformationMatrixWin.cpp
index 38dbfbf..47806a2 100644
--- a/WebCore/platform/graphics/win/TransformationMatrixWin.cpp
+++ b/WebCore/platform/graphics/win/TransformationMatrixWin.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "TransformationMatrix.h"
 
+#include <windows.h>
+
 namespace WebCore {
 
 TransformationMatrix::operator XFORM() const
diff --git a/WebCore/platform/win/CursorWin.cpp b/WebCore/platform/win/CursorWin.cpp
index 5afb1ae..48cf10b 100644
--- a/WebCore/platform/win/CursorWin.cpp
+++ b/WebCore/platform/win/CursorWin.cpp
@@ -408,4 +408,9 @@ const Cursor& grabbingCursor()
     return pointerCursor();
 }
 
+SharedCursor::~SharedCursor()
+{
+    DestroyIcon(m_nativeCursor);
+}
+
 }
diff --git a/WebCore/platform/win/EventLoopWin.cpp b/WebCore/platform/win/EventLoopWin.cpp
index aae107d..ece320f 100644
--- a/WebCore/platform/win/EventLoopWin.cpp
+++ b/WebCore/platform/win/EventLoopWin.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "EventLoop.h"
 
+#include <windows.h>
+
 namespace WebCore {
 
 void EventLoop::cycle()
diff --git a/WebCore/platform/win/SystemInfo.cpp b/WebCore/platform/win/SystemInfo.cpp
index ba20ddd..f010769 100644
--- a/WebCore/platform/win/SystemInfo.cpp
+++ b/WebCore/platform/win/SystemInfo.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "SystemInfo.h"
 
+#include <windows.h>
+
 namespace WebCore {
 
 bool isRunningOnVistaOrLater()

-- 
WebKit Debian packaging