1
=== modified file 'src/app/BrowserView.qml'
2
--- src/app/BrowserView.qml	2016-02-09 17:04:23 +0000
3
+++ src/app/BrowserView.qml	2016-06-16 18:22:11 +0000
4
@@ -19,6 +19,7 @@
5
19
import QtQuick 2.4
19
import QtQuick 2.4
6
20
import Ubuntu.Components 1.3
20
import Ubuntu.Components 1.3
7
21
import Ubuntu.Unity.Action 1.1 as UnityActions
21
import Ubuntu.Unity.Action 1.1 as UnityActions
8
22
import com.canonical.Oxide 1.15 as Oxide
9
22
23
10
23
FocusScope {
24
FocusScope {
11
24
    property bool developerExtrasEnabled: false
25
    property bool developerExtrasEnabled: false
12
@@ -54,4 +55,93 @@
13
54
            id: _osk
55
            id: _osk
14
55
        }
56
        }
15
56
    }
57
    }
16
58
17
59
    signal defaultVideoCaptureMediaIdUpdated(string defaultVideoCaptureDeviceId)
18
60
19
61
    /**
20
62
     * The goal of this chunk of code is to allow one to setup
21
63
     * a default selection for the camera based on its position.
22
64
     * As requested by:
23
65
     *   https://launchpad.net/bugs/1563398
24
66
     *
25
67
     * At the moment though, there is an Oxide bug that prevents
26
68
     * camera positions to be properly reported.
27
69
     *
28
70
     *   https://launchpad.net/bugs/1568145
29
71
     *
30
72
     * In order to workaround this for now, we use a hack based on the fact
31
73
     * that in hybris backed systems, the various video capture devices' names
32
74
     * are reported as "Front camera" & "Back camera", the string being translated.
33
75
     * We used this dirty heuristic instead of the position as a fallback for now.
34
76
     */
35
77
36
78
    property var currentWebcontext
37
79
    property string defaultVideoCaptureDeviceId
38
80
    property string defaultVideoCaptureDevicePosition: "frontface"
39
81
40
82
    QtObject {
41
83
        id: internal
42
84
43
85
        // "Front camera" is the user facing string returned by oxide
44
86
        // https://git.launchpad.net/oxide/tree/shared/browser/media/oxide_video_capture_device_factory_linux.cc#n49
45
87
        // It should be kept in sync.
46
88
        readonly property string defaultVideoCaptureDeviceUserName:
47
89
            (defaultVideoCaptureDevicePosition === "frontface") ?
48
90
                i18n.dtr("oxide-qt", "Front camera") : ""
49
91
50
92
        readonly property string cameraPositionUnspecified: "unspecified"
51
93
52
94
        function setupDefaultVideoCaptureDevice() {
53
95
            if ( ! currentWebcontext) {
54
96
                return
55
97
            }
56
98
57
99
            var devices = Oxide.Oxide.availableVideoCaptureDevices
58
100
59
101
            if (! currentWebcontext.defaultVideoCaptureDeviceId
60
102
                    && devices
61
103
                    && devices.length > 0) {
62
104
63
105
                for (var i = 0; i < devices.length; ++i) {
64
106
                    /**
65
107
                     * defaultVideoCaptureDeviceId has precedence
66
108
                     */
67
109
68
110
                    if (defaultVideoCaptureDeviceId
69
111
                            && devices[i].id === defaultVideoCaptureDeviceId) {
70
112
                        currentWebcontext.defaultVideoCaptureDeviceId = devices[i].id
71
113
                        defaultVideoCaptureMediaIdUpdated(devices[i].id)
72
114
                        break
73
115
                    }
74
116
75
117
                    if (defaultVideoCaptureDevicePosition) {
76
118
                        if (devices[i].position === defaultVideoCaptureDevicePosition) {
77
119
                            currentWebcontext.defaultVideoCaptureDeviceId = devices[i].id
78
120
                            defaultVideoCaptureMediaIdUpdated(devices[i].id)
79
121
                            break
80
122
                        }
81
123
82
124
                        /**
83
125
                         * This is only there to act as a fallback with a reasonnable
84
126
                         * heuristic that tracks the case described above.
85
127
                         */
86
128
                        var displayName = devices[i].displayName
87
129
                        if (internal.defaultVideoCaptureDeviceUserName
88
130
                                && internal.cameraPositionUnspecified === devices[i].position
89
131
                                && displayName.indexOf(
90
132
                                    internal.defaultVideoCaptureDeviceUserName) === 0) {
91
133
                            currentWebcontext.defaultVideoCaptureDeviceId = devices[i].id
92
134
                            defaultVideoCaptureMediaIdUpdated(devices[i].id)
93
135
                            break
94
136
                        }
95
137
                    }
96
138
                }
97
139
            }
98
140
        }
99
141
    }
100
142
101
143
    Connections {
102
144
        target: Oxide.Oxide
103
145
        onAvailableVideoCaptureDevicesChanged: internal.setupDefaultVideoCaptureDevice()
104
146
    }
105
57
}
147
}
106
58
148
107
=== modified file 'src/app/webbrowser/Browser.qml'
108
--- src/app/webbrowser/Browser.qml	2016-05-23 15:49:49 +0000
109
+++ src/app/webbrowser/Browser.qml	2016-06-16 18:22:11 +0000
110
@@ -19,6 +19,7 @@
111
19
import QtQuick 2.4
19
import QtQuick 2.4
112
20
import QtQuick.Window 2.2
20
import QtQuick.Window 2.2
113
21
import Qt.labs.settings 1.0
21
import Qt.labs.settings 1.0
114
22
import Ubuntu.Web 0.2
115
22
import com.canonical.Oxide 1.15 as Oxide
23
import com.canonical.Oxide 1.15 as Oxide
116
23
import Ubuntu.Components 1.3
24
import Ubuntu.Components 1.3
117
24
import Ubuntu.Components.Popups 1.3
25
import Ubuntu.Components.Popups 1.3
118
@@ -81,6 +82,15 @@
119
81
        onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
82
        onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
120
82
    }
83
    }
121
83
84
122
85
    currentWebcontext: SharedWebContext.sharedContext
123
86
    defaultVideoCaptureDeviceId: settings.defaultVideoDevice ? settings.defaultVideoDevice : ""
124
87
125
88
    onDefaultVideoCaptureMediaIdUpdated: {
126
89
        if (!settings.defaultVideoDevice) {
127
90
            settings.defaultVideoDevice = defaultVideoCaptureDeviceId
128
91
        }
129
92
    }
130
93
131
84
    InputDeviceModel {
94
    InputDeviceModel {
132
85
        id: miceModel
95
        id: miceModel
133
86
        deviceFilter: InputInfo.Mouse
96
        deviceFilter: InputInfo.Mouse
134
87
97
135
=== modified file 'src/app/webcontainer/WebApp.qml'
136
--- src/app/webcontainer/WebApp.qml	2016-04-29 20:19:23 +0000
137
+++ src/app/webcontainer/WebApp.qml	2016-06-16 18:22:11 +0000
138
@@ -62,6 +62,8 @@
139
62
    // not possible https://bugs.launchpad.net/autopilot-qt/+bug/1273956
62
    // not possible https://bugs.launchpad.net/autopilot-qt/+bug/1273956
140
63
    property alias generatedUrlPatterns: urlPatternSettings.generatedUrlPatterns
63
    property alias generatedUrlPatterns: urlPatternSettings.generatedUrlPatterns
141
64
64
142
65
    currentWebcontext: currentWebview ? currentWebview.context : null
143
66
144
65
    actions: [
67
    actions: [
145
66
        Actions.Back {
68
        Actions.Back {
146
67
            enabled: webapp.backForwardButtonsVisible && containerWebView.currentWebview && containerWebView.currentWebview.canGoBack
69
            enabled: webapp.backForwardButtonsVisible && containerWebView.currentWebview && containerWebView.currentWebview.canGoBack
147
68
70
148
=== modified file 'src/app/webcontainer/webapp-container.cpp'
149
--- src/app/webcontainer/webapp-container.cpp	2016-05-09 22:51:50 +0000
150
+++ src/app/webcontainer/webapp-container.cpp	2016-06-16 18:22:11 +0000
151
@@ -154,6 +154,7 @@
152
154
        m_window->setProperty("accountProvider", m_accountProvider);
154
        m_window->setProperty("accountProvider", m_accountProvider);
153
155
        m_window->setProperty("accountSwitcher", m_accountSwitcher);
155
        m_window->setProperty("accountSwitcher", m_accountSwitcher);
154
156
        m_window->setProperty("openExternalUrlInOverlay", m_openExternalUrlInOverlay);
156
        m_window->setProperty("openExternalUrlInOverlay", m_openExternalUrlInOverlay);
155
157
        m_window->setProperty("defaultVideoCaptureCameraPosition", m_defaultVideoCaptureCameraPosition);
156
157
158
157
158
        m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns);
159
        m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns);
158
159
        QQmlContext* context = m_engine->rootContext();
160
        QQmlContext* context = m_engine->rootContext();
159
@@ -324,6 +325,15 @@
160
324
    out << "  --enable-media-hub-audio            enable media-hub for audio playback" << endl;
325
    out << "  --enable-media-hub-audio            enable media-hub for audio playback" << endl;
161
325
    out << "  --user-agent-string=USER_AGENT      overrides the default User Agent with the provided one." << endl;
326
    out << "  --user-agent-string=USER_AGENT      overrides the default User Agent with the provided one." << endl;
162
326
    out << "  --open-external-url-in-overlay      if url patterns are defined, all external urls are opened in overlay instead of browser" << endl;
327
    out << "  --open-external-url-in-overlay      if url patterns are defined, all external urls are opened in overlay instead of browser" << endl;
163
328
164
329
    // The options should be kept in sync with:
165
330
    // http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/view/head:/qt/quick/api/oxideqquickglobal.cc#L43
166
331
    out << "  --camera-capture-default=position   set a default for the camera capture device in W3C Media API, 'position' should be"
167
332
                                                 " 'frontface', 'backface' or 'none'. If 'none' is selected the default"
168
333
                                                 " selection mechanism applied in Oxide is used. If this command line option"
169
334
                                                 " is not used, the default is set to 'frontface'. If the position is not found"
170
335
                                                 " the behavior is the same as if the option was not set."<< endl;
171
336
172
327
    out << "Chrome options (if none specified, no chrome is shown by default):" << endl;
337
    out << "Chrome options (if none specified, no chrome is shown by default):" << endl;
173
328
    out << "  --enable-back-forward               enable the display of the back and forward buttons (implies --enable-addressbar)" << endl;
338
    out << "  --enable-back-forward               enable the display of the back and forward buttons (implies --enable-addressbar)" << endl;
174
329
    out << "  --enable-addressbar                 enable the display of a minimal chrome (favicon and title)" << endl;
339
    out << "  --enable-addressbar                 enable the display of a minimal chrome (favicon and title)" << endl;
175
@@ -381,6 +391,8 @@
176
381
            m_userAgentOverride = argument.split("--user-agent-string=")[1];
391
            m_userAgentOverride = argument.split("--user-agent-string=")[1];
177
382
        } else if (argument == "--open-external-url-in-overlay") {
392
        } else if (argument == "--open-external-url-in-overlay") {
178
383
            m_openExternalUrlInOverlay = true;
393
            m_openExternalUrlInOverlay = true;
179
394
        } else if (argument.startsWith("--camera-capture-default=")) {
180
395
            m_defaultVideoCaptureCameraPosition = argument.split("--camera-capture-default=")[1];
181
384
        }
396
        }
182
385
    }
397
    }
183
386
}
398
}
184
387
399
185
=== modified file 'src/app/webcontainer/webapp-container.h'
186
--- src/app/webcontainer/webapp-container.h	2016-05-05 15:20:35 +0000
187
+++ src/app/webcontainer/webapp-container.h	2016-06-16 18:22:11 +0000
188
@@ -73,6 +73,7 @@
189
73
    QString m_userAgentOverride;
73
    QString m_userAgentOverride;
190
74
    QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
74
    QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
191
75
    QScopedPointer<SchemeFilter> m_schemeFilter;
75
    QScopedPointer<SchemeFilter> m_schemeFilter;
192
76
    QString m_defaultVideoCaptureCameraPosition;
193
76
77
194
77
    static const QString URL_PATTERN_SEPARATOR;
78
    static const QString URL_PATTERN_SEPARATOR;
195
78
    static const QString LOCAL_SCHEME_FILTER_FILENAME;
79
    static const QString LOCAL_SCHEME_FILTER_FILENAME;
196
79
80
197
=== modified file 'src/app/webcontainer/webapp-container.qml'
198
--- src/app/webcontainer/webapp-container.qml	2016-04-22 13:52:07 +0000
199
+++ src/app/webcontainer/webapp-container.qml	2016-06-16 18:22:11 +0000
200
@@ -46,6 +46,7 @@
201
46
    property string localUserAgentOverride: ""
46
    property string localUserAgentOverride: ""
202
47
    property bool blockOpenExternalUrls: false
47
    property bool blockOpenExternalUrls: false
203
48
    property bool openExternalUrlInOverlay: false
48
    property bool openExternalUrlInOverlay: false
204
49
    property string defaultVideoCaptureCameraPosition: ""
205
49
    property bool popupBlockerEnabled: true
50
    property bool popupBlockerEnabled: true
206
50
51
207
51
    currentWebview: webappViewLoader.item ? webappViewLoader.item.currentWebview : null
52
    currentWebview: webappViewLoader.item ? webappViewLoader.item.currentWebview : null
208
@@ -90,6 +91,9 @@
209
90
            webappUrlPatterns: root.webappUrlPatterns
91
            webappUrlPatterns: root.webappUrlPatterns
210
91
            blockOpenExternalUrls: root.blockOpenExternalUrls
92
            blockOpenExternalUrls: root.blockOpenExternalUrls
211
92
            openExternalUrlInOverlay: root.openExternalUrlInOverlay
93
            openExternalUrlInOverlay: root.openExternalUrlInOverlay
212
94
            defaultVideoCaptureDevicePosition: root.defaultVideoCaptureCameraPosition ?
213
95
                                                   root.defaultVideoCaptureCameraPosition
214
96
                                                 : browser.defaultVideoCaptureDevicePosition
215
93
            popupBlockerEnabled: root.popupBlockerEnabled
97
            popupBlockerEnabled: root.popupBlockerEnabled
216
94
98
217
95
            popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern
99
            popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy	functional	2016-04-11	Approve on 2016-06-20
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-06-16
Review via email: mp+291527@code.launchpad.net