Merge lp:~abreu-alexandre/oxide/add-quota-permission-context-support into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Add support for quota permission context request.

Add support for quota permission context request.

A patch branch for chromium is needed for that change:

https://git.launchpad.net/~abreu-alexandre/oxide/+git/chromium/commit/?h=expose-frame-id-quota&id=21f76382023aab780d211d5efad3c35690fc8ddc

[Chris Coulson (chrisccoulson)]

Thanks for working on this. I've added some comments inline.

This is also lacking tests - I'd start by looking at the geolocation permission tests (and also take in to consideration the points in bug 1399196). Note, cancellation when navigating subframes probably won't work for quota permissions like it should for geolocation (we have no indication of the frame on the browser side).

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

I've added some comments inline for this

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

I've left some comments inline again.

Also, how does this API behave if a site requests persistent storage in an incognito webview?

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

I've left some comments inline.

And the tests are still missing quite a few cases:
- It's not testing if requests from subframes behave correctly.
- It doesn't test if requests are cancelled on navigation.
- It doesn't verify that the request is denied if the application ignores it (ie, QuotaPermissionRequest is deleted without a response).

I still don't know what happens if a page in an incognito webview requests a persistent storage quota. Did you find out?

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

created a expose-quota-frame-id branch in ~oxide-developers/oxide/+git/chromium to track the patches that add the frame id to the storage quota request,

[lp:~abreu-alexandre/oxide/add-quota-permission-context-support]

1283. By Chris Coulson on 2015-11-26

Use Qt::PrimaryOrientation rather than passing in QScreen's own primary orientation

[Alexandre Abreu (abreu-alexandre)]

Also about you question, for incognito webviews the request still goes through except that for those the maximum quota is set to a lower threshold, see:

https://git.launchpad.net/~oxide-developers/oxide/+git/chromium/tree/storage/browser/quota/quota_manager.cc#n51

and

https://git.launchpad.net/~oxide-developers/oxide/+git/chromium/tree/storage/browser/quota/quota_manager.cc#n320

which is the control flow for a regular storage quota request with the case of a webview being incognito being handled as a max threshold case.

[lp:~abreu-alexandre/oxide/add-quota-permission-context-support]

1284. By Chris Coulson on 2015-11-27

QCoreApplication::applicationName() isn't really thread-safe - cache it to protect against accessing this whilst the application is modifying it (although we don't really expect this to change)

1285. By Chris Coulson on 2015-12-04

Build with 'use_ash: 0' as this seems to be pulling in dependencies from //chrome, resulting in random mis-builds

1286. By Chris Coulson on 2015-12-09

Bump Chromium rev to 0fcc1746 (48.0.2564.22)

1287. By Chris Coulson on 2015-12-09

Add support for the camera on the phone. Note this requires changes to libhybris that aren't approved yet, so some bits may change. It's also hidden behind a build option (ENABLE_HYBRIS_CAMERA)

1288. By Chris Coulson on 2015-12-11

Don't require libhybris-dev to be installed when building without ENABLE_HYBRIS_CAMERA

1289. By Chris Coulson on 2015-12-16

Merge from lp:oxide/crmaster

1290. By Chris Coulson on 2015-12-16

Bump qt version to 1.13

1291. By Chris Coulson on 2015-12-17

Bump Chromium rev to dee8b819 (49.0.2587.3)

1292. By Chris Coulson on 2015-12-19

Fix OxideQCertificateError::isMainFrame to work with Chromium 49

1293. By Chris Coulson on 2015-12-22

Don't build qt/core/api in a separate target with different build options. This means we can stop linking unconditionally with --gc-sections. It also means that the public API no longer has RTTI enabled - if we need this in the future, we'll have to split it out again and plumb it through a proxy layer like we do with qt/quick/api

1294. By Chris Coulson on 2016-01-04

Merge r1067 from lp:oxide/crmaster

1295. By Chris Coulson on 2016-01-04

Bump Chromium rev to 8af47bb2 (49.0.2593.0)

1296. By Chris Coulson on 2016-01-04

Bump Chromium rev to a6f2995b to pick up build fix

1297. By Chris Coulson on 2016-01-06

Pass StartParams by value and give it a move constructor - this makes it obvious that the StartParams passed to BrowserProcessMain::Start is no longer valid once the function returns

1298. By Chris Coulson on 2016-01-07

Merge r1072 from lp:oxide/crmaster

1299. By Chris Coulson on 2016-01-07

Bump Chromium rev to 3bbb11d8 (49.0.2612.0)

1300. By Chris Coulson on 2016-01-08

Check the return value from android_camera_get_device_info

1301. By Chris Coulson on 2016-01-08

Check the return of android_camera_get_device_info in another location

1302. By Chris Coulson on 2016-01-08

Fix an import failure in release.py

1303. By Chris Coulson on 2016-01-08

Update the exclude list and call init-checkout.py from release.py

1304. By Olivier Tilloy on 2016-01-08

Add missing revision qualifier to the WebView.hoveredUrl property.

1305. By Chris Coulson on 2016-01-08

Be a bit more intelligent when detecting whether the hybris camera compatibility layer is available, or whether we're running on the Android EGL stack

1306. By Chris Coulson on 2016-01-09

Expose value type enums to QML in Qt5.5

1307. By Olivier Tilloy on 2016-01-11

Update to oxide.qmltypes missed at revision 1304.

1308. By Chris Coulson on 2016-01-11

Don't include .git/index files anywhere in the tarball. This was added way back in r640 but doesn't actually fix anything, and instead causes LP: #1490868 to be reintroduced in official builds where we don't install git

1309. By Olivier Tilloy on 2016-01-12

Add a touch selection API, to allow embedders to display handles for resizing the current selection, and contextual actions for it.

1310. By Chris Coulson on 2016-01-12

Make QFlags naming consistent betweeen qt/core/api and qt/quick/api

1311. By Chris Coulson on 2016-01-13

Various clean-ups in soon-to-be-public headers. Also, we rename header files based on whether they're going to be public or not

1312. By Chris Coulson on 2016-01-13

Ensure we define OXIDE_QTQUICK_IMPLEMENTATION as part of the build

1313. By Chris Coulson on 2016-01-13

Remove SimplePermissionRequest

1314. By Chris Coulson on 2016-01-13

Register PermissionRequest and MediaAccessPermissionRequest

1315. By Chris Coulson on 2016-01-13

Add deprecation warnings for deprecated APIs

1316. By Chris Coulson on 2016-01-14

Add missing file

1317. By Chris Coulson on 2016-01-15

Disable the unprivileged namespace sandbox and fallback to the suid sandbox until we've figured out how it fits in with application confinement

1318. By Chris Coulson on 2016-01-18

Make a few changes to the build system:
- package is renamed to test-package, as the former is a reserved target in cmake. This gets rid of a warning.
- Use the built-in option command.
- Move a bunch of stuff from qt/CMakeLists.txt to CMakeLists.txt

1319. By Chris Coulson on 2016-01-19

Use INTERFACE_LINK_LIBRARIES for OXIDE_LIB, and make some libraries linked in to OXIDE_QUICKLIB public

1320. By Chris Coulson on 2016-01-19

Merge r1085 from lp:oxide/crmaster

1321. By Chris Coulson on 2016-01-20

Bump Chromium rev to c51aaef (49.0.2623.0)

1322. By Chris Coulson on 2016-01-20

Unbreak cross-compiles and make sure we test the version of the correct module

1323. By Chris Coulson on 2016-01-21

Merge in various build changes:
- Split out some code in to CMake modules
- Use CMake's PROJECT_VERSION properties rather than our own OXIDE_VERSION
- Install public header files
- Create and install CMake package config files

1324. By Chris Coulson on 2016-01-22

Safely handle event loop nesting from outside of Oxide

1325. By Chris Coulson on 2016-01-25

Bump Chromium rev to 37948b2 (49.0.2623.13)

1326. By Chris Coulson on 2016-01-26

Update the deprecation warning for loadingChanged and add a macro for doing this as well

1327. By Chris Coulson on 2016-01-27

Bump Chromium rev to 8e193e1 (49.0.2623.23)

1328. By Chris Coulson on 2016-01-28

Remove WebViewProxy::createHelpers - just export the relevant private classes and have OxideQQuickWebView use those directly

1329. By Chris Coulson on 2016-01-31

Bump qt version to 1.14

1330. By Chris Coulson on 2016-01-31

Rename development Chromium branches to oxide/dev/crXXXX

1331. By Chris Coulson on 2016-01-31

Merge r1097 from lp:oxide/crmaster

1332. By Chris Coulson on 2016-01-31

Bump Chromium rev to 0571636 (50.0.2633.3)

1333. By Alexandre Abreu on 2016-02-01

fix build failure with MediaHub specific code

1334. By Chris Coulson on 2016-02-07

Add support for drag and drop

1335. By Chris Coulson on 2016-02-08

Merge r1100 from lp:oxide/crmaster

1336. By Chris Coulson on 2016-02-08

Fix some test failures

1337. By Alexandre Abreu on 2016-02-08

Add support for quota permission context request.

1338. By Alexandre Abreu on 2016-02-08

Tweaks

Unmerged revisions

1338. By Alexandre Abreu on 2016-02-08

Tweaks

1337. By Alexandre Abreu on 2016-02-08

Add support for quota permission context request.

=== modified file 'qt/build/system.gyp'
--- qt/build/system.gyp	2015-10-28 19:09:39 +0000
+++ qt/build/system.gyp	2016-02-08 19:32:31 +0000
@@ -107,5 +107,22 @@
         ],
       },
     },
+    {
+      'target_name': 'Qt5Feedback',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags_cc': [
+          '<!@(<(pkg_config) --cflags Qt5Feedback)'
+        ]
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(<(pkg_config) --libs-only-L --libs-only-other Qt5Feedback)',
+        ],
+        'libraries': [
+          '<!@(<(pkg_config) --libs-only-l Qt5Feedback)',
+        ],
+      },
+    },
   ],
 }

=== modified file 'qt/core/api/oxideqpermissionrequest.cc'
--- qt/core/api/oxideqpermissionrequest.cc	2016-01-26 16:47:06 +0000
+++ qt/core/api/oxideqpermissionrequest.cc	2016-02-08 19:32:31 +0000
@@ -105,6 +105,18 @@
     ~OxideQMediaAccessPermissionRequestPrivate() {}
 
 // static
+OxideQQuotaPermissionRequest*
+OxideQQuotaPermissionRequestPrivate::Create(
+      quint64 requested_size,
+      scoped_ptr<oxide::PermissionRequest> request) {
+  DCHECK(request);
+  return new OxideQQuotaPermissionRequest(
+      *new OxideQQuotaPermissionRequestPrivate(
+        requested_size,
+        std::move(request)));
+}
+
+// static
 OxideQMediaAccessPermissionRequest*
 OxideQMediaAccessPermissionRequestPrivate::Create(
     scoped_ptr<oxide::MediaAccessPermissionRequest> request) {
@@ -114,6 +126,32 @@
       *new OxideQMediaAccessPermissionRequestPrivate(std::move(request)));
 }
 
+OxideQQuotaPermissionRequestPrivate::OxideQQuotaPermissionRequestPrivate(
+      quint64 requested_size,
+      scoped_ptr<oxide::PermissionRequest> request)
+  : OxideQPermissionRequestPrivate(std::move(request)),
+      requested_size_(requested_size) {}
+
+OxideQQuotaPermissionRequestPrivate::~OxideQQuotaPermissionRequestPrivate() {}
+
+bool OxideQQuotaPermissionRequestPrivate::canRespond() const {
+  if (request_->is_cancelled()) {
+    qWarning() <<
+        "OxideQQuotaPermissionRequestPrivate: Can't respond to a cancelled "
+        "permission request";
+    return false;
+  }
+
+  if (!request_->IsPending()) {
+    qWarning() <<
+        "OxideQQuotaPermissionRequestPrivate: Can only respond once to a "
+        "permission request";
+    return false;
+  }
+
+  return true;
+}
+
 OxideQPermissionRequest::OxideQPermissionRequest(
     OxideQPermissionRequestPrivate& dd)
     : d_ptr(&dd) {
@@ -206,3 +244,15 @@
 
   return d->request()->video_requested();
 }
+
+OxideQQuotaPermissionRequest::OxideQQuotaPermissionRequest(
+    OxideQQuotaPermissionRequestPrivate& dd)
+    : OxideQPermissionRequest(dd) {}
+
+OxideQQuotaPermissionRequest::~OxideQQuotaPermissionRequest() {}
+
+quint64 OxideQQuotaPermissionRequest::requestedSize() const {
+  Q_D(const OxideQQuotaPermissionRequest);
+
+  return d->requested_size_;
+}

=== modified file 'qt/core/api/oxideqpermissionrequest.h'
--- qt/core/api/oxideqpermissionrequest.h	2016-01-13 18:54:13 +0000
+++ qt/core/api/oxideqpermissionrequest.h	2016-02-08 19:32:31 +0000
@@ -28,6 +28,8 @@
 class OxideQGeolocationPermissionRequestPrivate;
 class OxideQMediaAccessPermissionRequestPrivate;
 class OxideQPermissionRequestPrivate;
+class OxideQQuotaPermissionRequestPrivate;
+class OxideQSimplePermissionRequestPrivate;
 
 class OXIDE_QTCORE_EXPORT OxideQPermissionRequest : public QObject {
   Q_OBJECT
@@ -106,4 +108,24 @@
       OxideQMediaAccessPermissionRequestPrivate& dd);
 };
 
+class OXIDE_QTCORE_EXPORT OxideQQuotaPermissionRequest :
+    public OxideQPermissionRequest {
+  Q_OBJECT
+
+  Q_PROPERTY(quint64 requestedSize READ requestedSize CONSTANT)
+
+  Q_DECLARE_PRIVATE(OxideQQuotaPermissionRequest)
+  Q_DISABLE_COPY(OxideQQuotaPermissionRequest)
+
+ public:
+
+  ~OxideQQuotaPermissionRequest();
+
+  quint64 requestedSize() const;
+
+ private:
+  OxideQQuotaPermissionRequest(
+      OxideQQuotaPermissionRequestPrivate& dd);
+};
+
 #endif // OXIDE_QTCORE_PERMISSION_REQUEST

=== modified file 'qt/core/api/oxideqpermissionrequest_p.h'
--- qt/core/api/oxideqpermissionrequest_p.h	2016-01-13 18:54:13 +0000
+++ qt/core/api/oxideqpermissionrequest_p.h	2016-02-08 19:32:31 +0000
@@ -66,6 +66,26 @@
       scoped_ptr<oxide::PermissionRequest> request);
 };
 
+class OxideQQuotaPermissionRequestPrivate
+    : public OxideQPermissionRequestPrivate {
+ public:
+  ~OxideQQuotaPermissionRequestPrivate();
+  
+  static OxideQQuotaPermissionRequest* Create(
+      quint64 requested_size,
+      scoped_ptr<oxide::PermissionRequest> request);
+
+ private:
+  OxideQQuotaPermissionRequestPrivate(
+      quint64 requested_size,
+      scoped_ptr<oxide::PermissionRequest> request);
+
+  friend class OxideQQuotaPermissionRequest;
+
+  bool canRespond() const;
+  quint64 requested_size_;
+};
+
 class OxideQMediaAccessPermissionRequestPrivate
     : public OxideQPermissionRequestPrivate {
  public:

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2016-02-05 16:17:52 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2016-02-08 19:32:31 +0000
@@ -46,8 +46,10 @@
 #include "content/common/cursors/webcursor.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "net/base/net_errors.h"
+#include "storage/browser/quota/quota_manager.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "third_party/WebKit/public/platform/WebTopControlsState.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
@@ -341,6 +343,15 @@
   return true;
 }
 
+void ClearQuotaPermissionDataDoneCallback(
+      QObject* callbackReceiver,
+      storage::QuotaStatusCode result,
+      int64_t quota) {
+  QMetaObject::invokeMethod(
+      callbackReceiver,
+      "cleared");
+}
+
 }
 
 class CompositorFrameHandleImpl : public CompositorFrameHandle {
@@ -1510,6 +1521,17 @@
   frame_tree_torn_down_ = true;
 }
 
+void WebView::clearQuotaPermissionData(const QString& origin, QObject* callbackReceiver) {
+  view_->GetWebContents()
+    ->GetRenderProcessHost()
+    ->GetStoragePartition()
+    ->GetQuotaManager()
+    ->SetPersistentHostQuota(
+        origin.toStdString(),
+        1,
+        base::Bind(ClearQuotaPermissionDataDoneCallback, callbackReceiver));
+}
+
 WebView::WebView(WebViewProxyClient* client,
                  QObject* native_view,
                  OxideQFindController* find_controller,
@@ -1599,6 +1621,16 @@
   return WebContext::FromBrowserContext(view_->GetBrowserContext());
 }
 
+void WebView::RequestQuotaPermission(
+    uint64_t requested_size,
+    scoped_ptr<oxide::PermissionRequest> request) {
+  scoped_ptr<OxideQQuotaPermissionRequest> req(
+      OxideQQuotaPermissionRequestPrivate::Create(
+        requested_size,
+        std::move(request)));
+  client_->RequestQuotaPermission(req.release());
+}
+
 const oxide::SecurityStatus& WebView::GetSecurityStatus() const {
   return view_->security_status();
 }

=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2016-02-05 16:17:52 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2016-02-08 19:32:31 +0000
@@ -192,6 +192,9 @@
       scoped_ptr<oxide::PermissionRequest> request) override;
   void RequestMediaAccessPermission(
       scoped_ptr<oxide::MediaAccessPermissionRequest> request) override;
+  void RequestQuotaPermission(
+      uint64_t requested_size,
+      scoped_ptr<oxide::PermissionRequest> request) override;
 
   // oxide::WebFrameTreeObserver implementation
   void FrameCreated(oxide::WebFrame* frame) override;
@@ -303,6 +306,8 @@
 
   void teardownFrameTree() override;
 
+  void clearQuotaPermissionData(const QString& origin, QObject* callbackReceiver);
+
   // This must outlive |view_|
   scoped_ptr<InputMethodContext> input_method_context_;
 

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2016-02-05 16:17:52 +0000
+++ qt/core/core.gyp	2016-02-08 19:32:31 +0000
@@ -27,6 +27,7 @@
       'dependencies': [
         '../build/system.gyp:Qt5Core',
         '../build/system.gyp:Qt5Core-private',
+        '../build/system.gyp:Qt5Feedback',
         '../build/system.gyp:Qt5Gui',
         '../build/system.gyp:Qt5Gui-private',
         '../build/system.gyp:Qt5Network',

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy.h'
--- qt/core/glue/oxide_qt_web_view_proxy.h	2016-02-05 16:17:52 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy.h	2016-02-08 19:32:31 +0000
@@ -251,6 +251,8 @@
   virtual void locationBarShow(bool animate) = 0;
   virtual void locationBarHide(bool animate) = 0;
 
+  virtual void clearQuotaPermissionData(const QString& origin, QObject* callbackReceiver) = 0;
+
   virtual WebProcessStatus webProcessStatus() const = 0;
 
   virtual void executeEditingCommand(EditingCommands command) const = 0;

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy_client.h'
--- qt/core/glue/oxide_qt_web_view_proxy_client.h	2016-01-08 06:38:22 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy_client.h	2016-02-08 19:32:31 +0000
@@ -34,6 +34,7 @@
 class OxideQNavigationRequest;
 class OxideQNewViewRequest;
 class OxideQPermissionRequest;
+class OxideQQuotaPermissionRequest;
 
 QT_BEGIN_NAMESPACE
 class QCursor;
@@ -158,6 +159,9 @@
   virtual void TargetURLChanged() = 0;
   
   virtual void OnEditingCapabilitiesChanged() = 0;
+
+  virtual void RequestQuotaPermission(
+      OxideQQuotaPermissionRequest* request) = 0;
 };
 
 } // namespace qt

=== modified file 'qt/qmlplugin/oxide.qmltypes'
--- qt/qmlplugin/oxide.qmltypes	2016-01-12 11:45:54 +0000
+++ qt/qmlplugin/oxide.qmltypes	2016-02-08 19:32:31 +0000
@@ -4,7 +4,7 @@
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -v -noinstantiate com.canonical.Oxide 1.12 com/canonical/Oxide'
+// 'qmlplugindump -v -noinstantiate com.canonical.Oxide 1.13 com/canonical/Oxide'
 
 Module {
     Component {
@@ -54,11 +54,10 @@
     }
     Component {
         name: "OxideQGeolocationPermissionRequest"
-        prototype: "OxideQSimplePermissionRequest"
+        prototype: "OxideQPermissionRequest"
         exports: ["GeolocationPermissionRequest 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
-        Property { name: "origin"; type: "QUrl"; isReadonly: true }
         Method { name: "accept" }
     }
     Component {
@@ -78,6 +77,15 @@
         Method { name: "deny" }
     }
     Component {
+        name: "OxideQMediaAccessPermissionRequest"
+        prototype: "OxideQPermissionRequest"
+        exports: ["MediaAccessPermissionRequest 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "isForAudio"; type: "bool"; isReadonly: true }
+        Property { name: "isForVideo"; type: "bool"; isReadonly: true }
+    }
+    Component {
         name: "OxideQNavigationRequest"
         prototype: "QObject"
         exports: ["NavigationRequest 1.0"]
@@ -127,11 +135,16 @@
     Component {
         name: "OxideQPermissionRequest"
         prototype: "QObject"
+        exports: ["PermissionRequest 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
         Property { name: "origin"; type: "QUrl"; isReadonly: true }
         Property { name: "embedder"; type: "QUrl"; isReadonly: true }
         Property { name: "isCancelled"; type: "bool"; isReadonly: true }
         Property { name: "url"; type: "QUrl"; isReadonly: true }
         Signal { name: "cancelled" }
+        Method { name: "allow" }
+        Method { name: "deny" }
     }
     Component {
         name: "OxideQQuickCookieManager"
@@ -480,13 +493,14 @@
             "WebView 1.0",
             "WebView 1.11",
             "WebView 1.12",
+            "WebView 1.13",
             "WebView 1.3",
             "WebView 1.4",
             "WebView 1.5",
             "WebView 1.8",
             "WebView 1.9"
         ]
-        exportMetaObjectRevisions: [0, 6, 7, 1, 2, 3, 4, 5]
+        exportMetaObjectRevisions: [0, 6, 7, 8, 1, 2, 3, 4, 5]
         attachedType: "OxideQQuickWebViewAttached"
         Enum {
             name: "LogMessageSeverityLevel"
@@ -718,6 +732,11 @@
         Signal { name: "hoveredUrlChanged"; revision: 7 }
         Signal { name: "editingCapabilitiesChanged"; revision: 7 }
         Signal {
+            name: "quotaPermissionRequested"
+            revision: 8
+            Parameter { name: "request"; type: "QJSValue" }
+        }
+        Signal {
             name: "loadingChanged"
             Parameter { name: "loadEvent"; type: "OxideQLoadEvent" }
         }
@@ -763,6 +782,14 @@
         Property { name: "view"; type: "OxideQQuickWebView"; isReadonly: true; isPointer: true }
     }
     Component {
+        name: "OxideQQuotaPermissionRequest"
+        prototype: "OxideQPermissionRequest"
+        exports: ["QuotaPermissionRequest 1.13"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "requestedSize"; type: "qulonglong"; isReadonly: true }
+    }
+    Component {
         name: "OxideQSecurityStatus"
         prototype: "QObject"
         exports: ["SecurityStatus 1.0"]
@@ -779,7 +806,7 @@
             }
         }
         Enum {
-            name: "ContentStatusFlags"
+            name: "ContentStatus"
             values: {
                 "ContentStatusNormal": 0,
                 "ContentStatusDisplayedInsecure": 1,
@@ -787,7 +814,7 @@
             }
         }
         Enum {
-            name: "CertStatusFlags"
+            name: "CertStatus"
             values: {
                 "CertStatusOk": 0,
                 "CertStatusBadIdentity": 1,
@@ -802,17 +829,11 @@
             }
         }
         Property { name: "securityLevel"; type: "SecurityLevel"; isReadonly: true }
-        Property { name: "contentStatus"; type: "ContentStatusFlags"; isReadonly: true }
-        Property { name: "certStatus"; type: "CertStatusFlags"; isReadonly: true }
+        Property { name: "contentStatus"; type: "ContentStatus"; isReadonly: true }
+        Property { name: "certStatus"; type: "CertStatus"; isReadonly: true }
         Property { name: "certificate"; type: "QVariant"; isReadonly: true }
     }
     Component {
-        name: "OxideQSimplePermissionRequest"
-        prototype: "OxideQPermissionRequest"
-        Method { name: "allow" }
-        Method { name: "deny" }
-    }
-    Component {
         name: "OxideQWebPreferences"
         prototype: "QObject"
         exports: ["WebPreferences 1.0"]

=== modified file 'qt/qmlplugin/oxide_qml_plugin.cc'
--- qt/qmlplugin/oxide_qml_plugin.cc	2016-01-13 19:05:43 +0000
+++ qt/qmlplugin/oxide_qml_plugin.cc	2016-02-08 19:32:31 +0000
@@ -187,6 +187,7 @@
     qmlRegisterType<OxideQQuickWebView, 4>(uri, 1, 8, "WebView");
 
     qmlRegisterType<OxideQQuickWebContext, 3>(uri, 1, 9, "WebContext");
+
     qmlRegisterUncreatableType<OxideQHttpAuthenticationRequest>(
         uri, 1, 9, "HttpAuthenticationRequest",
         "HttpAuthenticationRequest is delivered by "
@@ -199,7 +200,14 @@
         uri, 1, 12, "TouchSelectionController",
         "TouchSelectionController is accessed via "
         "WebView.touchSelectionController");
+
     qmlRegisterType<OxideQQuickWebView, 7>(uri, 1, 12, "WebView");
+
+    qmlRegisterUncreatableType<OxideQQuotaPermissionRequest>(uri, 1, 13,
+        "QuotaPermissionRequest",
+        "QuotaPermissionRequest is delivered by WebView.quotaPermissionRequested");
+
+    qmlRegisterType<OxideQQuickWebView, 8>(uri, 1, 13, "WebView");
   }
 };
 

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2016-02-05 16:17:52 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2016-02-08 19:32:31 +0000
@@ -637,6 +637,30 @@
   engine->collectGarbage();
 }
 
+void OxideQQuickWebViewPrivate::RequestQuotaPermission(
+      OxideQQuotaPermissionRequest* request) {
+  Q_Q(OxideQQuickWebView);
+
+  // See OxideQQuickWebViewPrivate::RequestGeolocationPermission
+  QQmlEngine* engine = qmlEngine(q);
+  if (!engine) {
+    delete request;
+    return;
+  }
+
+  {
+    QJSValue val = engine->newQObject(request);
+    if (!val.isQObject()) {
+      delete request;
+      return;
+    }
+
+    emit q->quotaPermissionRequested(val);
+  }
+
+  engine->collectGarbage();
+}
+
 void OxideQQuickWebViewPrivate::ContentBlocked() {
   Q_Q(OxideQQuickWebView);
 
@@ -1065,6 +1089,12 @@
   return proxy()->getNavigationEntryTimestamp(index);
 }
 
+void OxideQQuickWebViewPrivate::clearQuotaPermissionData(
+      const QString& origin,
+      QObject* callbackReceiver) {
+  proxy()->clearQuotaPermissionData(origin, callbackReceiver);
+}
+
 void OxideQQuickWebView::connectNotify(const QMetaMethod& signal) {
   Q_D(OxideQQuickWebView);
 

=== modified file 'qt/quick/api/oxideqquickwebview.h'
--- qt/quick/api/oxideqquickwebview.h	2016-02-05 16:17:52 +0000
+++ qt/quick/api/oxideqquickwebview.h	2016-02-08 19:32:31 +0000
@@ -36,6 +36,7 @@
 class OxideQLoadEvent;
 class OxideQNavigationRequest;
 class OxideQNewViewRequest;
+class OxideQQuotaPermissionRequest;
 class OxideQWebPreferences;
 class OxideQQuickLocationBarController;
 class OxideQQuickNavigationHistory;
@@ -366,6 +367,7 @@
   Q_REVISION(5) void httpAuthenticationRequested(const QJSValue& request);
   Q_REVISION(7) void hoveredUrlChanged();
   Q_REVISION(7) void editingCapabilitiesChanged();
+  Q_REVISION(8) void quotaPermissionRequested(const QJSValue& request);
 
   // Deprecated since 1.3
   void loadingChanged(const OxideQLoadEvent& loadEvent);

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2016-01-13 18:16:11 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2016-02-08 19:32:31 +0000
@@ -78,6 +78,10 @@
   QString getNavigationEntryTitle(int index) const;
   QDateTime getNavigationEntryTimestamp(int index) const;
 
+  void clearQuotaPermissionData(
+      const QString& origin,
+      QObject* callbackReceiver);
+
  private:
   friend class UpdatePaintNodeScope;
 
@@ -148,6 +152,8 @@
   void CloseRequested() override;
   void TargetURLChanged() override;
   void OnEditingCapabilitiesChanged() override;
+  void RequestQuotaPermission(
+      OxideQQuotaPermissionRequest* request) override;
 
   oxide::qt::WebViewProxy* proxy() const {
     return oxide::qt::WebViewProxyHandle::proxy();

=== modified file 'qt/tests/qmltests/TestWebView.qml'
--- qt/tests/qmltests/TestWebView.qml	2015-09-25 22:30:19 +0000
+++ qt/tests/qmltests/TestWebView.qml	2016-02-08 19:32:31 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import QtTest 1.0
-import com.canonical.Oxide 1.11
+import com.canonical.Oxide 1.12
 import com.canonical.Oxide.Testing 1.0 as Testing
 import "TestUtils.js" as TestUtils
 

=== added file 'qt/tests/qmltests/api/tst_WebView_quotaPermission.html'
--- qt/tests/qmltests/api/tst_WebView_quotaPermission.html	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_quotaPermission.html	2016-02-08 19:32:31 +0000
@@ -0,0 +1,49 @@
+<html>
+<body>
+<span id="requested_size"></span>
+</body>
+<script>
+
+window.onload = function() {
+  var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+
+  var requestedSizeElement = document.getElementById('requested_size')
+
+  var observer = new MutationObserver(function(mutations) {
+    var size = requestedSizeElement.innerHTML
+    if (size !== '') {
+      requestQuota(parseInt(size))
+    }
+  });
+  observer.observe(requestedSizeElement,
+      {childList: true, subtree: true });
+
+  function requestQuota(requested_size) {
+    function dispatchEventWith(results) {
+      var e = new CustomEvent(
+        "oxideQuotaResult",
+        { bubbles: true, detail: results });
+      if (window === top) {
+        document.documentElement.dispatchEvent(e);
+      } else {
+        parent.document.documentElement.dispatchEvent(e);
+      }
+    }
+
+    var succeeded = function(bytes) {
+      dispatchEventWith({success: true, quota: bytes})
+    };
+
+    var failed = function(error) {
+      dispatchEventWith({success: false, error: error.toString()})
+    };
+
+    navigator.webkitPersistentStorage.requestQuota(
+      requested_size,
+      succeeded,
+      failed);
+  }
+}
+
+</script>
+</html>

=== added file 'qt/tests/qmltests/api/tst_WebView_quotaPermission.qml'
--- qt/tests/qmltests/api/tst_WebView_quotaPermission.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_quotaPermission.qml	2016-02-08 19:32:31 +0000
@@ -0,0 +1,202 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.12
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  width: 200
+  height: 200
+
+  property var lastQuotaRequest: null
+
+  SignalSpy {
+    id: spy
+    target: webView
+    signalName: "quotaPermissionRequested"
+  }
+
+  SignalSpy {
+    id: cancelSpy
+    signalName: "cancelled"
+  }
+
+  Item {
+    id: quotaDatabaseClearedCallbackReceiver
+    signal cleared()
+  }
+
+  SignalSpy {
+    id: quotaDatabaseClearedCallbackReceiverSpy
+    target: quotaDatabaseClearedCallbackReceiver
+    signalName: "cleared"
+  }
+
+  onQuotaPermissionRequested: {
+    lastQuotaRequest = request;
+  }
+
+  property var lastStatus: -1
+  property var lastQuota: -1
+
+  messageHandlers: [
+    ScriptMessageHandler {
+      msgId: "QUOTA-REQUEST-RESPONSE"
+      contexts: [ "oxide://testutils/" ]
+      callback: function(msg) {
+        webView.lastStatus = msg.args.status;
+        webView.lastQuota = msg.args.lastQuota
+      }
+    }
+  ]
+
+  TestCase {
+    id: test
+    name: "WebView_QuotaPermissionRequest"
+    when: windowShown
+
+    function init() {
+      spy.clear();
+      cancelSpy.clear();
+      webView.lastQuotaRequest = null;
+      webView.lastStatus = -1;
+      Utils.clearQuotaPermissionData(
+          "testsuite",
+          webView,
+          quotaDatabaseClearedCallbackReceiver);
+      quotaDatabaseClearedCallbackReceiverSpy.wait()
+    }
+
+    function _test_allow() {
+      webView.lastQuotaRequest.allow();
+    }
+
+    function _test_deny() {
+      webView.lastQuotaRequest.deny();
+    }
+
+    function test_QuotaPermissionRequest_data() {
+      return [
+        { url: "http://testsuite/tst_WebView_quotaPermission.html", function: _test_allow, expected: true, requested_quota: 1024*1024*10, current_quota: 1024*1024*10 },
+        { url: "http://testsuite/tst_WebView_quotaPermission.html", function: _test_deny, expected: true, requested_quota: 1024*1024*10, current_quota: 1 },
+        { url: "http://testsuite/tst_WebView_quotaPermission_iframe.html", function: _test_allow, expected: true, requested_quota: 1024*1024*10, current_quota: 1024*1024*10 },
+      ];
+    }
+
+    function test_QuotaPermissionRequest(data) {
+      webView.url = data.url
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+
+      var is_iframe = (data.url.indexOf('_iframe') > 0)
+      var documentAccessPrefix = "document"
+      if (is_iframe) {
+        documentAccessPrefix = "document.getElementById('childframe').contentWindow.document"
+      }
+
+      webView.getTestApi().evaluateCode(
+          "document.addEventListener(\"oxideQuotaResult\", function(event) {
+  oxide.sendMessage(\"QUOTA-REQUEST-RESPONSE\", { status: event.detail.success, lastQuota: event.detail.quota });
+});", true);
+      webView.getTestApi().evaluateCode(
+          documentAccessPrefix +
+          ".getElementById('requested_size').innerHTML" +
+          " = "
+          + String(data.requested_quota))
+
+      if (!webView.lastQuotaRequest) {
+        spy.wait();
+      }
+
+      compare(webView.lastQuotaRequest.embedder, "http://testsuite/");
+      compare(webView.lastQuotaRequest.origin, "http://testsuite/");
+      compare(webView.lastQuotaRequest.isCancelled, false);
+
+      data.function();
+
+      verify(TestUtils.waitFor(function() { return webView.lastStatus != -1; }),
+             "Timed out waiting for quota response");
+      compare(webView.lastStatus, data.expected);
+      compare(webView.lastQuota, data.current_quota);
+    }
+
+    function test_QuotaPermissionRequest_main_frame_navigation_cancel() {
+      webView.url = "http://testsuite/tst_WebView_quotaPermission.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+
+      webView.getTestApi().evaluateCode(
+          "document.getElementById('requested_size').innerHTML" +
+          " = "
+          + String(10*1024*1024))
+
+      if (!webView.lastQuotaRequest) {
+        spy.wait();
+      }
+
+      cancelSpy.target = webView.lastQuotaRequest;
+
+      webView.clearLoadEventCounters();
+      webView.getTestApi().evaluateCode(
+          "window.location = \"http://testsuite/empty.html\";", false);
+      verify(webView.waitForLoadCommitted());
+
+      verify(webView.lastQuotaRequest.isCancelled);
+      compare(cancelSpy.count, 1) << "Pending request should have been cancelled";
+    }
+
+    function test_QuotaPermissionRequest_subframe_navigation_cancel() {
+      webView.url = "http://testsuite/tst_WebView_quotaPermission_iframe.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+
+      webView.getTestApi().evaluateCode(
+          "document.getElementById('childframe').contentWindow.document
+.getElementById('requested_size').innerHTML" +
+          " = "
+          + String(10*1024*1024))
+
+      if (!webView.lastQuotaRequest) {
+        spy.wait();
+      }
+
+      cancelSpy.target = webView.lastQuotaRequest;
+
+      webView.clearLoadEventCounters();
+      webView.getTestApiForFrame(webView.rootFrame.childFrames[0]).evaluateCode(
+          "window.location = \"http://testsuite/empty.html\";", false);
+ 
+      cancelSpy.wait();
+
+      compare(cancelSpy.count, 1) << "Pending request should have been cancelled";
+      verify(webView.lastQuotaRequest.isCancelled);
+    }
+
+    function test_QuotaPermissionRequest_subframe_delete_cancel() {
+      webView.url = "http://testsuite/tst_WebView_quotaPermission_iframe.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+
+      webView.getTestApi().evaluateCode(
+          "document.getElementById('childframe').contentWindow.document
+.getElementById('requested_size').innerHTML" +
+          " = "
+          + String(10*1024*1024))
+      if (!webView.lastQuotaRequest) {
+        spy.wait();
+      }
+
+      cancelSpy.target = webView.lastQuotaRequest;
+
+      webView.getTestApi().evaluateCode("
+var f = document.getElementById('childframe');
+f.parentElement.removeChild(f);", true);
+
+      cancelSpy.wait();
+
+      compare(cancelSpy.count, 1) << "Pending request should have been cancelled";
+      verify(webView.lastQuotaRequest.isCancelled);
+    }
+
+  }
+}

=== added file 'qt/tests/qmltests/api/tst_WebView_quotaPermission_iframe.html'
--- qt/tests/qmltests/api/tst_WebView_quotaPermission_iframe.html	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_quotaPermission_iframe.html	2016-02-08 19:32:31 +0000
@@ -0,0 +1,5 @@
+<html>
+<body>
+  <iframe id="childframe" src="http://testsuite/tst_WebView_quotaPermission.html"></iframe>
+</body>
+</html>

=== modified file 'qt/tests/qmltests/oxide_qml_testing_plugin.cc'
--- qt/tests/qmltests/oxide_qml_testing_plugin.cc	2016-01-13 18:16:11 +0000
+++ qt/tests/qmltests/oxide_qml_testing_plugin.cc	2016-02-08 19:32:31 +0000
@@ -37,6 +37,8 @@
 
 #include "qt/quick/api/oxideqquickwebcontext.h"
 #include "qt/quick/api/oxideqquickwebcontext_p.h"
+#include "qt/quick/api/oxideqquickwebview.h"
+#include "qt/quick/api/oxideqquickwebview_p.h"
 
 namespace {
 
@@ -218,6 +220,14 @@
     QGuiApplication::clipboard()->clear();
   }
 
+  Q_INVOKABLE void clearQuotaPermissionData(
+        const QString& origin,
+        OxideQQuickWebView* webview,
+        QObject* callbackReceiver) {
+    OxideQQuickWebViewPrivate::get(webview)
+        ->clearQuotaPermissionData(origin, callbackReceiver);
+  }
+
   Q_INVOKABLE void clearTemporarySavedPermissionStatuses(
       OxideQQuickWebContext* context) {
     OxideQQuickWebContextPrivate::get(context)

=== added file 'shared/browser/oxide_quota_permission_context.cc'
--- shared/browser/oxide_quota_permission_context.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_quota_permission_context.cc	2016-02-08 19:32:31 +0000
@@ -0,0 +1,116 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_quota_permission_context.h"
+
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/quota_permission_context.h"
+#include "content/public/browser/render_view_host.h"
+#include "storage/common/quota/quota_types.h"
+
+#include "permissions/oxide_permission_request.h"
+
+#include "oxide_web_view.h"
+
+namespace {
+
+/**
+ * Simple helper used to have the appearance of a PermissionRequest
+ * callback, by currying it w/ a QuotaPermissionCallback.
+ * Also makes sure that the callback is on the right thread.
+ */
+void QuotaPermissionRequestCallback(
+      const content::QuotaPermissionContext::PermissionCallback& cb,
+      oxide::PermissionRequestResponse result) {
+  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
+    content::BrowserThread::PostTask(
+        content::BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(&QuotaPermissionRequestCallback, cb, result));
+    return;
+  }
+  cb.Run(result == oxide::PERMISSION_REQUEST_RESPONSE_ALLOW ?
+         content::QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_ALLOW :
+         content::QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_DISALLOW);
+}
+  
+}
+
+namespace oxide {
+  
+QuotaPermissionContext::QuotaPermissionContext() {
+}
+
+QuotaPermissionContext::~QuotaPermissionContext() {
+}
+
+void QuotaPermissionContext::RequestQuotaPermission(
+    const content::StorageQuotaParams& params,
+    int render_process_id,
+    const content::QuotaPermissionContext::PermissionCallback& callback) {
+  if (params.storage_type != storage::kStorageTypePersistent) {
+    callback.Run(content::QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_DISALLOW);
+    return;
+  }
+
+  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&QuotaPermissionContext::RequestQuotaPermission,
+                   this, params, render_process_id, callback));
+    return;
+  }
+
+  content::RenderViewHost* rvh =
+      content::RenderViewHost::FromID(render_process_id, params.render_view_id);
+  if (!rvh) {
+    QuotaPermissionRequestCallback(
+        callback,
+        oxide::PERMISSION_REQUEST_RESPONSE_DENY);
+    return;
+  }
+
+  WebView* webview = WebView::FromRenderViewHost(rvh);
+  if (!webview || !webview->GetWebContents()) {
+    QuotaPermissionRequestCallback(
+        callback,
+        oxide::PERMISSION_REQUEST_RESPONSE_DENY);
+    return;
+  }
+
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(
+          webview->GetWebContents()->GetRenderProcessHost()->GetID(),
+          params.render_frame_id);
+  if (!render_frame_host) {
+    QuotaPermissionRequestCallback(
+        callback,
+        oxide::PERMISSION_REQUEST_RESPONSE_DENY);
+    return;
+  }
+
+  PermissionRequestDispatcher::FromWebContents(webview->GetWebContents())
+      ->RequestQuotaPermission(
+        render_frame_host,
+        params.origin_url,
+        params.requested_size,
+        base::Bind(&QuotaPermissionRequestCallback, callback));
+}
+
+} // namespace oxide
+

=== removed file 'shared/browser/oxide_quota_permission_context.cc'
--- shared/browser/oxide_quota_permission_context.cc	2015-01-20 17:58:10 +0000
+++ shared/browser/oxide_quota_permission_context.cc	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-// vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
-
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#include "oxide_quota_permission_context.h"
-
-namespace oxide {
-  
-QuotaPermissionContext::QuotaPermissionContext() {
-}
-
-QuotaPermissionContext::~QuotaPermissionContext() {
-}
-
-void QuotaPermissionContext::RequestQuotaPermission(
-    const content::StorageQuotaParams& params,
-    int render_process_id,
-    const content::QuotaPermissionContext::PermissionCallback& callback) {
-  callback.Run(QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_DISALLOW);
-}
-
-} // namespace oxide
-

=== added file 'shared/browser/oxide_quota_permission_context.h'
--- shared/browser/oxide_quota_permission_context.h	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_quota_permission_context.h	2016-02-08 19:32:31 +0000
@@ -0,0 +1,45 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
+#define _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
+
+#include "content/public/browser/quota_permission_context.h"
+#include "storage/common/quota/quota_types.h"
+
+namespace oxide {
+  
+class QuotaPermissionContext final :
+    public content::QuotaPermissionContext {
+ public:
+  QuotaPermissionContext();
+  ~QuotaPermissionContext();
+
+ private:
+  
+  void RequestQuotaPermission(
+      const content::StorageQuotaParams& params,
+      int render_process_id,
+      const content::QuotaPermissionContext::PermissionCallback& callback) final;
+
+  DISALLOW_COPY_AND_ASSIGN(QuotaPermissionContext);
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
+

=== removed file 'shared/browser/oxide_quota_permission_context.h'
--- shared/browser/oxide_quota_permission_context.h	2015-01-20 17:58:10 +0000
+++ shared/browser/oxide_quota_permission_context.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-// vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
-
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#ifndef _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
-#define _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
-
-#include "content/public/browser/quota_permission_context.h"
-#include "storage/common/quota/quota_types.h"
-
-namespace oxide {
-  
-class QuotaPermissionContext final :
-    public content::QuotaPermissionContext {
- public:
-  QuotaPermissionContext();
-  ~QuotaPermissionContext();
-
-  void RequestQuotaPermission(
-      const content::StorageQuotaParams& params,
-      int render_process_id,
-      const content::QuotaPermissionContext::PermissionCallback& callback) final;
-
- private:
-
-  DISALLOW_COPY_AND_ASSIGN(QuotaPermissionContext);
-};
-
-} // namespace oxide
-
-#endif // _OXIDE_SHARED_BROWSER_QUOTA_PERMISSION_CONTEXT_H_
-

=== modified file 'shared/browser/permissions/oxide_permission_request_dispatcher.cc'
--- shared/browser/permissions/oxide_permission_request_dispatcher.cc	2016-01-13 18:54:13 +0000
+++ shared/browser/permissions/oxide_permission_request_dispatcher.cc	2016-02-08 19:32:31 +0000
@@ -250,4 +250,31 @@
   return request_id;
 }
 
+int PermissionRequestDispatcher::RequestQuotaPermission(
+      content::RenderFrameHost* render_frame_host,
+      const GURL& requesting_origin,
+      uint64_t requested_size,
+      const PermissionRequestCallback& callback) {
+  if (!client_) {
+    callback.Run(PERMISSION_REQUEST_RESPONSE_CANCEL);
+    return -1;
+  }
+
+  int request_id = next_request_id_++;
+  scoped_ptr<PermissionRequest> request(
+      new PermissionRequest(
+        request_id,
+        RenderFrameHostID(render_frame_host),
+        requesting_origin,
+        web_contents()->GetLastCommittedURL().GetOrigin(),
+        callback));
+  AddPendingRequest(request.get());
+
+  client_->RequestQuotaPermission(
+      requested_size,
+      std::move(request));
+
+  return request_id;
+}
+
 } // namespace oxide

=== modified file 'shared/browser/permissions/oxide_permission_request_dispatcher.h'
--- shared/browser/permissions/oxide_permission_request_dispatcher.h	2015-10-07 18:07:40 +0000
+++ shared/browser/permissions/oxide_permission_request_dispatcher.h	2016-02-08 19:32:31 +0000
@@ -76,6 +76,12 @@
                                    bool video,
                                    const PermissionRequestCallback& callback);
 
+  // Request permission for storage size quota
+  int RequestQuotaPermission(content::RenderFrameHost* render_frame_host,
+                             const GURL& requesting_origin,
+                             uint64_t requested_size,
+                             const PermissionRequestCallback& callback);
+
  private:
   friend class content::WebContentsUserData<PermissionRequestDispatcher>;
   friend class PermissionRequest;

=== modified file 'shared/browser/permissions/oxide_permission_request_dispatcher_client.h'
--- shared/browser/permissions/oxide_permission_request_dispatcher_client.h	2016-01-13 18:54:13 +0000
+++ shared/browser/permissions/oxide_permission_request_dispatcher_client.h	2016-02-08 19:32:31 +0000
@@ -41,6 +41,10 @@
 
   virtual void RequestNotificationPermission(
       scoped_ptr<PermissionRequest> request) {}
+
+  virtual void RequestQuotaPermission(
+      uint64_t requested_size,
+      scoped_ptr<PermissionRequest> request) {}
 };
 
 } // namespace oxide