Merge ~osomon/oxide:contextmenu-copyImage into oxide:master

[Olivier Tilloy]

Add a copyImage() method to the context menu to copy the contents of an image element to the clipboard. Fixes https://launchpad.net/bugs/1585291.

[Chris Coulson (chrisccoulson)]

Thanks, I've left a few small comments inline

review: Needs Fixing

9c5022d... by Olivier Tilloy on 2016-06-15

Specify fully-qualified include path.

e442309... by Olivier Tilloy on 2016-06-15

Detach image instead of copying it.

8a323c1... by Olivier Tilloy on 2016-06-15

Call detach() on the returned image in QImageFromSkBitmap().

d420348... by Olivier Tilloy on 2016-06-15

Re-arrange code for improved readability.

[Olivier Tilloy (osomon)]

Updated.

[Chris Coulson (chrisccoulson)]

review: Approve

diff --git a/qt/core/browser/clipboard/oxide_qt_clipboard.cc b/qt/core/browser/clipboard/oxide_qt_clipboard.cc
index d6fd870..38d003e 100644
--- a/qt/core/browser/clipboard/oxide_qt_clipboard.cc
+++ b/qt/core/browser/clipboard/oxide_qt_clipboard.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -30,6 +30,8 @@
 #include <QObject>
 #include <QString>
 
+#include "qt/core/browser/oxide_qt_skutils.h"
+
 #define GET_CLIPBOARD_DATA(c) \
   c->mimeData( \
        type == ui::CLIPBOARD_TYPE_COPY_PASTE ? \
@@ -300,32 +302,7 @@ void Clipboard::WriteWebSmartPaste() {
 
 void Clipboard::WriteBitmap(const SkBitmap& bitmap) {
   DCHECK(CalledOnValidThread());
-  QImage image;
-  if (bitmap.info().colorType() != kN32_SkColorType) {
-    SkImageInfo info =
-        SkImageInfo::MakeN32(bitmap.width(),
-                             bitmap.height(),
-                             bitmap.alphaType());
-
-    SkBitmap convertedBitmap;
-    if (!convertedBitmap.tryAllocPixels(info)) {
-      return;
-    }
-
-    bitmap.readPixels(info, convertedBitmap.getPixels(), 0, 0, 0);
-
-    image = QImage(reinterpret_cast<const uchar *>(convertedBitmap.getPixels()),
-                   bitmap.width(),
-                   bitmap.height(),
-                   QImage::Format_RGBA8888);
-  } else {
-    image = QImage(reinterpret_cast<const uchar *>(bitmap.getPixels()),
-                   bitmap.width(),
-                   bitmap.height(),
-                   QImage::Format_RGBA8888);
-  }
-
-  write_mime_data_acc_->setImageData(image.copy());
+  write_mime_data_acc_->setImageData(QImageFromSkBitmap(bitmap));
 }
 
 void Clipboard::WriteData(const FormatType& format,
diff --git a/qt/core/browser/oxide_qt_skutils.cc b/qt/core/browser/oxide_qt_skutils.cc
index d7bc690..0aecca5 100644
--- a/qt/core/browser/oxide_qt_skutils.cc
+++ b/qt/core/browser/oxide_qt_skutils.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
+// Copyright (C) 2014-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -102,12 +102,16 @@ QImage QImageFromSkBitmap(const SkBitmap& bitmap) {
       QImageFormatFromSkColorType(color, alpha == kPremul_SkAlphaType);
   if (format != QImage::Format_Invalid) {
     SkAutoLockPixels lock(bitmap);
-    return QImage(reinterpret_cast<const uchar*>(bitmap.getPixels()),
-                  bitmap.width(), bitmap.height(), format);
+    QImage image(reinterpret_cast<const uchar*>(bitmap.getPixels()),
+                 bitmap.width(), bitmap.height(), format);
+    image.detach();
+    return image;
   }
 
   if (color == kBGRA_8888_SkColorType) {
-    return QImageFromSkBitmap_BGRA_8888(bitmap);
+    QImage image = QImageFromSkBitmap_BGRA_8888(bitmap);
+    image.detach();
+    return image;
   }
 
   LOG(WARNING) <<
diff --git a/qt/core/browser/oxide_qt_web_context_menu.cc b/qt/core/browser/oxide_qt_web_context_menu.cc
index 29202e2..acbbeae 100644
--- a/qt/core/browser/oxide_qt_web_context_menu.cc
+++ b/qt/core/browser/oxide_qt_web_context_menu.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -169,6 +169,10 @@ int WebContextMenu::mediaFlags() const {
   return flags;
 }
 
+void WebContextMenu::copyImage() const {
+  CopyImage();
+}
+
 void WebContextMenu::saveLink() const {
   SaveLink();
 }
diff --git a/qt/core/browser/oxide_qt_web_context_menu.h b/qt/core/browser/oxide_qt_web_context_menu.h
index 8db72d8..257db2b 100644
--- a/qt/core/browser/oxide_qt_web_context_menu.h
+++ b/qt/core/browser/oxide_qt_web_context_menu.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -60,6 +60,7 @@ class WebContextMenu : public oxide::WebContextMenu,
   void cancel() override;
   int editFlags() const override;
   int mediaFlags() const override;
+  void copyImage() const override;
   void saveLink() const override;
   void saveMedia() const override;
 
diff --git a/qt/core/glue/oxide_qt_web_context_menu_proxy_client.h b/qt/core/glue/oxide_qt_web_context_menu_proxy_client.h
index b5d0131..123297e 100644
--- a/qt/core/glue/oxide_qt_web_context_menu_proxy_client.h
+++ b/qt/core/glue/oxide_qt_web_context_menu_proxy_client.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,6 +71,7 @@ class WebContextMenuProxyClient {
 
   virtual int mediaFlags() const = 0;
 
+  virtual void copyImage() const = 0;
   virtual void saveLink() const = 0;
   virtual void saveMedia() const = 0;
 };
diff --git a/qt/quick/oxide_qquick_web_context_menu.cc b/qt/quick/oxide_qquick_web_context_menu.cc
index 31b4575..561f421 100644
--- a/qt/quick/oxide_qquick_web_context_menu.cc
+++ b/qt/quick/oxide_qquick_web_context_menu.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -71,6 +71,7 @@ class ContextMenuContext : public QObject {
   OxideQQuickWebView::EditCapabilities editFlags() const;
   OxideQQuickWebView::MediaStatus mediaFlags() const;
 
+  Q_INVOKABLE void copyImage() const;
   Q_INVOKABLE void saveLink() const;
   Q_INVOKABLE void saveMedia() const;
 
@@ -214,6 +215,22 @@ OxideQQuickWebView::MediaStatus ContextMenuContext::mediaFlags() const {
   return static_cast<OxideQQuickWebView::MediaStatus>(client_->mediaFlags());
 }
 
+void ContextMenuContext::copyImage() const {
+  OxideQQuickWebView::MediaType media_type = mediaType();
+  if (media_type != OxideQQuickWebView::MediaTypeImage &&
+      media_type != OxideQQuickWebView::MediaTypeCanvas) {
+    qWarning() << "ContextMenuContext::copyImage(): not an image";
+    return;
+  }
+
+  if (!hasImageContents()) {
+    qWarning() << "ContextMenuContext::copyImage(): image has no contents";
+    return;
+  }
+
+  client_->copyImage();
+}
+
 void ContextMenuContext::saveLink() const {
   if (linkUrl().isValid()) {
     client_->saveLink();
diff --git a/qt/tests/qmltests/api/tst_WebView_contextMenu.qml b/qt/tests/qmltests/api/tst_WebView_contextMenu.qml
index 6017a1b..f8954b2 100644
--- a/qt/tests/qmltests/api/tst_WebView_contextMenu.qml
+++ b/qt/tests/qmltests/api/tst_WebView_contextMenu.qml
@@ -96,6 +96,14 @@ TestWebView {
       compare(model.isEditable, data.isEditable);
     }
 
+    function test_WebView_contextMenu_copyImage() {
+      ClipboardTestUtils.clearClipboard();
+      verify(!ClipboardTestUtils.hasImage());
+      invokeContextMenu("image");
+      webView.currentContextMenu.contextModel.copyImage();
+      verify(TestUtils.waitFor(ClipboardTestUtils.hasImage));
+    }
+
     function test_WebView_contextMenu_saveLink() {
       invokeContextMenu("hyperlink");
       var model = webView.currentContextMenu.contextModel;
diff --git a/qt/tests/qmltests/qml_test_support.cc b/qt/tests/qmltests/qml_test_support.cc
index 4c464c0..1de24a5 100644
--- a/qt/tests/qmltests/qml_test_support.cc
+++ b/qt/tests/qmltests/qml_test_support.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -68,6 +68,10 @@ void ExternalProtocolHandler::setScheme(const QString& scheme) {
 
 ClipboardTestUtils::ClipboardTestUtils() {}
 
+bool ClipboardTestUtils::hasImage() const {
+  return QGuiApplication::clipboard()->mimeData()->hasImage();
+}
+
 void ClipboardTestUtils::copyToClipboard(const QString& mimeType,
                                          const QString& data) {
   QMimeData * mime_data = new QMimeData();
diff --git a/qt/tests/qmltests/qml_test_support.h b/qt/tests/qmltests/qml_test_support.h
index 8d400bd..ac0f904 100644
--- a/qt/tests/qmltests/qml_test_support.h
+++ b/qt/tests/qmltests/qml_test_support.h
@@ -58,6 +58,8 @@ class ClipboardTestUtils : public QObject {
  public:
   ClipboardTestUtils();
 
+  Q_INVOKABLE bool hasImage() const;
+
   Q_INVOKABLE void copyToClipboard(const QString& mimeType,
                                    const QString& data);
 
diff --git a/shared/browser/oxide_web_context_menu.cc b/shared/browser/oxide_web_context_menu.cc
index 718b7f9..6efa9f2 100644
--- a/shared/browser/oxide_web_context_menu.cc
+++ b/shared/browser/oxide_web_context_menu.cc
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -79,6 +79,13 @@ void WebContextMenu::Close() {
       content::BrowserThread::UI, FROM_HERE, this);
 }
 
+void WebContextMenu::CopyImage() const {
+  if ((params_.media_type == blink::WebContextMenuData::MediaTypeCanvas) ||
+      (params_.media_type == blink::WebContextMenuData::MediaTypeImage)) {
+    render_frame_host_->GetRenderViewHost()->CopyImageAt(params_.x, params_.y);
+  }
+}
+
 void WebContextMenu::SaveLink() const {
   content::BrowserContext* context = web_contents()->GetBrowserContext();
   content::DownloadManager* dlm =
diff --git a/shared/browser/oxide_web_context_menu.h b/shared/browser/oxide_web_context_menu.h
index 24f9277..8ca6d35 100644
--- a/shared/browser/oxide_web_context_menu.h
+++ b/shared/browser/oxide_web_context_menu.h
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -56,6 +56,7 @@ class OXIDE_SHARED_EXPORT WebContextMenu : public content::WebContentsObserver {
 
   content::ContextMenuParams params_;
 
+  void CopyImage() const;
   void SaveLink() const;
   void SaveMedia() const;