Merge lp:~osomon/webbrowser-app/maxCacheSizeHint into lp:webbrowser-app

[Olivier Tilloy]

Make use of the WebContext.maxCacheSizeHint property, introduced in Oxide 1.6.
This bumps the dependency of qtdeclarative5-ubuntu-web-plugin on liboxideqt-qmlplugin to 1.6.

[Alexandre Abreu (abreu-alexandre)]

I am wondering about the hardcoded value for webapp, it is pretty arbitrary and might benefit from being adjustable for certain webapps ... could you add a argument for this?

(added a nit comment inline)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:936
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1706/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2513/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2511/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1706/rebuild

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-04-10 13:33:10 +0000
+++ debian/control	2015-04-28 21:31:21 +0000
@@ -95,7 +95,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         liboxideqt-qmlplugin (>= 1.5),
+         liboxideqt-qmlplugin (>= 1.6),
          qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
          qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,

=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
--- src/Ubuntu/Web/UbuntuWebContext.qml	2015-02-24 10:32:50 +0000
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2015-04-28 21:31:21 +0000
@@ -17,13 +17,16 @@
  */
 
 import QtQuick 2.0
-import com.canonical.Oxide 1.3 as Oxide
+import com.canonical.Oxide 1.6 as Oxide
 
 Oxide.WebContext {
     readonly property string defaultUserAgent: __ua.defaultUA
 
+    dataPath: dataLocation
+
     cachePath: cacheLocation
-    dataPath: dataLocation
+    maxCacheSizeHint: cacheSizeHint
+
     userAgent: defaultUserAgent
 
     networkRequestDelegate: Oxide.WebContextDelegateWorker {

=== modified file 'src/Ubuntu/Web/plugin.cpp'
--- src/Ubuntu/Web/plugin.cpp	2015-03-27 18:24:56 +0000
+++ src/Ubuntu/Web/plugin.cpp	2015-04-28 21:31:21 +0000
@@ -23,6 +23,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QObject>
 #include <QtCore/QStandardPaths>
+#include <QtCore/QStorageInfo>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QtGlobal>
@@ -37,6 +38,7 @@
     Q_PROPERTY(QString cacheLocation READ cacheLocation NOTIFY cacheLocationChanged)
     Q_PROPERTY(QString dataLocation READ dataLocation NOTIFY dataLocationChanged)
     Q_PROPERTY(QString formFactor READ formFactor CONSTANT)
+    Q_PROPERTY(int cacheSizeHint READ cacheSizeHint NOTIFY cacheSizeHintChanged)
     Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT)
     Q_PROPERTY(int webviewDevtoolsDebugPort READ devtoolsPort CONSTANT)
     Q_PROPERTY(QStringList webviewHostMappingRules READ hostMappingRules CONSTANT)
@@ -47,6 +49,7 @@
     QString cacheLocation() const;
     QString dataLocation() const;
     QString formFactor();
+    int cacheSizeHint() const;
     QString devtoolsHost();
     int devtoolsPort();
     QStringList hostMappingRules();
@@ -54,6 +57,7 @@
 Q_SIGNALS:
     void cacheLocationChanged() const;
     void dataLocationChanged() const;
+    void cacheSizeHintChanged() const;
 
 private:
     QString m_formFactor;
@@ -72,6 +76,8 @@
             this, SIGNAL(cacheLocationChanged()));
     connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()),
             this, SIGNAL(dataLocationChanged()));
+    connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()),
+            this, SIGNAL(cacheSizeHintChanged()));
 }
 
 QString UbuntuWebPluginContext::cacheLocation() const
@@ -130,6 +136,29 @@
     return m_formFactor;
 }
 
+int UbuntuWebPluginContext::cacheSizeHint() const
+{
+    if (QCoreApplication::applicationName() == "webbrowser-app") {
+        // Let chromium decide the optimum cache size based on available disk space
+        return 0;
+    } else {
+        // For webapps and other embedders, determine the cache size hint
+        // using heuristics based on the disk space (total, and available).
+        QStorageInfo storageInfo(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
+        const int MB = 1024 * 1024;
+        // The total cache size for all apps should not exceed 10% of the total disk space
+        int maxSharedCache = storageInfo.bytesTotal() / MB * 0.1;
+        // One given app is allowed to use up to 5% o the total cache size
+        int maxAppCacheAllowance = maxSharedCache * 0.05;
+        // Ensure it never exceeds 200 MB though
+        int maxAppCacheAbsolute = qMin(maxAppCacheAllowance, 200);
+        // Never use more than 20% of the available disk space
+        int maxAppCacheRelative = storageInfo.bytesAvailable() / MB * 0.2;
+        // Never set a size hint below 5 MB, as that would result in a very inefficient cache
+        return qMax(5, qMin(maxAppCacheAbsolute, maxAppCacheRelative));
+    }
+}
+
 QStringList UbuntuWebPluginContext::hostMappingRules()
 {
     static const QString HOST_MAPPING_RULES_SEP = ",";