Merge lp:~osomon/webbrowser-app/webview-capture into lp:webbrowser-app

[Olivier Tilloy]

Optimize the capture functionality.

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'src/app/webbrowser/item-capture.cpp'
--- src/app/webbrowser/item-capture.cpp	2014-12-11 18:51:05 +0000
+++ src/app/webbrowser/item-capture.cpp	2014-12-12 09:22:26 +0000
@@ -85,15 +85,11 @@
         m_request.clear();
         QQuickShaderEffectTexture* texture =
             qobject_cast<QQuickShaderEffectTexture*>(textureProvider()->texture());
-        QOpenGLContext* ctx =
-            QQuickItemPrivate::get(this)->sceneGraphRenderContext()->openglContext();
-        if (ctx->makeCurrent(ctx->surface())) {
-            QImage image = texture->toImage().mirrored();
-            if (!image.isNull()) {
-                QString filePath = m_cacheLocation + "/" + request + ".jpg";
-                QtConcurrent::run(this, &ItemCapture::saveImage, image, filePath, m_quality, request);
-                return newNode;
-            }
+        QImage image = texture->toImage().mirrored();
+        if (!image.isNull()) {
+            QString filePath = m_cacheLocation + "/" + request + ".jpg";
+            QtConcurrent::run(this, &ItemCapture::saveImage, image, filePath, request);
+            return newNode;
         }
         QMetaObject::invokeMethod(this, "captureFinished", Qt::QueuedConnection,
                                   Q_ARG(QString, request), Q_ARG(QUrl, QUrl()));
@@ -111,11 +107,10 @@
     scheduleUpdate();
 }
 
-void ItemCapture::saveImage(const QImage& image, const QString& filePath,
-                            const int quality, const QString& request)
+void ItemCapture::saveImage(const QImage& image, const QString& filePath, const QString& request)
 {
     QUrl capture;
-    if (image.save(filePath, 0, quality)) {
+    if (image.save(filePath, 0, m_quality)) {
         capture = QUrl::fromLocalFile(filePath);
     }
     QMetaObject::invokeMethod(this, "captureFinished", Qt::QueuedConnection,

=== modified file 'src/app/webbrowser/item-capture.h'
--- src/app/webbrowser/item-capture.h	2014-12-11 18:51:05 +0000
+++ src/app/webbrowser/item-capture.h	2014-12-12 09:22:26 +0000
@@ -51,8 +51,7 @@
 private Q_SLOTS:
     void onParentChanged(QQuickItem* parent);
     void onParentVisibleChanged();
-    void saveImage(const QImage& image, const QString& filePath,
-                   const int quality, const QString& request);
+    void saveImage(const QImage& image, const QString& filePath, const QString& request);
 
 private:
     QString m_cacheLocation;