Fix a wrong extension mapping in the MIMETypeRegistry and identify about: url's as...

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 12d93011de2f739ae26a73cdde017d364a258b5f..10b4e0e0009e96581bad0aeb68bf50e50ed3784e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-01  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Eric.
+
+        Fix a wrong extension mapping in the MIMETypeRegistry and identify about: url's as frames in the FrameLoaderClient.
+
+        * platform/qt/MIMETypeRegistryQt.cpp:
+        (WebCore::):
+
 2007-10-01  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by Harrison.

diff --git a/WebCore/platform/qt/MIMETypeRegistryQt.cpp b/WebCore/platform/qt/MIMETypeRegistryQt.cpp
index 5753119f5bb4304cd9106cfa9d01c4deac1a55de..a8b157a15237190f934211b79cf173d1219ba3e3 100644 (file)
--- a/WebCore/platform/qt/MIMETypeRegistryQt.cpp
+++ b/WebCore/platform/qt/MIMETypeRegistryQt.cpp
@@ -49,7 +49,7 @@ static const ExtensionMap extensionMap [] = {
     { "js", "application/x-javascript" },
     { "mng", "video/x-mng" },
     { "pbm", "image/x-portable-bitmap" },
-    { "pbm", "image/x-portable-graymap" },
+    { "pgm", "image/x-portable-graymap" },
     { "pdf", "application/pdf" },
     { "png", "image/png" },
     { "ppm", "image/x-portable-pixmap" },

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index cead407b63406248f8cc9c80b1f68e2f1b973023..b59d081efc79cf59ad1dc38502bd08406521f1ac 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -1,3 +1,17 @@
+2007-10-01  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Eric.
+
+        Fix a wrong extension mapping in the MIMETypeRegistry and identify about: url's as frames in the FrameLoaderClient.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::makeDocumentView):
+        (WebCore::FrameLoaderClientQt::dispatchDidFinishLoad):
+        (WebCore::FrameLoaderClientQt::dispatchDidFailProvisionalLoad):
+        (WebCore::FrameLoaderClientQt::dispatchDidFailLoad):
+        (WebCore::FrameLoaderClientQt::objectContentType):
+        (WebCore::FrameLoaderClientQt::createPlugin):
+
 2007-09-30  George Staikos  <staikos@kde.org>
 
         Qt build fix (OS X specific).

diff --git a/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
index fdc69316ea340f5696be66930b2cd41f3881234c..9721511916edfb4c7d9c6f3875c007fb0b764b3f 100644 (file)
--- a/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -171,8 +171,8 @@ bool FrameLoaderClientQt::privateBrowsingEnabled() const
 void FrameLoaderClientQt::makeDocumentView()
 {
     qDebug() << "FrameLoaderClientQt::makeDocumentView" << m_frame->document();
-    
-//     if (!m_frame->document()) 
+
+//     if (!m_frame->document())
 //         m_frame->loader()->createEmptyDocument();
 }
 
@@ -198,7 +198,7 @@ void FrameLoaderClientQt::forceLayoutForNonHTML()
 
 void FrameLoaderClientQt::setCopiesOnScroll()
 {
-    // apparently mac specific 
+    // apparently mac specific
 }
 
 
@@ -320,7 +320,7 @@ void FrameLoaderClientQt::dispatchDidFinishDocumentLoad()
 void FrameLoaderClientQt::dispatchDidFinishLoad()
 {
     if (m_webFrame)
-        emit m_webFrame->loadDone(true);    
+        emit m_webFrame->loadDone(true);
 }
 
 
@@ -705,7 +705,7 @@ void FrameLoaderClientQt::download(WebCore::ResourceHandle*, const WebCore::Reso
 
 void FrameLoaderClientQt::assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&)
 {
-    notImplemented();   
+    notImplemented();
 }
 
 void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long, WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
@@ -758,13 +758,13 @@ bool FrameLoaderClientQt::dispatchDidLoadResourceFromMemoryCache(WebCore::Docume
 void FrameLoaderClientQt::dispatchDidFailProvisionalLoad(const WebCore::ResourceError&)
 {
     if (m_webFrame)
-        emit m_webFrame->loadDone(false);    
+        emit m_webFrame->loadDone(false);
 }
 
 void FrameLoaderClientQt::dispatchDidFailLoad(const WebCore::ResourceError&)
 {
     if (m_webFrame)
-        emit m_webFrame->loadDone(false);    
+        emit m_webFrame->loadDone(false);
 }
 
 WebCore::Frame* FrameLoaderClientQt::dispatchCreatePage()
@@ -882,7 +882,10 @@ ObjectContentType FrameLoaderClientQt::objectContentType(const KURL& url, const
 
     if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType))
         return ObjectContentFrame;
-    
+
+    if (url.protocol() == "about")
+        return ObjectContentFrame;
+
     return ObjectContentNone;
 }
 
@@ -899,13 +902,13 @@ const unsigned numqStyleSheetProperties = sizeof(qstyleSheetProperties) / sizeof
 Widget* FrameLoaderClientQt::createPlugin(const IntSize&, 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()<<"------ Creating plugin in FrameLoaderClientQt::createPlugin for "<<url.prettyURL() << 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) 
+    for (int i = 0; i < paramValues.size(); ++i)
         values.append(paramValues[i]);
 
     QString urlStr(url.url());
@@ -935,7 +938,7 @@ Widget* FrameLoaderClientQt::createPlugin(const IntSize&, Element* element, cons
             widget->setStyleSheet(styleSheet);
         }
     }
-    
+
     if (!object)
         object = QWebFactoryLoader::self()->create(m_webFrame, qurl, mimeType, params, values);