Changeset 69825 in webkit

Timestamp:

Oct 14, 2010 5:27:26 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-27 Dawit Alemayehu <​adawit@kde.org>

Reviewed by Andreas Kling.

[Qt] Added functions for obtaining and checking the supported content types.
​http://webkit.org/b/37880

• Api/qwebpage.cpp: (extractContentTypeFromHash): (extractContentTypeFromPluginVector): (QWebPage::supportedContentTypes): (QWebPage::supportsContentType):
• tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::supportedContentType):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (2 diffs)
• Api/qwebpage.h (modified) (1 diff)
• ChangeLog (modified) (2 diffs)
• tests/qwebpage/tst_qwebpage.cpp (modified) (3 diffs)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -94 +94 @@
 #include "WorkerThread.h"
 #include "wtf/Threading.h"
+#include "MIMETypeRegistry.h"
+#include "PluginDatabase.h"
+#include "PluginPackage.h"
 
 #include <QApplication>
@@ -2020 +2023 @@
 }
 
+static void extractContentTypeFromHash(const HashSet<String>& types, QStringList* list)
+{
+    if (!list)
+        return;
+
+    HashSet<String>::const_iterator endIt = types.end();
+    for (HashSet<String>::const_iterator it = types.begin(); it != endIt; ++it)
+        *list << *it;
+}
+
+static void extractContentTypeFromPluginVector(const Vector<PluginPackage*>& plugins, QStringList* list)
+{
+    if (!list)
+        return;
+
+    for (unsigned int i = 0; i < plugins.size(); ++i) {
+        MIMEToDescriptionsMap::const_iterator map_it = plugins[i]->mimeToDescriptions().begin();
+        MIMEToDescriptionsMap::const_iterator map_end = plugins[i]->mimeToDescriptions().end();
+        for (; map_it != map_end; ++map_it)
+            *list << map_it->first;
+    }
+}
+
+/*!
+ *  Returns the list of all content types supported by QWebPage.
+ */
+QStringList QWebPage::supportedContentTypes() const
+{
+    QStringList mimeTypes;
+
+    extractContentTypeFromHash(MIMETypeRegistry::getSupportedImageMIMETypes(), &mimeTypes);
+    extractContentTypeFromHash(MIMETypeRegistry::getSupportedNonImageMIMETypes(), &mimeTypes);
+    if (d->page->settings() && d->page->settings()->arePluginsEnabled())
+        extractContentTypeFromPluginVector(PluginDatabase::installedPlugins()->plugins(), &mimeTypes);
+
+    return mimeTypes;
+}
+
+/*!
+ *  Returns true if QWebPage can handle the given \a mimeType; otherwise, returns false.
+ */
+bool QWebPage::supportsContentType(const QString& mimeType) const
+{
+    const String type = mimeType.toLower();
+    if (MIMETypeRegistry::isSupportedImageMIMEType(type))
+        return true;
+
+    if (MIMETypeRegistry::isSupportedNonImageMIMEType(type))
+        return true;
+
+    if (d->page->settings() && d->page->settings()->arePluginsEnabled()
+        && PluginDatabase::installedPlugins()->isMIMETypeRegistered(type))
+        return true;
+
+    return false;
+}
+
 static WebCore::FrameLoadRequest frameLoadRequest(const QUrl &url, WebCore::Frame *frame)
 {

trunk/WebKit/qt/Api/qwebpage.h

@@ -310 +310 @@
     void setUserPermission(QWebFrame* frame, PermissionDomain domain, PermissionPolicy policy);
 
+    QStringList supportedContentTypes() const;
+    bool supportsContentType(const QString& mimeType) const;
+
     enum Extension {
         ChooseMultipleFilesExtension,

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-09-27 Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Added functions for obtaining and checking the supported content types.
+        http://webkit.org/b/37880
+
+        * Api/qwebpage.cpp:
+        (extractContentTypeFromHash):
+        (extractContentTypeFromPluginVector):
+        (QWebPage::supportedContentTypes):
+        (QWebPage::supportsContentType):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::supportedContentType):
+
 2010-10-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 
@@ -687 +702 @@
         (QWebSettings::QWebSettings):
         * Api/qwebsettings.h:
-
 
 2010-09-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -42 +42 @@
 #include <qwebsecurityorigin.h>
 #include <qwebview.h>
+#include <qimagewriter.h>
 
 class EventSpy : public QObject, public QList<QEvent::Type>
@@ -127 +128 @@
     void testStopScheduledPageRefresh();
     void findText();
+    void supportedContentType();
     
 private:
@@ -2204 +2206 @@
 }
 
+struct ImageExtensionMap {
+    const char* extension;
+    const char* mimeType;
+};
+
+static const ImageExtensionMap extensionMap[] = {
+    { "bmp", "image/bmp" },
+    { "css", "text/css" },
+    { "gif", "image/gif" },
+    { "html", "text/html" },
+    { "htm", "text/html" },
+    { "ico", "image/x-icon" },
+    { "jpeg", "image/jpeg" },
+    { "jpg", "image/jpeg" },
+    { "js", "application/x-javascript" },
+    { "mng", "video/x-mng" },
+    { "pbm", "image/x-portable-bitmap" },
+    { "pgm", "image/x-portable-graymap" },
+    { "pdf", "application/pdf" },
+    { "png", "image/png" },
+    { "ppm", "image/x-portable-pixmap" },
+    { "rss", "application/rss+xml" },
+    { "svg", "image/svg+xml" },
+    { "text", "text/plain" },
+    { "tif", "image/tiff" },
+    { "tiff", "image/tiff" },
+    { "txt", "text/plain" },
+    { "xbm", "image/x-xbitmap" },
+    { "xml", "text/xml" },
+    { "xpm", "image/x-xpm" },
+    { "xsl", "text/xsl" },
+    { "xhtml", "application/xhtml+xml" },
+    { "wml", "text/vnd.wap.wml" },
+    { "wmlc", "application/vnd.wap.wmlc" },
+    { 0, 0 }
+};
+
+static QString getMimeTypeForExtension(const QString &ext)
+{
+    const ImageExtensionMap *e = extensionMap;
+    while (e->extension) {
+        if (ext.compare(QLatin1String(e->extension), Qt::CaseInsensitive) == 0)
+            return QLatin1String(e->mimeType);
+        ++e;
+    }
+
+    return QString();
+}
+
+void tst_QWebPage::supportedContentType()
+{
+   QStringList contentTypes;
+
+   // Add supported non image types...
+   contentTypes << "text/html" << "text/xml" << "text/xsl" << "text/plain" << "text/"
+                << "application/xml" << "application/xhtml+xml" << "application/vnd.wap.xhtml+xml"
+                << "application/rss+xml" << "application/atom+xml" << "application/json";
+
+   // Add supported image types...
+   Q_FOREACH(const QByteArray& imageType, QImageWriter::supportedImageFormats()) {
+      const QString mimeType = getMimeTypeForExtension(imageType);
+      if (!mimeType.isEmpty())
+          contentTypes << mimeType;
+   }
+
+   // Get the mime types supported by webkit...
+   const QStringList supportedContentTypes = m_page->supportedContentTypes();
+
+   Q_FOREACH(const QString& mimeType, contentTypes)
+      QVERIFY2(supportedContentTypes.contains(mimeType), QString("'%1' is not a supported content type!").arg(mimeType).toLatin1());
+      
+   Q_FOREACH(const QString& mimeType, contentTypes)
+      QVERIFY2(m_page->supportsContentType(mimeType), QString("Cannot handle content types '%1'!").arg(mimeType).toLatin1());
+}
+
 QTEST_MAIN(tst_QWebPage)
 #include "tst_qwebpage.moc"