webbrowser-app

Merge lp:~uriboni/webbrowser-app/search-history into lp:webbrowser-app

search-history
Merge into trunk

Proposed by Ugo Riboni on 2015-09-14

Status:	Merged
Approved by:	Olivier Tilloy on 2015-09-18
Approved revision:	1040
Merged at revision:	1190
Proposed branch:	lp:~uriboni/webbrowser-app/search-history
Merge into:	lp:webbrowser-app
Prerequisite:	lp:~osomon/webbrowser-app/drawer-menu-actions-visible
Diff against target:	1883 lines (+776/-186) 25 files modified src/app/webbrowser/Browser.qml (+8/-4) src/app/webbrowser/CMakeLists.txt (+1/-1) src/app/webbrowser/Highlight.js (+46/-0) src/app/webbrowser/HistoryViewWide.qml (+155/-44) src/app/webbrowser/Suggestions.qml (+4/-26) src/app/webbrowser/ToolbarAction.qml (+1/-1) src/app/webbrowser/history-lastvisitdate-model.cpp (+59/-11) src/app/webbrowser/history-lastvisitdate-model.h (+8/-5) src/app/webbrowser/history-lastvisitdatelist-model.cpp (+40/-11) src/app/webbrowser/history-lastvisitdatelist-model.h (+7/-7) src/app/webbrowser/history-model.h (+8/-7) src/app/webbrowser/history-timeframe-model.cpp (+7/-0) src/app/webbrowser/history-timeframe-model.h (+1/-0) src/app/webbrowser/text-search-filter-model.cpp (+19/-16) src/app/webbrowser/text-search-filter-model.h (+5/-5) src/app/webbrowser/webbrowser-app.cpp (+2/-2) tests/autopilot/webbrowser_app/tests/test_findinpage.py (+14/-0) tests/unittests/CMakeLists.txt (+1/-1) tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp (+28/-6) tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp (+27/-10) tests/unittests/qml/CMakeLists.txt (+1/-0) tests/unittests/qml/tst_HistoryViewWide.qml (+277/-15) tests/unittests/qml/tst_QmlTests.cpp (+40/-1) tests/unittests/text-search-filter-model/CMakeLists.txt (+2/-2) tests/unittests/text-search-filter-model/tst_TextSearchFilterModelTests.cpp (+15/-11)
To merge this branch:	bzr merge lp:~uriboni/webbrowser-app/search-history
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2015-09-14	Needs Fixing on 2015-09-18
Olivier Tilloy		2015-09-14	Approve on 2015-09-17
Riccardo Padovani		2015-09-14	Pending
Review via email: mp+270929@code.launchpad.net

This proposal supersedes a proposal from 2015-08-20.

Commit Message

Implement search within the history view (only from the widescreen version)

Description of the Change

Implement search within the history view (only from the widescreen version)

NOTE to reviewer: the original author of the HistoryViewWide.qml file seems to have used a mix of different indentation styles and also in some cases left blank lines with spaces. I had my editor setup to automatically remove these and enforce the standard QML style, and noticed this too late. I could go back and revert these changes but I would rather not to.

PS Jenkins bot (ps-jenkins) wrote on 2015-08-20: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1002
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2127/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3813/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/881/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/881/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/881/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3810/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2127/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-08-20: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2128/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-08-24: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1007
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2134/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3839/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/888/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/888/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/888/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3836/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2134/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-08-25: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2135/rebuild

review: Needs Fixing (continuous-integration)

Riccardo Padovani (rpadovani) wrote on 2015-08-31: Posted in a previous version of this proposal

Thanks for working on this.
Unfortunately, when I press CTRL+F in the history view it doesn't activate the search in the history view, but in the page behind. I think it's a problem of focus...

review: Needs Fixing

Ugo Riboni (uriboni) wrote on 2015-09-03: Posted in a previous version of this proposal

> Thanks for working on this.
> Unfortunately, when I press CTRL+F in the history view it doesn't activate the
> search in the history view, but in the page behind. I think it's a problem of
> focus...

I can not reproduce this problem. When I press CTRL+F in the history view (widescreen) the search is activated correctly.

I updated the branch to match current trunk, but it was already working before I did that.

Riccardo Padovani (rpadovani) wrote on 2015-09-03: Posted in a previous version of this proposal

Now it works - probably I did something wrong last time, sorry.

Anyway, another thing:
- Open history
- Select a day (like today)
- Search for a string that matches in others days but not today
- You have this result[0] instead of this[1] (it highlights the day but there are no results)

[0]: http://people.ubuntu.com/~rpadovani/touch/browser/Screenshot%20from%202015-09-03%2011-26-10.png
[1]: http://people.ubuntu.com/~rpadovani/touch/browser/Screenshot%20from%202015-09-03%2011-27-03.png

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-09-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2171/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2173/rebuild

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-09-04: Posted in a previous version of this proposal

Please revert the changes to po/webbrowser-app.pot.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-09-07: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2184/rebuild

review: Approve (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-09-09: Posted in a previous version of this proposal

- Ctrl+H to open the history view
- Ctrl+F to activate search
- type in a few characters that will match at least one URL
- down arrow key to select the first match
- return/enter to open the URL in a new tab

-> doesn’t work

review: Needs Fixing (functional)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2214/rebuild

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-09-10: Posted in a previous version of this proposal

Thanks for the fix. I’m seeing another weird behaviour here:

- open the history view
- in the left panel, select a date
- Ctrl+F to search, enter characters that don’t match any URL for that date, the date disappears from the left panel and the last entry in the panel is selected.

In that case, if no entry matched in the selected date, I would expect the search to fall back on "All History", not just a random date.

review: Needs Fixing

Olivier Tilloy (osomon) wrote on 2015-09-10: Posted in a previous version of this proposal

Another minor issue:

- Ctrl+H to open history view
- Ctrl+F to start searching, this focuses the search field as expected
- Down arrow key, then Left arrow key, then Down arrow key a few times to select a given date
- From there it seems there is no way to focus again the search field (to search for entries in that specific date) without having to press the up arrow key a few times, thus de-selecting this date. I think pressing Ctrl+F again while there should focus the search field.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-09-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2218/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2219/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-10: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2220/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-11: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2224/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2229/rebuild

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-09-15: Posted in a previous version of this proposal

Download full text (3.7 KiB)

> When a cetain date is selected and the current search returns no
> results for that date, move back to the "all dates" block

This doesn’t seem to always work. In some cases, a more recent date than the one I initially selected, which has matching results, gets selected (just tested with 1st of sept, no matches for a given search string, but 2nd of sept gets selected instead of all history).
I think monitoring onCountChanged on the list in the right panel is not reliable, you should probably record which date was selected, and if it disappears from the left panel, then reset the current index.

In the visual spec (https://docs.google.com/presentation/d/1P6A7ZsI03sPfuI9vzPeC0VcUfIgugxnU4QyObH6UNTs/edit#slide=id.g75d5dd944_091), the search field has a magnifier icon always displayed on the left, and the field spans the width of the right panel.

In the history view, if I long-press on an item to enter multi-selection mode, then press Ctrl+F, nothing seemingly happens, but after closing the history view find-in-page is activated on the current tab. Ctrl+F events should be swallowed when in multi-selection mode. Or maybe they should exit multi-selection mode and activate search in history. In any case they shouldn’t have an effect on a view that’s not currently visible.

Related to the above comment (and not specific to this MR, but could be fixed together with it): if find in page was activated on the current page, I think it should be turned off when opening the history view.

In Highlight.js, only the highlightTerms function should be public, the rest (global vars and helper functions) shouldn’t be exposed, can’t they be defined in the body of highlightTerms?

In HistoryViewWide.qml, there is a typo in a comment: s/TestSearchFilterModel/TextSearchFilterModel/.

A note on the modifications you made to HistoryLastVisitDateModel: if it wasn’t for bug #1495641, this model could entirely be replaced by a simple SortFilterModel, which is what I did here: http://bazaar.launchpad.net/~osomon/webbrowser-app/use-qml-SortFilterModel/revision/1144. Until my fix for the bug in the UITK lands, your changes look good.

In history-lastvisitdatelist-model.h, includes are not ordered alphabetically.

Is the first change in history-timeframe-model.cpp really necessary? Doesn’t QSortFilterProxyModel::setSourceModel() imply a model reset notification?

In tst_HistoryLastVisitDateListModelTests.cpp, in shouldUpdateWhenChangingSourceModel(), timeframe2 is never deleted (the issue was there already, not introduced by your changes). Can it be instantiated on the stack, or deleted at the end of the method?

Can HistoryModelTest be renamed 'HistoryModelMock' ?

In HistoryModelTest::addByDate(), when inserting a new entry, the number of visits is initially set to 1 (with the call to add(…)), and then bumped to 2. Incrementing entry.visits should be done only when it’s not a new entry.

"efficiency is not important": I would re-word that to "efficiency is not critical". Efficiency is always important :)

In tests/unittests/qml/tst_QmlTests.cpp, the 'HistoryModelTest' type should be registered under "webbrowsertest.private", not under "webbrowserapp.private"...

review: Needs Fixing

lp:~uriboni/webbrowser-app/search-history updated on 2015-09-16

1021. By Ugo Riboni on 2015-09-16: Merge changes from trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-09-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2238/rebuild

review: Needs Fixing (continuous-integration)

Ugo Riboni (uriboni) wrote on 2015-09-16:

Fixed unless otherwise commented below

> In the history view, if I long-press on an item to enter multi-selection mode, then press Ctrl+F, nothing seemingly > happens, but after closing the history view find-in-page is activated on the current tab. Ctrl+F events should be
> swallowed when in multi-selection mode. Or maybe they should exit multi-selection mode and activate search in
> history. In any case they shouldn’t have an effect on a view that’s not currently visible.

Exiting select mode and entering search mode would be confusing and not symmetric, since when search mode you can't long press on items to switch to select mode.
So I am swallowing the key combo event instead.

> Related to the above comment (and not specific to this MR, but could be fixed together with it): if find in page
> was activated on the current page, I think it should be turned off when opening the history view.

Done and also exited the find in page mode when settings is shown (since when transitioning back from settings I found it really jarring to see the find in page box there)

> A note on the modifications you made to HistoryLastVisitDateModel: if it wasn’t for bug #1495641, this model could
> entirely be replaced by a simple SortFilterModel, which is what I did here: http://bazaar.launchpad.net/~osomon
> /webbrowser-app/use-qml-SortFilterModel/revision/1144. Until my fix for the bug in the UITK lands, your changes
> look good.

Since the change in UITK made it to the overlay PPA already, I switched to using SortFilterModel.
I have not removed the HistoryLastVisitDateModel sources and tests, as I think it is better done in a separate MR (like one based the branch you link above)

> Is the first change in history-timeframe-model.cpp really necessary? Doesn’t
> QSortFilterProxyModel::setSourceModel() imply a model reset notification?

I thought so too, but apparently not. And the documentation does not say so either.

> In tst_HistoryViewWide.qml:
> - in init(), I don’t think a call to historyViewWide.forceActiveFocus() is needed, instead you can just set
> "focus: true" on the Loader (which will forward focus as a Loader is a FocusScope)

Setting focus:true only on the Loader is not enough. On the loader and on the item inside works.

lp:~uriboni/webbrowser-app/search-history updated on 2015-09-16

1022. By Ugo Riboni on 2015-09-16: Use a simple SortFilterModel to filter by date intead of a custom model.
Not removing the model for now as it is better done in another MR.
1023. By Ugo Riboni on 2015-09-16: Properly detect when the current index in the dates list has changed automatically as result of a search, and reset index to "all dates" if it has moved to a date that is not in the list anymore.
1024. By Ugo Riboni on 2015-09-16: Intercept the Ctrl+F keypress when in select mode, so that it does not activate find in page in the tab below
1025. By Ugo Riboni on 2015-09-16: Deactivate find in page mode when entering history and settings
1026. By Ugo Riboni on 2015-09-16: Move internal highlight functions and variables within the scope of the public one
1027. By Ugo Riboni on 2015-09-16: Visually adapt the search box to match the visual spec
1028. By Ugo Riboni on 2015-09-16: Fix order of includes
1029. By Ugo Riboni on 2015-09-16: Clean up more properly in unit test
1030. By Ugo Riboni on 2015-09-16: Rename mock class
1031. By Ugo Riboni on 2015-09-16: More correctly implement HistoryModelMock::addByDate
1032. By Ugo Riboni on 2015-09-16: Register mock model in the correct namespace
1033. By Ugo Riboni on 2015-09-16: Remove useless code and focus via built-in properties instead of forcing on test init
1034. By Ugo Riboni on 2015-09-16: Verify text field is not initially visible before entering search mode
1035. By Ugo Riboni on 2015-09-16: Revert previous change, as the bug allowing us to use SortFilterModel.get() properly hasn't landed yet in the UITK (a similar fix had, and I got confused)
1036. By Ugo Riboni on 2015-09-16: Jump back to the search box when pressing UP from the dates list
1037. By Ugo Riboni on 2015-09-16: Correctly take into account which item is initially selected when focus is given via focus property before items are inserted, instead of being forced after items have been inserted

Ugo Riboni (uriboni) wrote on 2015-09-16:

Note: bug #1495641 has been merged but not released yet. So I reverted that specific change.

PS Jenkins bot (ps-jenkins) wrote on 2015-09-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2240/rebuild

review: Approve (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-09-17:

In test_search_button, 'var searchQuery = findChild(historyViewWide, "searchQuery")' is duplicated.

In HistoryViewWide.qml, there is still a typo in a comment: s/TestSearchFilterModel/TextSearchFilterModel/.

Olivier Tilloy (osomon) wrote on 2015-09-17:

The following block was kept:

  onCountChanged: {
    // when the list becomes empty as a result of searching for
    // something that doesn't exist in the current date, we
    // switch to the "All dates" block
    if (count === 0) lastVisitDateListView.currentIndex = 0
  }

Is it still used now that you added explicit tracking of the selected date when searching? Shouldn’t it be removed?

lp:~uriboni/webbrowser-app/search-history updated on 2015-09-17

1038. By Ugo Riboni on 2015-09-17: Fix typo. Remove duplicate variable declaration in unit test.

Olivier Tilloy (osomon) wrote on 2015-09-17:

Property 'terms' of 'searchQuery' should be marked readonly.

In tests/unittests/qml/tst_HistoryViewWide.qml, the import of webbrowserapp.private 0.1 seems to be useless.

lp:~uriboni/webbrowser-app/search-history updated on 2015-09-17

1039. By Ugo Riboni on 2015-09-17: Remove code that is not needed anymore
1040. By Ugo Riboni on 2015-09-17: Mark readonly property as readonly

PS Jenkins bot (ps-jenkins) wrote on 2015-09-17:

PASSED: Continuous integration, rev:1038
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1002
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1002/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23419

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2248/rebuild

review: Approve (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-09-17:

Looks good to me now, thanks!

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-09-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2251/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-18:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2254/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-18:

FAILED: Continuous integration, rev:1040
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2255/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1009
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1009
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4246
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23473

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2255/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Ubuntu Phablet Team

Ugo Riboni

to status/vote changes:

Rachel Liu

 === modified file 'src/app/webbrowser/Browser.qml'
 --- src/app/webbrowser/Browser.qml	2015-09-13 21:24:56 +0000
 +++ src/app/webbrowser/Browser.qml	2015-09-17 15:38:35 +0000
@@ -429,6 +429,7 @@
                      onTriggered: {
                          settingsComponent.createObject(settingsContainer)
                          settingsContainer.focus = true
++                        chrome.findInPageMode = false
+                     }
+                 }
+             ]
@@ -480,16 +481,17 @@
              Keys.onUpPressed: chrome.focus = true
              Keys.onEscapePressed: internal.resetFocus()
--            models: [historySuggestions,
++            models: searchTerms && searchTerms.length > 0 ?
++                    [historySuggestions,
                       bookmarksSuggestions,
--                     searchSuggestions.limit(4)]
++                     searchSuggestions.limit(4)] : []
              LimitProxyModel {
                  id: historySuggestions
                  limit: 2
                  readonly property string icon: "history"
                  readonly property bool displayUrl: true
--                sourceModel: SuggestionsFilterModel {
++                sourceModel: TextSearchFilterModel {
                      sourceModel: browser.historyModel
                      terms: suggestionsList.searchTerms
                      searchFields: ["url", "title"]
@@ -501,7 +503,7 @@
                  limit: 2
                  readonly property string icon: "non-starred"
                  readonly property bool displayUrl: true
--                sourceModel: SuggestionsFilterModel {
++                sourceModel: TextSearchFilterModel {
                      sourceModel: browser.bookmarksModel
                      terms: suggestionsList.searchTerms
                      searchFields: ["url", "title"]
@@ -775,6 +777,8 @@
          Keys.onEscapePressed: historyViewLoader.active = false
++        onActiveChanged: if (active) chrome.findInPageMode = false
++
          Timer {
              id: historyViewTimer
              // Set the model asynchronously to ensure
 === modified file 'src/app/webbrowser/CMakeLists.txt'
 --- src/app/webbrowser/CMakeLists.txt	2015-07-16 00:42:10 +0000
 +++ src/app/webbrowser/CMakeLists.txt	2015-09-17 15:38:35 +0000
@@ -21,8 +21,8 @@
      history-model.cpp
      history-timeframe-model.cpp
      limit-proxy-model.cpp
--    suggestions-filter-model.cpp
      tabs-model.cpp
++    text-search-filter-model.cpp
      top-sites-model.cpp
+ )
 === added file 'src/app/webbrowser/Highlight.js'
 --- src/app/webbrowser/Highlight.js	1970-01-01 00:00:00 +0000
 +++ src/app/webbrowser/Highlight.js	2015-09-17 15:38:35 +0000
@@ -0,0 +1,46 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app 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 General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++function highlightTerms(text, terms) {
++    var termsRe
++    var highlight = '<font color="#752571">$&</font>'
++    var searchTerms = []
++
++    function escapeTerm(term) {
++        // Escape special characters in a search term
++        // (a simpler version of preg_quote).
++        return term.replace(/[().?+|*^$]/g, '\\$&')
++    }
++
++    function setSearchTerms(terms) {
++        searchTerms = terms
++        termsRe = new RegExp(terms.map(escapeTerm).join('|'), 'ig')
++    }
++
++    // Highlight the matching terms in a case-insensitive manner
++    if (text && text.toString()) {
++        if (searchTerms !== terms) setSearchTerms(terms)
++        if (searchTerms.length == 0) return text
++        var highlighted = text.toString().replace(termsRe, highlight)
++        highlighted = highlighted.replace(new RegExp('&', 'g'), '&amp;')
++        highlighted = '<html>' + highlighted + '</html>'
++        return highlighted
++    } else {
++        return ""
++    }
++}
 === modified file 'src/app/webbrowser/HistoryViewWide.qml'
 --- src/app/webbrowser/HistoryViewWide.qml	2015-08-18 11:15:13 +0000
 +++ src/app/webbrowser/HistoryViewWide.qml	2015-09-17 15:38:35 +0000
@@ -20,11 +20,21 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Components.ListItems 1.3 as ListItems
  import webbrowserapp.private 0.1
++import "Highlight.js" as Highlight
  FocusScope {
      id: historyViewWide
--    property alias historyModel: historyTimeframeModel.sourceModel
++    property alias historyModel: historySearchModel.sourceModel
++    property bool searchMode: false
++    readonly property bool selectMode: urlsListView.ViewItems.selectMode
++    onSearchModeChanged: {
++        if (searchMode) searchQuery.focus = true
++        else {
++            searchQuery.text = ""
++            urlsListView.focus = true
++        }
++    }
      signal done()
      signal historyEntryClicked(url url)
@@ -32,12 +42,22 @@
      Keys.onLeftPressed: lastVisitDateListView.forceActiveFocus()
      Keys.onRightPressed: urlsListView.forceActiveFocus()
++    Keys.onUpPressed: if (searchMode) searchQuery.focus = true
++    Keys.onPressed: {
++        if (event.modifiers === Qt.ControlModifier && event.key === Qt.Key_F) {
++            if (searchMode) searchQuery.focus = true
++            else {
++                if (!selectMode) searchMode = true
++                else event.accepted = true
++            }
++        }
++    }
      Keys.onDeletePressed: {
          if (urlsListView.ViewItems.selectMode) {
              internal.removeSelected()
          } else {
              if (urlsListView.activeFocus) {
--                historyViewWide.historyModel.removeEntryByUrl(urlsListView.currentItem.url)
++                historyViewWide.historyModel.removeEntryByUrl(urlsListView.currentItem.siteUrl)
                  if (urlsListView.count == 0) {
                      lastVisitDateListView.currentIndex = 0
+                 }
@@ -62,10 +82,12 @@
          anchors.fill: parent
+     }
--    HistoryTimeframeModel {
--        id: historyTimeframeModel
++    TextSearchFilterModel {
++        id: historySearchModel
++        searchFields: ["title", "url"]
++        terms: searchQuery.terms
+     }
--
++
      Row {
          id: historyViewWideRow
          anchors {
@@ -77,7 +99,7 @@
+         }
          spacing: units.gu(1)
--
++
          Item {
              width: units.gu(40)
              height: parent.height
@@ -95,27 +117,61 @@
+                     }
                      urlsListView.ViewItems.selectedIndices = []
+                 }
--
++
++                // Manually track the current date, so that we can detect when
++                // the ListView automatically changes the currentItem as result
++                // of a change in the model that removes the currentItem.
++                // When this happens, we reset the currentItem to "all dates".
++                property date currentDate
++
++                // Ignore currentItemChanged signals while we are changing the
++                // currentIndex manually (as a result of either UP and DOWN key
++                // presses, or clicking on items)
++                // Any other emission of currentItemChanged will therefore be
++                // from ListView changing it automatically.
++                function explicitlyChangeCurrentIndex(changeAction) {
++                    explicitlySettingCurrentIndex = true
++                    changeAction()
++                    explicitlySettingCurrentIndex = false
++                    currentDate = currentItem.lastVisitDate
++                }
++                property bool explicitlySettingCurrentIndex: false
++                Keys.onDownPressed: explicitlyChangeCurrentIndex(incrementCurrentIndex)
++                Keys.onUpPressed: explicitlyChangeCurrentIndex(function() {
++                    if (lastVisitDateListView.currentIndex == 0 && searchMode) {
++                        searchQuery.focus = true
++                    } else {
++                        lastVisitDateListView.decrementCurrentIndex()
++                    }
++                })
++
++                onCurrentItemChanged: {
++                    if (explicitlySettingCurrentIndex) return;
++                    if (currentItem.lastVisitDate.valueOf() !== currentDate.valueOf()) {
++                        currentIndex = 0
++                    }
++                }
++
                  model: HistoryLastVisitDateListModel {
--                    sourceModel: historyTimeframeModel
++                    sourceModel: historyLastVisitDateModel.sourceModel
+                 }
--
++
                  delegate: ListItem {
                      objectName: "lastVisitDateDelegate"
                      property var lastVisitDate: model.lastVisitDate
--
++
                      anchors {
                          left: parent.left
                          right: parent.right
                          rightMargin: units.gu(1)
+                     }
--
++
                      width: parent.width
                      height: units.gu(4)
--
++
                      color: lastVisitDateListView.currentIndex == index ? highlightColor : "transparent"
--
++
                      Label {
                          objectName: "lastVisitDateDelegateLabel"
@@ -125,9 +181,9 @@
                              topMargin: units.gu(1)
                              leftMargin: units.gu(2)
+                         }
--
++
                          height: parent.height
--
++
                          text: {
                              if (!lastVisitDate.isValid()) {
                                  return i18n.tr("All History")
@@ -135,14 +191,14 @@
                              var today = new Date()
                              today.setHours(0, 0, 0, 0)
--
++
                              var yesterday = new Date()
                              yesterday.setDate(yesterday.getDate() - 1)
                              yesterday.setHours(0, 0, 0, 0)
--
++
                              var entryDate = new Date(lastVisitDate)
                              entryDate.setHours(0, 0, 0, 0)
--
++
                              if (entryDate.getTime() == today.getTime()) {
                                  return i18n.tr("Today")
                              } else if (entryDate.getTime() == yesterday.getTime()) {
@@ -150,12 +206,12 @@
+                             }
                              return Qt.formatDate(lastVisitDate, Qt.DefaultLocaleLongDate)
+                         }
--
++
                          fontSize: "small"
                          color: lastVisitDateListView.currentIndex == index ? UbuntuColors.orange : UbuntuColors.darkGrey
+                     }
--
--                    onClicked: lastVisitDateListView.currentIndex = index
++
++                    onClicked: ListView.view.explicitlyChangeCurrentIndex(function() { ListView.view.currentIndex = index })
+                }
+             }
@@ -174,15 +230,19 @@
                  objectName: "urlsListView"
                  anchors.fill: parent
--
++
                  Keys.onReturnPressed: historyEntrySelected()
                  Keys.onEnterPressed: historyEntrySelected()
                  model: HistoryLastVisitDateModel {
                      id: historyLastVisitDateModel
--                    sourceModel: historyTimeframeModel
++                    // Until a valid HistoryModel is assigned the TextSearchFilterModel
++                    // will not report role names, and the HistoryLastVisit*Models will emit warnings
++                    // since they need a dateLastVisit role to be present.
++                    // We avoid this by assigning the sourceModel only when HistoryModel is ready.
++                    sourceModel: historyModel ? historySearchModel : undefined
+                 }
--
++
                  clip: true
                  onModelChanged: urlsListView.currentIndex = -1
@@ -199,10 +259,10 @@
                      if (urlsListView.ViewItems.selectMode) {
                          currentItem.selected = !currentItem.selected
                      } else {
--                        historyViewWide.historyEntryClicked(currentItem.url)
++                        historyViewWide.historyEntryClicked(currentItem.siteUrl)
+                     }
+                 }
--
++
                  // Only use sections for "All History" history list
                  section.property: historyLastVisitDateModel.lastVisitDate.isValid() ? "" : "lastVisitDate"
                  section.delegate: HistorySectionDelegate {
@@ -211,22 +271,26 @@
                      anchors.leftMargin: units.gu(2)
                      todaySectionTitle: i18n.tr("Today")
+                 }
--
++
                  delegate: UrlDelegate{
++                    objectName: "historyDelegate"
                      width: parent.width - units.gu(1)
                      height: units.gu(5)
--
++
                      color: urlsListView.currentIndex == index ? highlightColor : "transparent"
--
++
++                    property url siteUrl: model.url
++
                      icon: model.icon
--                    title: model.title ? model.title : model.url
--                    url: model.url
--
++                    title: Highlight.highlightTerms(model.title ? model.title : model.url, searchQuery.terms)
++                    url: Highlight.highlightTerms(model.url, searchQuery.terms)
++
                      headerComponent: Component {
                          Item {
++                            objectName: "historySectionDelegate"
                              height: units.gu(3)
                              width: timeLabel.width
--
++
                              Label {
                                  id: timeLabel
                                  anchors.centerIn: parent
@@ -235,15 +299,15 @@
+                             }
+                         }
+                     }
--
--                    onClicked: {
++
++                    onClicked: {
                          if (selectMode) {
                              selected = !selected
                          } else {
                              historyViewWide.historyEntryClicked(model.url)
+                         }
+                     }
--
++
                      onRemoved: {
                          historyViewWide.historyModel.removeEntryByUrl(model.url)
                          if (urlsListView.count == 0) {
@@ -252,6 +316,7 @@
+                     }
                      onPressAndHold: {
++                        if (historyViewWide.searchMode) return
                          selectMode = !selectMode
                          if (selectMode) {
                              urlsListView.ViewItems.selectedIndices = [index]
@@ -279,7 +344,8 @@
+         }
          Label {
--            visible: !urlsListView.ViewItems.selectMode
++            visible: !urlsListView.ViewItems.selectMode &&
++                     !historyViewWide.searchMode
              anchors {
                  top: parent.top
@@ -288,13 +354,14 @@
                  leftMargin: units.gu(2)
+             }
--            text: i18n.tr("History")
++            text: i18n.tr("History")
+         }
          ToolbarAction {
              objectName: "backButton"
--            visible: urlsListView.ViewItems.selectMode
++            visible: urlsListView.ViewItems.selectMode ||
++                     historyViewWide.searchMode
              anchors {
                  top: parent.top
@@ -302,12 +369,16 @@
                  leftMargin: units.gu(2)
+             }
              height: parent.height - units.gu(2)
--
++
              iconName: "back"
              text: i18n.tr("Cancel")
              onClicked: {
--                urlsListView.ViewItems.selectMode = false
++                if (historyViewWide.searchMode) {
++                    historyViewWide.searchMode = false
++                } else {
++                    urlsListView.ViewItems.selectMode = false
++                }
                  lastVisitDateListView.forceActiveFocus()
+             }
+         }
@@ -323,7 +394,7 @@
                  rightMargin: units.gu(2)
+             }
              height: parent.height - units.gu(2)
--
++
              iconName: "select"
              text: i18n.tr("Select all")
@@ -349,12 +420,52 @@
              onClicked: internal.removeSelected()
+         }
++        TextField {
++            id: searchQuery
++            objectName: "searchQuery"
++            anchors {
++                verticalCenter: parent.verticalCenter
++                right: parent.right
++                rightMargin: units.gu(2)
++            }
++            width: urlsListView.width
++            primaryItem: Icon {
++               height: parent.height - units.gu(2)
++               width: height
++               name: "search"
++            }
++            hasClearButton: true
++            placeholderText: i18n.tr("search history")
++            visible: historyViewWide.searchMode
++            readonly property var terms: text.split(/\s+/g).filter(function(term) { return term.length > 0 })
++
++            Keys.onEscapePressed: historyViewWide.searchMode = false
++            Keys.onDownPressed: urlsListView.focus = true
++        }
++
++        ToolbarAction {
++            id: searchButton
++            iconName: "search"
++            objectName: "searchButton"
++            visible: !urlsListView.ViewItems.selectMode &&
++                     !historyViewWide.searchMode
++            anchors {
++                verticalCenter: parent.verticalCenter
++                right: parent.right
++                rightMargin: units.gu(3.5)
++            }
++            height: parent.height - units.gu(2)
++            onClicked: {
++                historyViewWide.searchMode = true
++                searchQuery.forceActiveFocus()
++            }
++        }
++
          ListItems.ThinDivider {
              anchors {
                  left: parent.left
                  right: parent.right
                  bottom: parent.bottom
--                bottomMargin: units.gu(1)
+             }
+         }
+     }
@@ -428,7 +539,7 @@
+             }
              if (urlsListView.count == urls.length) {
--                lastVisitDateListView.currentIndex = 0
++                lastVisitDateListView.currentIndex = 0
+             }
              urlsListView.ViewItems.selectMode = false
 === modified file 'src/app/webbrowser/Suggestions.qml'
 --- src/app/webbrowser/Suggestions.qml	2015-08-11 11:18:43 +0000
 +++ src/app/webbrowser/Suggestions.qml	2015-09-17 15:38:35 +0000
@@ -18,6 +18,7 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
++import "Highlight.js" as Highlight
  FocusScope {
      id: suggestions
@@ -71,8 +72,9 @@
              width: suggestionsList.width
              showDivider: index < model.length - 1
--            title: selected ? modelData.title : internal.highlightTerms(modelData.title)
--            subtitle: modelData.displayUrl ? (selected ? modelData.url : internal.highlightTerms(modelData.url)) : ""
++            title: selected ? modelData.title : Highlight.highlightTerms(modelData.title, searchTerms)
++            subtitle: modelData.displayUrl ? (selected ? modelData.url :
++                                                         Highlight.highlightTerms(modelData.url, searchTerms)) : ""
              icon: modelData.icon
              selected: suggestionsList.activeFocus && ListView.isCurrentItem
@@ -88,30 +90,6 @@
      QtObject {
          id: internal
--        readonly property var termsRe: new RegExp(searchTerms.map(escapeTerm).join('|'), 'ig')
--        readonly property string highlight: '<font color="%1">$&</font>'.arg("#752571")
--
--        function escapeTerm(term) {
--            // Escape special characters in a search term
--            // (a simpler version of preg_quote).
--            return term.replace(/[().?+|*^$]/g, '\\$&')
--        }
--
--        function highlightTerms(text) {
--            // Highlight the matching terms in a case-insensitive manner
--            if (text && text.toString()) {
--                if (searchTerms.length == 0) {
--                    return text
--                }
--                var highlighted = text.toString().replace(termsRe, highlight)
--                highlighted = highlighted.replace(new RegExp('&', 'g'), '&amp;')
--                highlighted = '<html>' + highlighted + '</html>'
--                return highlighted
--            } else {
--                return ""
--            }
--        }
--
          function countItems(total, model) {
              return total + (model.hasOwnProperty("length") ? model.length : model.count)
+         }
 === modified file 'src/app/webbrowser/ToolbarAction.qml'
 --- src/app/webbrowser/ToolbarAction.qml	2015-08-10 15:22:00 +0000
 +++ src/app/webbrowser/ToolbarAction.qml	2015-09-17 15:38:35 +0000
@@ -24,7 +24,7 @@
      property alias text: label.text
      opacity: enabled ? 1.0 : 0.3
--    width: label.paintedWidth
++    width: Math.max(label.paintedWidth, icon.width)
      Item {
          anchors {
 === modified file 'src/app/webbrowser/history-lastvisitdate-model.cpp'
 --- src/app/webbrowser/history-lastvisitdate-model.cpp	2015-07-14 22:16:41 +0000
 +++ src/app/webbrowser/history-lastvisitdate-model.cpp	2015-09-17 15:38:35 +0000
@@ -21,35 +21,61 @@
  #include "history-timeframe-model.h"
  // Qt
++#include <QtCore/QDebug>
  #include <QtCore/QUrl>
  /*!
      \class HistoryLastVisitDateModel
--    \brief Proxy model that filters the contents of a history model
--           based on last visit date
++    \brief Proxy model that filters the contents of a model based on last
++           visit date
      HistoryLastVisitDateModel is a proxy model that filters the contents
--    of a history model based on the last visit date.
++    of any QAbstractItemModel-derived model based on a role called
++    "lastVisitDate".
      An entry in the history model matches if the last visit date equals
      the filter visit date.
--    When no visit date is set, all entries match.
++    When no visit date is set, all entries match. If the model does not have
++    the "lastVisitDate" role, then no entries are returned if a filter visit
++    date is set, otherwise all entries match.
  */
  HistoryLastVisitDateModel::HistoryLastVisitDateModel(QObject* parent)
      : QSortFilterProxyModel(parent)
+ {
+ }
--HistoryTimeframeModel* HistoryLastVisitDateModel::sourceModel() const
++QVariant HistoryLastVisitDateModel::sourceModel() const
+ {
--    return qobject_cast<HistoryTimeframeModel*>(QSortFilterProxyModel::sourceModel());
++    QAbstractItemModel* model = QSortFilterProxyModel::sourceModel();
++    return (model) ? QVariant::fromValue(model) : QVariant();
+ }
--void HistoryLastVisitDateModel::setSourceModel(HistoryTimeframeModel* sourceModel)
++void HistoryLastVisitDateModel::setSourceModel(QVariant sourceModel)
+ {
--    if (sourceModel != this->sourceModel()) {
--        QSortFilterProxyModel::setSourceModel(sourceModel);
++    QAbstractItemModel* newSourceModel = qvariant_cast<QAbstractItemModel*>(sourceModel);
++    if (sourceModel.isValid() && newSourceModel == 0) {
++        qWarning() << "Only QAbstractItemModel-derived instances are allowed as"
++                   << "source models";
++    }
++
++    if (newSourceModel != QSortFilterProxyModel::sourceModel()) {
++        beginResetModel();
++
++        QAbstractItemModel* currentModel = QSortFilterProxyModel::sourceModel();
++        if (currentModel != 0) {
++            currentModel->disconnect(this);
++        }
++        QSortFilterProxyModel::setSourceModel(newSourceModel);
++        updateSourceModelRole();
++
++        if (newSourceModel != 0) {
++            connect(newSourceModel, SIGNAL(modelReset()), SLOT(updateSourceModelRole()));
++            connect(newSourceModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)),
++                    SLOT(updateSourceModelRole()));
++        }
++
++        endResetModel();
          Q_EMIT sourceModelChanged();
+     }
+ }
@@ -88,6 +114,28 @@
      if (m_lastVisitDate.isNull()) {
          return true;
+     }
--    QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
--    return m_lastVisitDate == sourceModel()->data(index, HistoryModel::LastVisitDate).toDate();
++
++    if (m_sourceModelRole == -1) {
++        return false;
++    }
++
++    QAbstractItemModel* model = QSortFilterProxyModel::sourceModel();
++    if (model) {
++        QModelIndex index = model->index(source_row, 0, source_parent);
++        return m_lastVisitDate == model->data(index, m_sourceModelRole).toDate();
++    } else {
++        return false;
++    }
++}
++
++void HistoryLastVisitDateModel::updateSourceModelRole()
++{
++    QAbstractItemModel* sourceModel = QSortFilterProxyModel::sourceModel();
++    if (sourceModel && sourceModel->roleNames().count() > 0) {
++        m_sourceModelRole = sourceModel->roleNames().key("lastVisitDate", -1);
++        if (m_sourceModelRole == -1) {
++            qWarning() << "No results will be returned because the sourceModel"
++                       << "does not have a role named \"lastVisitDate\"";
++        }
++    }
+ }
 === modified file 'src/app/webbrowser/history-lastvisitdate-model.h'
 --- src/app/webbrowser/history-lastvisitdate-model.h	2015-08-10 14:21:37 +0000
 +++ src/app/webbrowser/history-lastvisitdate-model.h	2015-09-17 15:38:35 +0000
@@ -24,21 +24,20 @@
  #include <QtCore/QSortFilterProxyModel>
  #include <QtCore/QString>
  #include <QtCore/QUrl>
--
--class HistoryTimeframeModel;
++#include <QtCore/QVariant>
  class HistoryLastVisitDateModel : public QSortFilterProxyModel
+ {
      Q_OBJECT
--    Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
++    Q_PROPERTY(QVariant sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
      Q_PROPERTY(QDate lastVisitDate READ lastVisitDate WRITE setLastVisitDate NOTIFY lastVisitDateChanged)
  public:
      HistoryLastVisitDateModel(QObject* parent=0);
--    HistoryTimeframeModel* sourceModel() const;
--    void setSourceModel(HistoryTimeframeModel* sourceModel);
++    QVariant sourceModel() const;
++    void setSourceModel(QVariant sourceModel);
      const QDate& lastVisitDate() const;
      Q_INVOKABLE void setLastVisitDate(const QDate& lastVisitDate);
@@ -53,8 +52,12 @@
      // reimplemented from QSortFilterProxyModel
      bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
++private Q_SLOTS:
++    void updateSourceModelRole();
++
  private:
      QDate m_lastVisitDate;
++    int m_sourceModelRole;
  };
  #endif // __HISTORY_LASTVISITDATE_MODEL_H__
 === modified file 'src/app/webbrowser/history-lastvisitdatelist-model.cpp'
 --- src/app/webbrowser/history-lastvisitdatelist-model.cpp	2015-08-11 16:51:54 +0000
 +++ src/app/webbrowser/history-lastvisitdatelist-model.cpp	2015-09-17 15:38:35 +0000
@@ -21,6 +21,7 @@
  #include "history-timeframe-model.h"
  // Qt
++#include <QtCore/QDebug>
  #include <QtCore/QStringList>
  /*!
@@ -28,10 +29,13 @@
      \brief List model that exposes a list of all last visit dates from history
      HistoryLastVisitiDateListModel is a list model that exposes all last visit
--    dates from a HistoryTimeframeModel. Each item in the list has one single
--    role: 'lastVisitDate' for a date in which there is at least one url visited
--    on the source model. A special entry is added to the begining of the list
--    to represent all dates.
++    dates from the source model. Each item has one single role: 'lastVisitDate'
++    for a date in which there is at least one url visited on the source model.
++    A special entry is added to the begining of the list to represent all dates.
++
++    The source model needs to expose a role named 'lastVisitDate', from which
++    the input dates will be read. If such role is not present, this model will
++    not expose any dates.
  */
  HistoryLastVisitDateListModel::HistoryLastVisitDateListModel(QObject* parent)
      : QAbstractListModel(parent)
@@ -74,20 +78,29 @@
+     }
+ }
--HistoryTimeframeModel* HistoryLastVisitDateListModel::sourceModel() const
++QVariant HistoryLastVisitDateListModel::sourceModel() const
+ {
--    return m_sourceModel;
++    return (m_sourceModel) ? QVariant::fromValue(m_sourceModel) : QVariant();
+ }
--void HistoryLastVisitDateListModel::setSourceModel(HistoryTimeframeModel* sourceModel)
++void HistoryLastVisitDateListModel::setSourceModel(QVariant sourceModel)
+ {
--    if (sourceModel != m_sourceModel) {
++    QAbstractItemModel* newSourceModel = qvariant_cast<QAbstractItemModel*>(sourceModel);
++    if (sourceModel.isValid() && newSourceModel == 0) {
++       qWarning() << "Only QAbstractItemModel-derived instances are allowed as"
++                  << "source models";
++    }
++
++    if (newSourceModel != m_sourceModel) {
          beginResetModel();
          if (m_sourceModel != 0) {
              m_sourceModel->disconnect(this);
+         }
          clearLastVisitDates();
--        m_sourceModel = sourceModel;
++
++        m_sourceModel = newSourceModel;
++        updateSourceModelRole();
++
          populateModel();
          if (m_sourceModel != 0) {
              connect(m_sourceModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
@@ -157,14 +170,26 @@
      if (m_lastVisitDates.isEmpty()) {
          // Remove the default entry if model is empty
          beginRemoveRows(QModelIndex(), 0, 0);
--        m_orderedDates.clear();
++        m_orderedDates.clear();
          endRemoveRows();
+     }
+ }
++void HistoryLastVisitDateListModel::updateSourceModelRole()
++{
++  if (m_sourceModel && m_sourceModel->roleNames().count() > 0) {
++    m_sourceModelRole = m_sourceModel->roleNames().key("lastVisitDate", -1);
++    if (m_sourceModelRole == -1) {
++        qWarning() << "No results will be returned because the sourceModel"
++                   << "does not have a role named \"lastVisitDate\"";
++    }
++  }
++}
++
  void HistoryLastVisitDateListModel::onModelReset()
+ {
      beginResetModel();
++    updateSourceModelRole();
      clearLastVisitDates();
      populateModel();
      endResetModel();
@@ -172,7 +197,11 @@
  void HistoryLastVisitDateListModel::insertNewHistoryEntry(QPersistentModelIndex* index, bool notify)
+ {
--    QDate lastVisitDate = index->data(HistoryModel::LastVisitDate).toDate();
++    if (m_sourceModelRole == -1) {
++      return;
++    }
++
++    QDate lastVisitDate = index->data(m_sourceModelRole).toDate();
      if (!m_lastVisitDates.contains(lastVisitDate)) {
          if (m_orderedDates.isEmpty()) {
              // Add default entry to represent all dates
 === modified file 'src/app/webbrowser/history-lastvisitdatelist-model.h'
 --- src/app/webbrowser/history-lastvisitdatelist-model.h	2015-08-10 13:51:19 +0000
 +++ src/app/webbrowser/history-lastvisitdatelist-model.h	2015-09-17 15:38:35 +0000
@@ -22,16 +22,14 @@
  // Qt
  #include <QtCore/QAbstractListModel>
  #include <QtCore/QMap>
++#include <QtCore/QSortFilterProxyModel>
  #include <QtCore/QString>
--class HistoryLastVisitDateModel;
--class HistoryTimeframeModel;
--
  class HistoryLastVisitDateListModel : public QAbstractListModel
+ {
      Q_OBJECT
--    Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
++    Q_PROPERTY(QVariant sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
      Q_ENUMS(Roles)
@@ -48,8 +46,8 @@
      int rowCount(const QModelIndex& parent=QModelIndex()) const;
      QVariant data(const QModelIndex& index, int role) const;
--    HistoryTimeframeModel* sourceModel() const;
--    void setSourceModel(HistoryTimeframeModel* sourceModel);
++    QVariant sourceModel() const;
++    void setSourceModel(QVariant sourceModel);
  Q_SIGNALS:
      void sourceModelChanged() const;
@@ -60,13 +58,15 @@
      void onModelReset();
  private:
--    HistoryTimeframeModel* m_sourceModel;
++    QAbstractItemModel* m_sourceModel;
++    int m_sourceModelRole;
      QMap<QDate, QList<QPersistentModelIndex*>*> m_lastVisitDates;
      QList<QDate> m_orderedDates;
      void clearLastVisitDates();
      void populateModel();
      void insertNewHistoryEntry(QPersistentModelIndex* index, bool notify);
++    void updateSourceModelRole();
  };
  #endif // __HISTORY_LASTVISITDATELIST_MODEL_H__
 === modified file 'src/app/webbrowser/history-model.h'
 --- src/app/webbrowser/history-model.h	2015-08-17 19:26:47 +0000
 +++ src/app/webbrowser/history-model.h	2015-09-17 15:38:35 +0000
@@ -73,12 +73,7 @@
      void databasePathChanged() const;
      void rowCountChanged();
--private:
--    QMutex m_dbMutex;
--    QSqlDatabase m_database;
--
--    QList<QUrl> m_hiddenEntries;
--
++protected:
      struct HistoryEntry {
          QUrl url;
          QString domain;
@@ -90,6 +85,13 @@
      };
      QList<HistoryEntry> m_entries;
      int getEntryIndex(const QUrl& url) const;
++    void updateExistingEntryInDatabase(const HistoryEntry& entry);
++
++private:
++    QMutex m_dbMutex;
++    QSqlDatabase m_database;
++
++    QList<QUrl> m_hiddenEntries;
      void resetDatabase(const QString& databaseName);
      void createOrAlterDatabaseSchema();
@@ -97,7 +99,6 @@
      void removeByIndex(int index);
      void insertNewEntryInDatabase(const HistoryEntry& entry);
      void insertNewEntryInHiddenDatabase(const QUrl& url);
--    void updateExistingEntryInDatabase(const HistoryEntry& entry);
      void removeEntryFromDatabaseByUrl(const QUrl& url);
      void removeEntryFromHiddenDatabaseByUrl(const QUrl& url);
      void removeEntriesFromDatabaseByDate(const QDate& date);
 === modified file 'src/app/webbrowser/history-timeframe-model.cpp'
 --- src/app/webbrowser/history-timeframe-model.cpp	2014-03-12 10:59:54 +0000
 +++ src/app/webbrowser/history-timeframe-model.cpp	2015-09-17 15:38:35 +0000
@@ -44,7 +44,9 @@
  void HistoryTimeframeModel::setSourceModel(HistoryModel* sourceModel)
+ {
      if (sourceModel != this->sourceModel()) {
++        beginResetModel();
          QSortFilterProxyModel::setSourceModel(sourceModel);
++        endResetModel();
          Q_EMIT sourceModelChanged();
+     }
+ }
@@ -89,3 +91,8 @@
+     }
      return true;
+ }
++
++QHash<int, QByteArray> HistoryTimeframeModel::roleNames() const
++{
++    return (sourceModel()) ? sourceModel()->roleNames() : QHash<int, QByteArray>();
++}
 === modified file 'src/app/webbrowser/history-timeframe-model.h'
 --- src/app/webbrowser/history-timeframe-model.h	2014-03-12 10:59:54 +0000
 +++ src/app/webbrowser/history-timeframe-model.h	2015-09-17 15:38:35 +0000
@@ -53,6 +53,7 @@
  protected:
      // reimplemented from QSortFilterProxyModel
      bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
++    QHash<int, QByteArray> roleNames() const;
  private:
      QDateTime m_start;
 === renamed file 'src/app/webbrowser/suggestions-filter-model.cpp' => 'src/app/webbrowser/text-search-filter-model.cpp'
 --- src/app/webbrowser/suggestions-filter-model.cpp	2015-04-16 17:48:55 +0000
 +++ src/app/webbrowser/text-search-filter-model.cpp	2015-09-17 15:38:35 +0000
@@ -16,37 +16,40 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "suggestions-filter-model.h"
++#include "text-search-filter-model.h"
  #include <QtCore/QDebug>
  #include <QtCore/QSet>
  /*!
--    \class SuggestionsFilterModel
++    \class TextSearchFilterModel
      \brief Proxy model that filters the contents of a model based on a list of
             keywords applied to multiple fields.
--    SuggestionsFilterModel is a proxy model that filters the contents of a
++    TextSearchFilterModel is a proxy model that filters the contents of a
      model based on a list of terms string that is applied to multiple user
      defined fields (matching role names in the source model).
      An item in the source model is returned by this model if all the search
--    terms are contained across all of the item's fields (i.e. given two search
++    terms are contained in any of the item's fields (i.e. given two search
      terms, if one is found in a field and the other in a different field, then
--    the item will be returned)
++    the item will be returned, but it will not be returned if only one is found)
++
++    If no searchTerms and/or no searchFields are present, all entries from the
++    source model are returned.
  */
--SuggestionsFilterModel::SuggestionsFilterModel(QObject* parent)
++TextSearchFilterModel::TextSearchFilterModel(QObject* parent)
      : QSortFilterProxyModel(parent)
+ {
+ }
--QVariant SuggestionsFilterModel::sourceModel() const
++QVariant TextSearchFilterModel::sourceModel() const
+ {
      QAbstractItemModel* source = QSortFilterProxyModel::sourceModel();
      return (source) ? QVariant::fromValue(source) : QVariant();
+ }
--void SuggestionsFilterModel::setSourceModel(QVariant sourceModel)
++void TextSearchFilterModel::setSourceModel(QVariant sourceModel)
+ {
      QAbstractItemModel* currentSource = QSortFilterProxyModel::sourceModel();
      QAbstractItemModel* newSource = qvariant_cast<QAbstractItemModel*>(sourceModel);
@@ -58,7 +61,7 @@
+     }
+ }
--void SuggestionsFilterModel::setTerms(const QStringList& terms)
++void TextSearchFilterModel::setTerms(const QStringList& terms)
+ {
      if (terms != m_terms) {
          m_terms = terms;
@@ -68,12 +71,12 @@
+     }
+ }
--const QStringList& SuggestionsFilterModel::terms() const
++const QStringList& TextSearchFilterModel::terms() const
+ {
      return m_terms;
+ }
--void SuggestionsFilterModel::setSearchFields(const QStringList& searchFields)
++void TextSearchFilterModel::setSearchFields(const QStringList& searchFields)
+ {
      if (searchFields != m_searchFields) {
          m_searchFields = searchFields;
@@ -84,12 +87,12 @@
+     }
+ }
--const QStringList& SuggestionsFilterModel::searchFields() const
++const QStringList& TextSearchFilterModel::searchFields() const
+ {
      return m_searchFields;
+ }
--void SuggestionsFilterModel::updateSearchRoles(const QAbstractItemModel* model) {
++void TextSearchFilterModel::updateSearchRoles(const QAbstractItemModel* model) {
      m_searchRoles.clear();
      if (model) {
          Q_FOREACH(const QString& field, m_searchFields) {
@@ -103,10 +106,10 @@
+     }
+ }
--bool SuggestionsFilterModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
++bool TextSearchFilterModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
+ {
      if (m_terms.isEmpty() || m_searchFields.isEmpty()) {
--        return false;
++        return true;
+     }
      QAbstractItemModel* source = QSortFilterProxyModel::sourceModel();
@@ -129,7 +132,7 @@
      return false;
+ }
--int SuggestionsFilterModel::count() const
++int TextSearchFilterModel::count() const
+ {
      return rowCount();
+ }
 === renamed file 'src/app/webbrowser/suggestions-filter-model.h' => 'src/app/webbrowser/text-search-filter-model.h'
 --- src/app/webbrowser/suggestions-filter-model.h	2015-04-16 15:59:20 +0000
 +++ src/app/webbrowser/text-search-filter-model.h	2015-09-17 15:38:35 +0000
@@ -16,8 +16,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#ifndef SUGGESTIONSFILTERMODEL_H
--#define SUGGESTIONSFILTERMODEL_H
++#ifndef TEXTSEARCHFILTERMODEL_H
++#define TEXTSEARCHFILTERMODEL_H
  // Qt
  #include <QtCore/QAbstractItemModel>
@@ -27,7 +27,7 @@
  #include <QtCore/QStringList>
  #include <QtCore/QVariant>
--class SuggestionsFilterModel : public QSortFilterProxyModel
++class TextSearchFilterModel : public QSortFilterProxyModel
+ {
      Q_OBJECT
@@ -37,7 +37,7 @@
      Q_PROPERTY(int count READ count NOTIFY countChanged)
  public:
--    SuggestionsFilterModel(QObject* parent=0);
++    TextSearchFilterModel(QObject* parent=0);
      QVariant sourceModel() const;
      void setSourceModel(QVariant sourceModel);
@@ -69,4 +69,4 @@
  };
--#endif // SUGGESTIONSFILTERMODEL_H
++#endif // TEXTSEARCHFILTERMODEL_H
 === modified file 'src/app/webbrowser/webbrowser-app.cpp'
 --- src/app/webbrowser/webbrowser-app.cpp	2015-08-10 14:21:37 +0000
 +++ src/app/webbrowser/webbrowser-app.cpp	2015-09-17 15:38:35 +0000
@@ -29,7 +29,7 @@
  #include "history-timeframe-model.h"
  #include "limit-proxy-model.h"
  #include "searchengine.h"
--#include "suggestions-filter-model.h"
++#include "text-search-filter-model.h"
  #include "tabs-model.h"
  #include "top-sites-model.h"
  #include "webbrowser-app.h"
@@ -81,7 +81,7 @@
      qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory);
      qmlRegisterType<SearchEngine>(uri, 0, 1, "SearchEngine");
      qmlRegisterSingletonType<CacheDeleter>(uri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory);
--    qmlRegisterType<SuggestionsFilterModel>(uri, 0, 1, "SuggestionsFilterModel");
++    qmlRegisterType<TextSearchFilterModel>(uri, 0, 1, "TextSearchFilterModel");
      if (BrowserApplication::initialize("webbrowser/webbrowser-app.qml")) {
          QStringList searchEnginesSearchPaths;
 === modified file 'tests/autopilot/webbrowser_app/tests/test_findinpage.py'
 --- tests/autopilot/webbrowser_app/tests/test_findinpage.py	2015-08-14 09:25:38 +0000
 +++ tests/autopilot/webbrowser_app/tests/test_findinpage.py	2015-09-17 15:38:35 +0000
@@ -155,6 +155,20 @@
          self.pointing_device.click_object(webview)
          self.assertThat(bar.findInPageMode, Eventually(Equals(False)))
++    def test_history_exits_findinpage_mode(self):
++        bar = self.chrome.address_bar
++        self.activate_find_in_page(False)
++        self.assertThat(bar.findInPageMode, Eventually(Equals(True)))
++        self.open_history()
++        self.assertThat(bar.findInPageMode, Eventually(Equals(False)))
++
++    def test_settings_exits_findinpage_mode(self):
++        bar = self.chrome.address_bar
++        self.activate_find_in_page(False)
++        self.assertThat(bar.findInPageMode, Eventually(Equals(True)))
++        self.open_settings()
++        self.assertThat(bar.findInPageMode, Eventually(Equals(False)))
++
      def test_find_in_page_not_in_menu_in_new_tab(self):
          if not self.main_window.wide:
              self.open_tabs_view()
 === modified file 'tests/unittests/CMakeLists.txt'
 --- tests/unittests/CMakeLists.txt	2015-07-07 20:50:04 +0000
 +++ tests/unittests/CMakeLists.txt	2015-09-17 15:38:35 +0000
@@ -10,7 +10,6 @@
  add_subdirectory(history-lastvisitdatelist-model)
  add_subdirectory(top-sites-model)
  add_subdirectory(session-utils)
--add_subdirectory(suggestions-filter-model)
  add_subdirectory(tabs-model)
  add_subdirectory(bookmarks-model)
  add_subdirectory(bookmarks-folder-model)
@@ -24,3 +23,4 @@
  add_subdirectory(webapp-container-hook)
  add_subdirectory(intent-filter)
  add_subdirectory(search-engine)
++add_subdirectory(text-search-filter-model)
 === modified file 'tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp'
 --- tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp	2015-08-04 02:14:53 +0000
 +++ tests/unittests/history-lastvisitdate-model/tst_HistoryLastVisitDateModelTests.cpp	2015-09-17 15:38:35 +0000
@@ -21,6 +21,7 @@
  #include <QtTest/QtTest>
  // local
++#include "bookmarks-model.h"
  #include "history-lastvisitdate-model.h"
  #include "history-model.h"
  #include "history-timeframe-model.h"
@@ -43,7 +44,7 @@
          timeframe = new HistoryTimeframeModel;
          timeframe->setSourceModel(history);
          model = new HistoryLastVisitDateModel;
--        model->setSourceModel(timeframe);
++        model->setSourceModel(QVariant::fromValue(timeframe));
+     }
      void cleanup()
@@ -61,15 +62,36 @@
      void shouldNotifyWhenChangingSourceModel()
+     {
          QSignalSpy spy(model, SIGNAL(sourceModelChanged()));
--        model->setSourceModel(timeframe);
++        model->setSourceModel(QVariant::fromValue(timeframe));
          QVERIFY(spy.isEmpty());
++
          HistoryTimeframeModel* timeframe2 = new HistoryTimeframeModel(model);
--        model->setSourceModel(timeframe2);
++        model->setSourceModel(QVariant::fromValue(timeframe2));
          QCOMPARE(spy.count(), 1);
--        QCOMPARE(model->sourceModel(), timeframe2);
--        model->setSourceModel(0);
++        QCOMPARE(model->sourceModel(), QVariant::fromValue(timeframe2));
++
++        model->setSourceModel(QVariant());
          QCOMPARE(spy.count(), 2);
--        QCOMPARE(model->sourceModel(), (HistoryTimeframeModel*) 0);
++        QVERIFY(!model->sourceModel().isValid());
++
++        QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances are allowed as source models");
++        model->setSourceModel(QVariant::fromValue(QString("not a model")));
++        QVERIFY(!model->sourceModel().isValid());
++        QCOMPARE(model->rowCount(), 0);
++        QCOMPARE(spy.count(), 2); // model is still invalid internally so no signal emitted
++
++        QTest::ignoreMessage(QtWarningMsg, "No results will be returned because the sourceModel does not have a role named \"lastVisitDate\"");
++        BookmarksModel bookmarks;
++        bookmarks.setDatabasePath(":memory:");
++        bookmarks.add(QUrl("http://example.org/"), "Example Domain", QUrl(), "");
++        model->setSourceModel(QVariant::fromValue(&bookmarks));
++        QCOMPARE(spy.count(), 3);
++        // with no filter, all entries match even if the model doesn't have the lastVisitDate role
++        QCOMPARE(model->rowCount(), 1);
++        model->setLastVisitDate(QDate::currentDate());
++        QCOMPARE(model->rowCount(), 0);
++
++        delete timeframe2;
+     }
      void shouldNotifyWhenChangingLastVisitDate()
 === modified file 'tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp'
 --- tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp	2015-08-11 16:51:54 +0000
 +++ tests/unittests/history-lastvisitdatelist-model/tst_HistoryLastVisitDateListModelTests.cpp	2015-09-17 15:38:35 +0000
@@ -21,6 +21,7 @@
  #include <QtTest/QtTest>
  // local
++#include "bookmarks-model.h"
  #include "domain-utils.h"
  #include "history-lastvisitdatelist-model.h"
  #include "history-model.h"
@@ -110,7 +111,7 @@
                  m_entries.removeAt(i);
                  endRemoveRows();
                  Q_EMIT rowCountChanged();
--            }
++            }
+         }
+     }
@@ -146,6 +147,7 @@
      MockHistoryModel* mockHistory;
      HistoryTimeframeModel* timeframe;
      HistoryLastVisitDateListModel* model;
++    BookmarksModel* bookmarks;
  private Q_SLOTS:
      void init()
@@ -155,7 +157,9 @@
          timeframe = new HistoryTimeframeModel;
          timeframe->setSourceModel(mockHistory);
          model = new HistoryLastVisitDateListModel;
--        model->setSourceModel(timeframe);
++        model->setSourceModel(QVariant::fromValue(timeframe));
++        bookmarks = new BookmarksModel;
++        bookmarks->setDatabasePath(":memory:");
+     }
      void cleanup()
@@ -163,6 +167,7 @@
          delete model;
          delete timeframe;
          delete mockHistory;
++        delete bookmarks;
+     }
      void shouldBeInitiallyEmpty()
@@ -270,7 +275,7 @@
+     {
          QDateTime dt1 = QDateTime(QDate(1970, 1, 1), QTime(6, 0, 0));
          QDateTime dt2 = QDateTime(QDate(1970, 1, 2), QTime(6, 0, 0));
--
++
          mockHistory->add(QUrl("http://example.com/"), "Example Domain", "example.com", QUrl(), dt1);
          mockHistory->add(QUrl("http://example.org/"), "Example Domain", "example.org", QUrl(), dt2);
          QTest::qWait(100);
@@ -288,7 +293,7 @@
          QSignalSpy spyRowsRemoved(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
          QDateTime dt1 = QDateTime(QDate(1970, 1, 1), QTime(6, 0, 0));
          QDateTime dt2 = QDateTime(QDate(1970, 1, 2), QTime(6, 0, 0));
--
++
          mockHistory->add(QUrl("http://example.com/"), "Example Domain", "example.com", QUrl(), dt1);
          mockHistory->add(QUrl("http://example.org/"), "Example Domain", "example.org", QUrl(), dt2);
          QCOMPARE(model->rowCount(), 3);
@@ -308,21 +313,33 @@
          mockHistory->add(QUrl("http://example.net/"), "Example Domain", "example.net", QUrl(), dt3);
          QCOMPARE(model->rowCount(), 4);
--        model->setSourceModel(timeframe);
++        model->setSourceModel(QVariant::fromValue(timeframe));
          QVERIFY(spy.isEmpty());
          QCOMPARE(model->rowCount(), 4);
++        QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances are allowed as source models");
          model->setSourceModel(0);
          QCOMPARE(spy.count(), 1);
--        QCOMPARE(model->sourceModel(), (HistoryTimeframeModel*) 0);
++        QVERIFY(!model->sourceModel().isValid());
          QCOMPARE(model->rowCount(), 0);
--        HistoryTimeframeModel* timeframe2 = new HistoryTimeframeModel(mockHistory);
--        timeframe2->setSourceModel(mockHistory);
--        model->setSourceModel(timeframe2);
++        HistoryTimeframeModel timeframe2(mockHistory);
++        timeframe2.setSourceModel(mockHistory);
++        model->setSourceModel(QVariant::fromValue(&timeframe2));
          QCOMPARE(spy.count(), 2);
--        QCOMPARE(model->sourceModel(), timeframe2);
++        QCOMPARE(model->sourceModel(), QVariant::fromValue(&timeframe2));
          QCOMPARE(model->rowCount(), 4);
++
++        QTest::ignoreMessage(QtWarningMsg, "Only QAbstractItemModel-derived instances are allowed as source models");
++        model->setSourceModel(QVariant::fromValue(QString("not a model")));
++        QCOMPARE(spy.count(), 3);
++        QVERIFY(!model->sourceModel().isValid());
++        QCOMPARE(model->rowCount(), 0);
++
++        QTest::ignoreMessage(QtWarningMsg, "No results will be returned because the sourceModel does not have a role named \"lastVisitDate\"");
++        bookmarks->add(QUrl("http://example.org/"), "Example Domain", QUrl(), "");
++        model->setSourceModel(QVariant::fromValue(bookmarks));
++        QCOMPARE(model->rowCount(), 0);
+     }
      void shouldKeepLastVisitDatesSorted()
 === modified file 'tests/unittests/qml/CMakeLists.txt'
 --- tests/unittests/qml/CMakeLists.txt	2015-08-11 21:35:55 +0000
 +++ tests/unittests/qml/CMakeLists.txt	2015-09-17 15:38:35 +0000
@@ -28,6 +28,7 @@
      ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp
      ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
      ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp
++    ${webbrowser-app_SOURCE_DIR}/text-search-filter-model.cpp
      ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp
      tst_QmlTests.cpp
+ )
 === modified file 'tests/unittests/qml/tst_HistoryViewWide.qml'
 --- tests/unittests/qml/tst_HistoryViewWide.qml	2015-08-18 13:58:19 +0000
 +++ tests/unittests/qml/tst_HistoryViewWide.qml	2015-09-17 15:38:35 +0000
@@ -21,6 +21,7 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Components.ListItems 1.3 as ListItems
  import Ubuntu.Test 1.0
++import webbrowsertest.private 0.1
  import "../../../src/app/webbrowser"
  Item {
@@ -29,12 +30,24 @@
      width: 700
      height: 500
--    HistoryViewWide {
--        id: historyViewWide
++    property var historyViewWide: historyViewWideLoader.item
++    property int ctrlFCaptured: 0
++
++    Keys.onPressed: {
++        if (event.modifiers === Qt.ControlModifier && event.key === Qt.Key_F)
++            ctrlFCaptured++
++    }
++
++    Loader {
++        id: historyViewWideLoader
          anchors.fill: parent
--        historyModel: HistoryModel {
--            id: historyMockModel
--            databasePath: ":memory:"
++        active: false
++        focus: true
++        sourceComponent: HistoryViewWide {
++            focus: true
++            historyModel: HistoryModelMock {
++                databasePath: ":memory:"
++            }
+         }
+     }
@@ -78,16 +91,40 @@
+         }
          function init() {
++            historyViewWideLoader.active = true
++            waitForRendering(historyViewWideLoader.item)
++
              for (var i = 0; i < 3; ++i) {
--                historyMockModel.add("http://example.org/" + i, "Example Domain " + i, "")
++                historyViewWide.historyModel.add("http://example.org/" + i, "Example Domain " + i, "")
+             }
              var urlsList = findChild(historyViewWide, "urlsListView")
++            waitForRendering(urlsList)
              tryCompare(urlsList, "count", 3)
--            waitForRendering(urlsList)
+         }
          function cleanup() {
--            historyMockModel.clearAll()
++            historyViewWideLoader.active = false
++            ctrlFCaptured = 0
++        }
++
++        function getListItems(name, itemName) {
++            var list = findChild(historyViewWide, name)
++            var items = []
++            if (list) {
++                // ensure all the delegates are created
++                list.cacheBuffer = list.count * 1000
++
++                // In some cases the ListView might add other children to the
++                // contentItem, so we filter the list of children to include
++                // only actual delegates
++                var children = list.contentItem.children
++                for (var i = 0; i < children.length; i++) {
++                    if (children[i].objectName === itemName) {
++                        items.push(children[i])
++                    }
++                }
++            }
++            return items
+         }
          function test_done_button() {
@@ -168,28 +205,253 @@
          function test_keyboard_navigation_between_lists() {
              var lastVisitDateList = findChild(historyViewWide, "lastVisitDateListView")
              var urlsList = findChild(historyViewWide, "urlsListView")
--            verify(!lastVisitDateList.activeFocus)
++            verify(urlsList.activeFocus)
              keyClick(Qt.Key_Left)
--            verify(lastVisitDateList.activeFocus)
--            verify(!urlsList.activeFocus)
++            verify(lastVisitDateList.activeFocus)
++            verify(!urlsList.activeFocus)
              keyClick(Qt.Key_Right)
--            verify(urlsList.activeFocus)
++            verify(urlsList.activeFocus)
++        }
++
++        function test_search_button() {
++            var searchQuery = findChild(historyViewWide, "searchQuery")
++            verify(!searchQuery.visible)
++
++            var searchButton = findChild(historyViewWide, "searchButton")
++            verify(searchButton.visible)
++            clickItem(searchButton)
++            verify(!searchButton.visible)
++
++            verify(searchQuery.visible)
++            verify(searchQuery.activeFocus)
++            compare(searchQuery.text, "")
++
++            var urlsList = findChild(historyViewWide, "urlsListView")
++            compare(urlsList.count, 3)
++            typeString("2")
++            compare(urlsList.count, 1)
++
++            var backButton = findChild(historyViewWide, "backButton")
++            verify(backButton.visible)
++            clickItem(backButton)
++            verify(!backButton.visible)
++            verify(!searchQuery.visible)
++            verify(searchButton.visible)
++            compare(urlsList.count, 3)
++
++            clickItem(searchButton)
++            compare(searchQuery.text, "")
++        }
++
++        function test_keyboard_navigation_for_search() {
++            var urlsList = findChild(historyViewWide, "urlsListView")
++            verify(urlsList.activeFocus)
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++
++            var searchQuery = findChild(historyViewWide, "searchQuery")
++            verify(searchQuery.activeFocus)
++
++            keyClick(Qt.Key_Escape)
++            verify(urlsList.activeFocus)
++
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            keyClick(Qt.Key_Down)
++            verify(urlsList.activeFocus)
++            keyClick(Qt.Key_Up)
++            verify(searchQuery.activeFocus)
++
++            keyClick(Qt.Key_Down)
++            keyClick(Qt.Key_Left)
++            keyClick(Qt.Key_Up)
++            verify(searchQuery.activeFocus)
++        }
++
++        function test_ctrl_f_during_search_returns_to_query() {
++            var urlsList = findChild(historyViewWide, "urlsListView")
++            var datesList = findChild(historyViewWide, "lastVisitDateListView")
++            var searchQuery = findChild(historyViewWide, "searchQuery")
++
++            verify(urlsList.activeFocus)
++            verify(!historyViewWide.searchMode)
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            verify(searchQuery.activeFocus)
++            verify(historyViewWide.searchMode)
++
++            // CTRL+F jumps back to the search box from the urls list...
++            keyClick(Qt.Key_Down)
++            verify(urlsList.activeFocus)
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            verify(searchQuery.activeFocus)
++
++            // ...and from the dates list
++            keyClick(Qt.Key_Down)
++            keyClick(Qt.Key_Left)
++            verify(datesList.activeFocus)
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            verify(searchQuery.activeFocus)
++        }
++
++        function test_ctrl_f_during_select_is_swallowed() {
++            var urlsList = findChild(historyViewWide, "urlsListView")
++            longPressItem(urlsList.children[0])
++            verify(historyViewWide.selectMode)
++
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            wait(50) // make sure event loop has processed
++            compare(ctrlFCaptured, 0)
++            verify(historyViewWide.selectMode)
++        }
++
++        function test_history_entry_activated_by_keyboard() {
++            var urlsList = findChild(historyViewWide, "urlsListView")
++            compare(urlsList.count, 3)
++            historyEntryClickedSpy.clear()
++            keyClick(Qt.Key_Enter)
++            compare(historyEntryClickedSpy.count, 1)
++            var args = historyEntryClickedSpy.signalArguments[0]
++            var entry = urlsList.model.get(2)
++            compare(String(args[0]), String(entry.url))
++
++            // now try the same during a search
++            historyEntryClickedSpy.clear()
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            typeString("dom")
++            keyClick(Qt.Key_Down)
++            keyClick(Qt.Key_Enter)
++            compare(historyEntryClickedSpy.count, 1)
++            args = historyEntryClickedSpy.signalArguments[0]
++            entry = urlsList.model.get(0)
++            compare(String(args[0]), String(entry.url))
++        }
++
++        function test_search_highlight() {
++            function wraphtml(text) { return "<html>%1</html>".arg(text) }
++            function highlight(term) {
++                return "<font color=\"%1\">%2</font>".arg("#752571").arg(term)
++            }
++
++            var searchButton = findChild(historyViewWide, "searchButton")
++            var searchQuery = findChild(historyViewWide, "searchQuery")
++            var urlsList = findChild(historyViewWide, "urlsListView")
++            clickItem(searchButton)
++
++            var term = "2"
++            typeString(term)
++            var items = getListItems("urlsListView", "historyDelegate")
++            compare(items.length, 1)
++            compare(items[0].title, wraphtml("Example Domain " + highlight(term)))
++
++            var backButton = findChild(historyViewWide, "backButton")
++            clickItem(backButton)
++            clickItem(searchButton)
++
++            var terms = ["1", "Example"]
++            typeString(terms.join(" "))
++            items = getListItems("urlsListView", "historyDelegate")
++            compare(items.length, 1)
++            compare(items[0].title, wraphtml("%1 Domain %0"
++                                             .arg(highlight(terms[0]))
++                                             .arg(highlight(terms[1]))))
++        }
++
++        function test_search_updates_dates_list() {
++            function getDateItem(date) {
++                var dates = getListItems("lastVisitDateListView", "lastVisitDateDelegate")
++                var items = dates.filter(function(item) {
++                    return item.lastVisitDate.valueOf() === date.valueOf()
++                })
++                if (items.length > 0) return items.pop()
++                else return null
++            }
++            function returnToDatesList() {
++                keyClick(Qt.Key_Down)
++                keyClick(Qt.Key_Left)
++            }
++
++            var searchQuery = findChild(historyViewWide, "searchQuery")
++            var today = new Date()
++            today = new Date(today.getFullYear(), today.getMonth(), today.getDate())
++            var youngest = new Date(1912, 6, 23)
++            var model = historyViewWide.historyModel
++            model.addByDate("https://en.wikipedia.org/wiki/Alan_Turing", "Alan Turing", youngest)
++            model.addByDate("https://en.wikipedia.org/wiki/Alonzo_Church", "Alonzo Church", new Date(1903, 6, 14))
++
++            var lastVisitDateList = findChild(historyViewWide, "lastVisitDateListView")
++            var dates = getListItems("lastVisitDateListView", "lastVisitDateDelegate")
++            var urls = getListItems("urlsListView", "historyDelegate")
++            compare(dates.length, 4)
++            compare(urls.length, 5)
++
++            // select a date that has search results in it and verify it is
++            // still the currently selected one after the search.
++            var testItem = getDateItem(youngest)
++            clickItem(testItem)
++            verify(testItem.activeFocus)
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            typeString("Alan")
++            urls = getListItems("urlsListView", "historyDelegate")
++            compare(urls.length, 1)
++            returnToDatesList()
++            verify(testItem.activeFocus)
++
++            // change the search terms so that it will display more items, but
++            // since we have a selected date, we will see only one
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            keyClick(Qt.Key_Backspace)
++            keyClick(Qt.Key_Backspace)
++            compare(searchQuery.text, "Al")
++            returnToDatesList()
++            verify(testItem.activeFocus)
++            urls = getListItems("urlsListView", "historyDelegate")
++            compare(urls.length, 1)
++
++            // change the search terms so that the current date will not be
++            // included in the results
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            typeString("onzo")
++            urls = getListItems("urlsListView", "historyDelegate")
++            compare(urls.length, 1)
++            compare(searchQuery.text, "Alonzo")
++            returnToDatesList()
++            testItem = getDateItem(youngest)
++            compare(testItem, null)
++
++            // verify that the current item has reverted to the first in the
++            // dates list ("all dates")
++            compare(lastVisitDateList.currentIndex, 0)
++
++            // if widen the search again now, we should see both results again
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            keyClick(Qt.Key_Backspace)
++            keyClick(Qt.Key_Backspace)
++            keyClick(Qt.Key_Backspace)
++            keyClick(Qt.Key_Backspace)
++            compare(searchQuery.text, "Al")
++            urls = getListItems("urlsListView", "historyDelegate")
++            compare(urls.length, 2)
+         }
          function test_delete_key_at_urls_list_view() {
              var urlsList = findChild(historyViewWide, "urlsListView")
              keyClick(Qt.Key_Right)
--            verify(urlsList.activeFocus)
++            verify(urlsList.activeFocus)
              compare(urlsList.count, 3)
              keyClick(Qt.Key_Delete)
              compare(urlsList.count, 2)
++
++            // now try the same while in a search
++            keyClick(Qt.Key_F, Qt.ControlModifier)
++            typeString("dom")
++            keyClick(Qt.Key_Down)
++            keyClick(Qt.Key_Delete)
++            compare(urlsList.count, 1)
+         }
          function test_delete_key_at_last_visit_date() {
              var lastVisitDateList = findChild(historyViewWide, "lastVisitDateListView")
              var urlsList = findChild(historyViewWide, "urlsListView")
              keyClick(Qt.Key_Left)
--            verify(lastVisitDateList.activeFocus)
++            verify(lastVisitDateList.activeFocus)
              compare(lastVisitDateList.currentIndex, 0)
              keyClick(Qt.Key_Down)
              compare(lastVisitDateList.currentIndex, 1)
@@ -202,7 +464,7 @@
              var lastVisitDateList = findChild(historyViewWide, "lastVisitDateListView")
              var urlsList = findChild(historyViewWide, "urlsListView")
              keyClick(Qt.Key_Left)
--            verify(lastVisitDateList.activeFocus)
++            verify(lastVisitDateList.activeFocus)
              compare(lastVisitDateList.currentIndex, 0)
              compare(urlsList.count, 3)
              keyClick(Qt.Key_Delete)
 === modified file 'tests/unittests/qml/tst_QmlTests.cpp'
 --- tests/unittests/qml/tst_QmlTests.cpp	2015-08-11 21:35:55 +0000
 +++ tests/unittests/qml/tst_QmlTests.cpp	2015-09-17 15:38:35 +0000
@@ -36,6 +36,7 @@
  #include "limit-proxy-model.h"
  #include "searchengine.h"
  #include "tabs-model.h"
++#include "text-search-filter-model.h"
  #include "top-sites-model.h"
  static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
@@ -109,6 +110,41 @@
      QTemporaryDir m_testDir2;
  };
++class HistoryModelMock : public HistoryModel {
++  Q_OBJECT
++
++public:
++  static bool compareHistoryEntries(const HistoryEntry& a, const HistoryEntry& b) {
++      return a.lastVisit < b.lastVisit;
++  }
++
++  Q_INVOKABLE int addByDate(const QUrl& url, const QString& title, const QDateTime& date)
++  {
++      int index = getEntryIndex(url);
++      int visitsToAdd = 1;
++      if (index == -1) {
++          add(url, title, QString());
++          index = getEntryIndex(url);
++          visitsToAdd = 0;
++      }
++
++      // Since this is useful only for testing and efficiency is not critical
++      // we reorder the model and reset it every time we add a new item by date
++      // to keep things simple.
++      beginResetModel();
++      HistoryEntry entry = m_entries.takeAt(index);
++      entry.lastVisit = date;
++      entry.visits = entry.visits + visitsToAdd;
++      m_entries.append(entry);
++      std::sort(m_entries.begin(), m_entries.end(), compareHistoryEntries);
++      endResetModel();
++
++      updateExistingEntryInDatabase(entry);
++
++      return entry.visits;
++  }
++};
++
  static QObject* TestContext_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+ {
      Q_UNUSED(engine);
@@ -131,10 +167,13 @@
      qmlRegisterType<HistoryLastVisitDateListModel>(browserUri, 0, 1, "HistoryLastVisitDateListModel");
      qmlRegisterType<HistoryLastVisitDateModel>(browserUri, 0, 1, "HistoryLastVisitDateModel");
      qmlRegisterType<LimitProxyModel>(browserUri, 0, 1, "LimitProxyModel");
++    qmlRegisterType<TextSearchFilterModel>(browserUri, 0, 1, "TextSearchFilterModel");
      qmlRegisterType<TopSitesModel>(browserUri, 0, 1, "TopSitesModel");
      qmlRegisterSingletonType<FileOperations>(browserUri, 0, 1, "FileOperations", FileOperations_singleton_factory);
--    qmlRegisterSingletonType<TestContext>("webbrowsertest.private", 0, 1, "TestContext", TestContext_singleton_factory);
++    const char* testUri = "webbrowsertest.private";
++    qmlRegisterSingletonType<TestContext>(testUri, 0, 1, "TestContext", TestContext_singleton_factory);
++    qmlRegisterType<HistoryModelMock>(testUri, 0, 1, "HistoryModelMock");
      return quick_test_main(argc, argv, "QmlTests", nullptr);
+ }
 === renamed directory 'tests/unittests/suggestions-filter-model' => 'tests/unittests/text-search-filter-model'
 === modified file 'tests/unittests/text-search-filter-model/CMakeLists.txt'
 --- tests/unittests/suggestions-filter-model/CMakeLists.txt	2015-06-22 10:29:20 +0000
 +++ tests/unittests/text-search-filter-model/CMakeLists.txt	2015-09-17 15:38:35 +0000
@@ -1,8 +1,8 @@
  find_package(Qt5Core REQUIRED)
  find_package(Qt5Sql REQUIRED)
  find_package(Qt5Test REQUIRED)
--set(TEST tst_SuggestionsFilterModelTests)
--add_executable(${TEST} tst_SuggestionsFilterModelTests.cpp)
++set(TEST tst_TextSearchFilterModelTests)
++add_executable(${TEST} tst_TextSearchFilterModelTests.cpp)
  include_directories(${webbrowser-app_SOURCE_DIR})
  target_link_libraries(${TEST}
      Qt5::Core
 === renamed file 'tests/unittests/suggestions-filter-model/tst_SuggestionsFilterModelTests.cpp' => 'tests/unittests/text-search-filter-model/tst_TextSearchFilterModelTests.cpp'
 --- tests/unittests/suggestions-filter-model/tst_SuggestionsFilterModelTests.cpp	2015-04-16 18:45:31 +0000
 +++ tests/unittests/text-search-filter-model/tst_TextSearchFilterModelTests.cpp	2015-09-17 15:38:35 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-2015 Canonical Ltd.
+  *
   * This file is part of webbrowser-app.
+  *
@@ -22,22 +22,22 @@
  // local
  #include "history-model.h"
--#include "suggestions-filter-model.h"
++#include "text-search-filter-model.h"
--class SuggestionsFilterModelTests : public QObject
++class TextSearchFilterModelTests : public QObject
+ {
      Q_OBJECT
  private:
      HistoryModel* model;
--    SuggestionsFilterModel* matches;
++    TextSearchFilterModel* matches;
  private Q_SLOTS:
      void init()
+     {
          model = new HistoryModel;
          model->setDatabasePath(":memory:");
--        matches = new SuggestionsFilterModel;
++        matches = new TextSearchFilterModel;
          matches->setSourceModel(QVariant::fromValue(model));
+     }
@@ -67,11 +67,17 @@
          delete model2;
+     }
--    void shouldBeEmptyWhileTermsAndFieldsEmpty()
++    void shouldReturnAllWhileTermsAndOrFieldsEmpty()
+     {
          model->add(QUrl("http://example.org"), "Example Domain", QUrl());
          model->add(QUrl("http://example.com"), "Example Domain", QUrl());
--        QCOMPARE(matches->rowCount(), 0);
++        QCOMPARE(matches->rowCount(), 2);
++        matches->setTerms(QStringList({"org"}));
++        QCOMPARE(matches->rowCount(), 2);
++        matches->setSearchFields(QStringList({"url"}));
++        QCOMPARE(matches->rowCount(), 1);
++        matches->setTerms(QStringList());
++        QCOMPARE(matches->rowCount(), 2);
+     }
      void shouldRecordTerms()
@@ -132,8 +138,6 @@
          QCOMPARE(matches->rowCount(), 2);
          matches->setTerms(QStringList({"wiki"}));
          QCOMPARE(matches->rowCount(), 1);
--        matches->setTerms(QStringList());
--        QCOMPARE(matches->rowCount(), 0);
+     }
      void shouldUpdateResultsWhenSourceModelUpdates()
@@ -184,5 +188,5 @@
+     }
  };
--QTEST_MAIN(SuggestionsFilterModelTests)
--#include "tst_SuggestionsFilterModelTests.moc"
++QTEST_MAIN(TextSearchFilterModelTests)
++#include "tst_TextSearchFilterModelTests.moc"