[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 602eb535b38dc4bbc4667c5f55b5105540a40b2b
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 02:27:15 2010 +0000

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c5e8b4c..3a8591a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,8 +1,14 @@
 2010-03-07  Mark Rowe  <mrowe at apple.com>
 
+        Qt build fix.
+
+        * platform/network/qt/ResourceHandleQt.cpp: Include SharedBuffer.h since we're using WebCore::SharedBuffer.
+
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
         Gtk build fix.
 
-        * platform/gtk/ClipboardGtk.cpp: Include Imageh since we're using WebCore::Image.
+        * platform/gtk/ClipboardGtk.cpp: Include Image.h since we're using WebCore::Image.
 
 2010-03-07  Mark Rowe  <mrowe at apple.com>
 
diff --git a/WebCore/platform/network/qt/ResourceHandleQt.cpp b/WebCore/platform/network/qt/ResourceHandleQt.cpp
index 09cdefd..a4403cc 100644
--- a/WebCore/platform/network/qt/ResourceHandleQt.cpp
+++ b/WebCore/platform/network/qt/ResourceHandleQt.cpp
@@ -28,20 +28,22 @@
  */
 
 #include "config.h"
-
-#include "Frame.h"
-#include "DocLoader.h"
 #include "ResourceHandle.h"
-#include "ResourceHandleClient.h"
-#include "ResourceHandleInternal.h"
-#include "qwebpage_p.h"
-#include "qwebframe_p.h"
+
 #include "ChromeClientQt.h"
+#include "DocLoader.h"
+#include "Frame.h"
 #include "FrameLoaderClientQt.h"
+#include "NotImplemented.h"
 #include "Page.h"
 #include "QNetworkReplyHandler.h"
+#include "ResourceHandleClient.h"
+#include "ResourceHandleInternal.h"
+#include "SharedBuffer.h"
 
-#include "NotImplemented.h"
+// FIXME: WebCore including these headers from WebKit is a massive layering violation.
+#include "qwebframe_p.h"
+#include "qwebpage_p.h"
 
 #if QT_VERSION >= 0x040500
 #include <QAbstractNetworkCache>

-- 
WebKit Debian packaging