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

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ebb1dee6ad79523d99a612c34fdb450e583eadb5
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 15:21:04 2010 +0000

    2010-02-23  Leandro Pereira  <leandro at profusion.mobi>
    
            Reviewed by Gustavo Noronha Silva.
    
            Fixes references to GOwnPtr and GRefPtr so the GTK+ port builds
            again.
            http://webkit.org/b/35084
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d7af938..697c0ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-23  Leandro Pereira  <leandro at profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Fixes references to GOwnPtr and GRefPtr so the GTK+ port builds
+        again.
+        http://webkit.org/b/35084
+
+        * GNUmakefile.am:
+
 2010-02-23  Diego Escalante Urrelo  <descalante at igalia.com>
 
         Reviewed by Eric Seidel.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 22161ea..5f6af48 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -162,6 +162,7 @@ javascriptcore_cppflags += \
 	-I$(srcdir)/JavaScriptCore/parser \
 	-I$(srcdir)/JavaScriptCore/wtf \
 	-I$(srcdir)/JavaScriptCore/wtf/gtk \
+	-I$(srcdir)/JavaScriptCore/wtf/gobject \
 	-I$(top_builddir)/DerivedSources
 
 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 22e58d0..3cd3766 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-23  Leandro Pereira  <leandro at profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Fixes references to GOwnPtr and GRefPtr so the GTK+ port builds
+        again.
+        http://webkit.org/b/35084
+
+        * WebCore/platform/gtk/DataObjectGtk.h:
+        * WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+
 2010-02-23  Ariya Hidayat  <ariya.hidayat at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
index e1c9fd2..6a99d4f 100644
--- a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
@@ -47,13 +47,13 @@
 #include "WebKitWebSourceGStreamer.h"
 #include "Widget.h"
 
+#include <GOwnPtr.h>
 #include <gst/gst.h>
 #include <gst/interfaces/mixer.h>
 #include <gst/interfaces/xoverlay.h>
 #include <gst/video/video.h>
 #include <limits>
 #include <math.h>
-#include <wtf/gtk/GOwnPtr.h>
 
 // GstPlayFlags flags from playbin2. It is the policy of GStreamer to
 // not publicly expose element-specific enums. That's why this
diff --git a/WebCore/platform/gtk/DataObjectGtk.h b/WebCore/platform/gtk/DataObjectGtk.h
index f1a2647..1cb7226 100644
--- a/WebCore/platform/gtk/DataObjectGtk.h
+++ b/WebCore/platform/gtk/DataObjectGtk.h
@@ -21,11 +21,11 @@
 
 #include "CString.h"
 #include "FileList.h"
+#include <GRefPtr.h>
 #include "KURL.h"
 #include "Range.h"
 #include "StringHash.h"
 #include <wtf/RefCounted.h>
-#include <wtf/gtk/GRefPtr.h>
 
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkDragContext GdkDragContext;
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 032a7a0..73599da 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-23  Leandro Pereira  <leandro at profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Fixes references to GOwnPtr and GRefPtr so the GTK+ port builds
+        again.
+        http://webkit.org/b/35084
+
+        * WebKit/gtk/webkit/webkitwebview.cpp:
+
 2010-02-23  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index bf5570d..16c9477 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -40,45 +40,45 @@
 #include "webkitwebhistoryitem.h"
 
 #include "AXObjectCache.h"
-#include "NotImplemented.h"
 #include "BackForwardList.h"
 #include "Cache.h"
-#include "CString.h"
 #include "ChromeClientGtk.h"
-#include "ContextMenu.h"
 #include "ContextMenuClientGtk.h"
 #include "ContextMenuController.h"
+#include "ContextMenu.h"
+#include "CString.h"
 #include "Cursor.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "DragClientGtk.h"
-#include "Editor.h"
 #include "EditorClientGtk.h"
+#include "Editor.h"
 #include "EventHandler.h"
 #include "FloatQuad.h"
 #include "FocusController.h"
+#include "FrameLoader.h"
 #include "FrameLoaderTypes.h"
-#include "HitTestRequest.h"
-#include "HitTestResult.h"
+#include "FrameView.h"
 #include <glib/gi18n-lib.h>
+#include <GOwnPtr.h>
 #include "GraphicsContext.h"
+#include "HitTestRequest.h"
+#include "HitTestResult.h"
 #include "IconDatabase.h"
 #include "InspectorClientGtk.h"
-#include "FrameLoader.h"
-#include "FrameView.h"
 #include "MouseEventWithHitTestResults.h"
+#include "NotImplemented.h"
 #include "PageCache.h"
 #include "Pasteboard.h"
-#include "PasteboardHelper.h"
 #include "PasteboardHelperGtk.h"
+#include "PasteboardHelper.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformWheelEvent.h"
 #include "ProgressTracker.h"
-#include "ResourceHandle.h"
 #include "RenderView.h"
+#include "ResourceHandle.h"
 #include "ScriptValue.h"
 #include "Scrollbar.h"
-#include <wtf/gtk/GOwnPtr.h>
 
 #include <gdk/gdkkeysyms.h>
 

-- 
WebKit Debian packaging