Merge pull request #1 from visionect/develop

Develop

Author: mdimec4

webkit2/settings.go

@@ -34,6 +34,22 @@ func (s *Settings) SetAutoLoadImages(autoLoad bool) {
 	C.webkit_settings_set_auto_load_images(s.settings, gboolean(autoLoad))
 }
 
+// GetEnableDeveloperExtras returns the "enable-developer-extras" property.
+//
+// See also: webkit_settings_set_enable_developer_extras at
+// http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html#webkit-settings-get-enable-developer-extras
+func (s *Settings) GetEnableDeveloperExtras() bool {
+	return gobool(C.webkit_settings_get_enable_developer_extras(s.settings))
+}
+
+// SetEnableDeveloperExtras sets the "enable-developer-extras" property.
+//
+// See also: webkit_settings_set_enable_developer_extras at
+// http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html#webkit-settings-set-enable-developer-extras
+func (s *Settings) SetEnableDeveloperExtras(autoLoad bool) {
+	C.webkit_settings_set_enable_developer_extras(s.settings, gboolean(autoLoad))
+}
+
 // SetUserAgentWithApplicationDetails sets the "user-agent" property by
 // appending the application details to the default user agent.
 //

webkit2/webcontext.go

@@ -2,21 +2,30 @@ package webkit2
 
 // #include <webkit2/webkit2.h>
 import "C"
-
+import (
+	"unsafe"
+	"github.com/visionect/gotk3/glib"
+)
 // WebContext manages all aspects common to all WebViews.
 //
 // See also: WebKitWebContext at
 // http://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebContext.html.
 type WebContext struct {
+	*glib.Object
 	webContext *C.WebKitWebContext
 }
 
+func newWebContext(webContext *C.WebKitWebContext) *WebContext {
+	obj := &glib.Object{glib.ToGObject(unsafe.Pointer(webContext))}
+	return &WebContext{obj, webContext}
+}
+
 // DefaultWebContext returns the default WebContext.
 //
 // See also: webkit_web_context_get_default at
 // http://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebContext.html#webkit-web-context-get-default.
 func DefaultWebContext() *WebContext {
-	return &WebContext{C.webkit_web_context_get_default()}
+	return newWebContext(C.webkit_web_context_get_default())
 }
 
 // CacheModel describes the caching behavior.
@@ -56,3 +65,12 @@ func (wc *WebContext) SetCacheModel(model CacheModel) {
 func (wc *WebContext) ClearCache() {
 	C.webkit_web_context_clear_cache(wc.webContext)
 }
+
+//SetWebExtensionsDirectory sets the directory where WebKit will look for Web Extensions.
+//
+//See also: webkit_web_context_set_web_extensions_directory
+//http://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebContext.html#webkit-web-context-set-web-extensions-directory
+func (wc *WebContext) SetWebExtensionsDirectory(directory string) {
+	C.webkit_web_context_set_web_extensions_directory(wc.webContext, (*C.gchar)(C.CString(directory)))
+}
+

webkit2/webview.go

@@ -55,7 +55,7 @@ func newWebView(webViewWidget *C.GtkWidget) *WebView {
 // See also: webkit_web_view_get_context at
 // http://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#webkit-web-view-get-context.
 func (v *WebView) Context() *WebContext {
-	return &WebContext{C.webkit_web_view_get_context(v.webView)}
+	return newWebContext(C.webkit_web_view_get_context(v.webView))
 }
 
 // LoadURI requests loading of the specified URI string.