Changeset 75878 in webkit
- Timestamp:
- Jan 15, 2011 6:51:56 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r75877 r75878 1 2011-01-15 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] plugins/no-mime-with-valid-extension.html fails 6 7 Check extension of resource against installed 8 plugins when determining mime-type. 9 10 https://bugs.webkit.org/show_bug.cgi?id=52288 11 https://bugs.webkit.org/show_bug.cgi?id=50657 12 * platform/qt/Skipped: 13 1 14 2011-01-15 Stephen White <senorblanco@chromium.org> 2 15 -
trunk/LayoutTests/platform/qt/Skipped
r75833 r75878 5380 5380 fast/xmlhttprequest/null-document-xmlhttprequest-open.html 5381 5381 fast/xmlhttprequest/xmlhttprequest-nonexistent-file.html 5382 5383 # [Qt] plugins/no-mime-with-valid-extension.html fails5384 # https://bugs.webkit.org/show_bug.cgi?id=522885385 plugins/no-mime-with-valid-extension.html -
trunk/WebKit/qt/ChangeLog
r75870 r75878 1 2011-01-15 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] plugins/no-mime-with-valid-extension.html fails 6 Check extension of resource against installed 7 plugins when determining mime-type. 8 9 https://bugs.webkit.org/show_bug.cgi?id=52288 10 https://bugs.webkit.org/show_bug.cgi?id=50657 11 12 * WebCoreSupport/FrameLoaderClientQt.cpp: 13 (WebCore::FrameLoaderClientQt::objectContentType): 14 1 15 2011-01-14 Sam Magnuson <smagnuso@gmail.com> 2 16 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r75870 r75878 1305 1305 { 1306 1306 // qDebug()<<" ++++++++++++++++ url is "<<url.prettyURL()<<", mime = "<<_mimeType; 1307 QFileInfo fi(url.path()); 1308 String extension = fi.suffix(); 1307 1309 if (_mimeType == "application/x-qt-plugin" || _mimeType == "application/x-qt-styled-widget") 1308 1310 return ObjectContentOtherPlugin; … … 1312 1314 1313 1315 String mimeType = _mimeType; 1314 if (!mimeType.length()) { 1315 QFileInfo fi(url.path()); 1316 mimeType = MIMETypeRegistry::getMIMETypeForExtension(fi.suffix()); 1317 } 1316 if (!mimeType.length()) 1317 mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension); 1318 1319 if (!mimeType.length()) 1320 mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(extension); 1318 1321 1319 1322 if (!mimeType.length())
Note: See TracChangeset
for help on using the changeset viewer.