Changeset 22027 in webkit

Timestamp:

Jun 6, 2007 7:47:42 AM (17 years ago)

Author:

lars

Message:

Reviewed by Zack

Add an API to create and load plugins.
Don't include moc files by hand anymore, rather let
qmake handle them.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (5 diffs)
• WebCore/platform/qt/MimeTypeRegistryQt.cpp (modified) (4 diffs)
• WebCore/platform/qt/QWebPopup.cpp (modified) (1 diff)
• WebCore/platform/qt/SharedTimerQt.cpp (modified) (1 diff)
• WebKitQt/Api/qcookiejar.cpp (modified) (1 diff)
• WebKitQt/Api/qwebframe.cpp (modified) (1 diff)
• WebKitQt/Api/qwebnetworkinterface.cpp (modified) (1 diff)
• WebKitQt/Api/qwebobjectplugin.cpp (added)
• WebKitQt/Api/qwebobjectplugin.h (added)
• WebKitQt/Api/qwebobjectplugin_p.h (added)
• WebKitQt/Api/qwebpage.cpp (modified) (1 diff)
• WebKitQt/ChangeLog (modified) (1 diff)
• WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-06  Lars Knoll <lars@trolltech.com>
+
+        Reviewed by Zack
+
+        Add an API to create and load plugins.
+        Don't include moc files by hand anymore, rather let
+        qmake handle them.
+
+        * WebCore.pro:
+        * platform/qt/MimeTypeRegistryQt.cpp:
+        (WebCore::):
+        (WebCore::MimeTypeRegistry::getMIMETypeForExtension):
+        * platform/qt/QWebPopup.cpp:
+        * platform/qt/SharedTimerQt.cpp:
+
 2007-06-06  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/WebCore.pro

@@ -60 +60 @@
     LIBS += -lxml2 -lxslt
 }
+
 qt-port {
 INCLUDEPATH += \
@@ -134 +135 @@
 
 STYLESHEETS_EMBED = $$PWD/css/html4.css
-
-MANUALMOC =
-qt-port:MANUALMOC += \
-    $$PWD/platform/qt/QWebPopup.h \
-    $$PWD/platform/qt/SharedTimerQt.h \
-    $$PWD/../WebKitQt/Api/qwebframe.h \
-    $$PWD/../WebKitQt/Api/qwebpage.h \
-    $$PWD/../WebKitQt/Api/qwebnetworkinterface.h \
-    $$PWD/../WebKitQt/Api/qwebnetworkinterface_p.h \
-    $$PWD/../WebKitQt/Api/qcookiejar.h \
-    $$PWD/../WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
 
 LUT_FILES += \
@@ -715 +705 @@
     xml/XSLTProcessor.cpp
 
+qt-port:HEADERS += \
+    $$PWD/platform/qt/QWebPopup.h \
+    $$PWD/platform/qt/SharedTimerQt.h \
+    $$PWD/../WebKitQt/Api/qwebframe.h \
+    $$PWD/../WebKitQt/Api/qwebpage.h \
+    $$PWD/../WebKitQt/Api/qwebnetworkinterface.h \
+    $$PWD/../WebKitQt/Api/qwebnetworkinterface_p.h \
+    $$PWD/../WebKitQt/Api/qwebobjectplugin.h \
+    $$PWD/../WebKitQt/Api/qwebobjectplugin_p.h \
+    $$PWD/../WebKitQt/Api/qcookiejar.h \
+    $$PWD/../WebKitQt/WebCoreSupport/FrameLoaderClientQt.h
+
 qt-port:SOURCES += \
     page/qt/DragControllerQt.cpp \
@@ -782 +784 @@
     ../WebKitQt/Api/qwebpage.cpp \
     ../WebKitQt/Api/qwebpagehistory.cpp \
-    ../WebKitQt/Api/qwebsettings.cpp
+    ../WebKitQt/Api/qwebsettings.cpp \
+    ../WebKitQt/Api/qwebobjectplugin.cpp 
 
 gdk-port:SOURCES += \
@@ -1389 +1392 @@
 QMAKE_EXTRA_COMPILERS += stylesheets
 
-# GENERATOR M
-manual_moc.output = tmp/${QMAKE_FILE_BASE}.moc
-manual_moc.commands = $$QMAKE_MOC ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT}
-manual_moc.input = MANUALMOC
-manual_moc.CONFIG += target_predeps no_link
-QMAKE_EXTRA_COMPILERS += manual_moc
-
 # GENERATOR 10: XPATH grammar
 xpathbison.output = tmp/${QMAKE_FILE_BASE}.cpp

trunk/WebCore/platform/qt/MimeTypeRegistryQt.cpp

@@ -30 +30 @@
 #include "NotImplemented.h"
 
-namespace WebCore 
+#include "qwebobjectplugin_p.h"
+
+namespace WebCore
 {
 
@@ -41 +43 @@
     { "gif", "image/gif" },
     { "html", "text/html" },
-    { "ico", "image/x-icon" },   
+    { "ico", "image/x-icon" },
     { "jpeg", "image/jpeg" },
     { "jpg", "image/jpeg" },
@@ -64 +66 @@
     { 0, 0 }
 };
-    
+
 String MimeTypeRegistry::getMIMETypeForExtension(const String &ext)
 {
     String s = ext.lower();
+
     const ExtensionMap *e = extensionMap;
     while (e->extension) {
@@ -74 +77 @@
         ++e;
     }
-    // unknown, let's just assume plain text
-    return "text/plain";
+    QString type = QWebFactoryLoader::self()->mimeTypeForExtension(ext);
+    if (!type.isEmpty())
+        return type;
+
+    return "application/octet-stream";
 }
 

trunk/WebCore/platform/qt/QWebPopup.cpp

@@ -23 +23 @@
 #include <QCoreApplication>
 #include <QMouseEvent>
-
-#include "QWebPopup.moc"
 
 namespace WebCore {

trunk/WebCore/platform/qt/SharedTimerQt.cpp

@@ -51 +51 @@
 }
 
-#include "SharedTimerQt.moc"
-
 // vim: ts=4 sw=4 et

trunk/WebKitQt/Api/qcookiejar.cpp

@@ -104 +104 @@
     return gJar;
 }
-
-
-#include "qcookiejar.moc"

trunk/WebKitQt/Api/qwebframe.cpp

@@ -323 +323 @@
     viewport()->scroll(dx, dy);
 }
-
-#include "qwebframe.moc"

trunk/WebKitQt/Api/qwebnetworkinterface.cpp

@@ -794 +794 @@
 }
 
-#include "qwebnetworkinterface_p.moc"
-#include "qwebnetworkinterface.moc"
-

trunk/WebKitQt/Api/qwebpage.cpp

@@ -358 +358 @@
     return settings;
 }
-
-
-#include "qwebpage.moc"

trunk/WebKitQt/ChangeLog

@@ +1 @@
+2007-06-06  Lars Knoll <lars@trolltech.com>
+
+        Reviewed by Zack
+
+        Add an API to create and load plugins.
+        Don't include moc files by hand anymore, rather let
+        qmake handle them.
+
+        * Api/qcookiejar.cpp:
+        (QCookieJar::cookieJar):
+        * Api/qwebframe.cpp:
+        (QWebFrame::scrollContentsBy):
+        * Api/qwebnetworkinterface.cpp:
+        * Api/qwebobjectplugin.cpp: Added.
+        (QWebFactoryLoader::QWebFactoryLoader):
+        (QWebFactoryLoader::self):
+        (QWebFactoryLoader::mimeTypeForExtension):
+        (QWebFactoryLoader::create):
+        (QWebObjectPlugin::QWebObjectPlugin):
+        (QWebObjectPlugin::~QWebObjectPlugin):
+        (QWebObjectPlugin::extensionsForMimetype):
+        * Api/qwebobjectplugin.h: Added.
+        * Api/qwebobjectplugin_p.h: Added.
+        (QWebFactoryLoader::mimeTypes):
+        (QWebFactoryLoader::extensions):
+        (QWebFactoryLoader::supportsMimeType):
+        * Api/qwebpage.cpp:
+        (QWebPage::settings):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidHandleOnloadEvents):
+        (WebCore::FrameLoaderClientQt::postProgressEstimateChangedNotification):
+        (WebCore::FrameLoaderClientQt::objectContentType):
+        (WebCore::FrameLoaderClientQt::createPlugin):
+
 2007-05-28  Zack Rusin  <zrusin@trolltech.com>
 

trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -45 +45 @@
 #include "qwebframe.h"
 #include "qwebframe_p.h"
+#include "qwebobjectplugin_p.h"
 
 #include <qfileinfo.h>
@@ -289 +290 @@
 void FrameLoaderClientQt::dispatchDidHandleOnloadEvents()
 {
-    
+    // don't need this one
 }
 
@@ -425 +426 @@
 {
     if (m_webFrame && m_frame->page())
-        emit loadProgressChanged(m_frame->page()->progress()->estimatedProgress() * 100);
+        emit loadProgressChanged(qRound(m_frame->page()->progress()->estimatedProgress() * 100));
 }
 
@@ -503 +504 @@
     return false;
 }
-
 
 bool FrameLoaderClientQt::representationExistsForURLScheme(const String& URLScheme) const
@@ -864 +864 @@
 }
 
-ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& mimeType)
-{
+ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const String& _mimeType)
+{
+    //qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<mimeType;
     if (!url.isValid())
-        return ObjectContentType();
+        return ObjectContentNone;
+
+    String mimeType = _mimeType;
+    if (!mimeType.length()) {
+        QFileInfo fi(url.path());
+        mimeType = MimeTypeRegistry::getMIMETypeForExtension(fi.suffix());
+    }
+
+    if (!mimeType.length())
+        return ObjectContentFrame;
+
+    if (MimeTypeRegistry::isSupportedImageMIMEType(mimeType))
+        return ObjectContentImage;
+
+    if (QWebFactoryLoader::self()->supportsMimeType(mimeType))
+        return ObjectContentPlugin;
+
+    if (MimeTypeRegistry::isSupportedNonImageMIMEType(mimeType))
+        return ObjectContentFrame;
     
-    //This is not really correct. it works because getMIMETypeForExtension
-    //  currently returns only the mimetypes that frames can handle
-    QFileInfo fi(url.path());
-    String rtype = MimeTypeRegistry::getMIMETypeForExtension(fi.suffix());
-    if (!rtype.isEmpty())
-        return ObjectContentFrame;
-    return ObjectContentType();
-}
-
-Widget* FrameLoaderClientQt::createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool)
-{
-    notImplemented();
+    return ObjectContentNone;
+}
+
+Widget* FrameLoaderClientQt::createPlugin(Element* element, const KURL& url, const Vector<String>& paramNames,
+                                          const Vector<String>& paramValues, const String& mimeType, bool loadManually)
+{
+    //qDebug()<<"------ Creating plugin in FrameLoaderClientQt::createPlugin for "<<mimeType;
+    //qDebug()<<"------\t url = "<<url.prettyURL();
+    QStringList params;
+    QStringList values;
+    for (int i = 0; i < paramNames.size(); ++i)
+        params.append(paramNames[i]);
+    for (int i = 0; i < paramValues.size(); ++i) 
+        values.append(paramValues[i]);
+    
+    QObject *object = QWebFactoryLoader::self()->create(m_webFrame->viewport(), mimeType, params, values);
+    if (object) {
+        QWidget *widget = qobject_cast<QWidget *>(object);
+        if (widget) {
+            Widget* w= new Widget();
+            w->setQWidget(widget);
+            return w;
+        }
+        // FIXME: make things work for widgetless plugins as well
+        delete object;
+    }
+
     return 0;
 }
@@ -904 +938 @@
 
 }
-
-#include "FrameLoaderClientQt.moc"