Midori Web Browser

Merge lp://staging/~midori/midori/gtk3WebKit2only into lp://staging/midori

gtk3WebKit2only
Merge into trunk

Proposed by Cris Dywan on 2014-11-18

Status:

Work in progress

Proposed branch:

lp://staging/~midori/midori/gtk3WebKit2only

Merge into:

lp://staging/midori

Diff against target:

16822 lines (+5233/-7471)

92 files modified

CMakeLists.txt (+14/-65)
data/error.html (+0/-30)
data/logo-shade.svg (+0/-150)
extensions/CMakeLists.txt (+81/-72)
extensions/about.vala (+31/-33)
extensions/adblock/extension.vala (+1/-27)
extensions/adblock/widgets.vala (+0/-8)
extensions/colorful-tabs.c (+0/-5)
extensions/colorful-tabs.web.vala (+69/-0)
extensions/cookie-manager/cookie-manager.c (+0/-6)
extensions/cookie-permissions/cookie-permission-manager-preferences-window.c (+0/-22)
extensions/cookie-permissions/cookie-permission-manager.c (+0/-6)
extensions/donottrack.web.vala (+141/-0)
extensions/external-download-manager.vala (+2/-19)
extensions/feed-panel/feed-panel.c (+0/-4)
extensions/feed-panel/main.c (+1/-1)
extensions/formhistory/formhistory.c (+1/-1)
extensions/history-list.vala (+0/-14)
extensions/hsts.web.vala (+173/-0)
extensions/nojs/nojs-preferences.c (+0/-18)
extensions/nojs/nojs.c (+1/-1)
extensions/nsplugin-manager.vala (+0/-71)
extensions/open-with.vala (+0/-11)
extensions/shortcuts.c (+1/-1)
extensions/status-clock.c (+1/-1)
extensions/statusbar-features.c (+1/-42)
extensions/tabby.vala (+0/-5)
extensions/transfers.vala (+1/-28)
ipc/CMakeLists.txt (+47/-0)
ipc/ipc-contextaction.vala (+56/-0)
ipc/ipc-paths.vala (+132/-0)
ipc/midori-tabproxy.vala (+29/-0)
ipc/midori-webextension.vala (+40/-0)
katze/gtk3-compat.c (+0/-119)
katze/gtk3-compat.h (+0/-93)
katze/katze-cellrenderercomboboxtext.c (+0/-39)
katze/katze-http-auth.c (+0/-464)
katze/katze-http-auth.h (+0/-42)
katze/katze-preferences.c (+4/-7)
katze/katze-utils.c (+0/-80)
katze/katze-utils.h (+0/-1)
katze/katze.h (+0/-5)
katze/midori-hsts.vala (+0/-145)
katze/midori-paths.vala (+22/-111)
katze/midori-uri.vala (+0/-6)
midori/CMakeLists.txt (+10/-12)
midori/main.c (+50/-11)
midori/midori-addons.vala (+415/-0)
midori/midori-app.c (+4/-9)
midori/midori-app.h (+5/-0)
midori/midori-browser.c (+190/-1110)
midori/midori-browser.h (+1/-1)
midori/midori-contextaction.vala (+19/-13)
midori/midori-download.vala (+2/-36)
midori/midori-extension.c (+47/-830)
midori/midori-extension.h (+2/-5)
midori/midori-findbar.c (+7/-4)
midori/midori-frontend.c (+19/-15)
midori/midori-locationaction.c (+16/-97)
midori/midori-navigationaction.vala (+237/-0)
midori/midori-notebook.vala (+0/-48)
midori/midori-oops.vala (+53/-0)
midori/midori-panedaction.vala (+0/-79)
midori/midori-panel.c (+0/-10)
midori/midori-platform.h (+0/-1)
midori/midori-preferences.c (+0/-15)
midori/midori-privatedata.c (+2/-44)
midori/midori-searchaction.c (+2/-8)
midori/midori-session.c (+0/-87)
midori/midori-session.h (+0/-3)
midori/midori-settings.vala (+1/-0)
midori/midori-tab.vala (+101/-50)
midori/midori-view.c (+151/-1121)
midori/midori-view.h (+3/-5)
midori/midori-websettings.c (+8/-202)
midori/midori-window.vala (+211/-0)
midori/midori.vapi (+2/-23)
midori/sokoke.c (+0/-53)
midori/sokoke.h (+0/-1)
midori/webkit2gtk-3.0.vapi (+0/-779)
midori/webkit2gtk-web-extension-4.0.vapi (+2801/-0)
midori/webkitgtk-3.0.deps (+0/-6)
midori/webkitgtk-3.0.vapi (+0/-841)
po/POTFILES.in (+12/-7)
tests/CMakeLists.txt (+0/-12)
tests/browser.c (+0/-33)
tests/extensions.c (+0/-52)
tests/hsts.vala (+0/-32)
tests/magic-uri.c (+0/-2)
tests/properties.c (+0/-5)
tests/tab.vala (+1/-5)
win32/makedist/makedist.midori (+12/-51)

To merge this branch:

bzr merge lp://staging/~midori/midori/gtk3WebKit2only

Related bugs:

Bug #898496: Use GTK3 by default (with WebKit2)	High	Fix Released
Bug #1173068: HTTPS passwords are not (re)stored with webkit2	Undecided	New
Bug #1232558: Use Headerbar with GTK+ 3.10 [$40]	High	Fix Released
Bug #1252120: Netscape plugins can't be managed in WebKit2	Medium	Confirmed
Bug #1357930: possible bug when authenticating	Medium	In Progress
Bug #1395326: Support theme color embedded in websites	Wishlist	In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Midori Devs		2014-11-18	Pending
Review via email: mp+242128@code.staging.launchpad.net

Commit message

Make WebKit2/ GTK+3 and GCR mandatory

Description of the change

WebKit2 porting:
[x] HSTS
[ ] Adblock
[*] Addons
[ ] Cookie Permissions
[*] Form History
[ ] NoJS
[x] NS plugin manager

Drop compatibility lower than
[x] GTK+3.12
[x] WebKit2GTK+ 2.6
[x] Vala 0.26

Other
[ ] Plug holes in WebKit2 API based code
[x] Drop obsolete custom auth backend
[x] Drop cryptic site-data-uri feature
[x] Split NavigationAction off Browser
[x] Add Do-Not-Track/ URL cleansing extension

lp://staging/~midori/midori/gtk3WebKit2only updated on 2015-03-10

6833. By Cris Dywan on 2014-11-21

Drop most obvious GTK+3/ WebKit2/ GCR compat code paths

Leaving for now some pieces of WebKit1-only code

6834. By Cris Dywan on 2014-11-21

Dropping gtk3-compat.* files

6835. By Cris Dywan on 2014-11-22

Drop remaining HAVE_GTK3 instances

6836. By Cris Dywan on 2014-11-22

More HAVE_WEBKIT2 droppings

6837. By Cris Dywan on 2014-11-23

Drop inspector split view which isn't needed for WebKit2

6838. By Cris Dywan on 2014-11-25

Switch to WebKit2GTK+ 4.0 (new ABI) and upstream vapi

6839. By Cris Dywan on 2014-11-25

Stop using javascriptcoregtk-3.0

6840. By Cris Dywan on 2014-11-27

Drop obsolete Soup-based KatzeHttpAuth

6841. By Cris Dywan on 2014-11-27

Drop Soup-based cache and cookie setup

6842. By Cris Dywan on 2014-11-27

Drop half-baked site data policy support: it was never fully implemented

6843. By Cris Dywan on 2014-11-27

Geo location request support with WebKit2

6844. By Cris Dywan on 2014-11-27

Correctly set/ unset link uri with WebKit2

6845. By Cris Dywan on 2014-11-27

Drop obsolete midori_view_ensure_link_uri helper

6846. By Cris Dywan on 2014-11-27

Use load-failed-with-tls-errors to handle certificate errors

6847. By Cris Dywan on 2014-11-30

Implement new NavigationAction and remove back/ forward logic from Browser

6848. By Cris Dywan on 2014-11-30

Drop GTK_CHECK_VERSION GTK2 fallbacks

6849. By Cris Dywan on 2014-11-30

Merge lp:midori

6850. By Cris Dywan on 2014-12-02

Save/ views source with WebKit2

6851. By Cris Dywan on 2014-12-02

Use gtk-decoration-layout to determine close button position

6852. By Cris Dywan on 2014-12-05

Port HSTS to WebKit.WebExtension

6853. By Cris Dywan on 2014-12-06

Run classic extensions through -t also

6854. By Cris Dywan on 2014-12-07

Add DoNotTrack/ URL cleanser web extension

6855. By Cris Dywan on 2014-12-07

Don't consider absent hsts cache as an error

6856. By Cris Dywan on 2014-12-07

Native GTK+ tabs: errors and private browsing info

6857. By Cris Dywan on 2014-12-10

New Window superclass with transparent header-/ toolbar

6858. By Cris Dywan on 2015-01-21

Implement Midori.Addons singleton

Extensions as well as Netscape plugins
and web extensions have a common place.
All modes have an App.
There's a proper way to handle stock extensions.

6859. By Paweł Forysiuk <email address hidden> on 2015-01-22

makedist: Drop support for gtk2 and old gstreamer version

6860. By Cris Dywan on 2015-01-26

Omit active extensions from about: and interns unless debugging

6861. By Cris Dywan on 2015-01-26

Scan user scripts/ styles and add to ContentManager

6862. By Cris Dywan on 2015-02-09

Implement non-GUI that provides a subset of Midori.Paths through IPC

6863. By Cris Dywan on 2015-02-21

Expose tabs on DBus and use it to set tab colors from meta tags

6864. By Cris Dywan on 2015-02-21

Fallback to uri if error page really has no title

6865. By Cris Dywan on 2015-02-21

Make extension tests aware of web extensions with user data

6866. By Cris Dywan on 2015-02-21

DoNotTrack needs to handle query keys being null

6867. By Cris Dywan on 2015-02-21

Fix return_if_fail's on midori_view_get_source/find_bar

6868. By Cris Dywan on 2015-02-21

Update webkit2gtk-web-extension-4.0.vapi from vala master

https://github.com/GNOME/vala/commit/8d57dffdea43a9d663e12b52722ef567c705bf5e

6869. By Cris Dywan on 2015-02-21

Make Midori.Database available to web extensions

6870. By Cris Dywan on 2015-02-21

Reinstate unowned annotation of URIRequest.get_http_headers

6871. By Cris Dywan on 2015-03-10

Implement TabProxy.add_icon and low-level Midori.ContextItem

Revision history for this message

Cris Dywan (kalikiana) wrote on 2015-03-14:

As per discussion I'll split this work once we branch stable off the current trunk which then becomes 0.6 in ~ a week's time and then review becomes easier.

Unmerged revisions