webkit2-gtk 3.1.8 → 3.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Rakefile +1 -1
- data/lib/webkit2-gtk/web-view.rb +12 -9
- data/sample/screenshot.rb +4 -7
- data/test/test-webkit2-gtk-web-view.rb +2 -4
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7c67dcfb98c0b30132569814916bb0581088e3b2
|
4
|
+
data.tar.gz: 7d49511db9c60fcde1cc56970374953b3c710115
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5fe7ea9d31336e204da912090bcee43ed25017680679e6f3b4cd5a70f566db0eea6d6705acf10580fbf93eb3d322303b232468d7c35eacc14486936ab39a2a6e
|
7
|
+
data.tar.gz: 12a06324dad5dfe8cba9f6107cc64afc1dab4a0e649e61ee748a5f55c7722871b99252f0d7edfa2abbdcbb4f622c7a4015c41cb8c38d7d12ef44d716a1c8ec8f
|
data/Rakefile
CHANGED
@@ -81,7 +81,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
|
|
81
81
|
:name => "webkitgtk",
|
82
82
|
:download_site => :webkitgtk,
|
83
83
|
:label => "WebKitGTK+",
|
84
|
-
:version => "2.
|
84
|
+
:version => "2.18.0",
|
85
85
|
:compression_method => "xz",
|
86
86
|
:windows => {
|
87
87
|
:build_concurrently => false,
|
data/lib/webkit2-gtk/web-view.rb
CHANGED
@@ -16,16 +16,16 @@
|
|
16
16
|
|
17
17
|
module WebKit2Gtk
|
18
18
|
class WebView
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
19
|
+
unless private_method_defined?(:initialize_new_with_related_view)
|
20
|
+
class << self
|
21
|
+
def new(*args)
|
22
|
+
return super unless args.size == 1
|
23
|
+
return super unless args[0].is_a?(Hash)
|
23
24
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
related_view.new_with_related_view
|
25
|
+
related_view = args[0][:related_view]
|
26
|
+
return super unless related_view
|
27
|
+
related_view.new_with_related_view
|
28
|
+
end
|
29
29
|
end
|
30
30
|
end
|
31
31
|
|
@@ -53,6 +53,7 @@ module WebKit2Gtk
|
|
53
53
|
context = options[:context]
|
54
54
|
settings = options[:settings]
|
55
55
|
user_content_manager = options[:user_content_manager]
|
56
|
+
related_view = options[:related_view]
|
56
57
|
|
57
58
|
if context
|
58
59
|
initialize_new_with_context(context)
|
@@ -60,6 +61,8 @@ module WebKit2Gtk
|
|
60
61
|
initialize_new_with_settings(settings)
|
61
62
|
elsif user_content_manager
|
62
63
|
initialize_new_with_user_content_manager(user_content_manager)
|
64
|
+
elsif related_view
|
65
|
+
initialize_new_with_related_view(related_view)
|
63
66
|
else
|
64
67
|
message =
|
65
68
|
"must specify :context, :settings, :user_content_manager or :related_view"
|
data/sample/screenshot.rb
CHANGED
@@ -23,7 +23,7 @@ if ARGV.empty?
|
|
23
23
|
exit(false)
|
24
24
|
end
|
25
25
|
|
26
|
-
|
26
|
+
main_loop = GLib::MainLoop.new
|
27
27
|
|
28
28
|
view_context = WebKit2Gtk::WebContext.new(ephemeral: true)
|
29
29
|
view = WebKit2Gtk::WebView.new(context: view_context)
|
@@ -33,12 +33,11 @@ window.set_default_size(800, 600)
|
|
33
33
|
window.show_all
|
34
34
|
ARGV.each do |uri|
|
35
35
|
view.load_uri(uri)
|
36
|
-
finished = false
|
37
36
|
view.signal_connect("load-changed") do |_, load_event|
|
38
37
|
case load_event
|
39
38
|
when WebKit2Gtk::LoadEvent::FINISHED
|
40
39
|
view.get_snapshot(:full_document, :none) do |_, result|
|
41
|
-
|
40
|
+
main_loop.quit
|
42
41
|
snapshot_surface = view.get_snapshot_finish(result)
|
43
42
|
base_path = CGI.escape(uri)
|
44
43
|
snapshot_surface.write_to_png("#{base_path}.png")
|
@@ -58,13 +57,11 @@ ARGV.each do |uri|
|
|
58
57
|
end
|
59
58
|
end
|
60
59
|
view.signal_connect("load-failed") do |_, _, failed_uri, error|
|
61
|
-
|
60
|
+
main_loop.quit
|
62
61
|
message = "failed to load URI: #{failed_uri}: "
|
63
62
|
message << "#{error.class}(#{error.code}): #{error.message}"
|
64
63
|
puts(message)
|
65
64
|
true
|
66
65
|
end
|
67
|
-
|
68
|
-
main_context.iteration(true)
|
69
|
-
end
|
66
|
+
main_loop.run
|
70
67
|
end
|
@@ -24,14 +24,12 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
|
|
24
24
|
context = WebKit2Gtk::WebContext.new
|
25
25
|
webview = WebKit2Gtk::WebView.new(context: context)
|
26
26
|
assert_equal(context, webview.context)
|
27
|
-
assert_nil(webview.user_content_manager)
|
28
27
|
end
|
29
28
|
|
30
29
|
test "with settings" do
|
31
30
|
settings = WebKit2Gtk::Settings.new
|
32
31
|
webview = WebKit2Gtk::WebView.new(settings: settings)
|
33
32
|
assert_equal(settings, webview.settings)
|
34
|
-
assert_nil(webview.user_content_manager)
|
35
33
|
end
|
36
34
|
|
37
35
|
test "with user content manager" do
|
@@ -43,7 +41,7 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
|
|
43
41
|
test "with related view" do
|
44
42
|
settings = WebKit2Gtk::Settings.new
|
45
43
|
related = WebKit2Gtk::WebView.new(settings: settings)
|
46
|
-
webview = related
|
44
|
+
webview = WebKit2Gtk::WebView.new(related_view: related)
|
47
45
|
assert_equal(settings, webview.settings)
|
48
46
|
end
|
49
47
|
|
@@ -89,7 +87,7 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
|
|
89
87
|
loaded = false
|
90
88
|
|
91
89
|
loop = GLib::MainLoop.new
|
92
|
-
timeout_id = GLib::Timeout.add(
|
90
|
+
timeout_id = GLib::Timeout.add(30000) do
|
93
91
|
timeout_id = nil
|
94
92
|
loop.quit
|
95
93
|
GLib::Source::REMOVE
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: webkit2-gtk
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.
|
4
|
+
version: 3.1.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- The Ruby-GNOME2 Project Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-10-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: gobject-introspection
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.1.
|
19
|
+
version: 3.1.9
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 3.1.
|
26
|
+
version: 3.1.9
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: gtk3
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 3.1.
|
33
|
+
version: 3.1.9
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 3.1.
|
40
|
+
version: 3.1.9
|
41
41
|
description: Ruby/WebKit2GTK is a Ruby binding of WebKit2GTK+.
|
42
42
|
email: ruby-gnome2-devel-en@lists.sourceforge.net
|
43
43
|
executables: []
|
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
78
78
|
version: '0'
|
79
79
|
requirements: []
|
80
80
|
rubyforge_project:
|
81
|
-
rubygems_version: 2.5.2
|
81
|
+
rubygems_version: 2.5.2.1
|
82
82
|
signing_key:
|
83
83
|
specification_version: 4
|
84
84
|
summary: Ruby/WebKit2GTK is a Ruby binding of WebKit2GTK+.
|