webbrowser-app

Merge lp:~osomon/webbrowser-app/official-api into lp:webbrowser-app

official-api
Merge into trunk

Proposed by Olivier Tilloy on 2014-05-29

Status:

Merged

Merged at revision:

565

Proposed branch:

lp:~osomon/webbrowser-app/official-api

Merge into:

lp:webbrowser-app

Diff against target:

1259 lines (+524/-263)

25 files modified

.bzrignore (+2/-0)
CMakeLists.txt (+2/-0)
debian/control (+41/-19)
debian/qtdeclarative5-ubuntu-web-plugin.install (+1/-0)
debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides (+3/-0)
doc/CMakeLists.txt (+11/-0)
doc/SharedWebContext.qdoc (+39/-0)
doc/WebContext.qdoc (+70/-0)
doc/WebView.qdoc (+207/-0)
doc/ubuntu-web.qdoc (+22/-0)
doc/ubuntu-web.qdocconf (+10/-0)
src/Ubuntu/CMakeLists.txt (+22/-0)
src/Ubuntu/Components/Extras/Browser/CMakeLists.txt (+2/-22)
src/Ubuntu/Components/Extras/Browser/qmldir (+3/-1)
src/Ubuntu/Web/CMakeLists.txt (+26/-0)
src/Ubuntu/Web/UbuntuWebContext.qml (+7/-7)
src/Ubuntu/Web/UbuntuWebView02.qml (+17/-146)
src/Ubuntu/Web/plugin.cpp (+8/-5)
src/Ubuntu/Web/qmldir (+5/-0)
src/Ubuntu/Web/selection02.js (+0/-41)
src/app/WebViewImpl.qml (+2/-2)
src/app/webbrowser/TimelineView.qml (+0/-1)
src/app/webcontainer/WebViewImplOxide.qml (+15/-15)
tests/unittests/qml/tst_UbuntuWebView02.qml (+4/-4)
webbrowser-app.qmlproject (+5/-0)

To merge this branch:

bzr merge lp:~osomon/webbrowser-app/official-api

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-06-09
Łukasz Zemczak	packaging	2014-06-03	Needs Fixing on 2014-06-09
Ubuntu Phablet Team		2014-05-29	Pending
Review via email: mp+221436@code.launchpad.net

Commit message

Move version 0.2 of the API to "Ubuntu.Web" namespace, rename "UbuntuWebView" to "WebView", and document the public API intended for application developers.

The legacy namespace and component name are kept around for compatibility with existing applications.

Version 0.1 of the API remains untouched (it is deprecated).

Packaging changes:
new qtdeclarative5-ubuntu-web-plugin package that contains the new namespace and name for the public QML API;
updated runtime dependencies for webbrowser-app, webapp-container and qtdeclarative5-ubuntu-ui-extras-browser-plugin;
updated descriptions for all packages;
added missing multiarch stanza for webapp-container-autopilot;
added missing predepends stanzas for multiarch packages.

Description of the change

Instructions for testing:

The name (UbuntuWebView → WebView) and namespace (Ubuntu.Components.Extras.Browser → Ubuntu.Web) changes should not break compatibility with existing applications, meaning that the current name and namespace will be kept around for the foreseeable future, while being advertised as deprecated in favour of the new name and namespace.

From public API point of view, there are three scenarii to test:

  import Ubuntu.Components.Extras.Browser 0.1 // legacy, QtWebKit based
  import Ubuntu.Components.Extras.Browser 0.2 // current, Oxide based
  import Ubuntu.Web 0.2 // new, same as above but renamed + API documentation

I have created three very simple click applications which can be used to test those scenarii, they all instantiate a webview that points to http://start.ubuntu.com, they are available there: http://people.canonical.com/~osomon/click/.

Existing webapps (that use the webapp container) should also be thoroughly tested to ensure no regressions.

Finally the webbrowser app itself should be tested as well (changes to the app itself are minimal, the autopilot tests should cover us reasonably well here).

The API documentation can be generated with "make doc", you can see a preview at http://people.canonical.com/~osomon/ubuntu-web-doc/ubuntu-web-qmlmodule.html, at present it looks rather ugly because it’s not themed, this will be addressed separately. Please have a quick read and let me know if it provides enough information for application developers.

There are debian packaging changes, I’ll make sure an ubuntu developer reviews them.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-29:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-02:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-06-03:

Couple of things I noticed in the clicks:
- com.ubuntu.developer.osomon.test-ubuntu-web: scrollbars are thicker than normal
- com.ubuntu.developer.osomon.test-ubuntu-components-extras-browser-01: scrollbars are thicker than normal
- com.ubuntu.developer.osomon.test-ubuntu-components-extras-browser-02: DPR settings seem wrong, the initial size of the page is too small

Revision history for this message

Bill Filler (bfiller) wrote on 2014-06-03:

Sorry, correction
com.ubuntu.developer.osomon.test-ubuntu-components-extras-browser-01: DPR settings seem wrong, the initial size of the page is too small

com.ubuntu.developer.osomon.test-ubuntu-components-extras-browser-02: scrollbar issue with sizing

Revision history for this message

Bill Filler (bfiller) wrote on 2014-06-03:

- browser-02: popup menus don't display, I think the user-agent string isn't getting set correctly either as google images looks different than on main browser

- browser-01: same issues, also typing in google search field causes the shift key to get turned on after every character which is quite odd

- com.ubuntu.developer.osomon.test-ubuntu-web: popup menus don't work

lp:~osomon/webbrowser-app/official-api updated on 2014-06-05

564. By Olivier Tilloy on 2014-06-05: Merge the latest changes from trunk and resolve a conflict.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-06-05:

The fact that popup menus don’t display is expected (and is not a regression): the application developer should provide a list of actions to be displayed (by default it is empty).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-05:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-06-05:

> The fact that popup menus don’t display is expected (and is not a regression):
> the application developer should provide a list of actions to be displayed (by
> default it is empty).

What’s not expected though is that an empty contextual menu is popped up. I filed bug #1326752 to track this issue.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-06-05:

> com.ubuntu.developer.osomon.test-ubuntu-components-extras-browser-01: DPR
> settings seem wrong, the initial size of the page is too small
>
> com.ubuntu.developer.osomon.test-ubuntu-components-extras-browser-02:
> scrollbar issue with sizing
>
> browser-02: popup menus don't display, I think the user-agent string
> isn't getting set correctly either as google images looks different than
> on main browser
>
> browser-01: same issues, also typing in google search field causes the
> shift key to get turned on after every character which is quite odd
>
> com.ubuntu.developer.osomon.test-ubuntu-web: popup menus don't work

Except for the popup menu issue (which I explained above and for which I submitted a fix in a separate branch already), and for the google images one, I’m seeing all those issues in the current version of the image (without the changes this branch introduces). In other words, those are not new regressions, but existing bugs which I’ll investigate separately.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-06-05:

Note: regarding the issue with google images, I cannot reproduce it on my device, rendering looks the same within the test app and within the stock browser.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-06-05:

> com.ubuntu.developer.osomon.test-ubuntu-components-extras-browser-02:
> scrollbar issue with sizing

Just tested on device with the latest oxide built from trunk, and the issue is gone, scrollbars are thin and semi-transparent as expected. I’m guessing this is a bug in the version of oxide that’s currently in the archive (based on revision 501 of lp:oxide, which is from two months ago). There’s a new release in preparation (based on revision 562 + selected bug fixes), it will hopefully resolve this issue and others.

Revision history for this message

Łukasz Zemczak (sil2100) wrote on 2014-06-09:

In overall it looks good packaging-wise. One small thing that I noticed is that all the libs are missing Pre-Depends: ${misc:Pre-Depends} for all Multi-Arch packages. Could you add that for those binary packages? It's not anything serious, but it would be nice to have everything as it's supposed to.

The rest seems to look fine.

review: Needs Fixing (packaging)

lp:~osomon/webbrowser-app/official-api updated on 2014-06-09

565. By Olivier Tilloy on 2014-06-09: Add missing pre-depends for multiarch packages.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/862/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:

Olivier Tilloy

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === modified file '.bzrignore'
 --- .bzrignore	2014-05-06 12:11:27 +0000
 +++ .bzrignore	2014-06-09 09:55:59 +0000
@@ -24,12 +24,14 @@
  RE:tests/unittests/.+/tst_\w+Tests$
  tests/unittests/qml/undertest
  po/*.gmo
++doc/html
  obj-*
  debian/files
  debian/tmp/
  debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
  debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin-assets/
++debian/qtdeclarative5-ubuntu-web-plugin/
  debian/webapp-container/
  debian/webapp-container-autopilot/
  debian/webbrowser-app/
 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2014-05-06 07:49:11 +0000
 +++ CMakeLists.txt	2014-06-09 09:55:59 +0000
@@ -61,6 +61,8 @@
  add_subdirectory(po)
++add_subdirectory(doc)
++
  install(FILES webbrowser-app.svg
          DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
  install(FILES screenshot.png
 === modified file 'debian/control'
 --- debian/control	2014-05-22 15:27:38 +0000
 +++ debian/control	2014-06-09 09:55:59 +0000
@@ -32,10 +32,12 @@
  Depends: ${misc:Depends},
           ${shlibs:Depends},
           liboxideqt-qmlplugin (>= 1.0.0~bzr490),
++         libqt5sql5-sqlite,
           qtdeclarative5-dialogs-plugin,
           qtdeclarative5-qtquick2-plugin,
--         qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
           qtdeclarative5-ubuntu-ui-toolkit-plugin,
++         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
++         qtdeclarative5-unity-action-plugin,
           qtdeclarative5-window-plugin,
  Replaces: webbrowser-app-assets,
            qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22),
@@ -43,7 +45,7 @@
  Provides: webbrowser-app-assets
  Breaks: qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22)
  Description: Ubuntu web browser
-- A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
++ A lightweight web browser tailored for Ubuntu, based on the Oxide browser
   engine and using the Ubuntu UI components.
  Package: webapp-container
@@ -51,44 +53,63 @@
  Multi-Arch: foreign
  Depends: ${misc:Depends},
           ${shlibs:Depends},
--         libqt5webkit5-qmlwebkitplugin,
++         liboxideqt-qmlplugin,
++         libqt5sql5-sqlite,
++         libqt5webkit5-qmlwebkitplugin,
           qtdeclarative5-accounts-plugin,
           qtdeclarative5-qtquick2-plugin (>= 5.2),
++         qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
++         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
++         qtdeclarative5-unity-action-plugin,
           unity-webapps-qml,
           webbrowser-app (= ${binary:Version}),
  Suggests: qtdeclarative5-online-accounts-client0.1 (>= 0.3),
  Description: Ubuntu web applications container
-- A lightweight webapps container tailored for Ubuntu, based on the Webkit
-- rendering engine and using the Ubuntu UI components.
++ A lightweight webapp container tailored for Ubuntu, based on the Oxide browser
++ engine and using the Ubuntu UI components.
  Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin
  Architecture: any
  Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends},
           ${shlibs:Depends},
--         libqt5sql5-sqlite,
           libqt5webkit5-qmlwebkitplugin,
--         liboxideqt-qmlplugin,
           qtdeclarative5-qtquick2-plugin,
           qtdeclarative5-ubuntu-ui-extras-browser-plugin-assets (>= ${source:Version}),
           qtdeclarative5-ubuntu-ui-toolkit-plugin,
--         qtdeclarative5-unity-action-plugin,
++         qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
           qtdeclarative5-window-plugin,
  Replaces: webbrowser-app (<< 0.21)
  Breaks: webbrowser-app (<< 0.21)
--Description: Ubuntu web browser QML plugin
-- A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
-- engine and using the Ubuntu UI components. This package contains a standalone
-- QML plugin that applications can use to embed a browser control.
++Description: Ubuntu web QML plugin
++ A standalone QML plugin that contains the UbuntuWebView component
++ (versions 0.1 based on WebKit and 0.2 based on Oxide), in the
++ Ubuntu.Components.Extras.Browser module.
  Package: qtdeclarative5-ubuntu-ui-extras-browser-plugin-assets
  Architecture: all
  Multi-Arch: foreign
  Depends: ${misc:Depends},
--Description: Ubuntu web browser QML plugin assets
-- A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
-- engine and using the Ubuntu UI components. This package contains the
-- PNGs used as UI elements by the QML plugin.
++Description: Ubuntu web QML plugin assets
++ A standalone QML plugin that contains the UbuntuWebView component
++ (versions 0.1 based on WebKit and 0.2 based on Oxide), in the
++ Ubuntu.Components.Extras.Browser module. This package contains the
++ PNGs used as UI elements by the plugin.
++
++Package: qtdeclarative5-ubuntu-web-plugin
++Architecture: any
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${misc:Depends},
++         ${shlibs:Depends},
++         liboxideqt-qmlplugin,
++         qtdeclarative5-qtquick2-plugin,
++         qtdeclarative5-ubuntu-ui-toolkit-plugin,
++         qtdeclarative5-window-plugin,
++Description: Ubuntu web QML plugin
++ A standalone QML plugin that contains the WebView component,
++ in the Ubuntu.Web module.
  Package: webbrowser-app-autopilot
  Architecture: all
@@ -101,12 +122,13 @@
           unity8-autopilot,
           webbrowser-app (>= ${binary:Version}),
  Description: Ubuntu web browser autopilot tests
-- A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
++ A lightweight web browser tailored for Ubuntu, based on the Oxide browser
   engine and using the Ubuntu UI components. This package contains autopilot
   tests for it.
  Package: webapp-container-autopilot
  Architecture: all
++Multi-Arch: foreign
  Depends: ${misc:Depends},
           libautopilot-qt (>= 1.4),
           libqt5test5,
@@ -114,6 +136,6 @@
           ubuntu-ui-toolkit-autopilot,
           webapp-container (>= ${binary:Version}),
  Description: Ubuntu web applications container autopilot tests
-- A lightweight webapps container tailored for Ubuntu, based on the Webkit
-- rendering engine and using the Ubuntu UI components. This package contains autopilot
++ A lightweight webapp container tailored for Ubuntu, based on the Oxide browser
++ engine and using the Ubuntu UI components. This package contains autopilot
   tests for it.
 === added file 'debian/qtdeclarative5-ubuntu-web-plugin.install'
 --- debian/qtdeclarative5-ubuntu-web-plugin.install	1970-01-01 00:00:00 +0000
 +++ debian/qtdeclarative5-ubuntu-web-plugin.install	2014-06-09 09:55:59 +0000
@@ -0,0 +1,1 @@
++usr/lib/*/qt5/qml/Ubuntu/Web/*
 === added file 'debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides'
 --- debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides	1970-01-01 00:00:00 +0000
 +++ debian/qtdeclarative5-ubuntu-web-plugin.lintian-overrides	2014-06-09 09:55:59 +0000
@@ -0,0 +1,3 @@
++qtdeclarative5-ubuntu-web-plugin: pkg-has-shlibs-control-file-but-no-actual-shared-libs
++qtdeclarative5-ubuntu-web-plugin: postinst-has-useless-call-to-ldconfig
++qtdeclarative5-ubuntu-web-plugin: postrm-has-useless-call-to-ldconfig
 === added directory 'doc'
 === added file 'doc/CMakeLists.txt'
 --- doc/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ doc/CMakeLists.txt	2014-06-09 09:55:59 +0000
@@ -0,0 +1,11 @@
++project(webbrowser-doc)
++
++find_program(QDOC_EXECUTABLE qdoc)
++if(QDOC_EXECUTABLE STREQUAL "QDOC_EXECUTABLE-NOTFOUND")
++    message(WARNING "qdoc not found, documentation cannot be built")
++else()
++    add_custom_target(doc
++                      COMMAND ${QDOC_EXECUTABLE}
++                      -outputdir ${CMAKE_CURRENT_BINARY_DIR}/html
++                      ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-web.qdocconf)
++endif()
 === added file 'doc/SharedWebContext.qdoc'
 --- doc/SharedWebContext.qdoc	1970-01-01 00:00:00 +0000
 +++ doc/SharedWebContext.qdoc	2014-06-09 09:55:59 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright 2013 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/>.
++ */
++
++/*!
++    \qmltype SharedWebContext
++    \inqmlmodule Ubuntu.Web 0.2
++    \ingroup ubuntu
++    \brief A singleton that exposes a shared \l WebContext that can be used
++           by several \l WebView instances in the same application.
++
++    Note that the \l WebView component already uses the shared context.
++ */
++
++/*!
++    \qmlproperty WebContext SharedWebContext::sharedContext
++
++    The \l WebContext instance that several \l WebView instances can share.
++ */
++
++/*!
++    \qmlproperty string SharedWebContext::customUA
++
++    An alias to the shared context’s default user agent string.
++ */
 === added file 'doc/WebContext.qdoc'
 --- doc/WebContext.qdoc	1970-01-01 00:00:00 +0000
 +++ doc/WebContext.qdoc	2014-06-09 09:55:59 +0000
@@ -0,0 +1,70 @@
++/*
++ * Copyright 2014 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/>.
++ */
++
++/*!
++    \qmltype WebContext
++    \inqmlmodule Ubuntu.Web 0.2
++    \ingroup ubuntu
++    \brief A default context implementation for use with \l WebView.
++
++    This default WebContext implementation has the default user agent string
++    used by the Ubuntu browser as well as the UA override mechanism that allows
++    sending an overridden user agent for given domains/websites, based on the
++    form factor.
++
++    It has its data path (for cache and cookie database) set to the standard
++    writable data location for the current application, which is based on the
++    application name (see \c Qt.application.name), for example
++    \e ~/.local/share/myApp/.
++
++    Note that the \l WebView component already uses this default context, so
++    there is no need to explicitly instantiate a \c WebContext unless you
++    want to override some of its default properties.
++
++    \sa SharedWebContext
++ */
++
++// Note: only a subset of the properties of Oxide’s WebContext are documented
++// here. This is intentional, typical applications are not expected to be
++// needing the full set of properties and methods exposed by Oxide.
++
++/*!
++    \qmlproperty string WebContext::userAgent
++
++    The default user agent string that will be sent with each HTTP request.
++ */
++
++/*!
++    \qmlproperty url WebContext::dataPath
++
++    The local path where persistent data (such as cookies) will be stored.
++ */
++
++/*!
++    \qmlproperty url WebContext::cachePath
++
++    The local path where network data will be cached.
++    If not set, it defaults to \l dataPath.
++ */
++
++/*!
++    \qmlproperty string WebContext::acceptLangs
++
++    The list of accepted languages (the Accept-Language HTTP header),
++    as a comma-separated list of language codes.
++ */
 === added file 'doc/WebView.qdoc'
 --- doc/WebView.qdoc	1970-01-01 00:00:00 +0000
 +++ doc/WebView.qdoc	2014-06-09 09:55:59 +0000
@@ -0,0 +1,207 @@
++/*
++ * Copyright 2014 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/>.
++ */
++
++/*!
++    \qmltype WebView
++    \inqmlmodule Ubuntu.Web 0.2
++    \ingroup ubuntu
++    \brief A webview that can be used to render web content in an application.
++
++    Here is a very simple example of how to use a WebView to render a web page:
++    \qml
++        import QtQuick 2.0
++        import Ubuntu.Web 0.2
++
++        WebView {
++            url: "http://ubuntu.com"
++        }
++    \endqml
++
++    The \c WebView component defaults to using a \l {SharedWebContext}
++    {shared \c WebContext} that is shared across all \c WebView instances
++    in a given application.
++
++    \sa SharedWebContext
++ */
++
++/*!
++    \qmlproperty url WebView::url
++
++    The URL of the current page.
++ */
++
++/*!
++    \qmlproperty string WebView::title
++
++    The title of the current page.
++ */
++
++/*!
++    \qmlproperty url WebView::icon
++
++    The URL of the favicon of the current page.
++ */
++
++/*!
++    \qmlproperty bool WebView::canGoBack
++
++    Whether the navigation history has a previous entry to navigate back.
++
++    \sa goBack, canGoForward
++ */
++
++/*!
++    \qmlproperty bool WebView::canGoForward
++
++    Whether the navigation history has a next entry to navigate forward.
++
++    \sa goForward, canGoBack
++ */
++
++/*!
++    \qmlproperty bool WebView::incognito
++
++    Whether the WebView is being used in private browsing mode,
++    where no data is persisted across sessions.
++ */
++
++/*!
++    \qmlproperty bool WebView::loading
++
++    Whether the current page is loading.
++
++    \sa loadProgress, stop, reload
++ */
++
++/*!
++    \qmlproperty bool WebView::fullscreen
++
++    Whether the current page requested fullscreen display.
++ */
++
++/*!
++    \qmlproperty int WebView::loadProgress
++
++    The load progress of the current page
++    (as a integer value between 0 and 100).
++
++    \sa loading
++ */
++
++/*!
++    \qmlproperty component WebView::alertDialog
++
++    The QML component that will be instantiated to display
++    a JavaScript alert dialog.
++
++    \sa confirmDialog, promptDialog, beforeUnloadDialog
++ */
++
++/*!
++    \qmlproperty component WebView::confirmDialog
++
++    The QML component that will be instantiated to display
++    a JavaScript confirmation dialog.
++
++    \sa alertDialog, promptDialog, beforeUnloadDialog
++ */
++
++/*!
++    \qmlproperty component WebView::promptDialog
++
++    The QML component that will be instantiated to display
++    a JavaScript prompt dialog.
++
++    \sa alertDialog, confirmDialog, beforeUnloadDialog
++ */
++
++/*!
++    \qmlproperty component WebView::beforeUnloadDialog
++
++    The QML component that will be instantiated to display
++    a JavaScript confirmation when the user initiates a navigation away from
++    the current page, if the page has defined an \c onBeforeUnload handler.
++
++    \sa alertDialog, confirmDialog, promptDialog
++ */
++
++/*!
++    \qmlproperty component WebView::filePicker
++
++    The QML component that will be instantiated to let the user select files
++    when the user clicks an \c {<input type="file">} element
++    on the current page.
++ */
++
++/*!
++    \qmlproperty WebContext WebView::context
++
++    The web context associated to this WebView.
++    By default a \l {SharedWebContext} {shared context} is used which should
++    fit most use cases, do not override unless you really need a finer control
++    over the context.
++ */
++
++/*!
++    \qmlproperty list WebView::navigationHistory
++
++    The navigation history (back/forward entries) stored as a list model
++    with a \c currentIndex property. Each entry exposes the URL and title of
++    the corresponding page, as well as a timestamp of when it was visited.
++ */
++
++/*!
++    \qmlmethod void WebView::goBack()
++
++    Go back one entry in the navigation history.
++
++    \sa canGoBack, goForward
++ */
++
++/*!
++    \qmlmethod void WebView::goForward()
++
++    Go forward one entry in the navigation history.
++
++    \sa canGoForward, goBack
++ */
++
++/*!
++    \qmlmethod void WebView::stop()
++
++    Stop loading the current page.
++    Does nothing if there is no page currently loading.
++
++    \sa reload, loading
++ */
++
++/*!
++    \qmlmethod void WebView::reload()
++
++    Reload the current page.
++
++    \sa stop
++ */
++
++/*!
++    \qmlmethod void WebView::loadHtml(string html, url baseUrl)
++
++    Load HTML content from memory instead of loading it from a URL.
++    The \c baseUrl argument is used to resolve relative URLs in the provided
++    content.
++ */
 === added file 'doc/ubuntu-web.qdoc'
 --- doc/ubuntu-web.qdoc	1970-01-01 00:00:00 +0000
 +++ doc/ubuntu-web.qdoc	2014-06-09 09:55:59 +0000
@@ -0,0 +1,22 @@
++/*
++ * Copyright 2014 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/>.
++ */
++
++/*!
++    \qmlmodule Ubuntu.Web 0.2
++    \title Ubuntu Web module
++ */
 === added file 'doc/ubuntu-web.qdocconf'
 --- doc/ubuntu-web.qdocconf	1970-01-01 00:00:00 +0000
 +++ doc/ubuntu-web.qdocconf	2014-06-09 09:55:59 +0000
@@ -0,0 +1,10 @@
++project = UbuntuWeb
++description = Ubuntu Web module documentation
++sourcedirs = ./
++sources.fileextensions = "*.qdoc"
++outputdir = html
++outputformats = HTML
++version = 0.2
++syntaxhightlighting = true
++sourceencoding = UTF-8
++outputencoding = UTF-8
 === modified file 'src/Ubuntu/CMakeLists.txt'
 --- src/Ubuntu/CMakeLists.txt	2013-07-02 07:58:19 +0000
 +++ src/Ubuntu/CMakeLists.txt	2014-06-09 09:55:59 +0000
@@ -1,1 +1,23 @@
++if(NOT CMAKE_CROSSCOMPILING)
++    find_program(QMAKE_EXECUTABLE qmake)
++    if(QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND")
++        message(FATAL_ERROR "qmake not found")
++    endif()
++    execute_process(
++        COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_QML
++        RESULT_VARIABLE RESULT
++        OUTPUT_VARIABLE QT_INSTALL_QML
++        OUTPUT_STRIP_TRAILING_WHITESPACE
++    )
++    if(NOT RESULT EQUAL 0)
++        message(FATAL_ERROR "Failed to determine QT_INSTALL_QML from qmake")
++    endif()
++else()
++    # qmake isn't multi-arch aware as it installs arch-specific mkspec files
++    # in to /usr/share, so we can't use it here (we'd need a qmake binary
++    # for the host arch using data for the target arch)
++    set(QT_INSTALL_QML "/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml")
++endif()
++
  add_subdirectory(Components)
++add_subdirectory(Web)
 === modified file 'src/Ubuntu/Components/Extras/Browser/CMakeLists.txt'
 --- src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2014-05-06 07:49:11 +0000
 +++ src/Ubuntu/Components/Extras/Browser/CMakeLists.txt	2014-06-09 09:55:59 +0000
@@ -1,25 +1,5 @@
  project(webbrowser-plugin)
--if(NOT CMAKE_CROSSCOMPILING)
--    find_program(QMAKE_EXECUTABLE qmake)
--    if(QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND")
--        message(FATAL_ERROR "qmake not found")
--    endif()
--    execute_process(
--        COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_QML
--        RESULT_VARIABLE RESULT
--        OUTPUT_VARIABLE QT_INSTALL_QML
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
--    if(NOT RESULT EQUAL 0)
--        message(FATAL_ERROR "Failed to determine QT_INSTALL_QML from qmake")
--    endif()
--else()
--    # qmake isn't multi-arch aware as it installs arch-specific mkspec files
--    # in to /usr/share, so we can't use it here (we'd need a qmake binary
--    # for the host arch using data for the target arch)
--    set(QT_INSTALL_QML "/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml")
--endif()
  set(WEBBROWSER_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/Components/Extras/Browser")
  set(PLUGIN ubuntu-ui-extras-browser-plugin)
@@ -46,6 +26,6 @@
                         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file}
                         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file})
    endforeach(_file)
--  add_custom_target(copy_files_to_build_dir DEPENDS ${copied})
--  add_dependencies(${PLUGIN} copy_files_to_build_dir)
++  add_custom_target(copy_files_to_build_dir_legacy DEPENDS ${copied})
++  add_dependencies(${PLUGIN} copy_files_to_build_dir_legacy)
  endif()
 === added symlink 'src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml'
 === target is u'../../../Web/ItemSelector02.qml'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/UbuntuSharedWebContext.qml'
 === target is u'../../../Web/UbuntuSharedWebContext.qml'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml'
 === target is u'../../../Web/UbuntuWebContext.qml'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml'
 === target is u'../../../Web/UbuntuWebView02.qml'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/UserAgent02.qml'
 === target is u'../../../Web/UserAgent02.qml'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/plugin.cpp'
 === target is u'../../../Web/plugin.cpp'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/plugin.h'
 === target is u'../../../Web/plugin.h'
 === modified file 'src/Ubuntu/Components/Extras/Browser/qmldir'
 --- src/Ubuntu/Components/Extras/Browser/qmldir	2014-04-16 09:21:28 +0000
 +++ src/Ubuntu/Components/Extras/Browser/qmldir	2014-06-09 09:55:59 +0000
@@ -3,6 +3,8 @@
  UbuntuWebView 0.1 UbuntuWebView01.qml
  UbuntuWebView 0.2 UbuntuWebView02.qml
  singleton UbuntuSharedWebContext 0.2 UbuntuSharedWebContext.qml
++singleton SharedWebContext 0.2 UbuntuSharedWebContext.qml
  UbuntuWebContext 0.2 UbuntuWebContext.qml
--# Without the following line, importing version 0.1 of the module fails
++# Without the following lines, importing version 0.1 of the module fails
  singleton UbuntuSharedWebContext 0.1 dummysingleton.qml
++singleton SharedWebContext 0.1 dummysingleton.qml
 === added symlink 'src/Ubuntu/Components/Extras/Browser/selection02.js'
 === target is u'../../../Web/selection02.js'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/ua-override-worker.js'
 === target is u'../../../Web/ua-override-worker.js'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/ua-overrides-desktop.js'
 === target is u'../../../Web/ua-overrides-desktop.js'
 === added symlink 'src/Ubuntu/Components/Extras/Browser/ua-overrides-mobile.js'
 === target is u'../../../Web/ua-overrides-mobile.js'
 === added directory 'src/Ubuntu/Web'
 === added file 'src/Ubuntu/Web/CMakeLists.txt'
 --- src/Ubuntu/Web/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ src/Ubuntu/Web/CMakeLists.txt	2014-06-09 09:55:59 +0000
@@ -0,0 +1,26 @@
++project(ubuntu-web-plugin)
++
++set(UBUNTU_WEB_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/Web")
++
++set(PLUGIN ubuntu-web-plugin)
++
++set(PLUGIN_SRC plugin.cpp)
++
++add_library(${PLUGIN} MODULE ${PLUGIN_SRC})
++
++qt5_use_modules(${PLUGIN} Core Gui Qml)
++
++file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir *.js)
++install(TARGETS ${PLUGIN} DESTINATION ${UBUNTU_WEB_IMPORTS_DIR})
++install(FILES ${QML_FILES} DESTINATION ${UBUNTU_WEB_IMPORTS_DIR})
++
++if(NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
++  # copy qml files over to build dir to be able to import them uninstalled
++  foreach(_file ${QML_FILES})
++    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}
++                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file}
++                       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file})
++  endforeach(_file)
++  add_custom_target(copy_files_to_build_dir DEPENDS ${QML_FILES})
++  add_dependencies(${PLUGIN} copy_files_to_build_dir)
++endif()
 === renamed file 'src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml' => 'src/Ubuntu/Web/ItemSelector02.qml'
 === renamed file 'src/Ubuntu/Components/Extras/Browser/UbuntuSharedWebContext.qml' => 'src/Ubuntu/Web/UbuntuSharedWebContext.qml'
 === renamed file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml' => 'src/Ubuntu/Web/UbuntuWebContext.qml'
 --- src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml	2014-04-16 10:45:57 +0000
 +++ src/Ubuntu/Web/UbuntuWebContext.qml	2014-06-09 09:55:59 +0000
@@ -17,12 +17,12 @@
   */
  import QtQuick 2.0
--import com.canonical.Oxide 1.0
++import com.canonical.Oxide 1.0 as Oxide
--WebContext {
++Oxide.WebContext {
      dataPath: dataLocation
      userAgent: __ua.defaultUA
--    networkRequestDelegate: WebContextDelegateWorker {
++    networkRequestDelegate: Oxide.WebContextDelegateWorker {
          source: Qt.resolvedUrl("ua-override-worker.js")
          onMessage: console.log("Overriden UA for", message.url, ":", message.override)
          Component.onCompleted: {
@@ -44,15 +44,15 @@
      sessionCookieMode: {
          if (typeof webContextSessionCookieMode !== 'undefined') {
              if (webContextSessionCookieMode === "persistent") {
--                return WebContext.SessionCookieModePersistent
++                return Oxide.WebContext.SessionCookieModePersistent
              } else if (webContextSessionCookieMode === "restored") {
--                return WebContext.SessionCookieModeRestored
++                return Oxide.WebContext.SessionCookieModeRestored
+             }
+         }
--        return WebContext.SessionCookieModeEphemeral
++        return Oxide.WebContext.SessionCookieModeEphemeral
+     }
      userScripts: [
--        UserScript {
++        Oxide.UserScript {
              context: "oxide://selection/"
              url: Qt.resolvedUrl("selection02.js")
              incognitoEnabled: true
 === renamed file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml' => 'src/Ubuntu/Web/UbuntuWebView02.qml'
 --- src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-06-05 11:49:42 +0000
 +++ src/Ubuntu/Web/UbuntuWebView02.qml	2014-06-09 09:55:59 +0000
@@ -18,16 +18,14 @@
  import QtQuick 2.0
  import QtQuick.Window 2.0
--import com.canonical.Oxide 1.0
++import com.canonical.Oxide 1.0 as Oxide
  import Ubuntu.Components 0.1
  import Ubuntu.Components.Popups 0.1
--import "."
++import "." // QTBUG-34418
--WebView {
++Oxide.WebView {
      id: _webview
--    //interactive: !selection.visible
--
      /**
       * Client overridable function called before the default treatment of a
       *  valid navigation request. This function can stop the navigation request
@@ -51,16 +49,16 @@
          return undefined
+     }
--    context: UbuntuSharedWebContext.sharedContext
++    context: SharedWebContext.sharedContext
      Component.onCompleted: {
          var customUA = getUAString()
          if (customUA !== undefined) {
--            UbuntuSharedWebContext.customUA = customUA
++            SharedWebContext.customUA = customUA
+         }
+     }
      messageHandlers: [
--        ScriptMessageHandler {
++        Oxide.ScriptMessageHandler {
              msgId: "contextmenu"
              contexts: ["oxide://selection/"]
              callback: function(msg, frame) {
@@ -90,7 +88,7 @@
+                 }
+             }
          },
--        ScriptMessageHandler {
++        Oxide.ScriptMessageHandler {
              msgId: "scroll"
              contexts: ["oxide://selection/"]
              callback: function(msg, frame) {
@@ -102,141 +100,14 @@
+     ]
      onNavigationRequested: {
--        request.action = NavigationRequest.ActionAccept;
++        request.action = Oxide.NavigationRequest.ActionAccept;
          navigationRequestedDelegate(request);
+     }
      preferences.passwordEchoEnabled: formFactor === "mobile"
--    /*experimental.preferences.navigatorQtObjectEnabled: true
--    experimental.userScripts: [Qt.resolvedUrl("selection.js")]
--    experimental.onMessageReceived: {
--        var data = null
--        try {
--            data = JSON.parse(message.data)
--        } catch (error) {
--            console.debug('DEBUG:', message.data)
--            return
--        }
--        if ('event' in data) {
--            if (data.event === 'longpress') {
--                if (('img' in data) || ('href' in data)) {
--                    contextualData.clear()
--                    if ('img' in data) {
--                        contextualData.img = data.img
--                    }
--                    if ('href' in data) {
--                        contextualData.href = data.href
--                        contextualData.title = data.title
--                    }
--                    contextualRectangle.position(data)
--                    PopupUtils.open(contextualPopover, contextualRectangle)
--                    return
--                }
--            }
--            if ((data.event === 'longpress') || (data.event === 'selectionadjusted')) {
--                selection.clearData()
--                selection.createData()
--                if ('html' in data) {
--                    selection.mimedata.html = data.html
--                }
--                // FIXME: push the text and image data in the order
--                // they appear in the selected block.
--                if ('text' in data) {
--                    selection.mimedata.text = data.text
--                }
--                if ('images' in data) {
--                    // TODO: download and cache the images locally
--                    // (grab them from the webview’s cache, if possible),
--                    // and forward local URLs.
--                    selection.mimedata.urls = data.images
--                }
--                selection.show(data.left, data.top, data.width, data.height)
--            }
--        }
--    }*/
--
      popupMenu: ItemSelector02 {}
--    /*property alias selection: selection
--    property ActionList selectionActions
--    Selection {
--        id: selection
--
--        anchors.fill: parent
--        visible: false
--
--        property Item __popover: null
--        property var mimedata: null
--
--        Component {
--            id: selectionPopover
--            ActionSelectionPopover {
--                grabDismissAreaEvents: false
--                actions: selectionActions
--            }
--        }
--
--        function createData() {
--            if (mimedata === null) {
--                mimedata = Clipboard.newData()
--            }
--        }
--
--        function clearData() {
--            if (mimedata !== null) {
--                delete mimedata
--                mimedata = null
--            }
--        }
--
--        function actionTriggered() {
--            selection.visible = false
--        }
--
--        function __showPopover() {
--            __popover = PopupUtils.open(selectionPopover, selection.rect)
--            var actions = __popover.actions.actions
--            for (var i in actions) {
--                actions[i].onTriggered.connect(actionTriggered)
--            }
--        }
--
--        function show(x, y, width, height) {
--            var scale = _webview.experimental.test.contentsScale * _webview.experimental.test.devicePixelRatio
--            rect.x = x * scale + _webview.contentX
--            rect.y = y * scale + _webview.contentY
--            rect.width = width * scale
--            rect.height = height * scale
--            visible = true
--            __showPopover()
--        }
--
--        onVisibleChanged: {
--            if (!visible && (__popover != null)) {
--                PopupUtils.close(__popover)
--                __popover = null
--            }
--        }
--
--        onResized: {
--            var message = new Object
--            message.query = 'adjustselection'
--            var rect = selection.rect
--            var scale = _webview.experimental.test.contentsScale * _webview.experimental.test.devicePixelRatio
--            message.left = (rect.x - _webview.contentX) / scale
--            message.right = (rect.x + rect.width - _webview.contentX) / scale
--            message.top = (rect.y - _webview.contentY) / scale
--            message.bottom = (rect.y + rect.height - _webview.contentY) / scale
--            _webview.experimental.postMessage(JSON.stringify(message))
--        }
--
--        function copy() {
--            Clipboard.push(mimedata)
--            clearData()
--        }
--    }*/
--
      Item {
          id: contextualRectangle
@@ -275,9 +146,9 @@
          property Item currentContextualMenu: null
+     }
--    readonly property bool lastLoadSucceeded: internal.lastLoadRequestStatus === LoadEvent.TypeSucceeded
--    readonly property bool lastLoadStopped: internal.lastLoadRequestStatus === LoadEvent.TypeStopped
--    readonly property bool lastLoadFailed: internal.lastLoadRequestStatus === LoadEvent.TypeFailed
++    readonly property bool lastLoadSucceeded: internal.lastLoadRequestStatus === Oxide.LoadEvent.TypeSucceeded
++    readonly property bool lastLoadStopped: internal.lastLoadRequestStatus === Oxide.LoadEvent.TypeStopped
++    readonly property bool lastLoadFailed: internal.lastLoadRequestStatus === Oxide.LoadEvent.TypeFailed
      onLoadingChanged: {
          if (loadEvent.url.toString() !== "data:text/html,chromewebdata") {
              internal.lastLoadRequestStatus = loadEvent.type
@@ -293,15 +164,15 @@
      onJavaScriptConsoleMessage: {
          var msg = "[JS] (%1:%2) %3".arg(sourceId).arg(lineNumber).arg(message)
--        if (level === WebView.LogSeverityVerbose) {
++        if (level === Oxide.WebView.LogSeverityVerbose) {
              console.log(msg)
--        } else if (level === WebView.LogSeverityInfo) {
++        } else if (level === Oxide.WebView.LogSeverityInfo) {
              console.info(msg)
--        } else if (level === WebView.LogSeverityWarning) {
++        } else if (level === Oxide.WebView.LogSeverityWarning) {
              console.warn(msg)
--        } else if ((level === WebView.LogSeverityError) ||
--                   (level === WebView.LogSeverityErrorReport) ||
--                   (level === WebView.LogSeverityFatal)) {
++        } else if ((level === Oxide.WebView.LogSeverityError) ||
++                   (level === Oxide.WebView.LogSeverityErrorReport) ||
++                   (level === Oxide.WebView.LogSeverityFatal)) {
              console.error(msg)
+         }
+     }
 === renamed file 'src/Ubuntu/Components/Extras/Browser/UserAgent02.qml' => 'src/Ubuntu/Web/UserAgent02.qml'
 === renamed file 'src/Ubuntu/Components/Extras/Browser/plugin.cpp' => 'src/Ubuntu/Web/plugin.cpp'
 --- src/Ubuntu/Components/Extras/Browser/plugin.cpp	2014-03-19 22:17:40 +0000
 +++ src/Ubuntu/Web/plugin.cpp	2014-06-09 09:55:59 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-2014 Canonical Ltd.
+  *
   * This file is part of webbrowser-app.
+  *
@@ -74,14 +74,17 @@
      QQmlContext* context = engine->rootContext();
      context->setContextProperty("dataLocation", dataLocation.absolutePath());
--    // Set the desired pixel ratio (not needed once we use Qt’s way of
--    // calculating the proper pixel ratio by device/screen).
--    context->setContextProperty("QtWebKitDPR", getQtWebkitDpr());
++    if (uri == QLatin1String("Ubuntu.Components.Extras.Browser")) {
++        // Set the desired pixel ratio (not needed once we use Qt’s way of
++        // calculating the proper pixel ratio by device/screen).
++        context->setContextProperty("QtWebKitDPR", getQtWebkitDpr());
++    }
      context->setContextProperty("formFactor", getFormFactor());
+ }
  void UbuntuBrowserPlugin::registerTypes(const char* uri)
+ {
--    Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Extras.Browser"));
++    Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Extras.Browser")
++          || uri == QLatin1String("Ubuntu.Web"));
+ }
 === renamed file 'src/Ubuntu/Components/Extras/Browser/plugin.h' => 'src/Ubuntu/Web/plugin.h'
 === added file 'src/Ubuntu/Web/qmldir'
 --- src/Ubuntu/Web/qmldir	1970-01-01 00:00:00 +0000
 +++ src/Ubuntu/Web/qmldir	2014-06-09 09:55:59 +0000
@@ -0,0 +1,5 @@
++module Ubuntu.Web
++plugin ubuntu-web-plugin
++WebView 0.2 UbuntuWebView02.qml
++WebContext 0.2 UbuntuWebContext.qml
++singleton SharedWebContext 0.2 UbuntuSharedWebContext.qml
 === renamed file 'src/Ubuntu/Components/Extras/Browser/selection02.js' => 'src/Ubuntu/Web/selection02.js'
 --- src/Ubuntu/Components/Extras/Browser/selection02.js	2014-04-23 12:30:01 +0000
 +++ src/Ubuntu/Web/selection02.js	2014-06-09 09:55:59 +0000
@@ -16,12 +16,6 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--function elementContainedInBox(element, box) {
--    var rect = element.getBoundingClientRect();
--    return ((box.left <= rect.left) && (box.right >= rect.right) &&
--            (box.top <= rect.top) && (box.bottom >= rect.bottom));
--}
--
  function getImgFullUri(uri) {
      if ((uri.slice(0, 7) === 'http://') ||
          (uri.slice(0, 8) === 'https://') ||
@@ -104,41 +98,6 @@
      return data;
+ }
--function adjustSelection(selection) {
--    // FIXME: allow selecting two consecutive blocks, instead of
--    // interpolating to the containing block.
--    var centerX = (selection.left + selection.right) / 2;
--    var centerY = (selection.top + selection.bottom) / 2;
--    var element = document.elementFromPoint(centerX, centerY);
--    var parent = element;
--    while (elementContainedInBox(parent, selection)) {
--        parent = parent.parentNode;
--    }
--    element = parent;
--    return getSelectedData(element);
--}
--
--function distance(touch1, touch2) {
--    return Math.sqrt(Math.pow(touch2.clientX - touch1.clientX, 2) +
--                     Math.pow(touch2.clientY - touch1.clientY, 2));
--}
--
--/*navigator.qt.onmessage = function(message) {
--    var data = null;
--    try {
--        data = JSON.parse(message.data);
--    } catch (error) {
--        return;
--    }
--    if ('query' in data) {
--        if (data.query === 'adjustselection') {
--            var selection = adjustSelection(data);
--            selection.event = 'selectionadjusted';
--            navigator.qt.postMessage(JSON.stringify(selection));
--        }
--    }
--}*/
--
  document.documentElement.addEventListener('contextmenu', function(event) {
      var element = document.elementFromPoint(event.clientX, event.clientY);
      var data = getSelectedData(element);
 === renamed file 'src/Ubuntu/Components/Extras/Browser/ua-override-worker.js' => 'src/Ubuntu/Web/ua-override-worker.js'
 === renamed file 'src/Ubuntu/Components/Extras/Browser/ua-overrides-desktop.js' => 'src/Ubuntu/Web/ua-overrides-desktop.js'
 === renamed file 'src/Ubuntu/Components/Extras/Browser/ua-overrides-mobile.js' => 'src/Ubuntu/Web/ua-overrides-mobile.js'
 === modified file 'src/app/WebViewImpl.qml'
 --- src/app/WebViewImpl.qml	2014-04-11 11:42:07 +0000
 +++ src/app/WebViewImpl.qml	2014-06-09 09:55:59 +0000
@@ -18,11 +18,11 @@
  import QtQuick 2.0
  //import Ubuntu.Components 0.1
--import Ubuntu.Components.Extras.Browser 0.2
++import Ubuntu.Web 0.2
  //import Ubuntu.Components.Popups 0.1
  //import "actions" as Actions
--UbuntuWebView {
++WebView {
      id: webview
      property var currentWebview: webview
 === modified file 'src/app/webbrowser/TimelineView.qml'
 --- src/app/webbrowser/TimelineView.qml	2014-05-22 16:21:27 +0000
 +++ src/app/webbrowser/TimelineView.qml	2014-06-09 09:55:59 +0000
@@ -18,7 +18,6 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
--//import Ubuntu.Components.Extras.Browser 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import webbrowserapp.private 0.1
 === modified file 'src/app/webcontainer/WebViewImplOxide.qml'
 --- src/app/webcontainer/WebViewImplOxide.qml	2014-05-06 17:21:19 +0000
 +++ src/app/webcontainer/WebViewImplOxide.qml	2014-06-09 09:55:59 +0000
@@ -18,11 +18,11 @@
  import QtQuick 2.0
  import QtQuick.Window 2.0
--import com.canonical.Oxide 1.0
++import com.canonical.Oxide 1.0 as Oxide
  import Ubuntu.Components 0.1
--import Ubuntu.Components.Extras.Browser 0.2
++import Ubuntu.Components.Popups 0.1
  import Ubuntu.UnityWebApps 0.1 as UnityWebApps
--import Ubuntu.Components.Popups 0.1
++import Ubuntu.Web 0.2
  import "../actions" as Actions
  import ".."
@@ -66,8 +66,8 @@
+     }
      function isNewForegroundWebViewDisposition(disposition) {
--        return disposition === NavigationRequest.DispositionNewPopup ||
--               disposition === NavigationRequest.DispositionNewForegroundTab;
++        return disposition === Oxide.NavigationRequest.DispositionNewPopup ||
++               disposition === Oxide.NavigationRequest.DispositionNewForegroundTab;
+     }
      function shouldAllowNavigationTo(url) {
@@ -104,14 +104,14 @@
          // See https://developer.mozilla.org/en-US/docs/Web/API/Window.open
          if (newForegroundPageRequest && url == 'about:blank') {
              console.log('Accepting a new window request to navigate to "about:blank"')
--            request.action = NavigationRequest.ActionAccept
++            request.action = Oxide.NavigationRequest.ActionAccept
              return;
+         }
          if (newForegroundPageRequest && shouldOpenPopupsInDefaultBrowser()) {
              console.debug('Opening: popup window ' + url + ' in the browser window.')
--            request.action = NavigationRequest.ActionReject
++            request.action = Oxide.NavigationRequest.ActionReject
              Qt.openUrlExternally(url);
              return;
+         }
@@ -120,20 +120,20 @@
          // or if we dont have a list of url patterns specified to filter the
          // browsing actions
          if ( ! webview.haveValidUrlPatterns() && ! webview.isRunningAsANamedWebapp()) {
--            request.action = NavigationRequest.ActionAccept
++            request.action = Oxide.NavigationRequest.ActionAccept
              return
+         }
--        request.action = NavigationRequest.ActionReject
++        request.action = Oxide.NavigationRequest.ActionReject
          if (webview.shouldAllowNavigationTo(url))
--            request.action = NavigationRequest.ActionAccept
++            request.action = Oxide.NavigationRequest.ActionAccept
          // SAML requests are used for instance by Google Apps for your domain;
          // they are implemented as a HTTP redirect to a URL containing the
          // query parameter called "SAMLRequest".
          // Besides letting the request through, we must also add the SAML
          // domain to the list of the allowed hosts.
--        if (request.disposition === NavigationRequest.DispositionCurrentTab &&
++        if (request.disposition === Oxide.NavigationRequest.DispositionCurrentTab &&
              url.indexOf("SAMLRequest") > 0) {
              var urlRegExp = new RegExp("https?://([^?/]+)")
              var match = urlRegExp.exec(url)
@@ -142,10 +142,10 @@
              var hostPattern = "https?://" + host.replace(escapeDotsRegExp, "\\.") + "/"
              console.log("SAML request detected. Adding host pattern: " + hostPattern)
              webappUrlPatterns.push(hostPattern)
--            request.action = NavigationRequest.ActionAccept
++            request.action = Oxide.NavigationRequest.ActionAccept
+         }
--        if (request.action === NavigationRequest.ActionReject) {
++        if (request.action === Oxide.NavigationRequest.ActionReject) {
              console.debug('Opening: ' + url + ' in the browser window.')
              Qt.openUrlExternally(url)
+         }
@@ -160,7 +160,7 @@
          Window {
              id: popup
              property alias request: popupBrowser.request
--            UbuntuWebView {
++            WebView {
                  id: popupBrowser
                  anchors.fill: parent
@@ -170,7 +170,7 @@
                      // If we are to browse in the popup to a place where we are not allows
                      if ( ! isNewForegroundWebViewDisposition(request.disposition) &&
                              ! webview.shouldAllowNavigationTo(url)) {
--                        request.action = NavigationRequest.ActionReject
++                        request.action = Oxide.NavigationRequest.ActionReject
                          Qt.openUrlExternally(url);
                          popup.close()
                          return;
 === modified file 'tests/unittests/qml/tst_UbuntuWebView02.qml'
 --- tests/unittests/qml/tst_UbuntuWebView02.qml	2014-04-16 12:33:49 +0000
 +++ tests/unittests/qml/tst_UbuntuWebView02.qml	2014-06-09 09:55:59 +0000
@@ -18,10 +18,10 @@
  import QtQuick 2.0
  import QtTest 1.0
--import Ubuntu.Components.Extras.Browser 0.2
++import Ubuntu.Web 0.2
  TestCase {
--    name: "UbuntuWebView"
++    name: "WebView"
      function test_context_singleton() {
          compare(webview1.context, webview2.context)
@@ -33,11 +33,11 @@
          compare(webview2.context.userAgent, "custom UA")
+     }
--    UbuntuWebView {
++    WebView {
          id: webview1
+     }
--    UbuntuWebView {
++    WebView {
          id: webview2
          function getUAString(url) {
 === modified file 'webbrowser-app.qmlproject'
 --- webbrowser-app.qmlproject	2013-07-18 08:35:41 +0000
 +++ webbrowser-app.qmlproject	2014-06-09 09:55:59 +0000
@@ -22,6 +22,11 @@
          filter: "*.h;*.cpp;*.py"
+     }
++    Files {
++        directory: "doc"
++        filter: "*.qdoc;*.qdocconf"
++    }
++
      /* List of plugin directories passed to QML runtime */
      importPaths: [ "src" ]
+ }