[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit fb1e0c244f4855158a26e0f6a95a2d24b8f65d1f
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 14:14:49 2009 +0000

    Add menu item to dump the plugin list to the console,
    which can be handy for debugging.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-20
    Reviewed by Tor Arne Vestbø.
    
    * QtLauncher/main.cpp:
    (MainWindow::dumpPlugins):
    (MainWindow::setupUI):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index e90a4ac..700fc63 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-20  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Add menu item to dump the plugin list to the console,
+        which can be handy for debugging.
+
+        * QtLauncher/main.cpp:
+        (MainWindow::dumpPlugins):
+        (MainWindow::setupUI):
+
 2009-10-19  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebKit/qt/QtLauncher/main.cpp b/WebKit/qt/QtLauncher/main.cpp
index 8cc8a09..8ce09d2 100644
--- a/WebKit/qt/QtLauncher/main.cpp
+++ b/WebKit/qt/QtLauncher/main.cpp
@@ -34,6 +34,7 @@
 #include <qwebview.h>
 #include <qwebframe.h>
 #include <qwebsettings.h>
+#include <qwebplugindatabase.h>
 #include <qwebelement.h>
 #include <qwebinspector.h>
 
@@ -232,6 +233,16 @@ protected slots:
         formatMenuAction->setVisible(on);
     }
 
+    void dumpPlugins() {
+        QList<QWebPluginInfo> plugins = QWebSettings::pluginDatabase()->plugins();
+        foreach (const QWebPluginInfo plugin, plugins) {
+            qDebug() << "Plugin:" << plugin.name();
+            foreach (const QWebPluginInfo::MimeType mime, plugin.mimeTypes()) {
+                qDebug() << "   " << mime.name;
+            }
+        }
+    }
+
     void dumpHtml() {
         qDebug() << "HTML: " << view->page()->mainFrame()->toHtml();
     }
@@ -320,6 +331,7 @@ private:
         zoomTextOnly->setChecked(false);
         viewMenu->addSeparator();
         viewMenu->addAction("Dump HTML", this, SLOT(dumpHtml()));
+        viewMenu->addAction("Dump plugins", this, SLOT(dumpPlugins()));
 
         QMenu *formatMenu = new QMenu("F&ormat", this);
         formatMenuAction = menuBar()->addMenu(formatMenu);

-- 
WebKit Debian packaging