[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 1a7144e9f649fb56d3e712ba6815cdef0bfcd8b1
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 03:06:03 2010 +0000

    Chromium build fix.
    
    WebCore:
    
    * platform/chromium/ClipboardChromium.cpp: Include Image.h since we're using WebCore::Image.
    
    WebKit/chromium:
    
    * src/ChromiumBridge.cpp: Include SharedBuffer.h since WebCore::SharedBuffer is being used.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8811d79..6284408 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-03-07  Mark Rowe  <mrowe at apple.com>
 
+        Chromium build fix.
+
+        * platform/chromium/ClipboardChromium.cpp: Include Image.h since we're using WebCore::Image.
+
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
         Gtk build fix.
 
         * platform/network/soup/ResourceHandleSoup.cpp: Include SharedBuffer.h since we're using WebCore::SharedBuffer.
diff --git a/WebCore/platform/chromium/ClipboardChromium.cpp b/WebCore/platform/chromium/ClipboardChromium.cpp
index a1f60a6..e069526 100644
--- a/WebCore/platform/chromium/ClipboardChromium.cpp
+++ b/WebCore/platform/chromium/ClipboardChromium.cpp
@@ -36,15 +36,16 @@
 #include "FileList.h"
 #include "Frame.h"
 #include "HTMLNames.h"
-#include "NamedAttrMap.h"
+#include "Image.h"
 #include "MIMETypeRegistry.h"
-#include "markup.h"
+#include "NamedAttrMap.h"
 #include "NamedNodeMap.h"
 #include "Pasteboard.h"
 #include "PlatformString.h"
 #include "Range.h"
 #include "RenderImage.h"
 #include "StringBuilder.h"
+#include "markup.h"
 
 namespace WebCore {
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ee417a3..1f65edb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,12 @@
 
         Chromium build fix.
 
+        * src/ChromiumBridge.cpp: Include SharedBuffer.h since WebCore::SharedBuffer is being used.
+
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
+        Chromium build fix.
+
         * src/ResourceHandle.cpp: Include SharedBuffer.h since WebCore::SharedBuffer is being used.
 
 2010-03-06  Pavel Feldman  <pfeldman at chromium.org>
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 2097e21..67811bd 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -81,6 +81,7 @@
 #include "NotImplemented.h"
 #include "PlatformContextSkia.h"
 #include "PluginData.h"
+#include "SharedBuffer.h"
 #include "Worker.h"
 #include "WorkerContextProxy.h"
 #include <wtf/Assertions.h>

-- 
WebKit Debian packaging