[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
xan at webkit.org
xan at webkit.org
Thu Apr 8 01:59:16 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 99cb16efe254aeb243ef796afaaf083bc694ad60
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 25 18:16:47 2010 +0000
2010-02-25 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
Simple style cleanups.
* plugins/gtk/PluginViewGtk.cpp:
(WebCore::plugRemovedCallback):
(WebCore::plugAddedCallback):
(WebCore::PluginView::platformStart):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe10aee..7d984b6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-25 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Simple style cleanups.
+
+ * plugins/gtk/PluginViewGtk.cpp:
+ (WebCore::plugRemovedCallback):
+ (WebCore::plugAddedCallback):
+ (WebCore::PluginView::platformStart):
+
2010-02-25 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Darin Adler.
diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
index 542ba7e..1847324 100644
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -753,12 +753,6 @@ static Display* getPluginDisplay()
#endif
}
-static gboolean
-plug_removed_cb(GtkSocket* socket, gpointer)
-{
- return TRUE;
-}
-
#if defined(XP_UNIX)
static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
{
@@ -797,7 +791,12 @@ static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
}
#endif
-void plugAddedCallback(GtkSocket* socket, PluginView* view)
+static gboolean plugRemovedCallback(GtkSocket* socket, gpointer)
+{
+ return TRUE;
+}
+
+static void plugAddedCallback(GtkSocket* socket, PluginView* view)
{
if (!socket || !view)
return;
@@ -833,7 +832,7 @@ bool PluginView::platformStart()
setPlatformWidget(gtk_socket_new());
gtk_container_add(GTK_CONTAINER(m_parentFrame->view()->hostWindow()->platformPageClient()), platformPluginWidget());
g_signal_connect(platformPluginWidget(), "plug-added", G_CALLBACK(plugAddedCallback), this);
- g_signal_connect(platformPluginWidget(), "plug_removed", G_CALLBACK(plug_removed_cb), NULL);
+ g_signal_connect(platformPluginWidget(), "plug-removed", G_CALLBACK(plugRemovedCallback), NULL);
} else
setPlatformWidget(gtk_xtbin_new(m_parentFrame->view()->hostWindow()->platformPageClient()->window, 0));
#else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list