Merge lp:~abreu-alexandre/webbrowser-app/front-camera-as-default-capture into lp:webbrowser-app

[Alexandre Abreu]

Set the front camera as the default for video media requests

Set the front camera as the default for video media requests

[Olivier Tilloy (osomon)]

Can you please revert the changes to webbrowser-app.pot ?

[Alexandre Abreu (abreu-alexandre)]

> Can you please revert the changes to webbrowser-app.pot ?

yes, a missed bit,
done

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1401
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/514/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/516
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/516
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/509
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/509
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/504
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/504/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/504
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/504/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/504
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/504/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/504
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/504/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/504
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/504/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/504
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/504/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/514/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1474
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/516/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/518/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/518
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/511
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/511
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/506/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/506/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/506
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/506
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/506
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/506
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/506/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/516/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1475
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/517/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/519
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/48/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/519
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/512
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/512
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/507
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/507/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/507
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/507/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/507
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/507/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/507
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/507/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/507
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/507/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/507
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/507/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/517/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1478
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/522/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/544
    UNSTABLE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/57
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/544
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/532
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/532
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/528
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/528
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/528
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/528
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/528
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/528
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/528/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/522/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

I’m probably missing something: why can’t this hack reside solely in the apps’ code? At app startup, check whether a specific default camera has been requested (via command-line flag), if not default to front, then enumerate all video capture devices, and set the default one accordingly if any matches.

See also a couple of inline comments.

[lp:~abreu-alexandre/webbrowser-app/front-camera-as-default-capture]

1479. By Alexandre Abreu on 2016-06-14

tweak camera names in comments

[Alexandre Abreu (abreu-alexandre)]

> I’m probably missing something: why can’t this hack reside solely in the apps’
> code? At app startup, check whether a specific default camera has been
> requested (via command-line flag), if not default to front, then enumerate all
> video capture devices, and set the default one accordingly if any matches.
>
> See also a couple of inline comments.

It was a conscious decision not to go for that, and to make it something that works
across all apps out-of-the-box,

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1479
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/529/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/581
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/69/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/581
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/561
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/561
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/555
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/555/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/555
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/555/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/555
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/555/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/555
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/555/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/555
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/555/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/555
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/555/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/529/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/front-camera-as-default-capture]

1480. By Alexandre Abreu on 2016-06-14

Move the changes back to the app code instead of webview context

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1480
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/532/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/606/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/606
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/576
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/576
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/569
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/569
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/569/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/569/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/569
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/569
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/569
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/569/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/532/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/front-camera-as-default-capture]

1481. By Alexandre Abreu on 2016-06-15

tweak default

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1481
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/533/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/608/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/608
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/578
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/578
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/571/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/571
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/571/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/571/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/571
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/571/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/571/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/571
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/571/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/533/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/front-camera-as-default-capture]

1482. By Alexandre Abreu on 2016-06-15

Make sure that the settings are properly up to date if a default front camera is set

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1482
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/535/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/621/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/621
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/591
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/591
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/584
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/584/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/584/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/584/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/584/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/584
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/584/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/584/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/535/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

In src/app/BrowserView.qml, you want i18n.dtr("oxide-qt", "Front") to pick up the translated string from oxide.

Is there really a need for a currentWebviewContext property? Can’t you simply refer to SharedWebContext.sharedContext everywhere instead? What’s the point of having a null currentWebviewContext in WebApp.qml if there is no webview yet? The context being a singleton, its lifetime should be independent from that of the webviews using it, no?

In BrowserView.qml, __internal doesn’t need to be a property, it can simply be a child of the FocusScope.

Can 'cameraIdVideoCaptureDefault' be renamed 'defaultVideoCaptureDeviceId'?
Can 'cameraPositionVideoCaptureDefault' be renamed 'defaultVideoCaptureDevicePosition'?

In BrowserView.qml, instead of connecting to 'changed' signals in an imperative manner, could you do it in a declarative way (using a Connections element)?

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

> In src/app/BrowserView.qml, you want i18n.dtr("oxide-qt", "Front") to pick up
> the translated string from oxide.

right, done,

> Is there really a need for a currentWebviewContext property? Can’t you simply
> refer to SharedWebContext.sharedContext everywhere instead? What’s the point
> of having a null currentWebviewContext in WebApp.qml if there is no webview
> yet? The context being a singleton, its lifetime should be independent from
> that of the webviews using it, no?

no, the container does not use the shared context, and the webview is delay loaded,

> In BrowserView.qml, __internal doesn’t need to be a property, it can simply be
> a child of the FocusScope.

right, done,

> Can 'cameraIdVideoCaptureDefault' be renamed 'defaultVideoCaptureDeviceId'?
> Can 'cameraPositionVideoCaptureDefault' be renamed
> 'defaultVideoCaptureDevicePosition'?

yes, done

> In BrowserView.qml, instead of connecting to 'changed' signals in an
> imperative manner, could you do it in a declarative way (using a Connections
> element)?

thank you yes, it makes things cleaner,

[lp:~abreu-alexandre/webbrowser-app/front-camera-as-default-capture]

1483. By Alexandre Abreu on 2016-06-16

Tweaks: renaming, use Connections, use domain based translations

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1483
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/540/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/631/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/631
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/600
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/600
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/593
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/593/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/593/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/593/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/593/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/593
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/593/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/593/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/540/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

I just realized that i18n.dtr("oxide-qt", "Front") as a prefix won’t work (because gettext matches only exact strings, not prefixes), you need the exact i18n’d string exposed by oxide: "Front camera" (see https://git.launchpad.net/oxide/tree/shared/browser/media/oxide_video_capture_device_factory_linux.cc#n53). A comment to specify that this should remain in sync with oxide’s source code would be useful I think.

review: Needs Fixing

[Olivier Tilloy (osomon)]

As a consequence of the above remark, the "Prefix" part of 'cameraNamePrefixVideoCaptureDefault' should be removed, seeing that it’s not a prefix any longer.

For consistency with the rest of the codebase, can you please rename "__internal" to "internal" (without the leading underscores) ?

Can 'currentWebviewContext' be renamed 'currentWebcontext'?

Is the 'defaultVideoCaptureMediaIdUpdated' signal really needed? Can we not connect to currentWebviewContext.onDefaultVideoCaptureDeviceIdChanged instead?

The added 'browserView' id seems to be unused. Can it be removed?

[lp:~abreu-alexandre/webbrowser-app/front-camera-as-default-capture]

1484. By Alexandre Abreu on 2016-06-16

Update some var names; fix translation string

[Alexandre Abreu (abreu-alexandre)]

all comments addressed,

[Alexandre Abreu (abreu-alexandre)]

> Is the 'defaultVideoCaptureMediaIdUpdated' signal really needed? Can we not
> connect to currentWebviewContext.onDefaultVideoCaptureDeviceIdChanged instead?

no, the intent is to update the *initial* settings when none have been set so that it
properly reflects the current device id.
This should not be done for every video capture device changed since this part
is handled by the settings page itself,

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1484
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/542/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/634/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/634
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/603
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/603
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/603
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/596/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/596
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/596/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/596
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/596/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/596
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/596/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/596
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/596/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/596
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/596/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/596/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/596/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/596
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/596/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/542/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Code changes look ok. I haven’t tested the actual functionality on a touch device though, this should be carefully tested from a silo.

review: Approve (code)

[Olivier Tilloy (osomon)]

Tested from silo 19 on arale (with webbrowser-app and appear.in webapp), this seems to work as intended.

review: Approve (functional)

=== modified file 'src/app/BrowserView.qml'
--- src/app/BrowserView.qml	2016-02-09 17:04:23 +0000
+++ src/app/BrowserView.qml	2016-06-16 18:22:11 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
+import com.canonical.Oxide 1.15 as Oxide
 
 FocusScope {
     property bool developerExtrasEnabled: false
@@ -54,4 +55,93 @@
             id: _osk
         }
     }
+
+    signal defaultVideoCaptureMediaIdUpdated(string defaultVideoCaptureDeviceId)
+
+    /**
+     * The goal of this chunk of code is to allow one to setup
+     * a default selection for the camera based on its position.
+     * As requested by:
+     *   https://launchpad.net/bugs/1563398
+     *
+     * At the moment though, there is an Oxide bug that prevents
+     * camera positions to be properly reported.
+     *
+     *   https://launchpad.net/bugs/1568145
+     *
+     * In order to workaround this for now, we use a hack based on the fact
+     * that in hybris backed systems, the various video capture devices' names
+     * are reported as "Front camera" & "Back camera", the string being translated.
+     * We used this dirty heuristic instead of the position as a fallback for now.
+     */
+
+    property var currentWebcontext
+    property string defaultVideoCaptureDeviceId
+    property string defaultVideoCaptureDevicePosition: "frontface"
+
+    QtObject {
+        id: internal
+
+        // "Front camera" is the user facing string returned by oxide
+        // https://git.launchpad.net/oxide/tree/shared/browser/media/oxide_video_capture_device_factory_linux.cc#n49
+        // It should be kept in sync.
+        readonly property string defaultVideoCaptureDeviceUserName:
+            (defaultVideoCaptureDevicePosition === "frontface") ?
+                i18n.dtr("oxide-qt", "Front camera") : ""
+
+        readonly property string cameraPositionUnspecified: "unspecified"
+
+        function setupDefaultVideoCaptureDevice() {
+            if ( ! currentWebcontext) {
+                return
+            }
+
+            var devices = Oxide.Oxide.availableVideoCaptureDevices
+
+            if (! currentWebcontext.defaultVideoCaptureDeviceId
+                    && devices
+                    && devices.length > 0) {
+
+                for (var i = 0; i < devices.length; ++i) {
+                    /**
+                     * defaultVideoCaptureDeviceId has precedence
+                     */
+
+                    if (defaultVideoCaptureDeviceId
+                            && devices[i].id === defaultVideoCaptureDeviceId) {
+                        currentWebcontext.defaultVideoCaptureDeviceId = devices[i].id
+                        defaultVideoCaptureMediaIdUpdated(devices[i].id)
+                        break
+                    }
+
+                    if (defaultVideoCaptureDevicePosition) {
+                        if (devices[i].position === defaultVideoCaptureDevicePosition) {
+                            currentWebcontext.defaultVideoCaptureDeviceId = devices[i].id
+                            defaultVideoCaptureMediaIdUpdated(devices[i].id)
+                            break
+                        }
+
+                        /**
+                         * This is only there to act as a fallback with a reasonnable
+                         * heuristic that tracks the case described above.
+                         */
+                        var displayName = devices[i].displayName
+                        if (internal.defaultVideoCaptureDeviceUserName
+                                && internal.cameraPositionUnspecified === devices[i].position
+                                && displayName.indexOf(
+                                    internal.defaultVideoCaptureDeviceUserName) === 0) {
+                            currentWebcontext.defaultVideoCaptureDeviceId = devices[i].id
+                            defaultVideoCaptureMediaIdUpdated(devices[i].id)
+                            break
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Connections {
+        target: Oxide.Oxide
+        onAvailableVideoCaptureDevicesChanged: internal.setupDefaultVideoCaptureDevice()
+    }
 }

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-05-23 15:49:49 +0000
+++ src/app/webbrowser/Browser.qml	2016-06-16 18:22:11 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.4
 import QtQuick.Window 2.2
 import Qt.labs.settings 1.0
+import Ubuntu.Web 0.2
 import com.canonical.Oxide 1.15 as Oxide
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
@@ -81,6 +82,15 @@
         onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
     }
 
+    currentWebcontext: SharedWebContext.sharedContext
+    defaultVideoCaptureDeviceId: settings.defaultVideoDevice ? settings.defaultVideoDevice : ""
+
+    onDefaultVideoCaptureMediaIdUpdated: {
+        if (!settings.defaultVideoDevice) {
+            settings.defaultVideoDevice = defaultVideoCaptureDeviceId
+        }
+    }
+
     InputDeviceModel {
         id: miceModel
         deviceFilter: InputInfo.Mouse

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-04-29 20:19:23 +0000
+++ src/app/webcontainer/WebApp.qml	2016-06-16 18:22:11 +0000
@@ -62,6 +62,8 @@
     // not possible https://bugs.launchpad.net/autopilot-qt/+bug/1273956
     property alias generatedUrlPatterns: urlPatternSettings.generatedUrlPatterns
 
+    currentWebcontext: currentWebview ? currentWebview.context : null
+
     actions: [
         Actions.Back {
             enabled: webapp.backForwardButtonsVisible && containerWebView.currentWebview && containerWebView.currentWebview.canGoBack

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2016-05-09 22:51:50 +0000
+++ src/app/webcontainer/webapp-container.cpp	2016-06-16 18:22:11 +0000
@@ -154,6 +154,7 @@
         m_window->setProperty("accountProvider", m_accountProvider);
         m_window->setProperty("accountSwitcher", m_accountSwitcher);
         m_window->setProperty("openExternalUrlInOverlay", m_openExternalUrlInOverlay);
+        m_window->setProperty("defaultVideoCaptureCameraPosition", m_defaultVideoCaptureCameraPosition);
 
         m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns);
         QQmlContext* context = m_engine->rootContext();
@@ -324,6 +325,15 @@
     out << "  --enable-media-hub-audio            enable media-hub for audio playback" << endl;
     out << "  --user-agent-string=USER_AGENT      overrides the default User Agent with the provided one." << endl;
     out << "  --open-external-url-in-overlay      if url patterns are defined, all external urls are opened in overlay instead of browser" << endl;
+
+    // The options should be kept in sync with:
+    // http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/view/head:/qt/quick/api/oxideqquickglobal.cc#L43
+    out << "  --camera-capture-default=position   set a default for the camera capture device in W3C Media API, 'position' should be"
+                                                 " 'frontface', 'backface' or 'none'. If 'none' is selected the default"
+                                                 " selection mechanism applied in Oxide is used. If this command line option"
+                                                 " is not used, the default is set to 'frontface'. If the position is not found"
+                                                 " the behavior is the same as if the option was not set."<< endl;
+
     out << "Chrome options (if none specified, no chrome is shown by default):" << endl;
     out << "  --enable-back-forward               enable the display of the back and forward buttons (implies --enable-addressbar)" << endl;
     out << "  --enable-addressbar                 enable the display of a minimal chrome (favicon and title)" << endl;
@@ -381,6 +391,8 @@
             m_userAgentOverride = argument.split("--user-agent-string=")[1];
         } else if (argument == "--open-external-url-in-overlay") {
             m_openExternalUrlInOverlay = true;
+        } else if (argument.startsWith("--camera-capture-default=")) {
+            m_defaultVideoCaptureCameraPosition = argument.split("--camera-capture-default=")[1];
         }
     }
 }

=== modified file 'src/app/webcontainer/webapp-container.h'
--- src/app/webcontainer/webapp-container.h	2016-05-05 15:20:35 +0000
+++ src/app/webcontainer/webapp-container.h	2016-06-16 18:22:11 +0000
@@ -73,6 +73,7 @@
     QString m_userAgentOverride;
     QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
     QScopedPointer<SchemeFilter> m_schemeFilter;
+    QString m_defaultVideoCaptureCameraPosition;
 
     static const QString URL_PATTERN_SEPARATOR;
     static const QString LOCAL_SCHEME_FILTER_FILENAME;

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2016-04-22 13:52:07 +0000
+++ src/app/webcontainer/webapp-container.qml	2016-06-16 18:22:11 +0000
@@ -46,6 +46,7 @@
     property string localUserAgentOverride: ""
     property bool blockOpenExternalUrls: false
     property bool openExternalUrlInOverlay: false
+    property string defaultVideoCaptureCameraPosition: ""
     property bool popupBlockerEnabled: true
 
     currentWebview: webappViewLoader.item ? webappViewLoader.item.currentWebview : null
@@ -90,6 +91,9 @@
             webappUrlPatterns: root.webappUrlPatterns
             blockOpenExternalUrls: root.blockOpenExternalUrls
             openExternalUrlInOverlay: root.openExternalUrlInOverlay
+            defaultVideoCaptureDevicePosition: root.defaultVideoCaptureCameraPosition ?
+                                                   root.defaultVideoCaptureCameraPosition
+                                                 : browser.defaultVideoCaptureDevicePosition
             popupBlockerEnabled: root.popupBlockerEnabled
 
             popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern