diff --git a/.gitignore b/.gitignore
index c41c337..5f25f93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /wxWidgets-9518d52.tar.gz
 /wxWidgets-f90b768.tar.gz
 /wxWidgets-e4293e9.tar.gz
+/wxWidgets-3.0.3.tar.bz2
diff --git a/sources b/sources
index 3ad3f74..795cf28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wxWidgets-e4293e9.tar.gz) = 30206398dfa6687ca9092fbf372a794cd739a063065a8574ce65494d6bb059b93454d9e79a8e1e552872b16fd025d192b9455b618c9a40e64a816e0c9821499e
+SHA512 (wxWidgets-3.0.3.tar.bz2) = dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
diff --git a/wxGTK3-3.0.3-webkit2.patch b/wxGTK3-3.0.3-webkit2.patch
index 1f6309c..53883f1 100644
--- a/wxGTK3-3.0.3-webkit2.patch
+++ b/wxGTK3-3.0.3-webkit2.patch
@@ -1,257 +1,1099 @@
-From 7ca24831df9b0076ff000555da57d2e3db040aa4 Mon Sep 17 00:00:00 2001
+From ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7 Mon Sep 17 00:00:00 2001
 From: Scott Talbert <swt@techie.net>
-Date: Sat, 4 Mar 2017 21:09:02 -0500
-Subject: [PATCH] WIP patch to convert webview to webkit2gtk
+Date: Thu, 30 Mar 2017 21:34:24 -0400
+Subject: [PATCH] Add support for WebKit2GTK+ in wxWebView
 
-This is a temporary patch for Fedora to switch to webkit2gtk for now.  This is
-not the final implementation.
+Closes https://github.com/wxWidgets/wxWidgets/pull/469
 ---
- configure.in                    |   2 +-
- include/wx/gtk/webview_webkit.h |  12 +-
- src/gtk/webview_webkit.cpp      | 435 +++++++++++++++++++++++-----------------
- 3 files changed, 263 insertions(+), 186 deletions(-)
+ Makefile.in                                |   58 +-
+ autoconf_inc.m4                            |    6 +
+ build/bakefiles/config.bkl                 |    1 +
+ build/bakefiles/files.bkl                  |    5 +
+ build/bakefiles/multilib.bkl               |    1 +
+ build/bakefiles/plugins.bkl                |    5 +
+ configure                                  |  108 ++-
+ configure.in                               |   42 +-
+ docs/changes.txt                           |    8 +
+ include/wx/android/setup.h                 |   13 +-
+ include/wx/chkconf.h                       |    2 +-
+ include/wx/gtk/setup0.h                    |   13 +-
+ include/wx/gtk/webview_webkit.h            |   18 +-
+ include/wx/gtk/webview_webkit2_extension.h |   15 +
+ include/wx/gtk/webviewhistoryitem_webkit.h |    2 +-
+ include/wx/motif/setup0.h                  |   13 +-
+ include/wx/msw/setup0.h                    |   13 +-
+ include/wx/msw/wince/setup.h               |   13 +-
+ include/wx/os2/setup0.h                    |   13 +-
+ include/wx/osx/setup0.h                    |   13 +-
+ include/wx/setup_inc.h                     |   13 +-
+ include/wx/univ/setup0.h                   |   13 +-
+ interface/wx/webview.h                     |    4 +
+ samples/webview/webview.cpp                |    2 +-
+ setup.h.in                                 |    8 +-
+ src/gtk/webview_webkit2.cpp                | 1261 ++++++++++++++++++++++++++++
+ src/gtk/webview_webkit2_extension.cpp      |  421 ++++++++++
+ 27 files changed, 2046 insertions(+), 38 deletions(-)
+ create mode 100644 include/wx/gtk/webview_webkit2_extension.h
+ create mode 100644 src/gtk/webview_webkit2.cpp
+ create mode 100644 src/gtk/webview_webkit2_extension.cpp
 
+diff --git a/Makefile.in b/Makefile.in
+index 7a10765..f032587 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1655,12 +1655,14 @@ WEBVIEWDLL_CXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+ 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ 	$(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
++	-DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" \
+ 	$(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+ WEBVIEWDLL_OBJCXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ 	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ 	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+ 	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+ 	$(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
++	-DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" \
+ 	$(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
+ WEBVIEWDLL_OBJECTS =  \
+ 	$(__webviewdll___win32rc) \
+@@ -2078,6 +2080,10 @@ SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
+ 	$(CXXFLAGS)
+ SOUND_SDL_OBJECTS =  \
+ 	sound_sdl_sound_sdl.o
++WEBKIT2_EXT_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
++	$(CXXFLAGS)
++WEBKIT2_EXT_OBJECTS =  \
++	webkit2_ext_webview_webkit2_extension.o
+ LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW
+ LOCALE_MSW_LINGUAS =  it
+ 
+@@ -6754,6 +6760,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+ @COND_PLATFORM_MACOSX_1@	= monodll_osx_webview_webkit.o
+ @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \
+ @COND_TOOLKIT_GTK@	monodll_gtk_webview_webkit.o
++@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \
++@COND_TOOLKIT_GTK@	monodll_webview_webkit2.o
+ @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
+ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \
+ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monodll_tabartgtk.o
+@@ -9009,6 +9017,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
+ @COND_PLATFORM_MACOSX_1@	= monolib_osx_webview_webkit.o
+ @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \
+ @COND_TOOLKIT_GTK@	monolib_gtk_webview_webkit.o
++@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \
++@COND_TOOLKIT_GTK@	monolib_webview_webkit2.o
+ @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
+ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \
+ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monolib_tabartgtk.o
+@@ -13765,6 +13775,8 @@ COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \
+ @COND_PLATFORM_MACOSX_1@	= webviewdll_osx_webview_webkit.o
+ @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \
+ @COND_TOOLKIT_GTK@	webviewdll_gtk_webview_webkit.o
++@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \
++@COND_TOOLKIT_GTK@	webviewdll_webview_webkit2.o
+ @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \
+ @COND_TOOLKIT_MSW@	webviewdll_webview_ie.o
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \
+@@ -13784,6 +13796,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \
+ @COND_PLATFORM_MACOSX_1@	= webviewlib_osx_webview_webkit.o
+ @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \
+ @COND_TOOLKIT_GTK@	webviewlib_gtk_webview_webkit.o
++@COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \
++@COND_TOOLKIT_GTK@	webviewlib_webview_webkit2.o
+ @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \
+ @COND_TOOLKIT_MSW@	webviewlib_webview_ie.o
+ @COND_SHARED_1@____wxwebview_namedll_DEP = $(__webviewdll___depname)
+@@ -14586,6 +14600,13 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
+ @COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
+ @COND_WITH_PLUGIN_SDL_1@__uninstall_sound_sdl___depname \
+ @COND_WITH_PLUGIN_SDL_1@	= uninstall_sound_sdl
++COND_USE_WEBVIEW_WEBKIT2_1___webkit2_ext___depname = \
++	$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
++@COND_USE_WEBVIEW_WEBKIT2_1@__webkit2_ext___depname = $(COND_USE_WEBVIEW_WEBKIT2_1___webkit2_ext___depname)
++@COND_USE_WEBVIEW_WEBKIT2_1@__install_webkit2_ext___depname \
++@COND_USE_WEBVIEW_WEBKIT2_1@	= install_webkit2_ext
++@COND_USE_WEBVIEW_WEBKIT2_1@__uninstall_webkit2_ext___depname \
++@COND_USE_WEBVIEW_WEBKIT2_1@	= uninstall_webkit2_ext
+ @COND_USE_XRC_1@__wxrc___depname = wxrc
+ @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
+ @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
+@@ -15255,9 +15276,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ 
+ ### Targets: ###
+ 
+-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
++all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+-install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
++install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+ 	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+@@ -15293,7 +15314,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal
+ 	@echo " ------------------------------------------------------"
+ 	@echo " "
+ 
+-uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_webviewdll___depname) $(__uninstall_webviewlib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall
++uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_webviewdll___depname) $(__uninstall_webviewlib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) $(__uninstall_webkit2_ext___depname) locale_uninstall locale_msw_uninstall
+ 	(cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4)
+ 	(cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py)
+ 	for f in setup.h $(RCDEFS_H); do \
+@@ -15322,6 +15343,7 @@ install-strip: install
+ 	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ 	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+ 	$(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
++	$(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions/$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+ 
+ clean: $(__clean_wxrc___depname)
+ 	rm -rf ./.deps ./.pch
+@@ -15402,6 +15424,7 @@ clean: $(__clean_wxrc___depname)
+ 	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+ 	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+ 	rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
++	rm -f $(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+ 	-(cd samples && $(MAKE) clean)
+ 	rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
+ 
+@@ -16130,6 +16153,16 @@ distclean: clean
+ @COND_WITH_PLUGIN_SDL_1@uninstall_sound_sdl: 
+ @COND_WITH_PLUGIN_SDL_1@	rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+ 
++@COND_USE_WEBVIEW_WEBKIT2_1@$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(WEBKIT2_EXT_OBJECTS)
++@COND_USE_WEBVIEW_WEBKIT2_1@	$(SHARED_LD_MODULE_CXX) $@ $(WEBKIT2_EXT_OBJECTS)  $(LDFLAGS)  $(EXTRALIBS_WEBVIEW) $(LIBS)
++
++@COND_USE_WEBVIEW_WEBKIT2_1@install_webkit2_ext: $(__webkit2_ext___depname)
++@COND_USE_WEBVIEW_WEBKIT2_1@	$(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions
++@COND_USE_WEBVIEW_WEBKIT2_1@	$(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions
++
++@COND_USE_WEBVIEW_WEBKIT2_1@uninstall_webkit2_ext: 
++@COND_USE_WEBVIEW_WEBKIT2_1@	rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/web-extensions/$(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
++
+ samples: 
+ 	(cd samples && $(MAKE) all)
+ 
+@@ -18563,6 +18596,9 @@ monodll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONODLL_ODEP)
+ monodll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONODLL_ODEP)
+ 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
+ 
++monodll_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(MONODLL_ODEP)
++	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp
++
+ monodll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONODLL_ODEP)
+ 	$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
+ 
+@@ -24440,6 +24476,9 @@ monolib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONOLIB_ODEP)
+ monolib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONOLIB_ODEP)
+ 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
+ 
++monolib_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(MONOLIB_ODEP)
++	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp
++
+ monolib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONOLIB_ODEP)
+ 	$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
+ 
+@@ -39792,7 +39831,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
+ @COND_PLATFORM_MACOSX_1@	$(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
+ 
+ webviewdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWDLL_ODEP)
+-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW
++	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW --define WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"
+ 
+ webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP)
+ 	$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
+@@ -39800,6 +39839,9 @@ webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP)
+ webviewdll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWDLL_ODEP)
+ 	$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
+ 
++webviewdll_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(WEBVIEWDLL_ODEP)
++	$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp
++
+ webviewdll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWDLL_ODEP)
+ 	$(CXXC) -c -o $@ $(WEBVIEWDLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
+ 
+@@ -39818,6 +39860,9 @@ webviewlib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWLIB_ODEP)
+ webviewlib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWLIB_ODEP)
+ 	$(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
+ 
++webviewlib_webview_webkit2.o: $(srcdir)/src/gtk/webview_webkit2.cpp $(WEBVIEWLIB_ODEP)
++	$(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2.cpp
++
+ webviewlib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWLIB_ODEP)
+ 	$(CXXC) -c -o $@ $(WEBVIEWLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
+ 
+@@ -40658,6 +40703,9 @@ gllib_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP)
+ sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
+ 	$(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
+ 
++webkit2_ext_webview_webkit2_extension.o: $(srcdir)/src/gtk/webview_webkit2_extension.cpp
++	$(CXXC) -c -o $@ $(WEBKIT2_EXT_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit2_extension.cpp
++
+ 
+ @COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
+ @COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+@@ -41569,4 +41617,4 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI
+ 	uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll \
+ 	install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll \
+ 	install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl \
+-	samples
++	install_webkit2_ext uninstall_webkit2_ext samples
+diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
+index 76cea6a..6bc6a0c 100644
+--- a/autoconf_inc.m4
++++ b/autoconf_inc.m4
+@@ -1088,6 +1088,12 @@ dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demo
+         COND_USE_THREADS_1=""
+     fi
+     AC_SUBST(COND_USE_THREADS_1)
++dnl ### begin block 20_COND_USE_WEBVIEW_WEBKIT2_1[wx.bkl] ###
++    COND_USE_WEBVIEW_WEBKIT2_1="#"
++    if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then
++        COND_USE_WEBVIEW_WEBKIT2_1=""
++    fi
++    AC_SUBST(COND_USE_WEBVIEW_WEBKIT2_1)
+ dnl ### begin block 20_COND_USE_XRC_1[../../utils/execmon/execmon.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+     COND_USE_XRC_1="#"
+     if test "x$USE_XRC" = "x1" ; then
+diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
+index a43afb49..a95b405 100644
+--- a/build/bakefiles/config.bkl
++++ b/build/bakefiles/config.bkl
+@@ -429,6 +429,7 @@ to run the tests, include CppUnit library here.
+         <option name="DYLIB_RPATH_INSTALL"/>
+         <option name="DYLIB_RPATH_POSTLINK"/>
+         <option name="SAMPLES_RPATH_FLAG"/>
++        <option name="USE_WEBVIEW_WEBKIT2"/>
+ 
+         <!-- see configure.in; it's required by some samples on Mac OS X -->
+         <option name="HEADER_PAD_OPTION"/>
+diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
+index 6c32a7b..956a808 100644
+--- a/build/bakefiles/files.bkl
++++ b/build/bakefiles/files.bkl
+@@ -3418,6 +3418,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
+ <set var="WEBVIEW_SRC_PLATFORM">
+     <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
+     <if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>
++    <if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit2.cpp</if>
+     <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
+ </set>
+ <set var="WEBVIEW_SRC" hints="files">
+@@ -3449,6 +3450,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
+     wx/webviewfshandler.h
+ </set>
+ 
++<set var="WEBVIEW_WEBKIT2_EXTENSION_SRC" hints="files">
++    src/gtk/webview_webkit2_extension.cpp
++</set>
++
+ <!-- ====================================================================== -->
+ <!--                                wxXRC                                   -->
+ <!-- ====================================================================== -->
+diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
+index cf2d4eb..aa811b9 100644
+--- a/build/bakefiles/multilib.bkl
++++ b/build/bakefiles/multilib.bkl
+@@ -180,6 +180,7 @@
+          cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
+         <define>WXUSINGDLL</define>
+         <define>WXMAKINGDLL_WEBVIEW</define>
++        <define>WX_WEB_EXTENSIONS_DIRECTORY="$(PLUGINS_INST_DIR)/web-extensions"</define>
+         <sources>$(WEBVIEW_SRC)</sources>
+         <library>coredll</library>
+         <library>basedll</library>
+diff --git a/build/bakefiles/plugins.bkl b/build/bakefiles/plugins.bkl
+index 2034f8c..cbf4ddb 100644
+--- a/build/bakefiles/plugins.bkl
++++ b/build/bakefiles/plugins.bkl
+@@ -11,5 +11,10 @@
+         <ldlibs>$(EXTRALIBS_SDL)</ldlibs>
+     </wx-base-plugin>
+ 
++    <wx-base-plugin id="webkit2_ext" cond="USE_WEBVIEW_WEBKIT2=='1'">
++        <sources>$(WEBVIEW_WEBKIT2_EXTENSION_SRC)</sources>
++        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
++        <install-to>$(PLUGINS_INST_DIR)/web-extensions</install-to>
++    </wx-base-plugin>
+ 
+ </makefile>
+diff --git a/configure b/configure
+index b01f393..3fa466a 100755
+--- a/configure
++++ b/configure
+@@ -675,6 +675,7 @@ COND_WXUNIV_0
+ COND_WITH_PLUGIN_SDL_1
+ COND_WINDOWS_IMPLIB_1
+ COND_USE_XRC_1
++COND_USE_WEBVIEW_WEBKIT2_1
+ COND_USE_THREADS_1
+ COND_USE_THREADS_0
+ COND_USE_STC_1
+@@ -37295,12 +37296,95 @@ fi
+ 
+ if test "$wxUSE_WEBVIEW" = "yes"; then
+     USE_WEBVIEW_WEBKIT=0
++    USE_WEBVIEW_WEBKIT2=0
+     if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
+         if test "$wxUSE_GTK" = 1; then
+-            webkitgtk=webkit-1.0
+             if test "$WXGTK3" = 1; then
+-                webkitgtk=webkitgtk-3.0
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5
++$as_echo_n "checking for WEBKIT... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$WEBKIT_CFLAGS"; then
++        pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-4.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$WEBKIT_LIBS"; then
++        pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-4.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "webkit2gtk-4.0") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit2gtk-4.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit2gtk-4.0"`
++        else
++	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit2gtk-4.0"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$WEBKIT_PKG_ERRORS" >&5
++
++
++                                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk not found, falling back to webkitgtk" >&5
++$as_echo "$as_me: WARNING: webkit2gtk not found, falling back to webkitgtk" >&2;}
++
++elif test $pkg_failed = untried; then
++
++                                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkit2gtk not found, falling back to webkitgtk" >&5
++$as_echo "$as_me: WARNING: webkit2gtk not found, falling back to webkitgtk" >&2;}
++
++else
++	WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS
++	WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++                                    USE_WEBVIEW_WEBKIT2=1
++                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
++                                    EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
++
++fi
+             fi
++            if test "$USE_WEBVIEW_WEBKIT2" = 0; then
++                webkitgtk=webkit-1.0
++                if test "$WXGTK3" = 1; then
++                    webkitgtk=webkitgtk-3.0
++                fi
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5
+@@ -37361,12 +37445,12 @@ fi
+ 	echo "$WEBKIT_PKG_ERRORS" >&5
+ 
+ 
+-                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5
++                                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5
+ $as_echo "$as_me: WARNING: webkitgtk not found." >&2;}
+ 
+ elif test $pkg_failed = untried; then
+ 
+-                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5
++                                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5
+ $as_echo "$as_me: WARNING: webkitgtk not found." >&2;}
+ 
+ else
+@@ -37375,11 +37459,12 @@ else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+-                                USE_WEBVIEW_WEBKIT=1
+-                                CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+-                                EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
++                                    USE_WEBVIEW_WEBKIT=1
++                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
++                                    EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
+ 
+ fi
++            fi
+         elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+                                     old_CPPFLAGS="$CPPFLAGS"
+             CPPFLAGS="-x objective-c++ $CPPFLAGS"
+@@ -37411,6 +37496,10 @@ fi
+             wxUSE_WEBVIEW="yes"
+             $as_echo "#define wxUSE_WEBVIEW_WEBKIT 1" >>confdefs.h
+ 
++        elif test "$USE_WEBVIEW_WEBKIT2" = 1; then
++            wxUSE_WEBVIEW="yes"
++            $as_echo "#define wxUSE_WEBVIEW_WEBKIT2 1" >>confdefs.h
++
+         else
+             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit not available, disabling wxWebView" >&5
+ $as_echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;}
+@@ -41665,6 +41754,11 @@ EOF
+         COND_USE_THREADS_1=""
+     fi
+ 
++    COND_USE_WEBVIEW_WEBKIT2_1="#"
++    if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then
++        COND_USE_WEBVIEW_WEBKIT2_1=""
++    fi
++
+     COND_USE_XRC_1="#"
+     if test "x$USE_XRC" = "x1" ; then
+         COND_USE_XRC_1=""
 diff --git a/configure.in b/configure.in
-index c88523a..6925887 100644
+index 20d3eff..632fd70 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -7244,7 +7244,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
+@@ -7252,22 +7252,37 @@ fi
+ 
+ if test "$wxUSE_WEBVIEW" = "yes"; then
+     USE_WEBVIEW_WEBKIT=0
++    USE_WEBVIEW_WEBKIT2=0
+     if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
          if test "$wxUSE_GTK" = 1; then
-             webkitgtk=webkit-1.0
+-            webkitgtk=webkit-1.0
              if test "$WXGTK3" = 1; then
 -                webkitgtk=webkitgtk-3.0
-+                webkitgtk=webkit2gtk-4.0
++                PKG_CHECK_MODULES([WEBKIT],
++                                  [webkit2gtk-4.0],
++                                  [
++                                    USE_WEBVIEW_WEBKIT2=1
++                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
++                                    EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
++                                  ],
++                                  [
++                                    AC_MSG_WARN([webkit2gtk not found, falling back to webkitgtk])
++                                  ])
++            fi
++            if test "$USE_WEBVIEW_WEBKIT2" = 0; then
++                webkitgtk=webkit-1.0
++                if test "$WXGTK3" = 1; then
++                    webkitgtk=webkitgtk-3.0
++                fi
++                PKG_CHECK_MODULES([WEBKIT],
++                                  [$webkitgtk >= 1.3.1],
++                                  [
++                                    USE_WEBVIEW_WEBKIT=1
++                                    CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
++                                    EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
++                                  ],
++                                  [
++                                    AC_MSG_WARN([webkitgtk not found.])
++                                  ])
              fi
-             PKG_CHECK_MODULES([WEBKIT],
-                               [$webkitgtk >= 1.3.1],
+-            PKG_CHECK_MODULES([WEBKIT],
+-                              [$webkitgtk >= 1.3.1],
+-                              [
+-                                USE_WEBVIEW_WEBKIT=1
+-                                CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+-                                EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
+-                              ],
+-                              [
+-                                AC_MSG_WARN([webkitgtk not found.])
+-                              ])
+         elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+             dnl Under Mac we always have the libraries but check for the
+             dnl headers
+@@ -7294,6 +7309,9 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
+         if test "$USE_WEBVIEW_WEBKIT" = 1; then
+             wxUSE_WEBVIEW="yes"
+             AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
++        elif test "$USE_WEBVIEW_WEBKIT2" = 1; then
++            wxUSE_WEBVIEW="yes"
++            AC_DEFINE(wxUSE_WEBVIEW_WEBKIT2)
+         else
+             AC_MSG_WARN([WebKit not available, disabling wxWebView])
+         fi
+diff --git a/docs/changes.txt b/docs/changes.txt
+index 0565bca..75158a5 100644
+--- a/docs/changes.txt
++++ b/docs/changes.txt
+@@ -580,6 +580,14 @@ Major new features in this release
+ 
+ 
+ 
++3.0.4: (released 2017-??-??)
++----------------------------
++
++wxGTK:
++
++- Allow using more recent WebKit2GTK+ in wxWebView (Scott Talbert).
++
++
+ 3.0.3: (released 2017-05-02)
+ ----------------------------
+ 
+diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h
+index 3b9ab29..2bbbdaa 100644
+--- a/include/wx/android/setup.h
++++ b/include/wx/android/setup.h
+@@ -726,12 +726,23 @@
+ // Default is 1 on GTK and OSX
+ //
+ // Recommended setting: 1
+-#if defined(__WXGTK__) || defined(__WXOSX__)
++#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
+ #define wxUSE_WEBVIEW_WEBKIT 1
+ #else
+ #define wxUSE_WEBVIEW_WEBKIT 0
+ #endif
+ 
++// Use the WebKit2 wxWebView backend
++//
++// Default is 1 on GTK3
++//
++// Recommended setting: 1
++#if defined(__WXGTK3__)
++#define wxUSE_WEBVIEW_WEBKIT2 1
++#else
++#define wxUSE_WEBVIEW_WEBKIT2 0
++#endif
++
+ // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
+ // 2D drawing API.  (Still somewhat experimental)
+ //
+diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
+index 47fa8ee..0c73823 100644
+--- a/include/wx/chkconf.h
++++ b/include/wx/chkconf.h
+@@ -2190,7 +2190,7 @@
+ #   endif
+ #endif /* wxUSE_TREELISTCTRL */
+ 
+-#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
++#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_WEBKIT2 || wxUSE_WEBVIEW_IE)
+ #   ifdef wxABORT_ON_CONFIG_ERROR
+ #       error "wxUSE_WEBVIEW requires at least one backend"
+ #   else
 diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
-index e1a01bf..e2c9f33 100644
+index e1a01bf..046554e 100644
 --- a/include/wx/gtk/webview_webkit.h
 +++ b/include/wx/gtk/webview_webkit.h
-@@ -134,6 +134,12 @@ public:
-     //create-web-view signal and so we need to send a new window event
-     bool m_creating;
+@@ -11,10 +11,15 @@
  
-+    //variables used for Find()
-+    int m_findFlags;
-+    wxString m_findText;
-+    int m_findPosition;
-+    int m_findCount;
-+
- protected:
-     virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
+ #include "wx/defs.h"
+ 
+-#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
++// NOTE: this header is used for both the WebKit1 and WebKit2 implementations
++#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_WEBKIT2) && defined(__WXGTK__)
  
-@@ -157,12 +163,6 @@ private:
+ #include "wx/sharedptr.h"
+ #include "wx/webview.h"
++#if wxUSE_WEBVIEW_WEBKIT2
++#include <glib.h>
++#include <gio/gio.h>
++#endif
  
-     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
+ typedef struct _WebKitWebView WebKitWebView;
  
--    //variables used for Find()
--    int m_findFlags;
--    wxString m_findText;
--    int m_findPosition;
--    int m_findCount;
--
+@@ -152,6 +157,11 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
+     // focus event handler: calls GTKUpdateBitmap()
+     void GTKOnFocus(wxFocusEvent& event);
+ 
++#if wxUSE_WEBVIEW_WEBKIT2
++    bool CanExecuteEditingCommand(const gchar* command) const;
++    void SetupWebExtensionServer();
++#endif
++
+     WebKitWebView *m_web_view;
+     int m_historyLimit;
+ 
+@@ -163,6 +173,12 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
+     int m_findPosition;
+     int m_findCount;
+ 
++#if wxUSE_WEBVIEW_WEBKIT2
++    //Used for webkit2 extension
++    GDBusServer *m_dbusServer;
++    GDBusProxy *m_extension;
++#endif
++
      wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
  };
  
-diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
-index e592331..315949d 100644
---- a/src/gtk/webview_webkit.cpp
-+++ b/src/gtk/webview_webkit.cpp
-@@ -1,5 +1,5 @@
- /////////////////////////////////////////////////////////////////////////////
--// Name:        src/gtk/webview_webkit.cpp
-+// Name:        src/gtk/webview_webkit2.cpp
- // Purpose:     GTK WebKit backend for web view component
- // Author:      Marianne Gagnon, Robert Roebling
- // Copyright:   (c) 2010 Marianne Gagnon, 1998 Robert Roebling
-@@ -18,7 +18,7 @@
- #include "wx/filesys.h"
- #include "wx/base64.h"
- #include "wx/log.h"
--#include <webkit/webkit.h>
-+#include <webkit2/webkit2.h>
+diff --git a/include/wx/gtk/webview_webkit2_extension.h b/include/wx/gtk/webview_webkit2_extension.h
+new file mode 100644
+index 0000000..f554d69
+--- /dev/null
++++ b/include/wx/gtk/webview_webkit2_extension.h
+@@ -0,0 +1,15 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name:        include/gtk/wx/webview_webkit2_extension.h
++// Purpose:     Common elements for webview webkit2 extension
++// Author:      Scott Talbert
++// Copyright:   (c) 2017 Scott Talbert
++// Licence:     wxWindows licence
++/////////////////////////////////////////////////////////////////////////////
++
++#ifndef _WX_GTK_WEBVIEW_WEBKIT2_EXTENSION_H_
++#define _WX_GTK_WEBVIEW_WEBKIT2_EXTENSION_H_
++
++#define WXGTK_WEB_EXTENSION_OBJECT_PATH "/org/wxwidgets/wxGTK/WebExtension"
++#define WXGTK_WEB_EXTENSION_INTERFACE   "org.wxwidgets.wxGTK.WebExtension"
++
++#endif
+diff --git a/include/wx/gtk/webviewhistoryitem_webkit.h b/include/wx/gtk/webviewhistoryitem_webkit.h
+index a798efd..3137b3a 100644
+--- a/include/wx/gtk/webviewhistoryitem_webkit.h
++++ b/include/wx/gtk/webviewhistoryitem_webkit.h
+@@ -11,7 +11,7 @@
  
- // ----------------------------------------------------------------------------
- // GTK callbacks
-@@ -28,36 +28,16 @@ extern "C"
+ #include "wx/setup.h"
+ 
+-#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
++#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_WEBKIT2) && defined(__WXGTK__)
+ 
+ class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
  {
+diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
+index 692445c..7044250 100644
+--- a/include/wx/msw/wince/setup.h
++++ b/include/wx/msw/wince/setup.h
+@@ -745,12 +745,23 @@
+ // Default is 1 on GTK and OSX
+ //
+ // Recommended setting: 1
+-#if defined(__WXGTK__) || defined(__WXOSX__)
++#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
+ #define wxUSE_WEBVIEW_WEBKIT 1
+ #else
+ #define wxUSE_WEBVIEW_WEBKIT 0
+ #endif
+ 
++// Use the WebKit2 wxWebView backend
++//
++// Default is 1 on GTK3
++//
++// Recommended setting: 1
++#if defined(__WXGTK3__)
++#define wxUSE_WEBVIEW_WEBKIT2 1
++#else
++#define wxUSE_WEBVIEW_WEBKIT2 0
++#endif
++
+ // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
+ // 2D drawing API.  (Still somewhat experimental)
+ //
+diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
+index dbca6a4..f87b39d 100644
+--- a/include/wx/setup_inc.h
++++ b/include/wx/setup_inc.h
+@@ -741,12 +741,23 @@
+ // Default is 1 on GTK and OSX
+ //
+ // Recommended setting: 1
+-#if defined(__WXGTK__) || defined(__WXOSX__)
++#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
+ #define wxUSE_WEBVIEW_WEBKIT 1
+ #else
+ #define wxUSE_WEBVIEW_WEBKIT 0
+ #endif
+ 
++// Use the WebKit2 wxWebView backend
++//
++// Default is 1 on GTK3
++//
++// Recommended setting: 1
++#if defined(__WXGTK3__)
++#define wxUSE_WEBVIEW_WEBKIT2 1
++#else
++#define wxUSE_WEBVIEW_WEBKIT2 0
++#endif
++
+ // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
+ // 2D drawing API.  (Still somewhat experimental)
+ //
+diff --git a/interface/wx/webview.h b/interface/wx/webview.h
+index 694eba7..e7ff2e9 100644
+--- a/interface/wx/webview.h
++++ b/interface/wx/webview.h
+@@ -571,11 +571,15 @@ class wxWebView : public wxControl
+ 
+     /**
+         Clear the history, this will also remove the visible page.
++
++        @note This is not implemented on the WebKit2GTK+ backend.
+     */
+     virtual void ClearHistory() = 0;
+ 
+     /**
+         Enable or disable the history. This will also clear the history.
++
++        @note This is not implemented on the WebKit2GTK+ backend.
+     */
+     virtual void EnableHistory(bool enable = true) = 0;
+ 
+diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
+index a1c6217..0c135c7 100644
+--- a/samples/webview/webview.cpp
++++ b/samples/webview/webview.cpp
+@@ -21,7 +21,7 @@
+     #include "wx/wx.h"
+ #endif
+ 
+-#if !wxUSE_WEBVIEW_WEBKIT && !wxUSE_WEBVIEW_IE
++#if !wxUSE_WEBVIEW_WEBKIT && !wxUSE_WEBVIEW_WEBKIT2 && !wxUSE_WEBVIEW_IE
+ #error "A wxWebView backend is required by this sample"
+ #endif
+ 
+diff --git a/setup.h.in b/setup.h.in
+index 86a162c..b1c630b 100644
+--- a/setup.h.in
++++ b/setup.h.in
+@@ -340,12 +340,18 @@
+ #define wxUSE_WEBVIEW_IE 0
+ #endif
+ 
+-#if defined(__WXGTK__) || defined(__WXOSX__)
++#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
+ #define wxUSE_WEBVIEW_WEBKIT 0
+ #else
+ #define wxUSE_WEBVIEW_WEBKIT 0
+ #endif
+ 
++#if defined(__WXGTK3__)
++#define wxUSE_WEBVIEW_WEBKIT2 0
++#else
++#define wxUSE_WEBVIEW_WEBKIT2 0
++#endif
++
  
- static void
--wxgtk_webview_webkit_load_status(GtkWidget* widget,
--                                 GParamSpec*,
--                                 wxWebViewWebKit *webKitCtrl)
+ #ifdef _MSC_VER
+ #   if _MSC_VER >= 1310
+diff --git a/src/gtk/webview_webkit2.cpp b/src/gtk/webview_webkit2.cpp
+new file mode 100644
+index 0000000..3e3393f
+--- /dev/null
++++ b/src/gtk/webview_webkit2.cpp
+@@ -0,0 +1,1261 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name:        src/gtk/webview_webkit2.cpp
++// Purpose:     GTK WebKit2 backend for web view component
++// Author:      Scott Talbert
++// Copyright:   (c) 2017 Scott Talbert
++// Licence:     wxWindows licence
++/////////////////////////////////////////////////////////////////////////////
++
++// For compilers that support precompilation, includes "wx.h".
++#include "wx/wxprec.h"
++
++#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT2
++
++#include "wx/stockitem.h"
++#include "wx/gtk/webview_webkit.h"
++#include "wx/gtk/control.h"
++#include "wx/gtk/private.h"
++#include "wx/filesys.h"
++#include "wx/base64.h"
++#include "wx/log.h"
++#include "wx/gtk/webview_webkit2_extension.h"
++#include <webkit2/webkit2.h>
++
++// ----------------------------------------------------------------------------
++// GTK callbacks
++// ----------------------------------------------------------------------------
++
++extern "C"
++{
++
++static void
 +wxgtk_webview_webkit_load_changed(GtkWidget *,
 +                                  WebKitLoadEvent load_event,
 +                                  wxWebViewWebKit *webKitCtrl)
- {
-     wxString url = webKitCtrl->GetCurrentURL();
- 
--    WebKitLoadStatus status;
--    g_object_get(G_OBJECT(widget), "load-status", &status, NULL);
--
-     wxString target; // TODO: get target (if possible)
- 
--    if (status == WEBKIT_LOAD_FINISHED)
++{
++    wxString url = webKitCtrl->GetCurrentURL();
++
++    wxString target; // TODO: get target (if possible)
++
 +    if (load_event == WEBKIT_LOAD_FINISHED)
-     {
--        WebKitWebBackForwardList* hist = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(widget));
--        WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_current_item(hist);
--        //We have to check if we are actually storing history
--        //If the item isn't added we add it ourselves, it isn't added otherwise
--        //with a custom scheme.
--        if(!item || (WEBKIT_IS_WEB_HISTORY_ITEM(item) && 
--                     webkit_web_history_item_get_uri(item) != url))
--        {
--            WebKitWebHistoryItem*
--                newitem = webkit_web_history_item_new_with_data
--                          (
--                            url.utf8_str(),
--                            webKitCtrl->GetCurrentTitle().utf8_str()
--                          );
--            webkit_web_back_forward_list_add_item(hist, newitem);
--        }
--
-         webKitCtrl->m_busy = false;
-         wxWebViewEvent event(wxEVT_WEBVIEW_LOADED,
-                              webKitCtrl->GetId(),
-@@ -66,7 +46,7 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
-         if (webKitCtrl && webKitCtrl->GetEventHandler())
-             webKitCtrl->GetEventHandler()->ProcessEvent(event);
-     }
--    else if (status ==  WEBKIT_LOAD_COMMITTED)
++    {
++        webKitCtrl->m_busy = false;
++        wxWebViewEvent event(wxEVT_WEBVIEW_LOADED,
++                             webKitCtrl->GetId(),
++                             url, target);
++
++        if (webKitCtrl && webKitCtrl->GetEventHandler())
++            webKitCtrl->GetEventHandler()->ProcessEvent(event);
++    }
 +    else if (load_event == WEBKIT_LOAD_COMMITTED)
-     {
-         webKitCtrl->m_busy = true;
-         wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
-@@ -79,15 +59,15 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
- }
- 
- static gboolean
--wxgtk_webview_webkit_navigation(WebKitWebView *,
--                                WebKitWebFrame *frame,
--                                WebKitNetworkRequest *request,
--                                WebKitWebNavigationAction *,
--                                WebKitWebPolicyDecision *policy_decision,
++    {
++        webKitCtrl->m_busy = true;
++        wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
++                             webKitCtrl->GetId(),
++                             url, target);
++
++        if (webKitCtrl && webKitCtrl->GetEventHandler())
++            webKitCtrl->GetEventHandler()->ProcessEvent(event);
++    }
++}
++
++static gboolean
 +wxgtk_webview_webkit_navigation(WebKitWebView *web_view,
 +                                WebKitPolicyDecision *decision,
-                                 wxWebViewWebKit *webKitCtrl)
- {
--    const gchar* uri = webkit_network_request_get_uri(request);
--    wxString target = webkit_web_frame_get_name (frame);
++                                wxWebViewWebKit *webKitCtrl)
++{
 +    WebKitNavigationPolicyDecision* navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION(decision);
 +    WebKitNavigationAction* action = webkit_navigation_policy_decision_get_navigation_action(navigation_decision);
 +    WebKitURIRequest* request = webkit_navigation_action_get_request(action);
 +    const gchar* uri = webkit_uri_request_get_uri(request);
 +    wxString target = webkit_navigation_policy_decision_get_frame_name(navigation_decision);
-     
-     //If m_creating is true then we are the result of a new window
-     //and so we need to send the event and veto the load
-@@ -102,7 +82,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
-         if(webKitCtrl && webKitCtrl->GetEventHandler())
-             webKitCtrl->GetEventHandler()->ProcessEvent(event);
-         
--        webkit_web_policy_decision_ignore(policy_decision);
++    
++    //If m_creating is true then we are the result of a new window
++    //and so we need to send the event and veto the load
++    if(webKitCtrl->m_creating)
++    {
++        webKitCtrl->m_creating = false;
++        wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
++                             webKitCtrl->GetId(),
++                             wxString(uri, wxConvUTF8),
++                             target);
++
++        if(webKitCtrl && webKitCtrl->GetEventHandler())
++            webKitCtrl->GetEventHandler()->ProcessEvent(event);
++        
 +        webkit_policy_decision_ignore(decision);
-         return TRUE;
-     }
- 
-@@ -111,8 +91,8 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
-         webKitCtrl->m_guard = false;
-         //We set this to make sure that we don't try to load the page again from
-         //the resource request callback
--        webKitCtrl->m_vfsurl = webkit_network_request_get_uri(request);
--        webkit_web_policy_decision_use(policy_decision);
++        return TRUE;
++    }
++
++    if(webKitCtrl->m_guard)
++    {
++        webKitCtrl->m_guard = false;
++        //We set this to make sure that we don't try to load the page again from
++        //the resource request callback
 +        webKitCtrl->m_vfsurl = webkit_web_view_get_uri(web_view);
 +        webkit_policy_decision_use(decision);
-         return FALSE;
-     }
- 
-@@ -129,17 +109,17 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
-     if (!event.IsAllowed())
-     {
-         webKitCtrl->m_busy = false;
--        webkit_web_policy_decision_ignore(policy_decision);
++        return FALSE;
++    }
++
++    webKitCtrl->m_busy = true;
++
++    wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,
++                         webKitCtrl->GetId(),
++                         wxString( uri, wxConvUTF8 ),
++                         target);
++
++    if (webKitCtrl && webKitCtrl->GetEventHandler())
++        webKitCtrl->GetEventHandler()->ProcessEvent(event);
++
++    if (!event.IsAllowed())
++    {
++        webKitCtrl->m_busy = false;
 +        webkit_policy_decision_ignore(decision);
-         return TRUE;
-     }
-     else
-     {
-         wxString wxuri = uri;
-         wxSharedPtr<wxWebViewHandler> handler;
--        wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
++        return TRUE;
++    }
++    else
++    {
++        wxString wxuri = uri;
++        wxSharedPtr<wxWebViewHandler> handler;
 +        wxVector<wxSharedPtr<wxWebViewHandler> > handlers = webKitCtrl->GetHandlers();
-         //We are not vetoed so see if we match one of the additional handlers
--        for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
--            it != hanlders.end(); ++it)
++        //We are not vetoed so see if we match one of the additional handlers
 +        for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = handlers.begin();
 +            it != handlers.end(); ++it)
-         {
-             if(wxuri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
-             {
-@@ -157,7 +137,7 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
-                 webKitCtrl->SetPage(*file->GetStream(), wxuri);
-             }
-             //We need to throw some sort of error here if file is NULL
--            webkit_web_policy_decision_ignore(policy_decision);
++        {
++            if(wxuri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
++            {
++                handler = (*it);
++            }
++        }
++        //If we found a handler we can then use it to load the file directly
++        //ourselves
++        if(handler)
++        {
++            webKitCtrl->m_guard = true;
++            wxFSFile* file = handler->GetFile(wxuri);
++            if(file)
++            {
++                webKitCtrl->SetPage(*file->GetStream(), wxuri);
++            }
++            //We need to throw some sort of error here if file is NULL
 +            webkit_policy_decision_ignore(decision);
-             return TRUE;
-         }
-         return FALSE;
-@@ -165,16 +145,15 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
- }
- 
- static gboolean
--wxgtk_webview_webkit_error(WebKitWebView*,
--                           WebKitWebFrame*,
--                           gchar *uri,
--                           gpointer web_error,
--                           wxWebViewWebKit* webKitWindow)
++            return TRUE;
++        }
++        return FALSE;
++    }
++}
++
++static gboolean
 +wxgtk_webview_webkit_load_failed(WebKitWebView *,
 +                                 WebKitLoadEvent,
 +                                 gchar *uri,
 +                                 GError *error,
 +                                 wxWebViewWebKit* webKitWindow)
- {
-     webKitWindow->m_busy = false;
-     wxWebViewNavigationError type = wxWEBVIEW_NAV_ERR_OTHER;
- 
--    GError* error = (GError*)web_error;
-     wxString description(error->message, wxConvUTF8);
- 
-     if (strcmp(g_quark_to_string(error->domain), "soup_http_error_quark") == 0)
-@@ -306,16 +285,15 @@ wxgtk_webview_webkit_error(WebKitWebView*,
- }
- 
- static gboolean
--wxgtk_webview_webkit_new_window(WebKitWebView*,
--                                WebKitWebFrame *frame,
--                                WebKitNetworkRequest *request,
--                                WebKitWebNavigationAction*,
--                                WebKitWebPolicyDecision *policy_decision,
++{
++    webKitWindow->m_busy = false;
++    wxWebViewNavigationError type = wxWEBVIEW_NAV_ERR_OTHER;
++
++    wxString description(error->message, wxConvUTF8);
++
++    if (strcmp(g_quark_to_string(error->domain), "soup_http_error_quark") == 0)
++    {
++        switch (error->code)
++        {
++            case SOUP_STATUS_CANCELLED:
++                type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
++                break;
++
++            case SOUP_STATUS_CANT_RESOLVE:
++            case SOUP_STATUS_NOT_FOUND:
++                type = wxWEBVIEW_NAV_ERR_NOT_FOUND;
++                break;
++
++            case SOUP_STATUS_CANT_RESOLVE_PROXY:
++            case SOUP_STATUS_CANT_CONNECT:
++            case SOUP_STATUS_CANT_CONNECT_PROXY:
++            case SOUP_STATUS_SSL_FAILED:
++            case SOUP_STATUS_IO_ERROR:
++                type = wxWEBVIEW_NAV_ERR_CONNECTION;
++                break;
++
++            case SOUP_STATUS_MALFORMED:
++                type = wxWEBVIEW_NAV_ERR_REQUEST;
++                break;
++
++            case SOUP_STATUS_BAD_REQUEST:
++                type = wxWEBVIEW_NAV_ERR_REQUEST;
++                break;
++
++            case SOUP_STATUS_UNAUTHORIZED:
++            case SOUP_STATUS_FORBIDDEN:
++                type = wxWEBVIEW_NAV_ERR_AUTH;
++                break;
++
++            case SOUP_STATUS_METHOD_NOT_ALLOWED:
++            case SOUP_STATUS_NOT_ACCEPTABLE:
++                type = wxWEBVIEW_NAV_ERR_SECURITY;
++                break;
++
++            case SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED:
++                type = wxWEBVIEW_NAV_ERR_AUTH;
++                break;
++
++            case SOUP_STATUS_REQUEST_TIMEOUT:
++                type = wxWEBVIEW_NAV_ERR_CONNECTION;
++                break;
++
++            case SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE:
++            case SOUP_STATUS_REQUEST_URI_TOO_LONG:
++            case SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE:
++                type = wxWEBVIEW_NAV_ERR_REQUEST;
++                break;
++
++            case SOUP_STATUS_BAD_GATEWAY:
++            case SOUP_STATUS_SERVICE_UNAVAILABLE:
++            case SOUP_STATUS_GATEWAY_TIMEOUT:
++                type = wxWEBVIEW_NAV_ERR_CONNECTION;
++                break;
++
++            case SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED:
++                type = wxWEBVIEW_NAV_ERR_REQUEST;
++                break;
++        }
++    }
++    else if (strcmp(g_quark_to_string(error->domain),
++                    "webkit-network-error-quark") == 0)
++    {
++        switch (error->code)
++        {
++            case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
++                type = wxWEBVIEW_NAV_ERR_REQUEST;
++                break;
++
++            case WEBKIT_NETWORK_ERROR_CANCELLED:
++                type = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
++                break;
++
++            case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
++                type = wxWEBVIEW_NAV_ERR_NOT_FOUND;
++                break;
++        }
++    }
++    else if (strcmp(g_quark_to_string(error->domain),
++                    "webkit-policy-error-quark") == 0)
++    {
++        switch (error->code)
++        {
++            case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
++                type = wxWEBVIEW_NAV_ERR_SECURITY;
++                break;
++        }
++    }
++
++    wxWebViewEvent event(wxEVT_WEBVIEW_ERROR,
++                         webKitWindow->GetId(),
++                         uri, "");
++    event.SetString(description);
++    event.SetInt(type);
++
++    if (webKitWindow && webKitWindow->GetEventHandler())
++    {
++        webKitWindow->GetEventHandler()->ProcessEvent(event);
++    }
++
++    return FALSE;
++}
++
++static gboolean
 +wxgtk_webview_webkit_new_window(WebKitPolicyDecision *decision,
-                                 wxWebViewWebKit *webKitCtrl)
- {
--    const gchar* uri = webkit_network_request_get_uri(request);
++                                wxWebViewWebKit *webKitCtrl)
++{
 +    WebKitNavigationPolicyDecision* navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION(decision);
 +    WebKitNavigationAction* action = webkit_navigation_policy_decision_get_navigation_action(navigation_decision);
 +    WebKitURIRequest* request = webkit_navigation_action_get_request(action);
 +    const gchar* uri = webkit_uri_request_get_uri(request);
- 
--    wxString target = webkit_web_frame_get_name (frame);
++
 +    wxString target = webkit_navigation_policy_decision_get_frame_name(navigation_decision);
-     wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
-                                        webKitCtrl->GetId(),
-                                        wxString( uri, wxConvUTF8 ),
-@@ -325,16 +303,35 @@ wxgtk_webview_webkit_new_window(WebKitWebView*,
-         webKitCtrl->GetEventHandler()->ProcessEvent(event);
- 
-     //We always want the user to handle this themselves
--    webkit_web_policy_decision_ignore(policy_decision);
++    wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
++                                       webKitCtrl->GetId(),
++                                       wxString( uri, wxConvUTF8 ),
++                                       target);
++
++    if (webKitCtrl && webKitCtrl->GetEventHandler())
++        webKitCtrl->GetEventHandler()->ProcessEvent(event);
++
++    //We always want the user to handle this themselves
 +    webkit_policy_decision_ignore(decision);
-     return TRUE;
- }
- 
++    return TRUE;
++}
++
 +static gboolean
 +wxgtk_webview_webkit_decide_policy(WebKitWebView *web_view,
 +                                   WebKitPolicyDecision *decision,
@@ -269,590 +1111,868 @@ index e592331..315949d 100644
 +    }
 +}
 +
- static void
--wxgtk_webview_webkit_title_changed(WebKitWebView*,
--                                   WebKitWebFrame*,
--                                   gchar *title,
++static void
 +wxgtk_webview_webkit_title_changed(GtkWidget* widget,
 +                                   GParamSpec *,
-                                    wxWebViewWebKit *webKitCtrl)
- {
++                                   wxWebViewWebKit *webKitCtrl)
++{
 +    gchar *title;
 +    g_object_get(G_OBJECT(widget), "title", &title, NULL);
 +
-     wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,
-                          webKitCtrl->GetId(),
-                          webKitCtrl->GetCurrentURL(),
-@@ -344,24 +341,23 @@ wxgtk_webview_webkit_title_changed(WebKitWebView*,
-     if (webKitCtrl && webKitCtrl->GetEventHandler())
-         webKitCtrl->GetEventHandler()->ProcessEvent(event);
- 
++    wxWebViewEvent event(wxEVT_WEBVIEW_TITLE_CHANGED,
++                         webKitCtrl->GetId(),
++                         webKitCtrl->GetCurrentURL(),
++                         "");
++    event.SetString(wxString(title, wxConvUTF8));
++
++    if (webKitCtrl && webKitCtrl->GetEventHandler())
++        webKitCtrl->GetEventHandler()->ProcessEvent(event);
++
 +    g_free(title);
- }
- 
- static void
- wxgtk_webview_webkit_resource_req(WebKitWebView *,
--                                  WebKitWebFrame *,
-                                   WebKitWebResource *,
--                                  WebKitNetworkRequest *request,
--                                  WebKitNetworkResponse *,
++}
++
++static void
++wxgtk_webview_webkit_resource_req(WebKitWebView *,
++                                  WebKitWebResource *,
 +                                  WebKitURIRequest *request,
-                                   wxWebViewWebKit *webKitCtrl)
- {
--    wxString uri = webkit_network_request_get_uri(request);
++                                  wxWebViewWebKit *webKitCtrl)
++{
 +    wxString uri = webkit_uri_request_get_uri(request);
- 
-     wxSharedPtr<wxWebViewHandler> handler;
--    wxVector<wxSharedPtr<wxWebViewHandler> > hanlders = webKitCtrl->GetHandlers();
++
++    wxSharedPtr<wxWebViewHandler> handler;
 +    wxVector<wxSharedPtr<wxWebViewHandler> > handlers = webKitCtrl->GetHandlers();
- 
-     //We are not vetoed so see if we match one of the additional handlers
--    for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = hanlders.begin();
--        it != hanlders.end(); ++it)
++
++    //We are not vetoed so see if we match one of the additional handlers
 +    for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = handlers.begin();
 +        it != handlers.end(); ++it)
-     {
-         if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
-         {
-@@ -389,19 +385,17 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
-             wxString mime = file->GetMimeType();
-             wxString path = "data:" + mime + ";base64," + data;
-             //Then we can redirect the call
--            webkit_network_request_set_uri(request, path.utf8_str());
++    {
++        if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
++        {
++            handler = (*it);
++        }
++    }
++    //If we found a handler we can then use it to load the file directly
++    //ourselves
++    if(handler)
++    {
++        //If it is requsting the page itself then return as we have already
++        //loaded it from the archive
++        if(webKitCtrl->m_vfsurl == uri)
++            return;
++
++        wxFSFile* file = handler->GetFile(uri);
++        if(file)
++        {
++            //We load the data into a data url to save it being written out again
++            size_t size = file->GetStream()->GetLength();
++            char *buffer = new char[size];
++            file->GetStream()->Read(buffer, size);
++            wxString data = wxBase64Encode(buffer, size);
++            delete[] buffer;
++            wxString mime = file->GetMimeType();
++            wxString path = "data:" + mime + ";base64," + data;
++            //Then we can redirect the call
 +            webkit_uri_request_set_uri(request, path.utf8_str());
-         }
- 
-     }
- }
- 
--#if WEBKIT_CHECK_VERSION(1, 10, 0)
--
- static gboolean
- wxgtk_webview_webkit_context_menu(WebKitWebView *,
--                                  GtkWidget *,
++        }
++
++    }
++}
++
++static gboolean
++wxgtk_webview_webkit_context_menu(WebKitWebView *,
 +                                  WebKitContextMenu *,
 +                                  GdkEvent *,
-                                   WebKitHitTestResult *,
--                                  gboolean,
-                                   wxWebViewWebKit *webKitCtrl)
- {
-     if(webKitCtrl->IsContextMenuEnabled())
-@@ -410,11 +404,9 @@ wxgtk_webview_webkit_context_menu(WebKitWebView *,
-         return TRUE;
- }
- 
--#endif
--
- static WebKitWebView*
- wxgtk_webview_webkit_create_webview(WebKitWebView *web_view,
--                                    WebKitWebFrame*,
++                                  WebKitHitTestResult *,
++                                  wxWebViewWebKit *webKitCtrl)
++{
++    if(webKitCtrl->IsContextMenuEnabled())
++        return FALSE;
++    else
++        return TRUE;
++}
++
++static WebKitWebView*
++wxgtk_webview_webkit_create_webview(WebKitWebView *web_view,
 +                                    WebKitNavigationAction *,
-                                     wxWebViewWebKit *webKitCtrl)
- {
-     //As we do not know the uri being loaded at this point allow the load to
-@@ -423,6 +415,30 @@ wxgtk_webview_webkit_create_webview(WebKitWebView *web_view,
-     return web_view;
- }
- 
++                                    wxWebViewWebKit *webKitCtrl)
++{
++    //As we do not know the uri being loaded at this point allow the load to
++    //continue and catch it in navigation-policy-decision-requested
++    webKitCtrl->m_creating = true;
++    return web_view;
++}
++
 +static void
 +wxgtk_webview_webkit_counted_matches(WebKitFindController *,
 +                                     guint match_count,
-+                                     wxWebViewWebKit *webKitCtrl)
++                                     int *findCount)
 +{
-+    std::cerr << "BLAH counted_matches: " << match_count << std::endl;
-+    webKitCtrl->m_findCount = match_count;
++    *findCount = match_count;
 +}
 +
 +static void
-+wxgtk_webview_webkit_failed_to_find_text(WebKitFindController *,
-+                                         wxWebViewWebKit *)
++wxgtk_initialize_web_extensions(WebKitWebContext *context,
++                                GDBusServer *dbusServer)
 +{
-+    std::cerr << "BLAH failed_to_find_text" << std::endl;
++    const char *address = g_dbus_server_get_client_address(dbusServer);
++    GVariant *user_data = g_variant_new("(s)", address);
++    webkit_web_context_set_web_extensions_directory(context,
++                                                    WX_WEB_EXTENSIONS_DIRECTORY);
++    webkit_web_context_set_web_extensions_initialization_user_data(context,
++                                                                   user_data);
 +}
 +
-+static void
-+wxgtk_webview_webkit_found_text(WebKitFindController *,
-+                                guint match_count,
-+                                wxWebViewWebKit *)
++static gboolean
++wxgtk_new_connection_cb(GDBusServer *,
++                        GDBusConnection *connection,
++                        GDBusProxy **proxy)
 +{
-+    std::cerr << "BLAH found_text: " << match_count << std::endl;
++    GError *error = NULL;
++    GDBusProxyFlags flags = static_cast<GDBusProxyFlags>(static_cast<int>(G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES) | static_cast<int>(G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS));
++    *proxy = g_dbus_proxy_new_sync(connection,
++                                   flags,
++                                   NULL,
++                                   NULL,
++                                   WXGTK_WEB_EXTENSION_OBJECT_PATH,
++                                   WXGTK_WEB_EXTENSION_INTERFACE,
++                                   NULL,
++                                   &error);
++    if (error)
++    {
++        g_warning("Failed to create dbus proxy: %s", error->message);
++        g_error_free(error);
++    }
++
++    return TRUE;
 +}
 +
- } // extern "C"
- 
- //-----------------------------------------------------------------------------
-@@ -464,30 +480,33 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
-     GTKCreateScrolledWindowWith(GTK_WIDGET(m_web_view));
-     g_object_ref(m_widget);
- 
--    g_signal_connect_after(m_web_view, "navigation-policy-decision-requested",
--                           G_CALLBACK(wxgtk_webview_webkit_navigation),
--                           this);
--    g_signal_connect_after(m_web_view, "load-error",
--                           G_CALLBACK(wxgtk_webview_webkit_error),
++gboolean
++wxgtk_dbus_peer_is_authorized(GCredentials *peer_credentials)
++{
++    static GCredentials *own_credentials = g_credentials_new();
++    GError *error = NULL;
++
++    if (peer_credentials && g_credentials_is_same_user(peer_credentials, own_credentials, &error))
++    {
++        return TRUE;
++    }
++
++    if (error)
++    {
++        g_warning("Failed to authorize web extension connection: %s", error->message);
++        g_error_free(error);
++    }
++    return FALSE;
++}
++
++static gboolean
++wxgtk_authorize_authenticated_peer_cb(GDBusAuthObserver *,
++                                      GIOStream *,
++                                      GCredentials *credentials,
++                                      wxWebViewWebKit *)
++{
++    return wxgtk_dbus_peer_is_authorized(credentials);
++}
++
++} // extern "C"
++
++//-----------------------------------------------------------------------------
++// wxWebViewWebKit
++//-----------------------------------------------------------------------------
++
++wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
++
++wxWebViewWebKit::wxWebViewWebKit()
++{
++    m_web_view = NULL;
++    m_dbusServer = NULL;
++    m_extension = NULL;
++}
++
++bool wxWebViewWebKit::Create(wxWindow *parent,
++                      wxWindowID id,
++                      const wxString &url,
++                      const wxPoint& pos,
++                      const wxSize& size,
++                      long style,
++                      const wxString& name)
++{
++    m_busy = false;
++    m_guard = false;
++    m_creating = false;
++    FindClear();
++
++    // We currently unconditionally impose scrolling in both directions as it's
++    // necessary to show arbitrary pages.
++    style |= wxHSCROLL | wxVSCROLL;
++
++    if (!PreCreation( parent, pos, size ) ||
++        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
++    {
++        wxFAIL_MSG( wxT("wxWebViewWebKit creation failed") );
++        return false;
++    }
++
++    SetupWebExtensionServer();
++    g_signal_connect_after(webkit_web_context_get_default(),
++                           "initialize-web-extensions",
++                           G_CALLBACK(wxgtk_initialize_web_extensions),
++                           m_dbusServer);
++
++    m_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new());
++    GTKCreateScrolledWindowWith(GTK_WIDGET(m_web_view));
++    g_object_ref(m_widget);
++
 +    g_signal_connect_after(m_web_view, "decide-policy",
 +                           G_CALLBACK(wxgtk_webview_webkit_decide_policy),
-                            this);
- 
--    g_signal_connect_after(m_web_view, "new-window-policy-decision-requested",
--                           G_CALLBACK(wxgtk_webview_webkit_new_window), this);
++                           this);
++
 +    g_signal_connect_after(m_web_view, "load-failed",
 +                           G_CALLBACK(wxgtk_webview_webkit_load_failed), this);
- 
--    g_signal_connect_after(m_web_view, "title-changed",
++
 +    g_signal_connect_after(m_web_view, "notify::title",
-                            G_CALLBACK(wxgtk_webview_webkit_title_changed), this);
- 
--    g_signal_connect_after(m_web_view, "resource-request-starting",
++                           G_CALLBACK(wxgtk_webview_webkit_title_changed), this);
++
 +    g_signal_connect_after(m_web_view, "resource-load-started",
-                            G_CALLBACK(wxgtk_webview_webkit_resource_req), this);
--      
--#if WEBKIT_CHECK_VERSION(1, 10, 0)    
--     g_signal_connect_after(m_web_view, "context-menu",
++                           G_CALLBACK(wxgtk_webview_webkit_resource_req), this);
 +
 +    g_signal_connect_after(m_web_view, "context-menu",
-                            G_CALLBACK(wxgtk_webview_webkit_context_menu), this);
--#endif
--     
--     g_signal_connect_after(m_web_view, "create-web-view",
++                           G_CALLBACK(wxgtk_webview_webkit_context_menu), this);
 +
 +    g_signal_connect_after(m_web_view, "create",
-                            G_CALLBACK(wxgtk_webview_webkit_create_webview), this);
- 
++                           G_CALLBACK(wxgtk_webview_webkit_create_webview), this);
++
 +    WebKitFindController* findctrl = webkit_web_view_get_find_controller(m_web_view);
 +    g_signal_connect_after(findctrl, "counted-matches",
-+                           G_CALLBACK(wxgtk_webview_webkit_counted_matches), this);
-+    g_signal_connect_after(findctrl, "failed-to-find-text",
-+                           G_CALLBACK(wxgtk_webview_webkit_failed_to_find_text), this);
-+    g_signal_connect_after(findctrl, "found-text",
-+                           G_CALLBACK(wxgtk_webview_webkit_found_text), this);
-+
-     m_parent->DoAddChild( this );
- 
-     PostCreation(size);
-@@ -495,14 +514,9 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
-     /* Open a webpage */
-     webkit_web_view_load_uri(m_web_view, url.utf8_str());
- 
--    //Get the initial history limit so we can enable and disable it later
--    WebKitWebBackForwardList* history;
--    history = webkit_web_view_get_back_forward_list(m_web_view);
--    m_historyLimit = webkit_web_back_forward_list_get_limit(history);
--
-     // last to avoid getting signal too early
--    g_signal_connect_after(m_web_view, "notify::load-status",
--                           G_CALLBACK(wxgtk_webview_webkit_load_status),
++                           G_CALLBACK(wxgtk_webview_webkit_counted_matches),
++                           &m_findCount);
++
++    m_parent->DoAddChild( this );
++
++    PostCreation(size);
++
++    /* Open a webpage */
++    webkit_web_view_load_uri(m_web_view, url.utf8_str());
++
++    // last to avoid getting signal too early
 +    g_signal_connect_after(m_web_view, "load-changed",
 +                           G_CALLBACK(wxgtk_webview_webkit_load_changed),
-                            this);
- 
-     return true;
-@@ -536,12 +550,12 @@ wxWebViewWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
- 
- void wxWebViewWebKit::ZoomIn()
- {
--    webkit_web_view_zoom_in(m_web_view);
++                           this);
++
++    return true;
++}
++
++wxWebViewWebKit::~wxWebViewWebKit()
++{
++    if (m_web_view)
++        GTKDisconnect(m_web_view);
++    if (m_dbusServer)
++        g_dbus_server_stop(m_dbusServer);
++    g_clear_object(&m_dbusServer);
++    g_clear_object(&m_extension);
++}
++
++bool wxWebViewWebKit::Enable( bool enable )
++{
++    if (!wxControl::Enable(enable))
++        return false;
++
++    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);
++
++    return true;
++}
++
++GdkWindow*
++wxWebViewWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
++{
++    GdkWindow* window = gtk_widget_get_parent_window(m_widget);
++    return window;
++}
++
++void wxWebViewWebKit::ZoomIn()
++{
 +    SetWebkitZoom(GetWebkitZoom() + 0.1);
- }
- 
- void wxWebViewWebKit::ZoomOut()
- {
--    webkit_web_view_zoom_out(m_web_view);
++}
++
++void wxWebViewWebKit::ZoomOut()
++{
 +    SetWebkitZoom(GetWebkitZoom() - 0.1);
- }
- 
- void wxWebViewWebKit::SetWebkitZoom(float level)
-@@ -601,39 +615,28 @@ bool wxWebViewWebKit::CanGoForward() const
- 
- void wxWebViewWebKit::ClearHistory()
- {
--    WebKitWebBackForwardList* history;
--    history = webkit_web_view_get_back_forward_list(m_web_view);
--    webkit_web_back_forward_list_clear(history);
++}
++
++void wxWebViewWebKit::SetWebkitZoom(float level)
++{
++    webkit_web_view_set_zoom_level(m_web_view, level);
++}
++
++float wxWebViewWebKit::GetWebkitZoom() const
++{
++    return webkit_web_view_get_zoom_level(m_web_view);
++}
++
++void wxWebViewWebKit::Stop()
++{
++     webkit_web_view_stop_loading(m_web_view);
++}
++
++void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
++{
++    if (flags & wxWEBVIEW_RELOAD_NO_CACHE)
++    {
++        webkit_web_view_reload_bypass_cache(m_web_view);
++    }
++    else
++    {
++        webkit_web_view_reload(m_web_view);
++    }
++}
++
++void wxWebViewWebKit::LoadURL(const wxString& url)
++{
++    webkit_web_view_load_uri(m_web_view, wxGTK_CONV(url));
++}
++
++
++void wxWebViewWebKit::GoBack()
++{
++    webkit_web_view_go_back(m_web_view);
++}
++
++void wxWebViewWebKit::GoForward()
++{
++    webkit_web_view_go_forward(m_web_view);
++}
++
++
++bool wxWebViewWebKit::CanGoBack() const
++{
++    return webkit_web_view_can_go_back(m_web_view);
++}
++
++
++bool wxWebViewWebKit::CanGoForward() const
++{
++    return webkit_web_view_can_go_forward(m_web_view);
++}
++
++void wxWebViewWebKit::ClearHistory()
++{
 +    // In WebKit2GTK+, the BackForwardList can't be cleared so do nothing.
- }
- 
--void wxWebViewWebKit::EnableHistory(bool enable)
++}
++
 +void wxWebViewWebKit::EnableHistory(bool)
- {
--    WebKitWebBackForwardList* history;
--    history = webkit_web_view_get_back_forward_list(m_web_view);
--    if(enable)
--    {
--        webkit_web_back_forward_list_set_limit(history, m_historyLimit);
--    }
--    else
--    {
--        webkit_web_back_forward_list_set_limit(history, 0);
--    }
++{
 +    // In WebKit2GTK+, history can't be disabled so do nothing here.
- }
- 
- wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
- {
-     wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
--    WebKitWebBackForwardList* history;
-+    WebKitBackForwardList* history;
-     history = webkit_web_view_get_back_forward_list(m_web_view);
--    GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history,
--                                                                        m_historyLimit);
++}
++
++wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
++{
++    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
++    WebKitBackForwardList* history =
++        webkit_web_view_get_back_forward_list(m_web_view);
 +    GList* list = webkit_back_forward_list_get_back_list_with_limit(history,
 +                                                                    m_historyLimit);
-     //We need to iterate in reverse to get the order we desire
-     for(int i = g_list_length(list) - 1; i >= 0 ; i--)
-     {
--        WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
++    //We need to iterate in reverse to get the order we desire
++    for(int i = g_list_length(list) - 1; i >= 0 ; i--)
++    {
 +        WebKitBackForwardListItem* gtkitem = (WebKitBackForwardListItem*)g_list_nth_data(list, i);
-         wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
--                                   webkit_web_history_item_get_uri(gtkitem),
--                                   webkit_web_history_item_get_title(gtkitem));
++        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
 +                              webkit_back_forward_list_item_get_uri(gtkitem),
 +                              webkit_back_forward_list_item_get_title(gtkitem));
-         wxitem->m_histItem = gtkitem;
-         wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
-         backhist.push_back(item);
-@@ -644,16 +647,16 @@ wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory
- wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
- {
-     wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
--    WebKitWebBackForwardList* history;
-+    WebKitBackForwardList* history;
-     history = webkit_web_view_get_back_forward_list(m_web_view);
--    GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history,
--                                                                           m_historyLimit);
++        wxitem->m_histItem = gtkitem;
++        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
++        backhist.push_back(item);
++    }
++    return backhist;
++}
++
++wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
++{
++    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
++    WebKitBackForwardList* history =
++        webkit_web_view_get_back_forward_list(m_web_view);
 +    GList* list = webkit_back_forward_list_get_forward_list_with_limit(history,
 +                                                                       m_historyLimit);
-     for(guint i = 0; i < g_list_length(list); i++)
-     {
--        WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
++    for(guint i = 0; i < g_list_length(list); i++)
++    {
 +        WebKitBackForwardListItem* gtkitem = (WebKitBackForwardListItem*)g_list_nth_data(list, i);
-         wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
--                                   webkit_web_history_item_get_uri(gtkitem),
--                                   webkit_web_history_item_get_title(gtkitem));
++        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(
 +                              webkit_back_forward_list_item_get_uri(gtkitem),
 +                              webkit_back_forward_list_item_get_title(gtkitem));
-         wxitem->m_histItem = gtkitem;
-         wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
-         forwardhist.push_back(item);
-@@ -663,62 +666,72 @@ wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory(
- 
- void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
- {
--    WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
++        wxitem->m_histItem = gtkitem;
++        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);
++        forwardhist.push_back(item);
++    }
++    return forwardhist;
++}
++
++void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
++{
 +    WebKitBackForwardListItem* gtkitem = (WebKitBackForwardListItem*)item->m_histItem;
-     if(gtkitem)
-     {
--        webkit_web_view_go_to_back_forward_item(m_web_view,
--                                                WEBKIT_WEB_HISTORY_ITEM(gtkitem));
++    if(gtkitem)
++    {
 +        webkit_web_view_go_to_back_forward_list_item(m_web_view,
 +                                                     WEBKIT_BACK_FORWARD_LIST_ITEM(gtkitem));
-     }
- }
- 
- bool wxWebViewWebKit::CanCut() const
- {
--    return webkit_web_view_can_cut_clipboard(m_web_view);
-+    // Cannot be determined without making an async call, so just return true
-+    return true;
- }
- 
- bool wxWebViewWebKit::CanCopy() const
- {
--    return webkit_web_view_can_copy_clipboard(m_web_view);
-+    // Cannot be determined without making an async call, so just return true
-+    return true;
- }
- 
- bool wxWebViewWebKit::CanPaste() const
- {
--    return webkit_web_view_can_paste_clipboard(m_web_view);
-+    // Cannot be determined without making an async call, so just return true
-+    return true;
- }
- 
- void wxWebViewWebKit::Cut()
- {
--    webkit_web_view_cut_clipboard(m_web_view);
++    }
++}
++
++static void wxgtk_can_execute_editing_command_cb(WebKitWebView *,
++                                                 GAsyncResult *res,
++                                                 GAsyncResult **res_out)
++{
++    *res_out = (GAsyncResult*)g_object_ref(res);
++}
++
++bool wxWebViewWebKit::CanExecuteEditingCommand(const gchar* command) const
++{
++    GAsyncResult *result = NULL;
++    webkit_web_view_can_execute_editing_command(m_web_view,
++                                                command,
++                                                NULL,
++                                                (GAsyncReadyCallback)wxgtk_can_execute_editing_command_cb,
++                                                &result);
++
++    GMainContext *main_context = g_main_context_get_thread_default();
++    while (!result)
++    {
++        g_main_context_iteration(main_context, TRUE);
++    }
++
++    gboolean can_execute = webkit_web_view_can_execute_editing_command_finish(m_web_view,
++                                                                              result,
++                                                                              NULL);
++    g_object_unref(result);
++
++    return can_execute;
++}
++
++bool wxWebViewWebKit::CanCut() const
++{
++    return CanExecuteEditingCommand(WEBKIT_EDITING_COMMAND_CUT);
++}
++
++bool wxWebViewWebKit::CanCopy() const
++{
++    return CanExecuteEditingCommand(WEBKIT_EDITING_COMMAND_COPY);
++}
++
++bool wxWebViewWebKit::CanPaste() const
++{
++    return CanExecuteEditingCommand(WEBKIT_EDITING_COMMAND_PASTE);
++}
++
++void wxWebViewWebKit::Cut()
++{
 +    webkit_web_view_execute_editing_command(m_web_view,
 +                                            WEBKIT_EDITING_COMMAND_CUT);
- }
- 
- void wxWebViewWebKit::Copy()
- {
--    webkit_web_view_copy_clipboard(m_web_view);
++}
++
++void wxWebViewWebKit::Copy()
++{
 +    webkit_web_view_execute_editing_command(m_web_view,
 +                                            WEBKIT_EDITING_COMMAND_COPY);
- }
- 
- void wxWebViewWebKit::Paste()
- {
--    webkit_web_view_paste_clipboard(m_web_view);
++}
++
++void wxWebViewWebKit::Paste()
++{
 +    webkit_web_view_execute_editing_command(m_web_view,
 +                                            WEBKIT_EDITING_COMMAND_PASTE);
- }
- 
- bool wxWebViewWebKit::CanUndo() const
- {
--    return webkit_web_view_can_undo(m_web_view);
-+    // Cannot be determined without making an async call, so just return true
-+    return true;
- }
- 
- bool wxWebViewWebKit::CanRedo() const
- {
--    return webkit_web_view_can_redo(m_web_view);
-+    // Cannot be determined without making an async call, so just return true
-+    return true;
- }
- 
- void wxWebViewWebKit::Undo()
- {
--    webkit_web_view_undo(m_web_view);
++}
++
++bool wxWebViewWebKit::CanUndo() const
++{
++    return CanExecuteEditingCommand(WEBKIT_EDITING_COMMAND_UNDO);
++}
++
++bool wxWebViewWebKit::CanRedo() const
++{
++    return CanExecuteEditingCommand(WEBKIT_EDITING_COMMAND_REDO);
++}
++
++void wxWebViewWebKit::Undo()
++{
 +    webkit_web_view_execute_editing_command(m_web_view,
 +                                            WEBKIT_EDITING_COMMAND_UNDO);
- }
- 
- void wxWebViewWebKit::Redo()
- {
--    webkit_web_view_redo(m_web_view);
++}
++
++void wxWebViewWebKit::Redo()
++{
 +    webkit_web_view_execute_editing_command(m_web_view,
 +                                            WEBKIT_EDITING_COMMAND_REDO);
- }
- 
- wxString wxWebViewWebKit::GetCurrentURL() const
-@@ -737,6 +750,7 @@ wxString wxWebViewWebKit::GetCurrentTitle() const
- 
- wxString wxWebViewWebKit::GetPageSource() const
- {
-+/* TODO: webkit_web_resource_get_data() async
-     WebKitWebFrame* frame = webkit_web_view_get_main_frame(m_web_view);
-     WebKitWebDataSource* src = webkit_web_frame_get_data_source (frame);
- 
-@@ -744,6 +758,8 @@ wxString wxWebViewWebKit::GetPageSource() const
-     // const gchar*
-     // webkit_web_data_source_get_encoding(WebKitWebDataSource *data_source);
-     return wxString(webkit_web_data_source_get_data (src)->str, wxConvUTF8);
-+*/
-+    return wxString("");
- }
- 
- 
-@@ -811,17 +827,19 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
- 
- void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type)
- {
--    webkit_web_view_set_full_content_zoom(m_web_view,
--                                          (type == wxWEBVIEW_ZOOM_TYPE_LAYOUT ?
--                                          TRUE : FALSE));
++}
++
++wxString wxWebViewWebKit::GetCurrentURL() const
++{
++    // FIXME: check which encoding the web kit control uses instead of
++    // assuming UTF8 (here and elsewhere too)
++    return wxString::FromUTF8(webkit_web_view_get_uri(m_web_view));
++}
++
++
++wxString wxWebViewWebKit::GetCurrentTitle() const
++{
++    return wxString::FromUTF8(webkit_web_view_get_title(m_web_view));
++}
++
++
++static void wxgtk_web_resource_get_data_cb(WebKitWebResource *,
++                                           GAsyncResult *res,
++                                           GAsyncResult **res_out)
++{
++    *res_out = (GAsyncResult*)g_object_ref(res);
++}
++
++wxString wxWebViewWebKit::GetPageSource() const
++{
++    WebKitWebResource *resource = webkit_web_view_get_main_resource(m_web_view);
++    if (!resource)
++    {
++        return wxString();
++    }
++
++    GAsyncResult *result = NULL;
++    webkit_web_resource_get_data(resource, NULL,
++                                 (GAsyncReadyCallback)wxgtk_web_resource_get_data_cb,
++                                 &result);
++
++    GMainContext *main_context = g_main_context_get_thread_default();
++    while (!result)
++    {
++        g_main_context_iteration(main_context, TRUE);
++    }
++
++    guchar *source = webkit_web_resource_get_data_finish(resource, result,
++                                                         NULL, NULL);
++    if (result)
++    {
++        g_object_unref(result);
++    }
++
++    if (source)
++    {
++        wxString wxs = wxString(source, wxConvUTF8);
++        free(source);
++        return wxs;
++    }
++    return wxString();
++}
++
++
++wxWebViewZoom wxWebViewWebKit::GetZoom() const
++{
++    float zoom = GetWebkitZoom();
++
++    // arbitrary way to map float zoom to our common zoom enum
++    if (zoom <= 0.65)
++    {
++        return wxWEBVIEW_ZOOM_TINY;
++    }
++    else if (zoom > 0.65 && zoom <= 0.90)
++    {
++        return wxWEBVIEW_ZOOM_SMALL;
++    }
++    else if (zoom > 0.90 && zoom <= 1.15)
++    {
++        return wxWEBVIEW_ZOOM_MEDIUM;
++    }
++    else if (zoom > 1.15 && zoom <= 1.45)
++    {
++        return wxWEBVIEW_ZOOM_LARGE;
++    }
++    else if (zoom > 1.45)
++    {
++        return wxWEBVIEW_ZOOM_LARGEST;
++    }
++
++    // to shut up compilers, this can never be reached logically
++    wxFAIL;
++    return wxWEBVIEW_ZOOM_MEDIUM;
++}
++
++
++void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
++{
++    // arbitrary way to map our common zoom enum to float zoom
++    switch (zoom)
++    {
++        case wxWEBVIEW_ZOOM_TINY:
++            SetWebkitZoom(0.6f);
++            break;
++
++        case wxWEBVIEW_ZOOM_SMALL:
++            SetWebkitZoom(0.8f);
++            break;
++
++        case wxWEBVIEW_ZOOM_MEDIUM:
++            SetWebkitZoom(1.0f);
++            break;
++
++        case wxWEBVIEW_ZOOM_LARGE:
++            SetWebkitZoom(1.3);
++            break;
++
++        case wxWEBVIEW_ZOOM_LARGEST:
++            SetWebkitZoom(1.6);
++            break;
++
++        default:
++            wxFAIL;
++    }
++}
++
++void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type)
++{
 +    WebKitSettings* settings = webkit_web_view_get_settings(m_web_view);
 +    webkit_settings_set_zoom_text_only(settings,
 +                                       (type == wxWEBVIEW_ZOOM_TYPE_TEXT ?
 +                                       TRUE : FALSE));
- }
- 
- wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
- {
--    gboolean fczoom = webkit_web_view_get_full_content_zoom(m_web_view);
++}
++
++wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
++{
 +    WebKitSettings* settings = webkit_web_view_get_settings(m_web_view);
 +    gboolean tozoom = webkit_settings_get_zoom_text_only(settings);
- 
--    if (fczoom) return wxWEBVIEW_ZOOM_TYPE_LAYOUT;
--    else        return wxWEBVIEW_ZOOM_TYPE_TEXT;
-+    if (tozoom) return wxWEBVIEW_ZOOM_TYPE_TEXT;
-+    else        return wxWEBVIEW_ZOOM_TYPE_LAYOUT;
- }
- 
- bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const
-@@ -832,24 +850,16 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const
- 
- void wxWebViewWebKit::DoSetPage(const wxString& html, const wxString& baseUri)
- {
--    webkit_web_view_load_string (m_web_view,
--                                 html.mb_str(wxConvUTF8),
--                                 "text/html",
--                                 "UTF-8",
--                                 baseUri.mb_str(wxConvUTF8));
++
++    if (tozoom)
++        return wxWEBVIEW_ZOOM_TYPE_TEXT;
++    else
++        return wxWEBVIEW_ZOOM_TYPE_LAYOUT;
++}
++
++bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType) const
++{
++    // this port supports all zoom types
++    return true;
++}
++
++void wxWebViewWebKit::DoSetPage(const wxString& html, const wxString& baseUri)
++{
 +    webkit_web_view_load_html(m_web_view,
 +                              html.mb_str(wxConvUTF8),
 +                              baseUri.mb_str(wxConvUTF8));
- }
- 
- void wxWebViewWebKit::Print()
- {
--    WebKitWebFrame* frame = webkit_web_view_get_main_frame(m_web_view);
--    webkit_web_frame_print (frame);
--
--    // GtkPrintOperationResult  webkit_web_frame_print_full
--    //      (WebKitWebFrame *frame,
--    //       GtkPrintOperation *operation,
--    //       GtkPrintOperationAction action,
--    //       GError **error);
--
++}
++
++void wxWebViewWebKit::Print()
++{
 +    WebKitPrintOperation* printop = webkit_print_operation_new(m_web_view);
 +    webkit_print_operation_run_dialog(printop, NULL);
 +    g_object_unref(printop);
- }
- 
- 
-@@ -886,26 +896,35 @@ void wxWebViewWebKit::SetEditable(bool enable)
- 
- bool wxWebViewWebKit::IsEditable() const
- {
--    return webkit_web_view_get_editable(m_web_view);
++}
++
++
++bool wxWebViewWebKit::IsBusy() const
++{
++    return m_busy;
++}
++
++void wxWebViewWebKit::SetEditable(bool enable)
++{
++    webkit_web_view_set_editable(m_web_view, enable);
++}
++
++bool wxWebViewWebKit::IsEditable() const
++{
 +    gboolean editable;
 +    g_object_get(m_web_view, "editable", &editable, NULL);
 +    return editable;
- }
- 
- void wxWebViewWebKit::DeleteSelection()
- {
-+/* TODO
-     webkit_web_view_delete_selection(m_web_view);
-+*/
- }
- 
- bool wxWebViewWebKit::HasSelection() const
- {
-+/* TODO
-     return webkit_web_view_has_selection(m_web_view);
-+*/
++}
++
++void wxWebViewWebKit::DeleteSelection()
++{
++    if (m_extension)
++    {
++        guint64 page_id = webkit_web_view_get_page_id(m_web_view);
++        GVariant *retval = g_dbus_proxy_call_sync(m_extension,
++                                                  "DeleteSelection",
++                                                  g_variant_new("(t)", page_id),
++                                                  G_DBUS_CALL_FLAGS_NONE, -1,
++                                                  NULL, NULL);
++        if (retval)
++        {
++            g_variant_unref(retval);
++        }
++    }
++}
++
++bool wxWebViewWebKit::HasSelection() const
++{
++    if (m_extension)
++    {
++        guint64 page_id = webkit_web_view_get_page_id(m_web_view);
++        GVariant *retval = g_dbus_proxy_call_sync(m_extension,
++                                                  "HasSelection",
++                                                  g_variant_new("(t)", page_id),
++                                                  G_DBUS_CALL_FLAGS_NONE, -1,
++                                                  NULL, NULL);
++        if (retval)
++	{
++            gboolean has_selection = FALSE;
++            g_variant_get(retval, "(b)", &has_selection);
++            g_variant_unref(retval);
++            return has_selection;
++        }
++    }
 +    return false;
- }
- 
- void wxWebViewWebKit::SelectAll()
- {
--    webkit_web_view_select_all(m_web_view);
++}
++
++void wxWebViewWebKit::SelectAll()
++{
 +    webkit_web_view_execute_editing_command(m_web_view,
 +                                            WEBKIT_EDITING_COMMAND_SELECT_ALL);
- }
- 
- wxString wxWebViewWebKit::GetSelectedText() const
- {
-+/* TODO: what to do about this?
-     WebKitDOMDocument* doc;
-     WebKitDOMDOMWindow* win;
-     WebKitDOMDOMSelection* sel;
-@@ -918,10 +937,13 @@ wxString wxWebViewWebKit::GetSelectedText() const
-                                                   0, NULL);
-     return wxString(webkit_dom_range_get_text(WEBKIT_DOM_RANGE(range)),
-                     wxConvUTF8);
-+*/
-+    return wxString("");
- }
- 
- wxString wxWebViewWebKit::GetSelectedSource() const
- {
-+/* TODO: what to do?
-     WebKitDOMDocument* doc;
-     WebKitDOMDOMWindow* win;
-     WebKitDOMDOMSelection* sel;
-@@ -943,10 +965,13 @@ wxString wxWebViewWebKit::GetSelectedSource() const
- 
-     return wxString(webkit_dom_html_element_get_inner_html(WEBKIT_DOM_HTML_ELEMENT(html)),
-                     wxConvUTF8);
-+*/
-+    return wxString("");
- }
- 
- void wxWebViewWebKit::ClearSelection()
- {
-+/* TODO: ???
-     WebKitDOMDocument* doc;
-     WebKitDOMDOMWindow* win;
-     WebKitDOMDOMSelection* sel;
-@@ -956,10 +981,12 @@ void wxWebViewWebKit::ClearSelection()
-     sel = webkit_dom_dom_window_get_selection(WEBKIT_DOM_DOM_WINDOW(win));
-     webkit_dom_dom_selection_remove_all_ranges(WEBKIT_DOM_DOM_SELECTION(sel));
- 
-+*/
- }
- 
- wxString wxWebViewWebKit::GetPageText() const
- {
-+/* TODO
-     WebKitDOMDocument* doc;
-     WebKitDOMHTMLElement* body;
- 
-@@ -967,12 +994,17 @@ wxString wxWebViewWebKit::GetPageText() const
-     body = webkit_dom_document_get_body(WEBKIT_DOM_DOCUMENT(doc));
-     return wxString(webkit_dom_html_element_get_inner_text(WEBKIT_DOM_HTML_ELEMENT(body)),
-                     wxConvUTF8);
-+*/
-+    return wxString("");
- }
- 
- void wxWebViewWebKit::RunScript(const wxString& javascript)
- {
--    webkit_web_view_execute_script(m_web_view,
--                                   javascript.mb_str(wxConvUTF8));
++}
++
++wxString wxWebViewWebKit::GetSelectedText() const
++{
++    if (m_extension)
++    {
++        guint64 page_id = webkit_web_view_get_page_id(m_web_view);
++        GVariant *retval = g_dbus_proxy_call_sync(m_extension,
++                                                  "GetSelectedText",
++                                                  g_variant_new("(t)", page_id),
++                                                  G_DBUS_CALL_FLAGS_NONE, -1,
++                                                  NULL, NULL);
++        if (retval)
++	{
++            char *text;
++            g_variant_get(retval, "(s)", &text);
++            g_variant_unref(retval);
++            return wxString(text, wxConvUTF8);
++        }
++    }
++    return wxString();
++}
++
++wxString wxWebViewWebKit::GetSelectedSource() const
++{
++    if (m_extension)
++    {
++        guint64 page_id = webkit_web_view_get_page_id(m_web_view);
++        GVariant *retval = g_dbus_proxy_call_sync(m_extension,
++                                                  "GetSelectedSource",
++                                                  g_variant_new("(t)", page_id),
++                                                  G_DBUS_CALL_FLAGS_NONE, -1,
++                                                  NULL, NULL);
++        if (retval)
++	{
++            char *source;
++            g_variant_get(retval, "(s)", &source);
++            g_variant_unref(retval);
++            return wxString(source, wxConvUTF8);
++        }
++    }
++    return wxString();
++}
++
++void wxWebViewWebKit::ClearSelection()
++{
++    if (m_extension)
++    {
++        guint64 page_id = webkit_web_view_get_page_id(m_web_view);
++        GVariant *retval = g_dbus_proxy_call_sync(m_extension,
++                                                  "ClearSelection",
++                                                  g_variant_new("(t)", page_id),
++                                                  G_DBUS_CALL_FLAGS_NONE, -1,
++                                                  NULL, NULL);
++        if (retval)
++        {
++            g_variant_unref(retval);
++        }
++    }
++}
++
++wxString wxWebViewWebKit::GetPageText() const
++{
++    if (m_extension)
++    {
++        guint64 page_id = webkit_web_view_get_page_id(m_web_view);
++        GVariant *retval = g_dbus_proxy_call_sync(m_extension,
++                                                  "GetPageText",
++                                                  g_variant_new("(t)", page_id),
++                                                  G_DBUS_CALL_FLAGS_NONE, -1,
++                                                  NULL, NULL);
++        if (retval)
++	{
++            char *text;
++            g_variant_get(retval, "(s)", &text);
++            g_variant_unref(retval);
++            return wxString(text, wxConvUTF8);
++        }
++    }
++    return wxString();
++}
++
++void wxWebViewWebKit::RunScript(const wxString& javascript)
++{
 +    webkit_web_view_run_javascript(m_web_view,
 +                                   javascript.mb_str(wxConvUTF8),
 +                                   NULL,
 +                                   NULL,
 +                                   NULL);
- }
- 
- void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
-@@ -991,14 +1023,15 @@ void wxWebViewWebKit::EnableContextMenu(bool enable)
- 
- long wxWebViewWebKit::Find(const wxString& text, int flags)
- {
++}
++
++void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
++{
++    m_handlerList.push_back(handler);
++}
++
++void wxWebViewWebKit::EnableContextMenu(bool enable)
++{
++    wxWebView::EnableContextMenu(enable);
++}
++
++long wxWebViewWebKit::Find(const wxString& text, int flags)
++{
 +    WebKitFindController* findctrl = webkit_web_view_get_find_controller(m_web_view);
-     bool newSearch = false;
-     if(text != m_findText || 
-        (flags & wxWEBVIEW_FIND_MATCH_CASE) != (m_findFlags & wxWEBVIEW_FIND_MATCH_CASE))
-     {
-         newSearch = true;
-         //If it is a new search we need to clear existing highlights
--        webkit_web_view_unmark_text_matches(m_web_view);
--        webkit_web_view_set_highlight_text_matches(m_web_view, false);
-+        //webkit_web_view_unmark_text_matches(m_web_view);
-+        //webkit_web_view_set_highlight_text_matches(m_web_view, false);
-     }
- 
-     m_findFlags = flags;
-@@ -1007,27 +1040,53 @@ long wxWebViewWebKit::Find(const wxString& text, int flags)
-     //If the search string is empty then we clear any selection and highlight
-     if(text == "")
-     {
--        webkit_web_view_unmark_text_matches(m_web_view);
--        webkit_web_view_set_highlight_text_matches(m_web_view, false);
--        ClearSelection();
++    bool newSearch = false;
++    if(text != m_findText || 
++       (flags & wxWEBVIEW_FIND_MATCH_CASE) != (m_findFlags & wxWEBVIEW_FIND_MATCH_CASE))
++    {
++        newSearch = true;
++        //If it is a new search we need to clear existing highlights
 +        webkit_find_controller_search_finish(findctrl);
-         return wxNOT_FOUND;
-     }
- 
-     bool wrap = false, matchCase = false, forward = true;
-+    guint32 options = WEBKIT_FIND_OPTIONS_NONE;
-     if(flags & wxWEBVIEW_FIND_WRAP)
++    }
++
++    m_findFlags = flags;
++    m_findText = text;
++
++    //If the search string is empty then we clear any selection and highlight
++    if(text.empty())
 +    {
-         wrap = true;
-+        options |= WEBKIT_FIND_OPTIONS_WRAP_AROUND;
++        webkit_find_controller_search_finish(findctrl);
++        ClearSelection();
++        return wxNOT_FOUND;
 +    }
-     if(flags & wxWEBVIEW_FIND_MATCH_CASE)
++
++    bool wrap = false, forward = true;
++    guint32 options = WEBKIT_FIND_OPTIONS_NONE;
++    if(flags & wxWEBVIEW_FIND_WRAP)
 +    {
-         matchCase = true;
++        wrap = true;
++        options |= WEBKIT_FIND_OPTIONS_WRAP_AROUND;
 +    }
-+    else
++    if(!(flags & wxWEBVIEW_FIND_MATCH_CASE))
 +    {
 +        options |= WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE;
 +    }
-     if(flags & wxWEBVIEW_FIND_BACKWARDS)
++    if(flags & wxWEBVIEW_FIND_BACKWARDS)
 +    {
-         forward = false;
++        forward = false;
 +        options |= WEBKIT_FIND_OPTIONS_BACKWARDS;
 +    }
- 
-     if(newSearch)
-     {
--        //Initially we mark the matches to know how many we have
--        m_findCount = webkit_web_view_mark_text_matches(m_web_view, wxGTK_CONV(text), matchCase, 0);
-+        ////Initially we mark the matches to know how many we have
-+        //m_findCount = webkit_web_view_mark_text_matches(m_web_view, wxGTK_CONV(text), matchCase, 0);
-         //In this case we return early to match IE behaviour
-         m_findPosition = -1;
--        return m_findCount;
-+        //return m_findCount;
++
++    if(newSearch)
++    {
++        //Initially we count the matches to know how many we have
++        m_findCount = -1;
++        webkit_find_controller_count_matches(findctrl,
++                                             wxGTK_CONV(text),
++                                             options,
++                                             G_MAXUINT);
++        GMainContext *main_context = g_main_context_get_thread_default();
++        while (m_findCount == -1)
++        {
++            g_main_context_iteration(main_context, TRUE);
++        }
++        //Highlight them if needed
 +        if(flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT)
 +        {
 +            webkit_find_controller_search(findctrl,
@@ -860,38 +1980,30 @@ index e592331..315949d 100644
 +                                          options,
 +                                          G_MAXUINT);
 +        }
++        //In this case we return early to match IE behaviour
++        m_findPosition = -1;
++        return m_findCount;
++    }
++    else
++    {
++        if(forward)
++            m_findPosition++;
 +        else
-+        {
-+            webkit_find_controller_count_matches(findctrl,
-+                                                 wxGTK_CONV(text),
-+                                                 options,
-+                                                 G_MAXUINT);
-+        }
-+        return G_MAXUINT;
-     }
-     else
-     {
-@@ -1041,17 +1100,36 @@ long wxWebViewWebKit::Find(const wxString& text, int flags)
-             m_findPosition -= m_findCount;
-     }
- 
--    //Highlight them if needed
--    bool highlight = flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT ? true : false;
--    webkit_web_view_set_highlight_text_matches(m_web_view, highlight);     
--
--    if(!webkit_web_view_search_text(m_web_view, wxGTK_CONV(text), matchCase, forward, wrap))
++            m_findPosition--;
++        if(m_findPosition < 0)
++            m_findPosition += m_findCount;
++        if(m_findPosition > m_findCount)
++            m_findPosition -= m_findCount;
++    }
++
 +    if(forward)
-     {
--        m_findPosition = -1;
--        ClearSelection();
--        return wxNOT_FOUND;
++    {
 +        webkit_find_controller_search_next(findctrl);
 +        if(m_findPosition == m_findCount && !wrap)
 +        {
 +            return wxNOT_FOUND;
 +        }
-     }
--    wxLogMessage(wxString::Format("Returning %d", m_findPosition));
++    }
 +    else
 +    {
 +        webkit_find_controller_search_previous(findctrl);
@@ -901,28 +2013,483 @@ index e592331..315949d 100644
 +        }
 +    }
 +
-+    //Highlight them if needed
-+    //bool highlight = flags & wxWEBVIEW_FIND_HIGHLIGHT_RESULT ? true : false;
-+    //webkit_web_view_set_highlight_text_matches(m_web_view, highlight);     
++    return newSearch ? m_findCount : m_findPosition;
++}
++
++void wxWebViewWebKit::FindClear()
++{
++    m_findCount = 0;
++    m_findFlags = 0;
++    m_findText.clear();
++    m_findPosition = -1;
++}
++
++// static
++wxVisualAttributes
++wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
++{
++     return GetDefaultAttributesFromGTKWidget(webkit_web_view_new());
++}
++
++void wxWebViewWebKit::SetupWebExtensionServer()
++{
++    char *address = g_strdup_printf("unix:tmpdir=%s", g_get_tmp_dir());
++    char *guid = g_dbus_generate_guid();
++    GDBusAuthObserver *observer = g_dbus_auth_observer_new();
++    GError *error = NULL;
++
++    g_signal_connect(observer, "authorize-authenticated-peer",
++                     G_CALLBACK(wxgtk_authorize_authenticated_peer_cb), this);
++
++    m_dbusServer = g_dbus_server_new_sync(address,
++                                          G_DBUS_SERVER_FLAGS_NONE,
++                                          guid,
++                                          observer,
++                                          NULL,
++                                          &error);
++
++    if (error)
++    {
++        g_warning("Failed to start web extension server on %s: %s", address, error->message);
++        g_error_free(error);
++    }
++    else
++    {
++        g_signal_connect(m_dbusServer, "new-connection",
++                         G_CALLBACK(wxgtk_new_connection_cb), &m_extension);
++        g_dbus_server_start(m_dbusServer);
++    }
++
++    g_free(address);
++    g_free(guid);
++    g_object_unref(observer);
++}
 +
-+    //if(!webkit_web_view_search_text(m_web_view, wxGTK_CONV(text), matchCase, forward, wrap))
-+    //{
-+    //    m_findPosition = -1;
-+    //    ClearSelection();
-+    //    return wxNOT_FOUND;
-+    //}
++#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT2
+diff --git a/src/gtk/webview_webkit2_extension.cpp b/src/gtk/webview_webkit2_extension.cpp
+new file mode 100644
+index 0000000..ddd0d94
+--- /dev/null
++++ b/src/gtk/webview_webkit2_extension.cpp
+@@ -0,0 +1,421 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name:        src/gtk/webview_webkit2_extension.cpp
++// Purpose:     GTK WebKit2 extension for web view component
++// Author:      Scott Talbert
++// Copyright:   (c) 2017 Scott Talbert
++// Licence:     wxWindows licence
++/////////////////////////////////////////////////////////////////////////////
 +
-+    
++#include "wx/defs.h"
++#include "wx/gtk/webview_webkit2_extension.h"
++#include <webkit2/webkit-web-extension.h>
++#define WEBKIT_DOM_USE_UNSTABLE_API
++#include <webkitdom/WebKitDOMDOMSelection.h>
++#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
 +
-     return newSearch ? m_findCount : m_findPosition;
- }
- 
-@@ -1070,5 +1148,4 @@ wxWebViewWebKit::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
-      return GetDefaultAttributesFromGTKWidget(webkit_web_view_new());
- }
- 
--
- #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
--- 
-2.9.3
-
++static const char introspection_xml[] =
++  "<node>"
++  " <interface name='org.wxwidgets.wxGTK.WebExtension'>"
++  "  <method name='ClearSelection'>"
++  "   <arg type='t' name='page_id' direction='in'/>"
++  "  </method>"
++  "  <method name='DeleteSelection'>"
++  "   <arg type='t' name='page_id' direction='in'/>"
++  "  </method>"
++  "  <method name='GetPageSource'>"
++  "   <arg type='t' name='page_id' direction='in'/>"
++  "   <arg type='s' name='source' direction='out'/>"
++  "  </method>"
++  "  <method name='GetPageText'>"
++  "   <arg type='t' name='page_id' direction='in'/>"
++  "   <arg type='s' name='text' direction='out'/>"
++  "  </method>"
++  "  <method name='GetSelectedSource'>"
++  "   <arg type='t' name='page_id' direction='in'/>"
++  "   <arg type='s' name='source' direction='out'/>"
++  "  </method>"
++  "  <method name='GetSelectedText'>"
++  "   <arg type='t' name='page_id' direction='in'/>"
++  "   <arg type='s' name='text' direction='out'/>"
++  "  </method>"
++  "  <method name='HasSelection'>"
++  "   <arg type='t' name='page_id' direction='in'/>"
++  "   <arg type='b' name='has_selection' direction='out'/>"
++  "  </method>"
++  " </interface>"
++  "</node>";
++
++class wxWebViewWebKitExtension;
++
++static gboolean
++wxgtk_webview_authorize_authenticated_peer_cb(GDBusAuthObserver *observer,
++                                              GIOStream *stream,
++                                              GCredentials *credentials,
++                                              wxWebViewWebKitExtension *extension);
++static void
++wxgtk_webview_dbus_connection_created_cb(GObject *source_object,
++                                         GAsyncResult *result,
++                                         wxWebViewWebKitExtension *extension);
++
++static wxWebViewWebKitExtension *gs_extension = NULL;
++
++class wxWebViewWebKitExtension
++{
++public:
++    wxWebViewWebKitExtension(WebKitWebExtension *webkit_extension, const char* server_address);
++    void ClearSelection(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void DeleteSelection(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void GetPageSource(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void GetPageText(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void GetSelectedSource(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void GetSelectedText(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void HasSelection(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void SetDBusConnection(GDBusConnection *dbusConnection);
++
++private:
++    WebKitWebPage* GetWebPageOrReturnError(GVariant *parameters, GDBusMethodInvocation *invocation);
++    void ReturnDBusStringValue(GDBusMethodInvocation *invocation, gchar *value);
++
++    GDBusConnection *m_dbusConnection;
++    WebKitWebExtension *m_webkitExtension;
++};
++
++wxWebViewWebKitExtension::wxWebViewWebKitExtension(WebKitWebExtension *extension, const char* server_address)
++{
++    m_webkitExtension = (WebKitWebExtension*)g_object_ref(extension);
++
++    GDBusAuthObserver *observer = g_dbus_auth_observer_new();
++    g_signal_connect(observer, "authorize-authenticated-peer",
++                     G_CALLBACK(wxgtk_webview_authorize_authenticated_peer_cb),
++                     this);
++
++    g_dbus_connection_new_for_address(server_address,
++                                      G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
++                                      observer,
++                                      NULL,
++                                      (GAsyncReadyCallback)wxgtk_webview_dbus_connection_created_cb,
++                                      this);
++    g_object_unref(observer);
++}
++
++WebKitWebPage* wxWebViewWebKitExtension::GetWebPageOrReturnError(GVariant *parameters, GDBusMethodInvocation *invocation)
++{
++    guint64 page_id;
++    g_variant_get(parameters, "(t)", &page_id);
++    WebKitWebPage *web_page = webkit_web_extension_get_page(m_webkitExtension,
++                                                            page_id);
++    if (!web_page)
++    {
++        g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR,
++                                              G_DBUS_ERROR_INVALID_ARGS,
++                                              "Invalid page ID: %" G_GUINT64_FORMAT, page_id);
++    }
++    return web_page;
++}
++
++void wxWebViewWebKitExtension::GetSelectedSource(GVariant *parameters,
++                                                 GDBusMethodInvocation *invocation)
++{
++    WebKitWebPage *web_page = GetWebPageOrReturnError(parameters, invocation);
++    if (!web_page)
++    {
++        return;
++    }
++
++    WebKitDOMDocument *doc = webkit_web_page_get_dom_document(web_page);
++    WebKitDOMDOMWindow *win = webkit_dom_document_get_default_view(doc);
++    WebKitDOMDOMSelection *sel = webkit_dom_dom_window_get_selection(win);
++    g_object_unref(win);
++    if (!sel)
++    {
++        ReturnDBusStringValue(invocation, NULL);
++        return;
++    }
++    WebKitDOMRange *range = webkit_dom_dom_selection_get_range_at(sel, 0, NULL);
++    if (!range)
++    {
++        ReturnDBusStringValue(invocation, NULL);
++        return;
++    }
++    WebKitDOMElement *div = webkit_dom_document_create_element(doc, "div",
++                                                               NULL);
++    WebKitDOMDocumentFragment *clone = webkit_dom_range_clone_contents(range,
++                                                                       NULL);
++    webkit_dom_node_append_child(&div->parent_instance,
++                                 &clone->parent_instance, NULL);
++    WebKitDOMElement *html = (WebKitDOMElement*)div;
++    gchar *text = webkit_dom_element_get_inner_html(html);
++    g_object_unref(range);
++
++    ReturnDBusStringValue(invocation, text);
++}
++
++void wxWebViewWebKitExtension::GetPageSource(GVariant *parameters,
++                                             GDBusMethodInvocation *invocation)
++{
++    WebKitWebPage *web_page = GetWebPageOrReturnError(parameters, invocation);
++    if (!web_page)
++    {
++        return;
++    }
++
++    WebKitDOMDocument *doc = webkit_web_page_get_dom_document(web_page);
++    WebKitDOMElement *body = webkit_dom_document_get_document_element(doc);
++    gchar *source = webkit_dom_element_get_outer_html(body);
++    g_dbus_method_invocation_return_value(invocation,
++                                          g_variant_new("(s)", source ? source : ""));
++}
++
++void wxWebViewWebKitExtension::GetPageText(GVariant *parameters,
++                                           GDBusMethodInvocation *invocation)
++{
++    WebKitWebPage *web_page = GetWebPageOrReturnError(parameters, invocation);
++    if (!web_page)
++    {
++        return;
++    }
++
++    WebKitDOMDocument *doc = webkit_web_page_get_dom_document(web_page);
++    WebKitDOMHTMLElement *body = webkit_dom_document_get_body(doc);
++    gchar *text = webkit_dom_html_element_get_inner_text(body);
++    g_dbus_method_invocation_return_value(invocation,
++                                          g_variant_new("(s)", text));
++}
++
++void wxWebViewWebKitExtension::GetSelectedText(GVariant *parameters,
++                                               GDBusMethodInvocation *invocation)
++{
++    WebKitWebPage *web_page = GetWebPageOrReturnError(parameters, invocation);
++    if (!web_page)
++    {
++        return;
++    }
++
++    WebKitDOMDocument *doc = webkit_web_page_get_dom_document(web_page);
++    WebKitDOMDOMWindow *win = webkit_dom_document_get_default_view(doc);
++    WebKitDOMDOMSelection *sel = webkit_dom_dom_window_get_selection(win);
++    g_object_unref(win);
++    if (!sel)
++    {
++        ReturnDBusStringValue(invocation, NULL);
++        return;
++    }
++    WebKitDOMRange *range = webkit_dom_dom_selection_get_range_at(sel, 0, NULL);
++    if (!range)
++    {
++        ReturnDBusStringValue(invocation, NULL);
++        return;
++    }
++    gchar *text = webkit_dom_range_get_text(range);
++    g_object_unref(range);
++
++    ReturnDBusStringValue(invocation, text);
++}
++
++void wxWebViewWebKitExtension::ClearSelection(GVariant *parameters,
++                                              GDBusMethodInvocation *invocation)
++{
++    WebKitWebPage *web_page = GetWebPageOrReturnError(parameters, invocation);
++    if (!web_page)
++    {
++        return;
++    }
++
++    WebKitDOMDocument *doc = webkit_web_page_get_dom_document(web_page);
++    WebKitDOMDOMWindow *win = webkit_dom_document_get_default_view(doc);
++    WebKitDOMDOMSelection *sel = webkit_dom_dom_window_get_selection(win);
++    g_object_unref(win);
++    if (sel)
++    {
++        webkit_dom_dom_selection_remove_all_ranges(sel);
++    }
++
++    g_dbus_method_invocation_return_value(invocation, NULL);
++}
++
++void wxWebViewWebKitExtension::HasSelection(GVariant *parameters,
++                                            GDBusMethodInvocation *invocation)
++{
++    WebKitWebPage *web_page = GetWebPageOrReturnError(parameters, invocation);
++    if (!web_page)
++    {
++        return;
++    }
++
++    WebKitDOMDocument *doc = webkit_web_page_get_dom_document(web_page);
++    WebKitDOMDOMWindow *win = webkit_dom_document_get_default_view(doc);
++    WebKitDOMDOMSelection *sel = webkit_dom_dom_window_get_selection(win);
++    g_object_unref(win);
++    gboolean has_selection = FALSE;
++    if (WEBKIT_DOM_IS_DOM_SELECTION(sel))
++    {
++        if (!webkit_dom_dom_selection_get_is_collapsed(sel))
++        {
++            has_selection = TRUE;
++        }
++    }
++    g_dbus_method_invocation_return_value(invocation,
++                                          g_variant_new("(b)", has_selection));
++}
++
++void wxWebViewWebKitExtension::DeleteSelection(GVariant *parameters,
++                                               GDBusMethodInvocation *invocation)
++{
++    WebKitWebPage *web_page = GetWebPageOrReturnError(parameters, invocation);
++    if (!web_page)
++    {
++        return;
++    }
++
++    WebKitDOMDocument *doc = webkit_web_page_get_dom_document(web_page);
++    WebKitDOMDOMWindow *win = webkit_dom_document_get_default_view(doc);
++    WebKitDOMDOMSelection *sel = webkit_dom_dom_window_get_selection(win);
++    g_object_unref(win);
++    if (sel)
++    {
++        webkit_dom_dom_selection_delete_from_document(sel);
++    }
++
++    g_dbus_method_invocation_return_value(invocation, NULL);
++}
++
++void wxWebViewWebKitExtension::ReturnDBusStringValue(GDBusMethodInvocation *invocation, gchar *value)
++{
++    g_dbus_method_invocation_return_value(invocation,
++                                          g_variant_new("(s)", value ? value : ""));
++}
++
++void wxWebViewWebKitExtension::SetDBusConnection(GDBusConnection *dbusConnection)
++{
++    m_dbusConnection = dbusConnection;
++}
++
++static void
++wxgtk_webview_handle_method_call(GDBusConnection *connection,
++                                 const char *sender,
++                                 const char *object_path,
++                                 const char *interface_name,
++                                 const char *method_name,
++                                 GVariant *parameters,
++                                 GDBusMethodInvocation *invocation,
++                                 gpointer user_data)
++{
++    if (g_strcmp0(interface_name, WXGTK_WEB_EXTENSION_INTERFACE) != 0)
++    {
++        return;
++    }
++
++    wxWebViewWebKitExtension *extension = (wxWebViewWebKitExtension*)user_data;
++
++    if (g_strcmp0(method_name, "ClearSelection") == 0)
++    {
++        extension->ClearSelection(parameters, invocation);
++    }
++    else if (g_strcmp0(method_name, "DeleteSelection") == 0)
++    {
++        extension->DeleteSelection(parameters, invocation);
++    }
++    else if (g_strcmp0(method_name, "GetPageSource") == 0)
++    {
++        extension->GetPageSource(parameters, invocation);
++    }
++    else if (g_strcmp0(method_name, "GetPageText") == 0)
++    {
++        extension->GetPageText(parameters, invocation);
++    }
++    else if (g_strcmp0(method_name, "GetSelectedSource") == 0)
++    {
++        extension->GetSelectedSource(parameters, invocation);
++    }
++    else if (g_strcmp0(method_name, "GetSelectedText") == 0)
++    {
++        extension->GetSelectedText(parameters, invocation);
++    }
++    else if (g_strcmp0(method_name, "HasSelection") == 0)
++    {
++        extension->HasSelection(parameters, invocation);
++    }
++}
++
++static const GDBusInterfaceVTable interface_vtable = {
++    wxgtk_webview_handle_method_call,
++    NULL,
++    NULL
++};
++
++gboolean
++wxgtk_webview_dbus_peer_is_authorized(GCredentials *peer_credentials)
++{
++    static GCredentials *own_credentials = g_credentials_new();
++    GError *error = NULL;
++
++    if (peer_credentials && g_credentials_is_same_user(peer_credentials, own_credentials, &error))
++    {
++        return TRUE;
++    }
++
++    if (error)
++    {
++        g_warning("Failed to authorize web extension connection: %s", error->message);
++        g_error_free(error);
++    }
++    return FALSE;
++}
++
++static gboolean
++wxgtk_webview_authorize_authenticated_peer_cb(GDBusAuthObserver *observer,
++                                              GIOStream *stream,
++                                              GCredentials *credentials,
++                                              wxWebViewWebKitExtension *extension)
++{
++    return wxgtk_webview_dbus_peer_is_authorized(credentials);
++}
++
++static void
++wxgtk_webview_dbus_connection_created_cb(GObject *source_object,
++                                         GAsyncResult *result,
++                                         wxWebViewWebKitExtension *extension)
++{
++    static GDBusNodeInfo *introspection_data =
++        g_dbus_node_info_new_for_xml(introspection_xml, NULL);
++
++    GError *error = NULL;
++    GDBusConnection *connection =
++        g_dbus_connection_new_for_address_finish(result, &error);
++    if (error)
++    {
++        g_warning("Failed to connect to UI process: %s", error->message);
++        g_error_free(error);
++        return;
++    }
++
++    guint registration_id =
++        g_dbus_connection_register_object(connection,
++                                          WXGTK_WEB_EXTENSION_OBJECT_PATH,
++                                          introspection_data->interfaces[0],
++                                          &interface_vtable,
++                                          extension,
++                                          NULL,
++                                          &error);
++    if (!registration_id)
++    {
++        g_warning ("Failed to register web extension object: %s\n", error->message);
++        g_error_free (error);
++        g_object_unref (connection);
++        return;
++    }
++
++    extension->SetDBusConnection(connection);
++}
++
++extern "C" WXEXPORT void
++webkit_web_extension_initialize_with_user_data (WebKitWebExtension *webkit_extension,
++                                                GVariant           *user_data)
++{
++    const char *server_address;
++
++    g_variant_get (user_data, "(&s)", &server_address);
++
++    gs_extension = new wxWebViewWebKitExtension(webkit_extension,
++                                                server_address);
++}
diff --git a/wxGTK3.spec b/wxGTK3.spec
index 38e1a35..c98a5f3 100644
--- a/wxGTK3.spec
+++ b/wxGTK3.spec
@@ -10,17 +10,17 @@
 %endif
 
 #For git snapshots, set to 0 to use release instead:
-%global usesnapshot 1
+%global usesnapshot 0
 %if 0%{?usesnapshot}
 %global commit0 e4293e9e39d2d6e7757ed5907ce66d2847d8e16a
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-#What doc version to use with the snapshot (usually last release):
-%global builddocs 1
+%global snapshottag .git%{shortcommit0}
 %endif
+%global builddocs 1
 
 Name:           %{wxgtkname}
 Version:        3.0.3
-Release:        0.8%{?usesnapshot:.git%{shortcommit0}}%{?dist}
+Release:        1%{?snapshottag}%{?dist}
 Summary:        GTK port of the wxWidgets GUI library
 License:        wxWidgets
 Group:          System Environment/Libraries
@@ -39,7 +39,7 @@ Source10:       wx-config
 # remove abort when ABI check fails
 # Backport from wxGTK
 Patch0:         %{name}-%{version}-abicheck.patch
-# Temporary patch to port to webkit2gtk
+# Patch to port to webkit2gtk
 %if 0%{?fedora} > 26
 Patch1:         %{name}-%{version}-webkit2.patch
 %endif
@@ -47,7 +47,7 @@ Patch1:         %{name}-%{version}-webkit2.patch
 BuildRequires:  gtk%{gtkver}-devel
 #Note webkitgtk (GTK2) does not appear to be supported
 %if %{gtkver} == 3
-%if 0%{?fedora} < 27
+%if 0%{?fedora} < 26
 BuildRequires:  webkitgtk3-devel
 %else
 BuildRequires:  webkitgtk4-devel
@@ -58,10 +58,18 @@ BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  expat-devel
+%if 0%{?fedora} < 26
+BuildRequires:  SDL-devel
+%else
 BuildRequires:  SDL2-devel
+%endif
 BuildRequires:  libGLU-devel
 BuildRequires:  libSM-devel
+%if 0%{?fedora} < 26
+BuildRequires:  gstreamer-plugins-base-devel
+%else
 BuildRequires:  gstreamer1-plugins-base-devel
+%endif
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  cppunit-devel
@@ -185,9 +193,6 @@ This package provides XML documentation for the %{srcname} library.
 %autosetup -n %{srcname}-%{version} %{!?builddocs:-a 1} -p1
 %endif
 
-# Run autogen since we're patching configure.in
-./autogen.sh
-
 # patch some installed files to avoid conflicts with 2.8.*
 sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
 sed -i -e 's|wxstd.mo|wxstd3.mo|' Makefile.in
@@ -209,8 +214,6 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export LDFLAGS="-Wl,--as-needed"
 # Trick configure into using pkg-config for cppunit-config
 export CPPUNIT_CONFIG="/usr/bin/pkg-config cppunit"
-# Trick configure into building with SDL2
-export SDL_CONFIG=/usr/bin/sdl2-config
 
 %if 0%{?usesnapshot}
 #For snapshots, mo files need to be generated
@@ -342,6 +345,9 @@ fi
 %exclude %{_datadir}/bakefile/presets/wx3/*.pyc
 %exclude %{_datadir}/bakefile/presets/wx3/*.pyo
 %{_libexecdir}/%{name}
+%if 0%{?fedora} > 25
+%exclude %{_libdir}/wx/3.0
+%endif
 
 %files gl
 %{_libdir}/libwx_gtk%{gtkver}u_gl-*.so.*
@@ -352,6 +358,8 @@ fi
 %if 0%{?fedora} > 25
 %files webview
 %{_libdir}/libwx_gtk%{gtkver}u_webview-*.so.*
+%dir %{_libdir}/wx
+%{_libdir}/wx/3.0
 %endif
 
 %files -n %{wxbasename}
@@ -368,6 +376,10 @@ fi
 %doc docs/doxygen/out/xml/*
 
 %changelog
+* Wed May 03 2017 Scott Talbert <swt@techie.net> - 3.0.3-1
+- New upstream release 3.0.3
+- Update to latest WebKit2 patch (#1428997)
+
 * Mon Apr 17 2017 Scott Talbert <swt@techie.net> - 3.0.3-0.8.gite4293e9
 - Rebuild against SDL2