[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5f01dcefc2e152ea5ba60ac5a6073e0ec0f172a6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 04:29:24 2010 +0000

    2010-10-12  David Leong  <david.leong at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index 6b36522..818a426 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -1076,12 +1076,12 @@ QString QWebSettings::localStoragePath() const
 */
 void QWebSettings::enablePersistentStorage(const QString& path)
 {
+#ifndef QT_NO_DESKTOPSERVICES
     QString storagePath;
 
     if (path.isEmpty()) {
-#ifndef QT_NO_DESKTOPSERVICES
+
         storagePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
-#endif
         if (storagePath.isEmpty())
             storagePath = WebCore::pathByAppendingComponent(QDir::homePath(), QCoreApplication::applicationName());
     } else
@@ -1098,12 +1098,18 @@ void QWebSettings::enablePersistentStorage(const QString& path)
     QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
 
 #if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE)
-    QFileInfo info(storagePath);
+    // All applications can share the common QtWebkit cache file(s).
+    // Path is not configurable and uses QDesktopServices::CacheLocation by default.
+    QString cachePath = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
+    WebCore::makeAllDirectories(cachePath);
+
+    QFileInfo info(cachePath);
     if (info.isDir() && info.isWritable()) {
         WebCore::PluginDatabase::setPersistentMetadataCacheEnabled(true);
-        WebCore::PluginDatabase::setPersistentMetadataCachePath(storagePath);
+        WebCore::PluginDatabase::setPersistentMetadataCachePath(cachePath);
     }
 #endif
+#endif
 }
 
 /*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 124dac2..1b215de 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-12  David Leong  <david.leong at 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):
+
 2010-10-12  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Antonio Gomes.

-- 
WebKit Debian packaging