[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 6783a2d539bdc7832ee80ed5af8569194637ef15
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 02:18:52 2010 +0000

    Gtk build fix.
    
    * platform/gtk/ClipboardGtk.cpp: Include Imageh since we're using WebCore::Image.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 29fbee0..c5e8b4c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-03-07  Mark Rowe  <mrowe at apple.com>
 
+        Gtk build fix.
+
+        * platform/gtk/ClipboardGtk.cpp: Include Imageh since we're using WebCore::Image.
+
+2010-03-07  Mark Rowe  <mrowe at apple.com>
+
         Rubber-stamped by Cameron Zwarich.
 
         Remove unnecessary includes from header files, adding them to the handful of implementation files that need them.
diff --git a/WebCore/platform/gtk/ClipboardGtk.cpp b/WebCore/platform/gtk/ClipboardGtk.cpp
index 6122d8f..0dd3138 100644
--- a/WebCore/platform/gtk/ClipboardGtk.cpp
+++ b/WebCore/platform/gtk/ClipboardGtk.cpp
@@ -17,17 +17,17 @@
 #include "config.h"
 #include "ClipboardGtk.h"
 
-#include "CachedImage.h"
 #include "CString.h"
+#include "CachedImage.h"
 #include "Editor.h"
 #include "Element.h"
 #include "FileList.h"
 #include "Frame.h"
-#include "markup.h"
+#include "Image.h"
 #include "NotImplemented.h"
 #include "RenderImage.h"
 #include "StringHash.h"
-
+#include "markup.h"
 #include <gtk/gtk.h>
 
 namespace WebCore {

-- 
WebKit Debian packaging