[webkitgtk4/f21] Add patch for rbz#1156330
catanzaro
catanzaro at fedoraproject.org
Tue Mar 17 00:22:23 UTC 2015
commit 8d1193c6fdb60c58590e9da2289cdf03601a04bb
Author: Michael Catanzaro <mcatanzaro at gnome.org>
Date: Mon Mar 16 19:22:20 2015 -0500
Add patch for rbz#1156330
webkitgtk-2.6.5-ax-child-changed.patch | 17 +++++++++++++++++
webkitgtk4.spec | 8 +++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/webkitgtk-2.6.5-ax-child-changed.patch b/webkitgtk-2.6.5-ax-child-changed.patch
new file mode 100644
index 0000000..6a9de60
--- /dev/null
+++ b/webkitgtk-2.6.5-ax-child-changed.patch
@@ -0,0 +1,17 @@
+--- a/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp
++++ a/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp
+@@ -80,6 +80,14 @@ void AXObjectCache::attachWrapper(AccessibilityObject* obj)
+ if (obj->accessibilityIsIgnoredByDefault())
+ return;
+
++ // Don't emit the signal if the object being added is not -- or not yet -- rendered,
++ // which can occur in nested iframes. In these instances we don't want to ignore the
++ // child. But if an assistive technology is listening, AT-SPI2 will attempt to create
++ // and cache the state set for the child upon emission of the signal. If the object
++ // has not yet been rendered, this will result in a crash.
++ if (!obj->renderer())
++ return;
++
+ // Don't emit the signal for objects whose parents won't be exposed directly.
+ AccessibilityObject* coreParent = obj->parentObjectUnignored();
+ if (!coreParent || coreParent->accessibilityIsIgnoredByDefault())
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index b0aa31f..154ce23 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -10,7 +10,7 @@
Name: webkitgtk4
Version: 2.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK+ Web content engine library
License: LGPLv2
@@ -21,6 +21,8 @@ Patch0: webkit-1.1.14-nspluginwrapper.patch
Patch1: webkitgtk-2.6.4-disable-codec-installer.patch
Patch2: webkitgtk-2.5.90-cloop_fix.patch
Patch3: webkitgtk-2.5.2-commit_align.patch
+# https://bugs.webkit.org/show_bug.cgi?id=142309
+Patch4: webkitgtk-2.6.5-ax-child-changed.patch
BuildRequires: at-spi2-core-devel
BuildRequires: bison
@@ -94,6 +96,7 @@ This package contains developer documentation for %{name}.
%ifarch %{power64} aarch64 ppc
%patch3 -p1 -b .commit_align
%endif
+%patch4 -p1 -b .ax_child_changed
# Remove bundled libraries
rm -rf Source/ThirdParty/leveldb/
@@ -186,6 +189,9 @@ make %{?_smp_mflags} -C %{_target_platform}
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
%changelog
+* Mon Mar 16 2015 Michael Catanzaro <mcatanzaro at gnome.org> - 2.6.5-2
+- Add patch for rbz#1156330
+
* Thu Jan 15 2015 Tomas Popela <tpopela at redhat.com> - 2.6.5-1
- Update to 2.6.5
More information about the scm-commits
mailing list