[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d321cb97e5c991ffb2779f616014c814cc7afe55
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 02:33:30 2010 +0000

    Windows build fix.  Add some required includes.
    
    * platform/graphics/win/ImageCGWin.cpp:
    * platform/network/cf/ResourceHandleCFNet.cpp:
    * platform/win/ClipboardWin.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a7fb4f..d42f116 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-03-07  Mark Rowe  <mrowe at apple.com>
 
+        Windows build fix.  Add some required includes.
+
+        * platform/graphics/win/ImageCGWin.cpp:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        * platform/win/ClipboardWin.cpp:
+
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
         Gtk build fix.
 
         * platform/graphics/GraphicsContext.h: Include wtf/PassOwnPtr.h since some platforms use WTF::PassOwnPtr in this header.
diff --git a/WebCore/platform/graphics/win/ImageCGWin.cpp b/WebCore/platform/graphics/win/ImageCGWin.cpp
index 2c6d41d..a0fbba7 100644
--- a/WebCore/platform/graphics/win/ImageCGWin.cpp
+++ b/WebCore/platform/graphics/win/ImageCGWin.cpp
@@ -25,13 +25,14 @@
 
 #include "config.h"
 #include "Image.h"
+
 #include "BitmapImage.h"
 #include "BitmapInfo.h"
 #include "GraphicsContext.h"
+#include "PlatformString.h"
 #include <ApplicationServices/ApplicationServices.h>
-
 #include <windows.h>
-#include "PlatformString.h"
+#include <wtf/RetainPtr.h>
 
 namespace WebCore {
 
diff --git a/WebCore/platform/network/cf/ResourceHandleCFNet.cpp b/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
index 570d192..a6c90e5 100644
--- a/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
@@ -44,16 +44,14 @@
 #include "MIMETypeRegistry.h"
 #include "ResourceError.h"
 #include "ResourceResponse.h"
-
-#include <wtf/HashMap.h>
-#include <wtf/Threading.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <process.h> // for _beginthread()
-
+#include "SharedBuffer.h"
 #include <CFNetwork/CFNetwork.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
+#include <process.h> // for _beginthread()
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <wtf/HashMap.h>
+#include <wtf/Threading.h>
 
 namespace WebCore {
 
diff --git a/WebCore/platform/win/ClipboardWin.cpp b/WebCore/platform/win/ClipboardWin.cpp
index d61e681..8e95315 100644
--- a/WebCore/platform/win/ClipboardWin.cpp
+++ b/WebCore/platform/win/ClipboardWin.cpp
@@ -49,14 +49,13 @@
 #include "Range.h"
 #include "RenderImage.h"
 #include "ResourceResponse.h"
+#include "SharedBuffer.h"
 #include "StringHash.h"
 #include "WCDataObject.h"
 #include "csshelper.h"
 #include "markup.h"
-
 #include <shlwapi.h>
 #include <wininet.h>
-
 #include <wtf/RefPtr.h>
 
 using namespace std;

-- 
WebKit Debian packaging