Merge lp:~uriboni/oxide/find-in-page into lp:~oxide-developers/oxide/oxide.trunk

[Ugo Riboni]

Adds a new API to allow searching text within a page.

[lp:~uriboni/oxide/find-in-page]

1063. By Ugo Riboni on 2015-05-04

Remove unrelated changes to cmake file

1064. By Ugo Riboni on 2015-05-04

Minor code style fixes

1065. By Ugo Riboni on 2015-05-11

Make findInPage group property constant to prevent non-notifyable property warnings

1066. By Ugo Riboni on 2015-05-12

Merge changes from trunk

[Olivier Tilloy (osomon)]

The API looks good to me (I’ll let Chris comment on the actual implementation). Here are a few comments, most of them on the unit tests:

 - In test_case_insensitive(), the second test should be on a different string, otherwise the count might not have been updated yet.

 - In test_new_text_resets_count() and in test_navigation_does_not_reset(), next() should be called after verifying that the count is 2.

 - In test_find_on_invalid_page(), waiting for a successful load doesn’t look right. Shouldn’t you use webView.waitForLoadFailed() ?

 - In test_navigation_does_not_reset(), the comparison of text to "dolor" doesn’t need a tryCompare(), it should be a simple compare().

 - In OxideQQuickWebViewFindInPage’s constructor, the explicit initialization of text_ is useless.

 - In the implementation of WebView::findInPage() and other methods, please avoid the use of a return statement on the same line as the condition, and always use curly braces, even for one-liner if blocks.

[lp:~uriboni/oxide/find-in-page]

1067. By Ugo Riboni on 2015-05-12

Fix code style (braces, indentation)

1068. By Ugo Riboni on 2015-05-12

Improve some tests

1069. By Ugo Riboni on 2015-05-12

Remove useless initialization

1070. By Ugo Riboni on 2015-05-12

Add explanatory comment and fix indentation

1071. By Ugo Riboni on 2015-05-14

Merge changes from trunk

[Chris Coulson (chrisccoulson)]

Thanks for working on this. I have some general comments:

- I think I'd prefer WebView.findController and FindController for the corresponding class name in QML

- The implementation doesn't need to live in qt/quick/api - it should go in qt/core/api as OxideQFindController, as it doesn't really have any dependencies outside of the core library or QtCore and the implementation could be shared with a QWidget port - if someone ever decides it would be a good idea to write one :)

- As we want to open up the C++ API in the future, the data members on the public class should be in a private class.

I've also left some comments inline.

review: Needs Fixing

[lp:~uriboni/oxide/find-in-page]

1072. By Ugo Riboni on 2015-05-19

Refactor all the logic into an OxideQFindController class owned by oxide::qt::WebView. The QML API merely exposes it through the renamed findController property. Address other minor issues from code review.

1073. By Ugo Riboni on 2015-05-19

Merge changes from trunk

1074. By Ugo Riboni on 2015-05-20

Move all non-QT code to oxide::WebView

[Ugo Riboni (uriboni)]

I think all your comments should be addressed at this point, except some to which I replied inline.

[Chris Coulson (chrisccoulson)]

Thanks. There's a few stylistic nits (eg, 4-space indents in some places) and some other things (eg, the constructor for OxideQFindController shouldn't be exported). The API looks like it's fine now.

I'm going to approve this though, as I'm currently working on re-architecting oxide::WebView which is probably going to be quite disruptive to this branch - I've already created some merge conflicts with http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/revision/1087, which I'll fix up

review: Approve

[Ugo Riboni (uriboni)]

> Thanks. There's a few stylistic nits (eg, 4-space indents in some places) and
> some other things (eg, the constructor for OxideQFindController shouldn't be
> exported). The API looks like it's fine now.
>
> I'm going to approve this though, as I'm currently working on re-architecting
> oxide::WebView which is probably going to be quite disruptive to this branch -
> I've already created some merge conflicts with http://bazaar.launchpad.net
> /~oxide-developers/oxide/oxide.trunk/revision/1087, which I'll fix up

Thanks Chris.
Just to be clear, is there any further action needed from me on this branch ?

[Chris Coulson (chrisccoulson)]

There isn't - I'm going to clean up the merge conflicts I've created and then merge it in for you.

Thanks!

=== added file 'qt/core/api/oxideqfindcontroller.cc'
--- qt/core/api/oxideqfindcontroller.cc	1970-01-01 00:00:00 +0000
+++ qt/core/api/oxideqfindcontroller.cc	2015-05-20 22:10:39 +0000
@@ -0,0 +1,97 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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 "oxideqfindcontroller.h"
+#include "oxideqfindcontroller_p.h"
+
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "qt/core/browser/oxide_qt_web_view.h"
+#include "shared/browser/oxide_web_view.h"
+
+OxideQFindControllerPrivate::OxideQFindControllerPrivate(oxide::WebView* webview) :
+    case_sensitive_(false),
+    count_(0),
+    current_(0),
+    request_id_(0),
+    webview_(webview) {}
+
+OxideQFindControllerPrivate::~OxideQFindControllerPrivate() {}
+
+OxideQFindController::OxideQFindController(oxide::WebView* webview) :
+    QObject(nullptr),
+    d_ptr(new OxideQFindControllerPrivate(webview)) {
+}
+
+OxideQFindController::~OxideQFindController() {}
+
+QString OxideQFindController::text() const {
+  Q_D(const OxideQFindController);
+
+  return QString::fromStdString(d->webview_->GetFindInPageText());
+}
+
+void OxideQFindController::setText(const QString& newText) {
+  Q_D(OxideQFindController);
+
+  if (newText == text()) {
+    return;
+  }
+
+  d->webview_->SetFindInPageText(newText.toStdString());
+  emit textChanged();
+}
+
+bool OxideQFindController::caseSensitive() const {
+  Q_D(const OxideQFindController);
+
+  return d->webview_->GetFindInPageCaseSensitive();
+}
+
+void OxideQFindController::setCaseSensitive(bool newCaseSensitive) {
+  Q_D(OxideQFindController);
+
+  if (newCaseSensitive == caseSensitive()) {
+      return;
+  }
+
+  d->webview_->SetFindInPageCaseSensitive(newCaseSensitive);
+  emit caseSensitiveChanged();
+}
+
+int OxideQFindController::count() const {
+  Q_D(const OxideQFindController);
+
+  return d->webview_->GetFindInPageCount();
+}
+
+int OxideQFindController::current() const {
+  Q_D(const OxideQFindController);
+
+  return d->webview_->GetFindInPageCurrent();
+}
+
+void OxideQFindController::next() {
+  Q_D(OxideQFindController);
+
+  d->webview_->FindInPageNext();
+}
+
+void OxideQFindController::previous() {
+  Q_D(OxideQFindController);
+
+  d->webview_->FindInPagePrevious();
+}

=== added file 'qt/core/api/oxideqfindcontroller.h'
--- qt/core/api/oxideqfindcontroller.h	1970-01-01 00:00:00 +0000
+++ qt/core/api/oxideqfindcontroller.h	2015-05-20 22:10:39 +0000
@@ -0,0 +1,71 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_Q_FIND_CONTROLLER
+#define OXIDE_Q_FIND_CONTROLLER
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QString>
+#include <QtGlobal>
+
+class OxideQFindControllerPrivate;
+
+namespace oxide {
+  class WebView;
+  namespace qt {
+      class WebView;
+  }
+}
+
+class Q_DECL_EXPORT OxideQFindController : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
+    Q_PROPERTY(bool caseSensitive READ caseSensitive WRITE setCaseSensitive NOTIFY caseSensitiveChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(int current READ current NOTIFY currentChanged)
+
+    Q_DECLARE_PRIVATE(OxideQFindController)
+    Q_DISABLE_COPY(OxideQFindController)
+
+   public:
+    OxideQFindController(oxide::WebView* webview);
+    ~OxideQFindController();
+
+    QString text() const;
+    void setText(const QString& text);
+    bool caseSensitive() const;
+    void setCaseSensitive(bool caseSensitive);
+    int count() const;
+    int current() const;
+
+    Q_INVOKABLE void next();
+    Q_INVOKABLE void previous();
+
+   Q_SIGNALS:
+    void textChanged() const;
+    void caseSensitiveChanged() const;
+    void countChanged() const;
+    void currentChanged() const;
+
+   private:
+    QScopedPointer<OxideQFindControllerPrivate> d_ptr;
+
+   friend class oxide::qt::WebView;
+};
+
+#endif // OXIDE_Q_FIND_CONTROLLER

=== added file 'qt/core/api/oxideqfindcontroller_p.h'
--- qt/core/api/oxideqfindcontroller_p.h	1970-01-01 00:00:00 +0000
+++ qt/core/api/oxideqfindcontroller_p.h	2015-05-20 22:10:39 +0000
@@ -0,0 +1,46 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 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_CORE_API_FIND_CONTROLLER_P_H_
+#define _OXIDE_QT_CORE_API_FIND_CONTROLLER_P_H_
+
+#include <QtGlobal>
+#include <QString>
+
+namespace oxide {
+  class WebView;
+}
+
+class OxideQFindControllerPrivate {
+ public:
+  virtual ~OxideQFindControllerPrivate();
+
+ private:
+  OxideQFindControllerPrivate(oxide::WebView* webview);
+
+  QString text_;
+  bool case_sensitive_;
+  int count_;
+  int current_;
+  int request_id_;
+  oxide::WebView* webview_;
+
+ friend class OxideQFindController;
+};
+
+#endif // _OXIDE_QT_CORE_API_FIND_CONTROLLER_P_H_
+

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2015-05-11 21:23:12 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2015-05-20 22:10:39 +0000
@@ -67,6 +67,8 @@
 #include "qt/core/api/oxideqcertificateerror_p.h"
 #include "qt/core/api/oxideqsecuritystatus.h"
 #include "qt/core/api/oxideqsecuritystatus_p.h"
+#include "qt/core/api/oxideqfindcontroller.h"
+#include "qt/core/api/oxideqfindcontroller_p.h"
 #include "qt/core/api/oxideqwebpreferences.h"
 #include "qt/core/api/oxideqwebpreferences_p.h"
 #include "qt/core/common/oxide_qt_screen_utils.h"
@@ -1280,6 +1282,18 @@
   Reload();
 }
 
+OxideQFindController* WebView::findInPage() {
+  return find_in_page_controller_.get();
+}
+
+void WebView::OnFindInPageCountChanged() {
+  Q_EMIT find_in_page_controller_->countChanged();
+}
+
+void WebView::OnFindInPageCurrentChanged() {
+  Q_EMIT find_in_page_controller_->currentChanged();
+}
+
 void WebView::loadHtml(const QString& html, const QUrl& base_url) {
   QByteArray encoded_data = html.toUtf8().toPercentEncoding();
   LoadData(std::string(encoded_data.constData(), encoded_data.length()),
@@ -1511,7 +1525,8 @@
     client_(client),
     has_input_method_state_(false),
     qsecurity_status_(
-        OxideQSecurityStatusPrivate::Create(this)) {
+        OxideQSecurityStatusPrivate::Create(this)),
+    find_in_page_controller_(new OxideQFindController(this)) {
   QInputMethod* im = QGuiApplication::inputMethod();
   if (im) {
     connect(im, SIGNAL(visibleChanged()),

=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2015-05-11 21:23:12 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2015-05-20 22:10:39 +0000
@@ -41,6 +41,7 @@
 class QWheelEvent;
 QT_END_NAMESPACE
 
+class OxideQFindController;
 class OxideQSecurityStatus;
 
 namespace oxide {
@@ -156,6 +157,9 @@
 			   const std::string& cookies,
 			   const std::string& referrer) override;
 
+  void OnFindInPageCountChanged() override;
+  void OnFindInPageCurrentChanged() override;
+
   bool ShouldHandleNavigation(const GURL& url,
                               WindowOpenDisposition disposition,
                               bool user_gesture) override;
@@ -231,6 +235,8 @@
   void stop() override;
   void reload() override;
 
+  OxideQFindController* findInPage() override;
+
   void loadHtml(const QString& html, const QUrl& base_url) override;
 
   QList<ScriptMessageHandlerProxyHandle*>& messageHandlers() override;
@@ -291,6 +297,7 @@
   UITouchEventFactory touch_event_factory_;
 
   QSharedPointer<CompositorFrameHandle> compositor_frame_;
+  scoped_ptr<OxideQFindController> find_in_page_controller_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebView);
 };

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2015-05-06 21:13:13 +0000
+++ qt/core/core.gyp	2015-05-20 22:10:39 +0000
@@ -201,6 +201,7 @@
         '<(INTERMEDIATE_DIR)/moc_oxideqnavigationrequest.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqnewviewrequest.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqpermissionrequest.cc',
+        '<(INTERMEDIATE_DIR)/moc_oxideqfindcontroller.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqsecuritystatus.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqsslcertificate.cc',
         '<(INTERMEDIATE_DIR)/moc_oxideqstoragepermissionrequest.cc',
@@ -229,6 +230,9 @@
         'api/oxideqpermissionrequest.cc',
         'api/oxideqpermissionrequest.h',
         'api/oxideqpermissionrequest_p.h',
+        'api/oxideqfindcontroller.cc',
+        'api/oxideqfindcontroller.h',
+        'api/oxideqfindcontroller_p.h',
         'api/oxideqsecuritystatus.cc',
         'api/oxideqsecuritystatus.h',
         'api/oxideqsecuritystatus_p.h',
@@ -279,6 +283,11 @@
           'includes': [ 'moc.gypi' ],
         },
         {
+          'action_name': 'moc_oxideqfindcontroller.cc',
+          'moc_input': 'api/oxideqfindcontroller.h',
+          'includes': [ 'moc.gypi' ],
+        },
+        {
           'action_name': 'moc_oxideqsecuritystatus.cc',
           'moc_input': 'api/oxideqsecuritystatus.h',
           'includes': [ 'moc.gypi' ],

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy.h'
--- qt/core/glue/oxide_qt_web_view_proxy.h	2015-05-06 15:05:53 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy.h	2015-05-20 22:10:39 +0000
@@ -45,6 +45,7 @@
 class QWheelEvent;
 QT_END_NAMESPACE
 
+class OxideQFindController;
 class OxideQNewViewRequest;
 class OxideQSecurityStatus;
 class OxideQWebPreferences;
@@ -101,6 +102,14 @@
   virtual EGLImageKHR GetImageFrame() = 0;
 };
 
+struct FindInPageState {
+  int request_id;
+  QString text;
+  bool case_sensitive;
+  int current;
+  int count;
+};
+
 OXIDE_Q_DECL_PROXY_HANDLE(ScriptMessageHandlerProxy);
 OXIDE_Q_DECL_PROXY_HANDLE(WebContextProxy);
 OXIDE_Q_DECL_PROXY_HANDLE(WebFrameProxy);
@@ -155,6 +164,8 @@
   virtual void stop() = 0;
   virtual void reload() = 0;
 
+  virtual OxideQFindController* findInPage() = 0;
+
   virtual void loadHtml(const QString& html, const QUrl& base_url) = 0;
 
   virtual QList<ScriptMessageHandlerProxyHandle*>& messageHandlers() = 0;

=== modified file 'qt/qmlplugin/oxide_qml_plugin.cc'
--- qt/qmlplugin/oxide_qml_plugin.cc	2015-05-11 21:23:12 +0000
+++ qt/qmlplugin/oxide_qml_plugin.cc	2015-05-20 22:10:39 +0000
@@ -24,6 +24,7 @@
 
 #include "qt/core/api/oxideqcertificateerror.h"
 #include "qt/core/api/oxideqdownloadrequest.h"
+#include "qt/core/api/oxideqfindcontroller.h"
 #include "qt/core/api/oxideqloadevent.h"
 #include "qt/core/api/oxideqnavigationrequest.h"
 #include "qt/core/api/oxideqnewviewrequest.h"
@@ -128,8 +129,12 @@
     qmlRegisterUncreatableType<OxideQQuickLocationBarController, 1>(uri, 1, 7, "LocationBarController",
         "LocationBarController is accessed via WebView.locationBarController");
 
+    qmlRegisterUncreatableType<OxideQFindController>(uri, 1, 8, "FindController",
+        "FindInPage is accessed via WebView.findController");
+
     qmlRegisterUncreatableType<OxideQLoadEvent, 2>(uri, 1, 8, "LoadEvent",
         "LoadEvent is delivered by WebView.loadEvent");
+
     qmlRegisterType<OxideQQuickWebView, 4>(uri, 1, 8, "WebView");
   }
 };

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2015-05-11 15:32:11 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2015-05-20 22:10:39 +0000
@@ -41,6 +41,7 @@
 #include <Qt>
 
 #include "qt/core/api/oxideqcertificateerror.h"
+#include "qt/core/api/oxideqfindcontroller.h"
 #include "qt/core/api/oxideqglobal.h"
 #include "qt/core/api/oxideqloadevent.h"
 #include "qt/core/api/oxideqnewviewrequest.h"
@@ -1744,4 +1745,10 @@
   d->proxy()->prepareToClose();
 }
 
+OxideQFindController* OxideQQuickWebView::findController() const {
+  Q_D(const OxideQQuickWebView);
+
+  return d->proxy()->findInPage();
+}
+
 #include "moc_oxideqquickwebview_p.cpp"

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2015-05-11 15:32:11 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2015-05-20 22:10:39 +0000
@@ -32,6 +32,7 @@
 
 QT_USE_NAMESPACE
 
+class OxideQFindController;
 class OxideQLoadEvent;
 class OxideQNavigationRequest;
 class OxideQNewViewRequest;
@@ -45,6 +46,11 @@
 class OxideQQuickWebViewPrivate;
 class OxideQDownloadRequest;
 class OxideQSecurityStatus;
+namespace oxide {
+    namespace qt {
+        class WebViewProxy;
+    }
+}
 
 class OxideQQuickWebViewAttached : public QObject {
   Q_OBJECT
@@ -107,6 +113,8 @@
 
   Q_PROPERTY(OxideQNewViewRequest* request READ request WRITE setRequest)
 
+  Q_PROPERTY(OxideQFindController* findController READ findController CONSTANT REVISION 4)
+
   // Set at construction time only
   Q_PROPERTY(QString restoreState READ restoreState WRITE setRestoreState REVISION 2)
   Q_PROPERTY(RestoreType restoreType READ restoreType WRITE setRestoreType REVISION 2)
@@ -234,6 +242,8 @@
 
   static OxideQQuickWebViewAttached* qmlAttachedProperties(QObject* object);
 
+  OxideQFindController* findController() const;
+
  public Q_SLOTS:
   void goBack();
   void goForward();

=== added file 'qt/tests/qmltests/api/tst_WebView_findController.html'
--- qt/tests/qmltests/api/tst_WebView_findController.html	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_findController.html	2015-05-20 22:10:39 +0000
@@ -0,0 +1,13 @@
+<html>
+    <head>
+        <meta charset="UTF-8">
+    </head>
+    <body>
+        Lorem ipsum dolor sit Amet, consectetur adipiscing elit.
+        Nam eu venenatis velit.
+        Suspendisse vitae libero rutrum Amet, congue velit quis, fringilla eros.
+        Nulla at semper purus, id scelerisque est.
+        Fusce rhoncus placerat erat ñec ultricies amet.
+        Curabitur mauris. Dolor, facilisis eu tellus vitae, semper iaculis tortor.
+    </body>
+</html>

=== added file 'qt/tests/qmltests/api/tst_WebView_findController.qml'
--- qt/tests/qmltests/api/tst_WebView_findController.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_findController.qml	2015-05-20 22:10:39 +0000
@@ -0,0 +1,152 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.8
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  focus: true
+  width: 200
+  height: 200
+
+  TestCase {
+    name: "findController"
+    when: windowShown
+
+    function init() {
+      webView.findController.text = "";
+      webView.findController.caseSensitive = false;
+
+      // load the page that will be used by most tests
+      webView.url = "http://testsuite/tst_WebView_findController.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+    }
+
+    function test_case_insensitive() {
+      webView.findController.text = "suspendisse";
+      tryCompare(webView.findController, "count", 1);
+
+      webView.findController.text = "aMet";
+      tryCompare(webView.findController, "count", 3);
+    }
+
+    function test_case_sensitive() {
+      webView.findController.caseSensitive = true;
+
+      webView.findController.text = "Suspendisse";
+      tryCompare(webView.findController, "count", 1);
+
+      webView.findController.text = "suspendisse";
+      tryCompare(webView.findController, "count", 0);
+    }
+
+    function test_change_case_sensitivity() {
+      webView.findController.caseSensitive = true;
+
+      webView.findController.text = "Dolor";
+      tryCompare(webView.findController, "count", 1);
+
+      webView.findController.caseSensitive = false;
+      tryCompare(webView.findController, "count", 2);
+    }
+
+    function test_movement() {
+      webView.findController.text = "dolor";
+      tryCompare(webView.findController, "count", 2);
+      tryCompare(webView.findController, "current", 1);
+
+      webView.findController.next();
+      tryCompare(webView.findController, "count", 2);
+      tryCompare(webView.findController, "current", 2);
+
+      webView.findController.previous();
+      tryCompare(webView.findController, "count", 2);
+      tryCompare(webView.findController, "current", 1);
+    }
+
+    function test_movement_wraps() {
+      webView.findController.text = "dolor";
+      tryCompare(webView.findController, "count", 2);
+      tryCompare(webView.findController, "current", 1);
+
+      webView.findController.next();
+      webView.findController.next();
+      tryCompare(webView.findController, "current", 1);
+
+      webView.findController.previous();
+      webView.findController.previous();
+      tryCompare(webView.findController, "current", 1);
+    }
+
+    function test_clear() {
+      webView.findController.text = "dolor";
+      tryCompare(webView.findController, "count", 2);
+
+      webView.findController.text = "";
+      tryCompare(webView.findController, "count", 0);
+      tryCompare(webView.findController, "current", 0);
+    }
+
+    function test_new_text_resets_count() {
+      webView.findController.text = "dolor";
+      tryCompare(webView.findController, "count", 2);
+      webView.findController.next();
+      tryCompare(webView.findController, "current", 2);
+
+      webView.findController.text = "suspendisse";
+      tryCompare(webView.findController, "count", 1);
+      tryCompare(webView.findController, "current", 1);
+    }
+
+    function test_not_found_resets_count() {
+      webView.findController.text = "dolor";
+      tryCompare(webView.findController, "count", 2);
+
+      webView.findController.text = "i_am_not_there";
+      tryCompare(webView.findController, "count", 0);
+      tryCompare(webView.findController, "current", 0);
+    }
+
+    function test_find_non_latin() {
+      webView.findController.text = "ñec";
+      tryCompare(webView.findController, "count", 1);
+    }
+
+    function test_find_on_invalid_page() {
+      webView.url = "http://testsuite/tst_invalid_page.html";
+      // verify successful load because the server returns a 404 page apparently
+      // and that does not count as a failure
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+
+      webView.findController.text = "hello";
+      tryCompare(webView.findController, "count", 0);
+      tryCompare(webView.findController, "current", 0);
+    }
+
+    function test_navigation_does_not_reset() {
+      webView.findController.text = "dolor";
+      tryCompare(webView.findController, "count", 2);
+      webView.findController.next();
+      tryCompare(webView.findController, "current", 2);
+
+      // Verify that when navigating to another page the search does not
+      // reset, it is the user responsibility to cancel it and restart it
+      webView.url = "http://testsuite/tst_WebView_findControllerManyResults.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+      compare(webView.findController.text, "dolor");
+      tryCompare(webView.findController, "count", 2);
+      tryCompare(webView.findController, "current", 2);
+
+      webView.findController.text = "";
+      tryCompare(webView.findController, "count", 0);
+      tryCompare(webView.findController, "current", 0);
+
+      webView.findController.text = "dolor";
+      tryCompare(webView.findController, "count", 20);
+      tryCompare(webView.findController, "current", 1);
+    }
+  }
+}

=== added file 'qt/tests/qmltests/api/tst_WebView_findControllerManyResults.html'
--- qt/tests/qmltests/api/tst_WebView_findControllerManyResults.html	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_findControllerManyResults.html	2015-05-20 22:10:39 +0000
@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <meta charset="UTF-8">
+    </head>
+    <body>
+        Lorem ipsum dolor dolor dolor dolor dolor dolor dolor dolor dolor dolor
+        dolor dolor dolor dolor dolor dolor dolor dolor dolor dolor sit amet.
+    </body>
+</html>

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2015-05-15 14:49:32 +0000
+++ shared/browser/oxide_web_view.cc	2015-05-20 22:10:39 +0000
@@ -76,6 +76,8 @@
 #include "shared/common/oxide_event_utils.h"
 #include "shared/common/oxide_messages.h"
 
+#include "third_party/WebKit/public/web/WebFindOptions.h"
+
 #include "oxide_browser_context.h"
 #include "oxide_browser_process_main.h"
 #include "oxide_content_browser_client.h"
@@ -753,6 +755,25 @@
   return IsFullscreen();
 }
 
+void WebView::FindReply(content::WebContents* web_contents,
+                        int request_id,
+                        int number_of_matches,
+                        const gfx::Rect& selection_rect,
+                        int active_match_ordinal,
+                        bool final_update) {
+  if (active_match_ordinal != -1 &&
+      find_in_page_.current != active_match_ordinal)  {
+      find_in_page_.current = active_match_ordinal;
+      OnFindInPageCurrentChanged();
+  }
+
+  if (number_of_matches != -1 &&
+      find_in_page_.count != number_of_matches)  {
+      find_in_page_.count = number_of_matches;
+      OnFindInPageCountChanged();
+  }
+}
+
 void WebView::RequestMediaAccessPermission(
     content::WebContents* source,
     const content::MediaStreamRequest& request,
@@ -1222,6 +1243,9 @@
 void WebView::OnPrepareToCloseResponse(bool proceed) {}
 void WebView::OnCloseRequested() {}
 
+void WebView::OnFindInPageCountChanged() {}
+void WebView::OnFindInPageCurrentChanged() {}
+
 WebView::WebView()
     : text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       show_ime_if_needed_(false),
@@ -1636,6 +1660,84 @@
   rvh->OnWebkitPreferencesChanged();
 }
 
+int WebView::GetFindInPageCount() const {
+  return find_in_page_.count;
+}
+
+int WebView::GetFindInPageCurrent() const {
+  return find_in_page_.current;
+}
+
+std::string WebView::GetFindInPageText() const {
+  return find_in_page_.text;
+}
+
+bool WebView::GetFindInPageCaseSensitive() const {
+  return find_in_page_.case_sensitive;
+}
+
+void WebView::SetFindInPageText(const std::string& text) {
+  find_in_page_.text = text;
+  RestartFindInPage();
+}
+
+void WebView::SetFindInPageCaseSensitive(bool case_sensitive) {
+  find_in_page_.case_sensitive = case_sensitive;
+  RestartFindInPage();
+}
+
+void WebView::RestartFindInPage() {
+  if (!web_contents_) {
+      return;
+  }
+
+  web_contents_->StopFinding(content::STOP_FIND_ACTION_CLEAR_SELECTION);
+
+  find_in_page_.current = 0;
+  OnFindInPageCurrentChanged();
+  find_in_page_.count = 0;
+  OnFindInPageCountChanged();
+
+  if (!find_in_page_.text.empty()) {
+    find_in_page_.request_id++;
+
+    blink::WebFindOptions options;
+    options.forward = true;
+    options.findNext = false;
+    options.matchCase = find_in_page_.case_sensitive;
+
+    web_contents_->Find(find_in_page_.request_id,
+                        base::UTF8ToUTF16(find_in_page_.text),
+                        options);
+  }
+}
+
+void WebView::FindInPageNext() {
+  if (!web_contents_) {
+    return;
+  }
+
+  blink::WebFindOptions options;
+  options.forward = true;
+  options.findNext = true;
+
+  web_contents_->Find(find_in_page_.request_id,
+                      base::UTF8ToUTF16(find_in_page_.text), options);
+}
+
+void WebView::FindInPagePrevious() {
+  if (!web_contents_) {
+    return;
+  }
+
+  blink::WebFindOptions options;
+  options.forward = false;
+  options.findNext = true;
+
+  web_contents_->Find(find_in_page_.request_id,
+                      base::UTF8ToUTF16(find_in_page_.text), options);
+}
+
 BrowserContext* WebView::GetBrowserContext() const {
   return BrowserContext::FromContent(web_contents_->GetBrowserContext());
 }

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2015-05-15 14:49:32 +0000
+++ shared/browser/oxide_web_view.h	2015-05-20 22:10:39 +0000
@@ -201,6 +201,15 @@
   void InputPanelVisibilityChanged();
   void UpdateWebPreferences();
 
+  int GetFindInPageCount() const;
+  int GetFindInPageCurrent() const;
+  std::string GetFindInPageText() const;
+  void SetFindInPageText(const std::string& text);
+  bool GetFindInPageCaseSensitive() const;
+  void SetFindInPageCaseSensitive(bool case_sensitive);
+  void FindInPageNext();
+  void FindInPagePrevious();
+
   BrowserContext* GetBrowserContext() const;
   content::WebContents* GetWebContents() const;
 
@@ -355,6 +364,8 @@
   void InitializeTopControlsForHost(content::RenderViewHost* rvh,
                                     bool initial_host);
 
+  void RestartFindInPage();
+
   // ScriptMessageTarget implementation
   virtual size_t GetScriptMessageHandlerCount() const override;
   virtual const ScriptMessageHandler* GetScriptMessageHandlerAt(
@@ -440,6 +451,13 @@
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) final;
 
+  void FindReply(content::WebContents* web_contents,
+                 int request_id,
+                 int number_of_matches,
+                 const gfx::Rect& selection_rect,
+                 int active_match_ordinal,
+                 bool final_update) final;
+
   // content::WebContentsObserver implementation
   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) final;
   void RenderViewReady() final;
@@ -577,6 +595,9 @@
   virtual void OnPrepareToCloseResponse(bool proceed);
   virtual void OnCloseRequested();
 
+  virtual void OnFindInPageCurrentChanged();
+  virtual void OnFindInPageCountChanged();
+
   struct WebContentsDeleter {
     void operator()(content::WebContents* contents);
   };
@@ -623,6 +644,17 @@
 
   SecurityStatus security_status_;
 
+  struct FindInPageState {
+    int request_id;
+    int current;
+    int count;
+    bool case_sensitive;
+    std::string text;
+    FindInPageState() : request_id(0), current(0), count(0),
+                        case_sensitive(false) {}
+  };
+  FindInPageState find_in_page_;
+
   int location_bar_height_pix_;
   blink::WebTopControlsState location_bar_constraints_;
   bool location_bar_animated_;