Changeset 69636 in webkit


Ignore:
Timestamp:
Oct 12, 2010 9:29:24 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-12 David Leong <david.leong@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Enable Netscape plugin metadata caching on Linux
https://bugs.webkit.org/show_bug.cgi?id=46287

QWebSettings::enablePersistentStorage will now store the netscape
plugin cache to QDesktopServices::CacheLocation.

  • Api/qwebsettings.cpp: (QWebSettings::enablePersistentStorage):
Location:
trunk/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/qt/Api/qwebsettings.cpp

    r68166 r69636  
    10771077void QWebSettings::enablePersistentStorage(const QString& path)
    10781078{
     1079#ifndef QT_NO_DESKTOPSERVICES
    10791080    QString storagePath;
    10801081
    10811082    if (path.isEmpty()) {
    1082 #ifndef QT_NO_DESKTOPSERVICES
     1083
    10831084        storagePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
    1084 #endif
    10851085        if (storagePath.isEmpty())
    10861086            storagePath = WebCore::pathByAppendingComponent(QDir::homePath(), QCoreApplication::applicationName());
     
    10991099
    11001100#if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE)
    1101     QFileInfo info(storagePath);
     1101    // All applications can share the common QtWebkit cache file(s).
     1102    // Path is not configurable and uses QDesktopServices::CacheLocation by default.
     1103    QString cachePath = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
     1104    WebCore::makeAllDirectories(cachePath);
     1105
     1106    QFileInfo info(cachePath);
    11021107    if (info.isDir() && info.isWritable()) {
    11031108        WebCore::PluginDatabase::setPersistentMetadataCacheEnabled(true);
    1104         WebCore::PluginDatabase::setPersistentMetadataCachePath(storagePath);
     1109        WebCore::PluginDatabase::setPersistentMetadataCachePath(cachePath);
    11051110    }
     1111#endif
    11061112#endif
    11071113}
  • trunk/WebKit/qt/ChangeLog

    r69582 r69636  
     12010-10-12  David Leong  <david.leong@nokia.com>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Enable Netscape plugin metadata caching on Linux
     6        https://bugs.webkit.org/show_bug.cgi?id=46287
     7       
     8        QWebSettings::enablePersistentStorage will now store the netscape
     9        plugin cache to QDesktopServices::CacheLocation.
     10       
     11        * Api/qwebsettings.cpp:
     12        (QWebSettings::enablePersistentStorage):
     13
    1142010-10-12  Yael Aharon  <yael.aharon@nokia.com>
    215
Note: See TracChangeset for help on using the changeset viewer.