webbrowser-app

Merge lp:~dbarth/webbrowser-app/webapp-container.remove-qtwebkit-support into lp:webbrowser-app

  1. webapp-container.remove-qtwebkit-support
  2. Merge into trunk
Proposed by David Barth
Status: Rejected
Rejected by: Olivier Tilloy
Proposed branch: lp:~dbarth/webbrowser-app/webapp-container.remove-qtwebkit-support
Merge into: lp:webbrowser-app
Diff against target: 568 lines (+16/-318)
11 files modified
debian/control (+0/-1)
po/webbrowser-app.pot (+13/-17)
src/app/browserapplication.cpp (+0/-22)
src/app/config.h.in (+0/-1)
src/app/webbrowser/webbrowser-app.cpp (+1/-2)
src/app/webcontainer/WebApp.qml (+1/-3)
src/app/webcontainer/WebViewImplWebkit.qml (+0/-164)
src/app/webcontainer/WebappContainerWebview.qml (+0/-59)
src/app/webcontainer/webapp-container.cpp (+1/-47)
src/app/webcontainer/webapp-container.h (+0/-1)
src/app/webcontainer/webapp-container.qml (+0/-1)
To merge this branch: bzr merge lp:~dbarth/webbrowser-app/webapp-container.remove-qtwebkit-support
Reviewer Review Type Date Requested Status
Olivier Tilloy Disapprove
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+221773@code.launchpad.net

Commit message

Remove support for qtwebkit. This makes Oxide the default and only runtime, and also removes the runtime and cmdline switches related to choosing a web engine.

Description of the change

Remove support for qtwebkit. This makes Oxide the default and only runtime, and also removes the runtime and cmdline switches related to choosing a web engine.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:556
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/847/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/558/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/142/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/46
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/499/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/697
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/697/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1174
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1174/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6778/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7989

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

You should also "bzr rm src/app/webcontainer/WebViewImplWebkit.qml", which is now unused.

Revision history for this message
Olivier Tilloy (osomon) wrote :

In src/app/webcontainer/webapp-container.h, the following can be removed (line 47):

    bool m_withOxide;

Revision history for this message
Olivier Tilloy (osomon) wrote :

In src/app/browserapplication.cpp, lines 102 to 118 can be removed as they are QtWebKit-specific.

Revision history for this message
Olivier Tilloy (osomon) wrote :

In debian/control, line 55 (binary dep of webapp-container on libqt5webkit5-qmlwebkitplugin) should be removed.

lp:~dbarth/webbrowser-app/webapp-container.remove-qtwebkit-support updated
557. By David Barth

more cleanups; remove --inspector for now, until the oxide equivalent becomes available

Revision history for this message
David Barth (dbarth) wrote :

Thanks for the review. This should be better now.

Revision history for this message
Olivier Tilloy (osomon) wrote :

This now fails to build because of the removal of the inspector boolean. It can be trivially fixed by removing line 121 of src/app/browserapplication.cpp.

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

Since some QML files that contained user-facing strings were removed, the translation template needs to be updated. You can do that by running the following in your branch:

   cmake .
   make webbrowser-app.pot

and then committing the changes to po/webbrowser-app.pot.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:557
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/850/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/568/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/707/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1192/console

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

review: Needs Fixing (continuous-integration)
lp:~dbarth/webbrowser-app/webapp-container.remove-qtwebkit-support updated
558. By David Barth

fix translations and missing symbol issue

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/851/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/569
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/146/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/50
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/708
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1196
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1196/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6783/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8010

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

review: Needs Fixing (continuous-integration)
lp:~dbarth/webbrowser-app/webapp-container.remove-qtwebkit-support updated
559. By David Barth

more cleanups, courtesy of Olivie

Revision history for this message
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:559
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/852/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/573
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/712
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1203/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6784/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8018

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

Superseded by https://code.launchpad.net/~abreu-alexandre/webbrowser-app/remove-qtwebkit-deps/+merge/254291.

review: Disapprove

Unmerged revisions

559. By David Barth

more cleanups, courtesy of Olivie

558. By David Barth

fix translations and missing symbol issue

557. By David Barth

more cleanups; remove --inspector for now, until the oxide equivalent becomes available

556. By David Barth

remove support for qtwebkit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-05-02 05:45:21 +0000
3+++ debian/control 2014-06-03 12:17:17 +0000
4@@ -52,7 +52,6 @@
5 Depends: ${misc:Depends},
6 ${shlibs:Depends},
7 unity-webapps-qml,
8- libqt5webkit5-qmlwebkitplugin,
9 webbrowser-app (= ${binary:Version}),
10 Description: Ubuntu web applications container
11 A lightweight webapps container tailored for Ubuntu, based on the Webkit
12
13=== modified file 'po/webbrowser-app.pot'
14--- po/webbrowser-app.pot 2014-05-06 15:25:31 +0000
15+++ po/webbrowser-app.pot 2014-06-03 12:17:17 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: webbrowser-app\n"
19 "Report-Msgid-Bugs-To: \n"
20-"POT-Creation-Date: 2014-05-06 16:25+0100\n"
21+"POT-Creation-Date: 2014-06-03 12:35+0200\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25@@ -89,7 +89,7 @@
26 msgid "Forward"
27 msgstr ""
28
29-#: src/app/Chrome.qml:127 src/app/webbrowser/ActivityView.qml:36
30+#: src/app/Chrome.qml:126 src/app/webbrowser/ActivityView.qml:36
31 msgid "Activity"
32 msgstr ""
33
34@@ -246,39 +246,39 @@
35 msgid "Currently viewing (%1)"
36 msgstr ""
37
38-#: src/app/webbrowser/TabsList.qml:68
39+#: src/app/webbrowser/TabsList.qml:69
40 msgid "+"
41 msgstr ""
42
43-#: src/app/webbrowser/TimelineView.qml:84
44+#: src/app/webbrowser/TimelineView.qml:88
45 msgid "Today"
46 msgstr ""
47
48-#: src/app/webbrowser/TimelineView.qml:86
49+#: src/app/webbrowser/TimelineView.qml:90
50 msgid "Yesterday"
51 msgstr ""
52
53-#: src/app/webbrowser/TimelineView.qml:88
54+#: src/app/webbrowser/TimelineView.qml:92
55 msgid "Last 7 Days"
56 msgstr ""
57
58-#: src/app/webbrowser/TimelineView.qml:90
59+#: src/app/webbrowser/TimelineView.qml:94
60 msgid "This Month"
61 msgstr ""
62
63-#: src/app/webbrowser/TimelineView.qml:92
64+#: src/app/webbrowser/TimelineView.qml:96
65 msgid "This Year"
66 msgstr ""
67
68-#: src/app/webbrowser/TimelineView.qml:94
69+#: src/app/webbrowser/TimelineView.qml:98
70 msgid "Older"
71 msgstr ""
72
73-#: src/app/webbrowser/TimelineView.qml:277
74+#: src/app/webbrowser/TimelineView.qml:288
75 msgid "(local files)"
76 msgstr ""
77
78-#: src/app/webbrowser/TimelineView.qml:279
79+#: src/app/webbrowser/TimelineView.qml:290
80 msgid "(other)"
81 msgstr ""
82
83@@ -296,13 +296,13 @@
84
85 #. TRANSLATORS: %1 refers to the current page’s title
86 #: src/app/webbrowser/webbrowser-app.qml:35
87-#: src/app/webcontainer/webapp-container.qml:47
88+#: src/app/webcontainer/webapp-container.qml:46
89 #, qt-format
90 msgid "%1 - Ubuntu Web Browser"
91 msgstr ""
92
93 #: src/app/webbrowser/webbrowser-app.qml:37
94-#: src/app/webcontainer/webapp-container.qml:49
95+#: src/app/webcontainer/webapp-container.qml:48
96 msgid "Ubuntu Web Browser"
97 msgstr ""
98
99@@ -321,7 +321,3 @@
100 #: src/app/webcontainer/AccountsView.qml:38
101 msgid "Select an account"
102 msgstr ""
103-
104-#: src/app/webcontainer/WebViewImplWebkit.qml:63
105-msgid "This page wants to know your device’s location."
106-msgstr ""
107
108=== modified file 'src/app/browserapplication.cpp'
109--- src/app/browserapplication.cpp 2014-05-21 08:01:42 +0000
110+++ src/app/browserapplication.cpp 2014-06-03 12:17:17 +0000
111@@ -17,9 +17,7 @@
112 */
113
114 // Qt
115-#include <QtCore/QLibrary>
116 #include <QtCore/QtGlobal>
117-#include <QtNetwork/QNetworkInterface>
118 #include <QtGui/QOpenGLContext>
119 #include <QtQml/QQmlComponent>
120 #include <QtQml/QQmlContext>
121@@ -99,24 +97,6 @@
122 QOpenGLContextPrivate::setGlobalShareContext(glcontext);
123 #endif
124
125- bool inspector = m_arguments.contains("--inspector");
126- if (inspector) {
127- QString host;
128- Q_FOREACH(QHostAddress address, QNetworkInterface::allAddresses()) {
129- if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol)) {
130- host = address.toString();
131- break;
132- }
133- }
134- QString server;
135- if (host.isEmpty()) {
136- server = QString::number(REMOTE_INSPECTOR_PORT);
137- } else {
138- server = QString("%1:%2").arg(host, QString::number(REMOTE_INSPECTOR_PORT));
139- }
140- qputenv("QTWEBKIT_INSPECTOR_SERVER", server.toUtf8());
141- }
142-
143 m_engine = new QQmlEngine;
144 connect(m_engine, SIGNAL(quit()), SLOT(quit()));
145 if (!isRunningInstalled()) {
146@@ -136,8 +116,6 @@
147 m_window = qobject_cast<QQuickWindow*>(browser);
148 m_webbrowserWindowProxy->setWindow(m_window);
149
150- browser->setProperty("developerExtrasEnabled", inspector);
151-
152 return true;
153 }
154
155
156=== modified file 'src/app/config.h.in'
157--- src/app/config.h.in 2013-11-14 16:05:18 +0000
158+++ src/app/config.h.in 2014-06-03 12:17:17 +0000
159@@ -25,7 +25,6 @@
160
161 #define APP_ID "webbrowser-app"
162 #define DEFAULT_HOMEPAGE "http://start.ubuntu.com"
163-#define REMOTE_INSPECTOR_PORT 9221
164
165 inline bool isRunningInstalled()
166 {
167
168=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
169--- src/app/webbrowser/webbrowser-app.cpp 2014-03-27 16:11:54 +0000
170+++ src/app/webbrowser/webbrowser-app.cpp 2014-06-03 12:17:17 +0000
171@@ -102,13 +102,12 @@
172 {
173 QTextStream out(stdout);
174 QString command = QFileInfo(QCoreApplication::applicationFilePath()).fileName();
175- out << "Usage: " << command << " [-h|--help] [--chromeless] [--fullscreen] [--maximized] [--inspector] [--app-id=APP_ID] [URL]" << endl;
176+ out << "Usage: " << command << " [-h|--help] [--chromeless] [--fullscreen] [--maximized] [--app-id=APP_ID] [URL]" << endl;
177 out << "Options:" << endl;
178 out << " -h, --help display this help message and exit" << endl;
179 out << " --chromeless do not display any chrome" << endl;
180 out << " --fullscreen display full screen" << endl;
181 out << " --maximized opens the application maximized" << endl;
182- out << " --inspector run a remote inspector on port " << REMOTE_INSPECTOR_PORT << endl;
183 out << " --app-id=APP_ID run the application with a specific APP_ID" << endl;
184 }
185
186
187=== modified file 'src/app/webcontainer/WebApp.qml'
188--- src/app/webcontainer/WebApp.qml 2014-04-30 01:43:34 +0000
189+++ src/app/webcontainer/WebApp.qml 2014-06-03 12:17:17 +0000
190@@ -34,7 +34,6 @@
191
192 property string webappModelSearchPath: ""
193
194- property alias oxide: webview.withOxide
195 property alias webappName: webview.webappName
196 property alias webappUrlPatterns: webview.webappUrlPatterns
197
198@@ -60,12 +59,11 @@
199 // The UITK is trying too hard to be clever about the header and toolbar.
200 flickable: null
201
202-
203 // to prevent https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1305834
204 // caused by a recent UI toolkit change, we are returning an empty title for now:
205 title: ""
206
207- WebappContainerWebview {
208+ WebViewImplOxide {
209 id: webview
210 toolbar: panel.panel
211
212
213=== removed file 'src/app/webcontainer/WebViewImplWebkit.qml'
214--- src/app/webcontainer/WebViewImplWebkit.qml 2014-04-24 14:15:51 +0000
215+++ src/app/webcontainer/WebViewImplWebkit.qml 1970-01-01 00:00:00 +0000
216@@ -1,164 +0,0 @@
217-/*
218- * Copyright 2013 Canonical Ltd.
219- *
220- * This file is part of webbrowser-app.
221- *
222- * webbrowser-app is free software; you can redistribute it and/or modify
223- * it under the terms of the GNU General Public License as published by
224- * the Free Software Foundation; version 3.
225- *
226- * webbrowser-app is distributed in the hope that it will be useful,
227- * but WITHOUT ANY WARRANTY; without even the implied warranty of
228- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
229- * GNU General Public License for more details.
230- *
231- * You should have received a copy of the GNU General Public License
232- * along with this program. If not, see <http://www.gnu.org/licenses/>.
233- */
234-
235-import QtQuick 2.0
236-import QtWebKit 3.1
237-import QtWebKit.experimental 1.0
238-import Ubuntu.Components 0.1
239-import Ubuntu.Components.Extras.Browser 0.1
240-import Ubuntu.UnityWebApps 0.1 as UnityWebApps
241-import Ubuntu.Components.Popups 0.1
242-import "../actions" as Actions
243-import ".."
244-
245-UbuntuWebView {
246- id: webview
247-
248- property bool developerExtrasEnabled: false
249- property var currentWebview: webview
250- property var toolbar: null
251- property string webappName: ""
252- property var webappUrlPatterns: null
253- property string localUserAgentOverride: ""
254-
255- function getUAString() {
256- return webview.localUserAgentOverride.length === 0 ? undefined : webview.localUserAgentOverride
257- }
258-
259- experimental.certificateVerificationDialog: CertificateVerificationDialog {}
260- experimental.authenticationDialog: AuthenticationDialog {}
261- experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}
262- experimental.alertDialog: AlertDialog {}
263- experimental.confirmDialog: ConfirmDialog {}
264- experimental.promptDialog: PromptDialog {}
265-
266- selectionActions: ActionList {
267- Actions.Copy {
268- onTriggered: selection.copy()
269- }
270- }
271-
272- property bool lastLoadFailed: false
273- onLoadingChanged: {
274- lastLoadFailed = (loadRequest.status === WebView.LoadFailedStatus)
275- }
276-
277- experimental.preferences.developerExtrasEnabled: developerExtrasEnabled
278-
279- experimental.onPermissionRequested: {
280- if (permission.type === PermissionRequest.Geolocation) {
281- if (webview.toolbar) {
282- webview.toolbar.close()
283- }
284- var text = i18n.tr("This page wants to know your device’s location.")
285- PopupUtils.open(Qt.resolvedUrl("PermissionRequest.qml"),
286- webview.currentWebview,
287- {"permission": permission, "text": text})
288- }
289- // TODO: handle other types of permission requests
290- // TODO: we might want to store the answer to avoid requesting
291- // the permission everytime the user visits this site.
292- }
293-
294- contextualActions: ActionList {
295- Actions.CopyLink {
296- enabled: webview.contextualData.href.toString()
297- onTriggered: Clipboard.push([webview.contextualData.href])
298- }
299- Actions.CopyImage {
300- enabled: webview.contextualData.img.toString()
301- onTriggered: Clipboard.push([webview.contextualData.img])
302- }
303- }
304-
305- function isRunningAsANamedWebapp() {
306- return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
307- }
308-
309- function haveValidUrlPatterns() {
310- return webappUrlPatterns && webappUrlPatterns.length !== 0
311- }
312-
313- function navigationRequestedDelegate(request) {
314- if (!request.isMainFrame) {
315- request.action = WebView.AcceptRequest
316- return
317- }
318-
319- // Pass-through if we are not running as a named webapp (--webapp='Gmail')
320- // or if we dont have a list of url patterns specified to filter the
321- // browsing actions
322- if ( ! haveValidUrlPatterns() && ! isRunningAsANamedWebapp()) {
323- request.action = WebView.AcceptRequest
324- return
325- }
326-
327- var action = WebView.IgnoreRequest
328- var url = request.url.toString()
329-
330- // The list of url patterns defined by the webapp takes precedence over command line
331- if (isRunningAsANamedWebapp()) {
332- if (unityWebapps.model.exists(unityWebapps.name) &&
333- unityWebapps.model.doesUrlMatchesWebapp(unityWebapps.name, url)) {
334- request.action = WebView.AcceptRequest
335- return;
336- }
337- }
338-
339- // We still take the possible additional patterns specified in the command line
340- // (the in the case of finer grained ones specifically for the container and not
341- // as an 'install source' for the webapp).
342- if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
343- for (var i = 0; i < webappUrlPatterns.length; ++i) {
344- var pattern = webappUrlPatterns[i]
345- if (url.match(pattern)) {
346- action = WebView.AcceptRequest
347- break
348- }
349- }
350- }
351-
352- request.action = action
353- if (action === WebView.IgnoreRequest) {
354- console.debug('Opening: ' + url + ' in the browser window.')
355- Qt.openUrlExternally(url)
356- }
357- }
358-
359- onNewTabRequested: Qt.openUrlExternally(url)
360-
361- // Small shim needed when running as a webapp to wire-up connections
362- // with the webview (message received, etc…).
363- // This is being called (and expected) internally by the webapps
364- // component as a way to bind to a webview lookalike without
365- // reaching out directly to its internals (see it as an interface).
366- function getUnityWebappsProxies() {
367- var eventHandlers = {
368- onAppRaised: function () {
369- if (webbrowserWindow) {
370- try {
371- webbrowserWindow.raise();
372- } catch (e) {
373- console.debug('Error while raising: ' + e);
374- }
375- }
376- }
377- };
378- return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview, eventHandlers)
379- }
380-}
381
382=== removed file 'src/app/webcontainer/WebappContainerWebview.qml'
383--- src/app/webcontainer/WebappContainerWebview.qml 2014-04-24 14:15:51 +0000
384+++ src/app/webcontainer/WebappContainerWebview.qml 1970-01-01 00:00:00 +0000
385@@ -1,59 +0,0 @@
386-/*
387- * Copyright 2014 Canonical Ltd.
388- *
389- * This file is part of webbrowser-app.
390- *
391- * webbrowser-app is free software; you can redistribute it and/or modify
392- * it under the terms of the GNU General Public License as published by
393- * the Free Software Foundation; version 3.
394- *
395- * webbrowser-app is distributed in the hope that it will be useful,
396- * but WITHOUT ANY WARRANTY; without even the implied warranty of
397- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
398- * GNU General Public License for more details.
399- *
400- * You should have received a copy of the GNU General Public License
401- * along with this program. If not, see <http://www.gnu.org/licenses/>.
402- */
403-
404-import QtQuick 2.0
405-import Ubuntu.Components 0.1
406-import Ubuntu.Unity.Action 1.0 as UnityActions
407-import Ubuntu.UnityWebApps 0.1 as UnityWebApps
408-import "../actions" as Actions
409-import ".."
410-
411-Item {
412- id: containerWebview
413-
414- property string url: ""
415- property bool withOxide: false
416- property bool developerExtrasEnabled: false
417- property string webappName: ""
418- property var currentWebview: webappContainerWebViewLoader.item
419- property var toolbar: null
420- property var webappUrlPatterns
421- property string localUserAgentOverride: ""
422-
423- Loader {
424- id: webappContainerWebViewLoader
425- anchors.fill: parent
426- }
427-
428- Component.onCompleted: {
429- var webappEngineSource =
430- withOxide ?
431- Qt.resolvedUrl("WebViewImplOxide.qml")
432- : Qt.resolvedUrl("WebViewImplWebkit.qml");
433-
434- webappContainerWebViewLoader.setSource(
435- webappEngineSource,
436- { toolbar: containerWebview.toolbar
437- , localUserAgentOverride: containerWebview.localUserAgentOverride
438- , url: containerWebview.url
439- , webappName: containerWebview.webappName
440- , webappUrlPatterns: containerWebview.webappUrlPatterns
441- , developerExtrasEnabled: containerWebview.developerExtrasEnabled})
442- }
443-}
444-
445
446=== modified file 'src/app/webcontainer/webapp-container.cpp'
447--- src/app/webcontainer/webapp-container.cpp 2014-05-08 16:51:08 +0000
448+++ src/app/webcontainer/webapp-container.cpp 2014-06-03 12:17:17 +0000
449@@ -25,10 +25,8 @@
450 // Qt
451 #include <QtCore/QCoreApplication>
452 #include <QtCore/QDebug>
453-#include <QtCore/QFile>
454 #include <QtCore/QFileInfo>
455 #include <QtCore/QtGlobal>
456-#include <QtCore/QRegularExpression>
457 #include <QtCore/QTextStream>
458 #include <QtQuick/QQuickWindow>
459 #include <QtQml/QQmlComponent>
460@@ -38,44 +36,11 @@
461 #include <QStandardPaths>
462 #include <QSettings>
463
464-namespace
465-{
466-
467-static QString currentArchitecturePathName()
468-{
469-#if defined(Q_PROCESSOR_X86_32)
470- return QLatin1String("i386-linux-gnu");
471-#elif defined(Q_PROCESSOR_X86_64)
472- return QLatin1String("x86_64-linux-gnu");
473-#elif defined(Q_PROCESSOR_ARM)
474- return QLatin1String("arm-linux-gnueabihf");
475-#else
476-#error Unable to determine target architecture
477-#endif
478-}
479-
480-static bool canUseOxide()
481-{
482- // Use a runtime hint to transparently know if oxide
483- // can be used as a backend without the user/dev having
484- // to update its app or change something in the Exec args.
485- // Version 1.1 of ubuntu apparmor policy allows this file to
486- // be accessed whereas v1.0 only knows about qtwebkit.
487- QString oxideHintLocation =
488- QString("/usr/lib/%1/oxide-qt/oxide-renderer")
489- .arg(currentArchitecturePathName());
490-
491- return QFile(oxideHintLocation).open(QIODevice::ReadOnly);
492-}
493-
494-}
495-
496 const QString WebappContainer::URL_PATTERN_SEPARATOR = ",";
497
498
499 WebappContainer::WebappContainer(int& argc, char** argv):
500 BrowserApplication(argc, argv),
501- m_withOxide(canUseOxide()),
502 m_storeSessionCookies(false),
503 m_backForwardButtonsVisible(false),
504 m_addressBarVisible(false),
505@@ -104,9 +69,6 @@
506 m_window->setProperty("backForwardButtonsVisible", m_backForwardButtonsVisible);
507 m_window->setProperty("addressBarVisible", m_addressBarVisible);
508
509- qDebug() << "Using" << (m_withOxide ? "Oxide" : "QtWebkit") << "as the web engine backend";
510- m_window->setProperty("oxide", m_withOxide);
511-
512 m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns);
513 QQmlContext* context = m_engine->rootContext();
514 if (m_storeSessionCookies) {
515@@ -141,7 +103,6 @@
516 out << "Usage: " << command << " [-h|--help]"
517 " [--fullscreen]"
518 " [--maximized]"
519- " [--inspector]"
520 " [--app-id=APP_ID]"
521 " [--homepage=URL]"
522 " [--webapp=name]"
523@@ -156,7 +117,6 @@
524 out << " --fullscreen display full screen" << endl;
525 out << " --local-webapp-manifest configure the webapp assuming that it has a local manifest.json file" << endl;
526 out << " --maximized opens the application maximized" << endl;
527- out << " --inspector run a remote inspector on port " << REMOTE_INSPECTOR_PORT << endl;
528 out << " --app-id=APP_ID run the application with a specific APP_ID" << endl;
529 out << " --homepage=URL override any URL passed as an argument" << endl;
530 out << " --webapp=name try to match the webapp by name with an installed integration script" << endl;
531@@ -171,13 +131,7 @@
532 void WebappContainer::parseCommandLine()
533 {
534 Q_FOREACH(const QString& argument, m_arguments) {
535- if (argument == "--webkit") {
536- // force webkit
537- m_withOxide = false;
538- } else if (argument == "--oxide") {
539- // force oxide
540- m_withOxide = true;
541- } else if (argument.startsWith("--webappModelSearchPath=")) {
542+ if (argument.startsWith("--webappModelSearchPath=")) {
543 m_webappModelSearchPath = argument.split("--webappModelSearchPath=")[1];
544 } else if (argument.startsWith("--webapp=")) {
545 // We use the name as a reference instead of the URL with a subsequent step to match it with a webapp.
546
547=== modified file 'src/app/webcontainer/webapp-container.h'
548--- src/app/webcontainer/webapp-container.h 2014-05-08 16:51:08 +0000
549+++ src/app/webcontainer/webapp-container.h 2014-06-03 12:17:17 +0000
550@@ -44,7 +44,6 @@
551 QString m_webappName;
552 QString m_webappModelSearchPath;
553 QStringList m_webappUrlPatterns;
554- bool m_withOxide;
555 bool m_storeSessionCookies;
556 bool m_backForwardButtonsVisible;
557 bool m_addressBarVisible;
558
559=== modified file 'src/app/webcontainer/webapp-container.qml'
560--- src/app/webcontainer/webapp-container.qml 2014-04-22 15:35:16 +0000
561+++ src/app/webcontainer/webapp-container.qml 2014-06-03 12:17:17 +0000
562@@ -32,7 +32,6 @@
563 property alias webappName: browser.webappName
564 property alias webappModelSearchPath: browser.webappModelSearchPath
565 property alias webappUrlPatterns: browser.webappUrlPatterns
566- property alias oxide: browser.oxide
567
568 contentOrientation: browser.screenOrientation
569

Subscribers

People subscribed via source and target branches

to status/vote changes: