Merge lp:~osomon/oxide/thumbnails into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Expose an asynchronous API on WebView to request a thumbnail.

[lp:~osomon/oxide/thumbnails]

455. By Olivier Tilloy on 2014-04-10

Merge the latest changes from trunk.

456. By Olivier Tilloy on 2014-04-10

Use the physical size of the view in pixels instead of the DPI aware bounds.

457. By Olivier Tilloy on 2014-04-10

Scale down using bilinear filtering.

458. By Olivier Tilloy on 2014-04-10

Clip scrollbars only when overlay scrollbars are not enabled.

459. By Olivier Tilloy on 2014-04-10

Add some unit tests for thumbnailing.

460. By Olivier Tilloy on 2014-04-29

Merge the latest changes from trunk and resolve a conflict.

461. By Olivier Tilloy on 2014-04-29

Match API changes in trunk.

462. By Olivier Tilloy on 2014-05-28

Merge the latest changes from trunk and resolve a bunch of conflicts.

463. By Olivier Tilloy on 2014-05-28

Add warning to make it clear that RenderWidgetHostView::CopyFromCompositingSurface(…) is not implemented.

464. By Olivier Tilloy on 2014-06-02

Merge the latest changes from trunk and resolve a bunch of conflicts.

Unmerged revisions

464. By Olivier Tilloy on 2014-06-02

Merge the latest changes from trunk and resolve a bunch of conflicts.

463. By Olivier Tilloy on 2014-05-28

Add warning to make it clear that RenderWidgetHostView::CopyFromCompositingSurface(…) is not implemented.

462. By Olivier Tilloy on 2014-05-28

Merge the latest changes from trunk and resolve a bunch of conflicts.

461. By Olivier Tilloy on 2014-04-29

Match API changes in trunk.

460. By Olivier Tilloy on 2014-04-29

Merge the latest changes from trunk and resolve a conflict.

459. By Olivier Tilloy on 2014-04-10

Add some unit tests for thumbnailing.

458. By Olivier Tilloy on 2014-04-10

Clip scrollbars only when overlay scrollbars are not enabled.

457. By Olivier Tilloy on 2014-04-10

Scale down using bilinear filtering.

456. By Olivier Tilloy on 2014-04-10

Use the physical size of the view in pixels instead of the DPI aware bounds.

455. By Olivier Tilloy on 2014-04-10

Merge the latest changes from trunk.

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2014-05-30 08:58:49 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2014-06-02 08:50:28 +0000
@@ -17,17 +17,19 @@
 
 #include "oxide_qt_web_view.h"
 
+#include <QImage>
 #include <QKeyEvent>
 #include <QString>
 #include <QtDebug>
 #include <QUrl>
 
 #include "base/strings/utf_string_conversions.h"
-#include "url/gurl.h"
+#include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "net/base/net_errors.h"
-#include "content/public/browser/native_web_keyboard_event.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "url/gurl.h"
 
 #include "qt/core/api/oxideqloadevent.h"
 #include "qt/core/api/oxideqnavigationrequest.h"
@@ -342,11 +344,6 @@
   return view;
 }
 
-// static
-WebView* WebView::Create(WebViewAdapter* adapter) {
-  return new WebView(adapter);
-}
-
 void WebView::HandleKeyboardEvent(content::WebContents* source,
                                   const content::NativeWebKeyboardEvent& event) {
   if (event.skip_in_browser) {
@@ -366,5 +363,28 @@
   adapter_->HandleKeyboardEvent(qevent);
 }
 
+void WebView::GotThumbnail(const GURL& url, const gfx::Size& size,
+                           bool result, const SkBitmap& bitmap) {
+  QUrl qurl(QString::fromStdString(url.spec()));
+  if (result) {
+    QImage thumbnail(static_cast<uchar*>(bitmap.getPixels()),
+                     bitmap.width(), bitmap.height(), QImage::Format_ARGB32);
+    if ((bitmap.width() > size.width()) || (bitmap.height() > size.height())) {
+      // CopyFromBackingStore doesn’t guarantee it will honour the requested size
+      thumbnail = thumbnail.scaled(size.width(), size.height(),
+                                   Qt::IgnoreAspectRatio,
+                                   Qt::SmoothTransformation);
+    }
+    adapter_->GotThumbnail(qurl, thumbnail);
+  } else {
+    adapter_->GotThumbnail(qurl, QImage());
+  }
+}
+
+// static
+WebView* WebView::Create(WebViewAdapter* adapter) {
+  return new WebView(adapter);
+}
+
 } // namespace qt
 } // namespace oxide
 
=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2014-05-30 08:58:49 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2014-06-02 08:50:28 +0000
@@ -110,6 +110,9 @@
   void HandleKeyboardEvent(content::WebContents* source,
                            const content::NativeWebKeyboardEvent& event);
 
+  void GotThumbnail(const GURL& url, const gfx::Size& size,
+                    bool result, const SkBitmap& bitmap) FINAL;
+
   WebViewAdapter* adapter_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebView);
 
=== modified file 'qt/core/glue/oxide_qt_web_view_adapter.cc'
--- qt/core/glue/oxide_qt_web_view_adapter.cc	2014-05-30 08:53:36 +0000
+++ qt/core/glue/oxide_qt_web_view_adapter.cc	2014-06-02 08:50:28 +0000
@@ -273,5 +273,9 @@
   priv->UpdateWebPreferences();
 }
 
+void WebViewAdapter::requestThumbnail(const QSize& size) const {
+  priv->RequestThumbnail(gfx::Size(size.width(), size.height()));
+}
+
 } // namespace qt
 } // namespace oxide
 
=== modified file 'qt/core/glue/oxide_qt_web_view_adapter.h'
--- qt/core/glue/oxide_qt_web_view_adapter.h	2014-05-30 08:58:49 +0000
+++ qt/core/glue/oxide_qt_web_view_adapter.h	2014-06-02 08:50:28 +0000
@@ -30,6 +30,7 @@
 #include "qt/core/glue/oxide_qt_javascript_dialog_delegate.h"
 
 QT_BEGIN_NAMESPACE
+class QImage;
 class QKeyEvent;
 class QSize;
 QT_END_NAMESPACE
@@ -107,6 +108,8 @@
 
   void updateWebPreferences();
 
+  void requestThumbnail(const QSize& size) const;
+
  protected:
   WebViewAdapter(QObject* q);
 
@@ -175,6 +178,8 @@
 
   virtual void HandleKeyboardEvent(QKeyEvent* event) = 0;
 
+  virtual void GotThumbnail(const QUrl& url, const QImage& thumbnail) = 0;
+
   QScopedPointer<WebView> priv;
   QList<ScriptMessageHandlerAdapter *> message_handlers_;
   QScopedPointer<ConstructProperties> construct_props_;
 
=== modified file 'qt/quick/CMakeLists.txt'
--- qt/quick/CMakeLists.txt	2014-04-23 21:36:15 +0000
+++ qt/quick/CMakeLists.txt	2014-06-02 08:50:28 +0000
@@ -56,6 +56,7 @@
     api/oxideqquickwebcontext.cc
     api/oxideqquickwebcontextdelegateworker.cc
     api/oxideqquickwebframe.cc
+    api/oxideqquickwebthumbnail.cc
     api/oxideqquickwebview.cc
     api/oxidequseragentoverriderequest.cc
     oxide_qml_plugin.cc
 
=== added file 'qt/quick/api/oxideqquickwebthumbnail.cc'
--- qt/quick/api/oxideqquickwebthumbnail.cc	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquickwebthumbnail.cc	2014-06-02 08:50:28 +0000
@@ -0,0 +1,54 @@
+// 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 "oxideqquickwebthumbnail_p.h"
+#include "oxideqquickwebthumbnail_p_p.h"
+
+OxideQQuickWebThumbnailPrivate::OxideQQuickWebThumbnailPrivate(
+    const QUrl& url, const QImage& thumbnail) :
+    url_(url),
+    thumbnail_(thumbnail) {}
+
+OxideQQuickWebThumbnail::OxideQQuickWebThumbnail(
+    const QUrl& url, const QImage& thumbnail) :
+    d_ptr(new OxideQQuickWebThumbnailPrivate(url, thumbnail)) {}
+
+OxideQQuickWebThumbnail::~OxideQQuickWebThumbnail() {}
+
+const QUrl& OxideQQuickWebThumbnail::url() const {
+  Q_D(const OxideQQuickWebThumbnail);
+
+  return d->url_;
+}
+
+int OxideQQuickWebThumbnail::width() const {
+  Q_D(const OxideQQuickWebThumbnail);
+
+  return d->thumbnail_.width();
+}
+
+int OxideQQuickWebThumbnail::height() const {
+  Q_D(const OxideQQuickWebThumbnail);
+
+  return d->thumbnail_.height();
+}
+
+void OxideQQuickWebThumbnail::save(const QString& fileName) const {
+  Q_D(const OxideQQuickWebThumbnail);
+
+  d->thumbnail_.save(fileName);
+}
 
=== added file 'qt/quick/api/oxideqquickwebthumbnail_p.h'
--- qt/quick/api/oxideqquickwebthumbnail_p.h	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquickwebthumbnail_p.h	2014-06-02 08:50:28 +0000
@@ -0,0 +1,59 @@
+// 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_QT_QUICK_API_WEB_THUMBNAIL_P_H_
+#define _OXIDE_QT_QUICK_API_WEB_THUMBNAIL_P_H_
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QtQml>
+#include <QUrl>
+
+QT_BEGIN_NAMESPACE
+class QImage;
+class QString;
+QT_END_NAMESPACE
+
+class OxideQQuickWebThumbnailPrivate;
+
+class OxideQQuickWebThumbnail Q_DECL_FINAL : public QObject {
+  Q_OBJECT
+  Q_PROPERTY(QUrl url READ url CONSTANT FINAL)
+  Q_PROPERTY(int width READ width CONSTANT FINAL)
+  Q_PROPERTY(int height READ height CONSTANT FINAL)
+
+ public:
+  OxideQQuickWebThumbnail(const QUrl& url, const QImage& thumbnail);
+  ~OxideQQuickWebThumbnail();
+
+  const QUrl& url() const;
+  int width() const;
+  int height() const;
+
+ public Q_SLOTS:
+  void save(const QString& fileName) const;
+
+ private:
+  QScopedPointer<OxideQQuickWebThumbnailPrivate> d_ptr;
+
+  Q_DECLARE_PRIVATE(OxideQQuickWebThumbnail)
+  Q_DISABLE_COPY(OxideQQuickWebThumbnail)
+};
+
+QML_DECLARE_TYPE(OxideQQuickWebThumbnail)
+
+#endif // _OXIDE_QT_QUICK_API_WEB_THUMBNAIL_P_H_
 
=== added file 'qt/quick/api/oxideqquickwebthumbnail_p_p.h'
--- qt/quick/api/oxideqquickwebthumbnail_p_p.h	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquickwebthumbnail_p_p.h	2014-06-02 08:50:28 +0000
@@ -0,0 +1,41 @@
+// 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_QT_QUICK_API_WEB_THUMBNAIL_P_P_H_
+#define _OXIDE_QT_QUICK_API_WEB_THUMBNAIL_P_P_H_
+
+#include <QImage>
+#include <QtGlobal>
+#include <QUrl>
+
+class OxideQQuickWebThumbnail;
+
+class OxideQQuickWebThumbnailPrivate Q_DECL_FINAL {
+  Q_DECLARE_PUBLIC(OxideQQuickWebThumbnail)
+
+ private:
+  OxideQQuickWebThumbnailPrivate(const QUrl& url, const QImage& thumbnail);
+
+  OxideQQuickWebThumbnail* q_ptr;
+
+  QUrl url_;
+  QImage thumbnail_;
+
+  Q_DISABLE_COPY(OxideQQuickWebThumbnailPrivate);
+};
+
+#endif // _OXIDE_QT_QUICK_API_WEB_THUMBNAIL_P_P_H_
 
=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2014-05-31 08:30:20 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2014-06-02 08:50:28 +0000
@@ -44,6 +44,7 @@
 #include "oxideqquickwebcontext_p_p.h"
 #include "oxideqquickwebframe_p.h"
 #include "oxideqquickwebframe_p_p.h"
+#include "oxideqquickwebthumbnail_p.h"
 
 QT_USE_NAMESPACE
 
@@ -299,6 +300,13 @@
   w->sendEvent(q, event);
 }
 
+void OxideQQuickWebViewPrivate::GotThumbnail(const QUrl& url,
+                                             const QImage& thumbnail) {
+  Q_Q(OxideQQuickWebView);
+
+  emit q->gotThumbnail(new OxideQQuickWebThumbnail(url, thumbnail));
+}
+
 void OxideQQuickWebViewPrivate::completeConstruction() {
   Q_Q(OxideQQuickWebView);
 
@@ -877,4 +885,10 @@
   d->loadHtml(html, baseUrl);
 }
 
+void OxideQQuickWebView::requestThumbnail(const QSize& size) {
+  Q_D(OxideQQuickWebView);
+
+  d->requestThumbnail(size);
+}
+
 #include "moc_oxideqquickwebview_p.cpp"
 
=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2014-05-30 08:58:49 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2014-06-02 08:50:28 +0000
@@ -28,6 +28,7 @@
 
 QT_BEGIN_NAMESPACE
 class QQmlComponent;
+class QSize;
 QT_END_NAMESPACE
 
 QT_USE_NAMESPACE
@@ -41,6 +42,7 @@
 class OxideQQuickScriptMessageHandler;
 class OxideQQuickWebContext;
 class OxideQQuickWebFrame;
+class OxideQQuickWebThumbnail;
 class OxideQQuickWebView;
 class OxideQQuickWebViewPrivate;
 
@@ -172,6 +174,7 @@
   void stop();
   void reload();
   void loadHtml(const QString& html, const QUrl& baseUrl = QUrl());
+  void requestThumbnail(const QSize& size);
 
  Q_SIGNALS:
   void urlChanged();
@@ -203,6 +206,7 @@
                                 const QString& message,
                                 int lineNumber,
                                 const QString& sourceId);
+  void gotThumbnail(OxideQQuickWebThumbnail* thumbnail);
 
  private:
   Q_PRIVATE_SLOT(d_func(), void contextConstructed());
 
=== modified file 'qt/quick/api/oxideqquickwebview_p_p.h'
--- qt/quick/api/oxideqquickwebview_p_p.h	2014-05-30 08:58:49 +0000
+++ qt/quick/api/oxideqquickwebview_p_p.h	2014-06-02 08:50:28 +0000
@@ -100,6 +100,8 @@
 
   void HandleKeyboardEvent(QKeyEvent *event) Q_DECL_FINAL;
 
+  void GotThumbnail(const QUrl& url, const QImage& thumbnail) Q_DECL_FINAL;
+
   void completeConstruction();
 
   static void messageHandler_append(
 
=== modified file 'qt/quick/oxide_qml_plugin.cc'
--- qt/quick/oxide_qml_plugin.cc	2014-05-07 14:06:05 +0000
+++ qt/quick/oxide_qml_plugin.cc	2014-06-02 08:50:28 +0000
@@ -35,6 +35,7 @@
 #include "qt/quick/api/oxideqquickwebcontext_p.h"
 #include "qt/quick/api/oxideqquickwebcontextdelegateworker_p.h"
 #include "qt/quick/api/oxideqquickwebframe_p.h"
+#include "qt/quick/api/oxideqquickwebthumbnail_p.h"
 #include "qt/quick/api/oxideqquickwebview_p.h"
 
 QT_USE_NAMESPACE
@@ -78,6 +79,8 @@
         "OutgoingMessageRequests are created automatically by WebFrame.sendMessage");
     qmlRegisterUncreatableType<OxideQQuickWebFrame>(uri, 1, 0, "WebFrame",
         "Frames are created automatically by Oxide to represent frames in the renderer");
+    qmlRegisterUncreatableType<OxideQQuickWebThumbnail>(uri, 1, 0, "WebThumbnail",
+        "WebThumbnails are created automatically by Oxide");
 
     qmlRegisterType<OxideQQuickScriptMessageHandler>(uri, 1, 0, "ScriptMessageHandler");
     qmlRegisterType<OxideQQuickUserScript>(uri, 1, 0, "UserScript");
 
=== added file 'qt/tests/qmltests/api/tst_WebView_thumbnail.qml'
--- qt/tests/qmltests/api/tst_WebView_thumbnail.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_thumbnail.qml	2014-06-02 08:50:28 +0000
@@ -0,0 +1,44 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  focus: true
+  width: 200
+  height: 200
+
+  SignalSpy {
+    id: spy
+    target: webView
+    signalName: "gotThumbnail"
+  }
+
+  TestCase {
+    name: "WebView_thumbnail"
+    when: windowShown
+
+    function test_requestThumbnail_data() {
+      return [
+        { requested: Qt.size(50, 50), expected: Qt.size(50, 50) },
+        { requested: Qt.size(50, 75), expected: Qt.size(50, 75) },
+        { requested: Qt.size(75, 50), expected: Qt.size(75, 50) },
+        // Account for the clipping of scrollbars (15px, assuming this test
+        // will be run on desktop where overlay scrollbars are not enabled).
+        { requested: Qt.size(300, 300), expected: Qt.size(185, 185) }
+      ];
+    }
+
+    function test_requestThumbnail(data) {
+      webView.url = "http://localhost:8080/empty.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+      webView.requestThumbnail(data.requested);
+      spy.wait();
+      var thumbnail = spy.signalArguments[spy.count - 1][0];
+      compare(thumbnail.url, webView.url);
+      compare(thumbnail.width, data.expected.width);
+      compare(thumbnail.height, data.expected.height);
+    }
+  }
+}
 
=== modified file 'shared/browser/oxide_render_widget_host_view.cc'
--- shared/browser/oxide_render_widget_host_view.cc	2014-05-19 10:10:11 +0000
+++ shared/browser/oxide_render_widget_host_view.cc	2014-06-02 08:50:28 +0000
@@ -270,6 +270,7 @@
     const gfx::Size& dst_size,
     const base::Callback<void(bool, const SkBitmap&)>& callback,
     const SkBitmap::Config config) {
+  NOTIMPLEMENTED();
   callback.Run(false, SkBitmap());
 }
 
 
=== modified file 'shared/browser/oxide_render_widget_host_view.h'
--- shared/browser/oxide_render_widget_host_view.h	2014-05-19 09:32:11 +0000
+++ shared/browser/oxide_render_widget_host_view.h	2014-06-02 08:50:28 +0000
@@ -103,6 +103,8 @@
   // content::RenderWidgetHostView
   content::RenderWidgetHost* GetRenderWidgetHost() const FINAL;
 
+  virtual gfx::Size GetPhysicalBackingSize() const = 0;
+
   void SetBounds(const gfx::Rect& rect) FINAL;
 
  protected:
 
=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2014-05-31 08:35:36 +0000
+++ shared/browser/oxide_web_view.cc	2014-06-02 08:50:28 +0000
@@ -43,14 +43,15 @@
 #include "content/public/common/url_constants.h"
 #include "net/base/net_errors.h"
 #include "ui/base/window_open_disposition.h"
+#include "ui/gfx/scrollbar_size.h"
 #include "url/gurl.h"
 #include "webkit/common/webpreferences.h"
 
 #include "shared/common/oxide_content_client.h"
 
-#include "oxide_browser_process_main.h"
 #include "oxide_content_browser_client.h"
 #include "oxide_file_picker.h"
+#include "oxide_form_factor.h"
 #include "oxide_render_widget_host_view.h"
 #include "oxide_web_contents_view.h"
 #include "oxide_web_frame.h"
@@ -938,4 +939,38 @@
   return false;
 }
 
+void WebView::RequestThumbnail(const gfx::Size& size) {
+  RenderWidgetHostView* rwhv = static_cast<RenderWidgetHostView *>(
+      web_contents_->GetRenderWidgetHostView());
+  if (!rwhv) {
+    return;
+  }
+  gfx::Rect copy_rect(rwhv->GetPhysicalBackingSize());
+
+  if (GetFormFactorHint() == FORM_FACTOR_DESKTOP) {
+    // Clip the pixels that will commonly hold a scrollbar,
+    // which looks bad in thumbnails.
+    int scrollbar_size = gfx::scrollbar_size();
+    copy_rect.Inset(0, 0, scrollbar_size, scrollbar_size);
+  }
+
+  // Crop the target region to match the aspect ratio of the requested size.
+  int c1 = size.width() * copy_rect.height();
+  int c2 = copy_rect.width() * size.height();
+  if (c1 > c2) {
+    copy_rect.set_height(c2 / size.width());
+  } else if (c1 < c2) {
+    copy_rect.set_width(c1 / size.height());
+  }
+
+  if (!copy_rect.IsEmpty()) {
+    content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
+    rvh->CopyFromBackingStore(
+        copy_rect, size,
+        base::Bind(
+            &WebView::GotThumbnail, base::Unretained(this), GetURL(), size),
+        SkBitmap::kARGB_8888_Config);
+  }
+}
+
 } // namespace oxide
 
=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2014-05-30 08:58:49 +0000
+++ shared/browser/oxide_web_view.h	2014-06-02 08:50:28 +0000
@@ -41,6 +41,7 @@
 #include "shared/common/oxide_message_enums.h"
 
 class GURL;
+class SkBitmap;
 
 namespace gfx {
 class Size;
@@ -170,6 +171,8 @@
 
   virtual bool CanCreateWindows() const;
 
+  void RequestThumbnail(const gfx::Size& size);
+
  protected:
   WebView();
 
@@ -307,6 +310,9 @@
   virtual WebView* CreateNewWebView(const gfx::Rect& initial_pos,
                                     WindowOpenDisposition disposition);
 
+  virtual void GotThumbnail(const GURL& url, const gfx::Size& size,
+                            bool result, const SkBitmap& bitmap) = 0;
+
   scoped_ptr<content::WebContentsImpl> web_contents_;
   WebViewContentsHelper* web_contents_helper_;