Merge lp:~laney/ubiquity/webkit2 into lp:ubiquity

[Iain Lane]

Port to WebKit 2

Port to webkit2. I think it's fairly straightforward and seems to work.

We need to upload everything at once, so please review but don't merge/upload right away

[Sebastien Bacher (seb128)]

thanks for the work, it doesn't work for me though (using the version published in a ppa an hour ago), the slides don't display

/var/log/installer/debug has

"sys:1: PyGIWarning: WebKit2 was imported without specifying a version first. Use gi.require_version('WebKit2', '4.0') before import to ensure that the right version gets loaded.

(process:8709): Gtk-WARNING **: This process is currently running setuid or setgid.
This is not a supported use of GTK+. You must create a helper
program instead. For further details, see:

    http://www.gtk.org/setuid.html

Refusing to initialize GTK+."

one other small thing
"# True will not sure the menu"

is that a typo sure->show?

review: Needs Fixing

[Sebastien Bacher (seb128)]

could you also version the import to avoid the require_version warning?

[lp:~laney/ubiquity/webkit2]

6373. By Iain Lane on 2016-02-09

Merge with trunk

6374. By Iain Lane on 2016-02-09

drop and regain privileges harder

6375. By Iain Lane on 2016-02-09

Set a minimal version for WK2

6376. By Iain Lane on 2016-02-09

typo sure -> show

[Iain Lane (laney)]

On Tue, Feb 09, 2016 at 02:54:18PM -0000, Sebastien Bacher wrote:
> Review: Needs Fixing
>
> thanks for the work, it doesn't work for me though (using the version published in a ppa an hour ago), the slides don't display

Try again from the PPA please. All should be fixed.

I did this to test it from a live session:

  $ sudo sed -i 's/main/main universe/' /etc/apt/sources.list
  $ sudo add-apt-repository ppa:laney/wk2
  $ sudo apt update
  $ sudo apt install ubiquity ubiquity-frontend-kde- # recommends? don't need the kdeish bits to test this

Then close terminal and launch using the desktop file on the desktop.

This

  http://people.canonical.com/~laney/weird-things/zlidezhow.png

is a screenshot of it which I took just now.

Cheers,

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Dimitri John Ledkov (xnox)]

On 10 February 2016 at 15:12, Iain Lane <email address hidden> wrote:
> On Tue, Feb 09, 2016 at 02:54:18PM -0000, Sebastien Bacher wrote:
>> Review: Needs Fixing
>>
>> thanks for the work, it doesn't work for me though (using the version published in a ppa an hour ago), the slides don't display
>
> Try again from the PPA please. All should be fixed.
>
> I did this to test it from a live session:
>
> $ sudo sed -i 's/main/main universe/' /etc/apt/sources.list
> $ sudo add-apt-repository ppa:laney/wk2
> $ sudo apt update
> $ sudo apt install ubiquity ubiquity-frontend-kde- # recommends? don't need the kdeish bits to test this
>

for historical reasons we depends on : ubiquity-frontend-kde |
ubiquity-frontend-gtk

So one can do:

$ sudo apt install ubiquity ubiquity-frontend-gtk

to upgrade it mid flight.

> Then close terminal and launch using the desktop file on the desktop.
>
> This
>
> http://people.canonical.com/~laney/weird-things/zlidezhow.png
>
> is a screenshot of it which I took just now.
>
> Cheers,
>
> --
> Iain Lane [ <email address hidden> ]
> Debian Developer [ <email address hidden> ]
> Ubuntu Developer [ <email address hidden> ]
>
> https://code.launchpad.net/~laney/ubiquity/webkit2/+merge/282467
> You are subscribed to branch lp:ubiquity.

--
Regards,

Dimitri.

[Sebastien Bacher (seb128)]

the updated version works fine here, tried on yesterday's daily with the ppa, the slides display as they should, you can switch to next/previous ones and clicking on an url in summary slide opens the webbrowser on the correct url

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

LGTM.

review: Approve

=== modified file 'd-i/manifest'
--- d-i/manifest	2016-01-27 00:23:39 +0000
+++ d-i/manifest	2016-02-09 17:06:05 +0000
@@ -1,34 +1,34 @@
-apt-setup 1:0.104ubuntu2
+apt-setup 1:0.104ubuntu3
 base-installer 1.158ubuntu2
-bterm-unifont 1.3
-choose-mirror 2.65ubuntu2
+bterm-unifont 1.4
+choose-mirror 2.65ubuntu4
 clock-setup 0.126ubuntu1
 console-setup 1.108ubuntu10
 debian-installer-utils 1.113ubuntu1
-flash-kernel 3.0~rc.4ubuntu57
+flash-kernel 3.0~rc.4ubuntu58
 grub-installer 1.128ubuntu2
 hw-detect 1.114ubuntu1
 localechooser 2.65ubuntu3
 netcfg 1.135ubuntu1
-partconf 1.48
+partconf 1.49
 partman-auto 131ubuntu1
 partman-auto-crypto 22ubuntu1
 partman-auto-loop 0ubuntu21
 partman-auto-lvm 56ubuntu1
 partman-base 187ubuntu1
 partman-basicfilesystems 120ubuntu1
-partman-basicmethods 60
+partman-basicmethods 61
 partman-btrfs 18ubuntu1
 partman-crypto 86ubuntu1
 partman-efi 71ubuntu1
 partman-ext3 84ubuntu2
 partman-jfs 46
-partman-lvm 111
-partman-newworld 33
+partman-lvm 112
+partman-newworld 34
 partman-partitioning 110ubuntu1
 partman-target 98ubuntu1
 partman-uboot 5
-partman-xfs 57
+partman-xfs 58
 preseed 1.68ubuntu1
 tzsetup 1:0.81ubuntu1
 user-setup 1.63ubuntu1
 
=== modified file 'd-i/update-control'
--- d-i/update-control	2015-01-29 17:46:16 +0000
+++ d-i/update-control	2016-02-09 17:06:05 +0000
@@ -41,7 +41,7 @@
     'dpkg-dev (>= 1.14.4)',
     'gir1.2-soup-2.4',
     'gir1.2-timezonemap-1.0',
-    'gir1.2-webkit-3.0',
+    'gir1.2-webkit2-4.0',
     'intltool (>= 0.40.0)',
     'imagemagick',
     'libcairo2-dev',
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-01-27 00:26:44 +0000
+++ debian/changelog	2016-02-09 17:06:05 +0000
@@ -1,3 +1,13 @@
+ubiquity (2.21.44) UNRELEASED; urgency=medium
+
+  * Port the slideshow screen to WebKit 2 (LP: #1469221)
+  * Automatic update of included source packages: apt-setup
+    1:0.104ubuntu3, bterm-unifont 1.4, choose-mirror 2.65ubuntu4, flash-
+    kernel 3.0~rc.4ubuntu58, partconf 1.49, partman-basicmethods 61,
+    partman-lvm 112, partman-newworld 34, partman-xfs 58.
+
+ -- Iain Lane <[e-mail]>  Tue, 09 Feb 2016 12:18:57 +0000
+
 ubiquity (2.21.43) xenial; urgency=medium
 
   * ubiquity/install_misc.py: be extra careful retrieving the state of the
 
=== modified file 'debian/control'
--- debian/control	2015-12-23 16:37:19 +0000
+++ debian/control	2016-02-09 17:06:05 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: adwaita-icon-theme, apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dh-systemd, dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, libsubunit-dev, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: adwaita-icon-theme, apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dh-systemd, dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit2-4.0, gir1.2-xkl-1.0, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, libsubunit-dev, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
 Standards-Version: 3.9.4
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest
@@ -45,7 +45,7 @@
 Package: ubiquity-frontend-gtk
 Architecture: amd64 arm64 armhf i386 powerpc ppc64el
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-pango-1.0, gir1.2-soup-2.4, gir1.2-vte-2.91, gir1.2-webkit-3.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-pango-1.0, gir1.2-soup-2.4, gir1.2-vte-2.91, gir1.2-webkit2-4.0, iso-codes, metacity | marco | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | gnome-shell, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, busybox-static | busybox
 Suggests: gnome-control-center | feh
 Conflicts: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)
 Replaces: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)
 
=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2015-07-15 05:37:56 +0000
+++ ubiquity/frontend/gtk_ui.py	2016-02-09 17:06:05 +0000
@@ -37,6 +37,7 @@
 import configparser
 from functools import reduce
 import gettext
+import gi
 import os
 import subprocess
 import sys
@@ -831,15 +832,27 @@
 
         return self.returncode
 
-    def on_slideshow_link_clicked(self, unused_view, unused_frame, req,
-                                  unused_action, decision):
-        uri = req.get_uri()
-        decision.ignore()
-        subprocess.Popen(['sensible-browser', uri],
-                         close_fds=True, preexec_fn=misc.drop_all_privileges)
+    def on_context_menu(self, unused_web_view, unused_context_menu,
+                        unused_event, unused_hit_test_result):
+        # True will not show the menu
         return True
 
+    def on_slideshow_link_clicked(self, web_view, decision, decision_type):
+        gi.require_version('WebKit2', '4.0')
+        from gi.repository import WebKit2
+        if decision_type == WebKit2.PolicyDecisionType.NEW_WINDOW_ACTION:
+            request = decision.get_request()
+            uri = request.get_uri()
+            decision.ignore()
+            subprocess.Popen(['sensible-browser', uri],
+                             close_fds=True,
+                             preexec_fn=misc.drop_all_privileges)
+            return True
+        return False
+
     def start_slideshow(self):
+        # WebKit2 spawns a process which we don't want to run as root
+        misc.drop_privileges_save()
         self.progress_mode.set_current_page(
             self.progress_pages['progress_bar'])
 
@@ -863,32 +876,35 @@
 
         slides = 'file://%s#%s' % (slideshow_main, parameters_encoded)
 
-        from gi.repository import WebKit
+        gi.require_version('WebKit2', '4.0')
+        from gi.repository import WebKit2
         # We have no significant browsing interface, so there isn't much point
         # in WebKit creating a memory-hungry cache.
-        WebKit.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER)
-        webview = WebKit.WebView()
+        context = WebKit2.WebContext.get_default()
+        context.set_cache_model(WebKit2.CacheModel.DOCUMENT_VIEWER)
+        webview = WebKit2.WebView()
         # WebKit puts file URLs in their own domain by default.
         # This means that anything which checks for the same origin,
         # such as creating a XMLHttpRequest, will fail unless this
         # is disabled.
         # http://www.gitorious.org/webkit/webkit/commit/624b946
         s = webview.get_settings()
-        s.set_property('enable-file-access-from-file-uris', True)
-        s.set_property('enable-default-context-menu', False)
+        s.set_property('allow-file-access-from-file-urls', True)
+        webview.connect('context-menu', self.on_context_menu)
         if (os.environ.get('UBIQUITY_A11Y_PROFILE') == 'screen-reader'):
             s.set_property('enable-caret-browsing', True)
 
-        webview.connect('new-window-policy-decision-requested',
+        webview.connect('decide-policy',
                         self.on_slideshow_link_clicked)
 
-        self.webkit_scrolled_window.add(webview)
-        webview.open(slides)
+        webview.show()
+        self.page_mode.insert_page(webview, None, 1)
+        webview.load_uri(slides)
         # TODO do these in a page loaded callback
         self.page_mode.show()
         self.page_mode.set_current_page(1)
-        webview.show()
         webview.grab_focus()
+        misc.regain_privileges_save()
 
     def customize_installer(self):
         """Initial UI setup."""