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

mrowe at apple.com mrowe at apple.com
Thu Apr 8 02:13:27 UTC 2010


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

    Gtk build fix.
    
    * platform/network/soup/ResourceHandleSoup.cpp: Include SharedBuffer.h since we're using WebCore::SharedBuffer.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a4c85b..8811d79 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,12 @@
 
         Gtk build fix.
 
+        * platform/network/soup/ResourceHandleSoup.cpp: Include SharedBuffer.h since we're using WebCore::SharedBuffer.
+
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
+        Gtk build fix.
+
         * platform/graphics/gtk/ImageGtk.cpp: Include SharedBuffer.h since we're using WebCore::SharedBuffer.
 
 2010-03-07  Mark Rowe  <mrowe at apple.com>
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 965826d..825d5fb 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -28,9 +28,9 @@
 #include "ResourceHandle.h"
 
 #include "Base64.h"
-#include "CookieJarSoup.h"
-#include "ChromeClient.h"
 #include "CString.h"
+#include "ChromeClient.h"
+#include "CookieJarSoup.h"
 #include "DocLoader.h"
 #include "FileSystem.h"
 #include "Frame.h"
@@ -44,6 +44,7 @@
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
 #include "ResourceResponse.h"
+#include "SharedBuffer.h"
 #include "TextEncoding.h"
 
 #include <errno.h>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list