Title: [127619] releases/WebKitGTK/webkit-1.10/Source
- Revision
- 127619
- Author
- carlo...@webkit.org
- Date
- 2012-09-05 11:46:24 -0700 (Wed, 05 Sep 2012)
Log Message
Merge r127483 - [GTK] Crash in AccessibilityObject::accessibilityPlatformIncludesObject()
https://bugs.webkit.org/show_bug.cgi?id=95740
Patch by Joanmarie Diggs <jdi...@igalia.com> on 2012-09-04
Reviewed by Martin Robinson.
Source/WebCore:
Added sanity check to be sure we have a render object prior to seeing if
said object is an anonymous block.
Testing via unit test because a non-flaky layout test crasher could not
be found.
* accessibility/gtk/AccessibilityObjectAtk.cpp:
(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
Sanity check for render object added.
Source/WebKit/gtk:
Updated unit test.
* tests/testatk.c:
(testWebkitAtkComboBox): Added checks that the menu popup in a combo box
has 0 links and, more importantly, that checking doesn't result in a crash.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog (127618 => 127619)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-05 18:40:58 UTC (rev 127618)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-05 18:46:24 UTC (rev 127619)
@@ -1,3 +1,20 @@
+2012-09-04 Joanmarie Diggs <jdi...@igalia.com>
+
+ [GTK] Crash in AccessibilityObject::accessibilityPlatformIncludesObject()
+ https://bugs.webkit.org/show_bug.cgi?id=95740
+
+ Reviewed by Martin Robinson.
+
+ Added sanity check to be sure we have a render object prior to seeing if
+ said object is an anonymous block.
+
+ Testing via unit test because a non-flaky layout test crasher could not
+ be found.
+
+ * accessibility/gtk/AccessibilityObjectAtk.cpp:
+ (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+ Sanity check for render object added.
+
2012-09-04 Mario Sanchez Prada <msanc...@igalia.com>
[Stable] [GTK] Crash in WebCore::HTMLSelectElement::selectedIndex
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp (127618 => 127619)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp 2012-09-05 18:40:58 UTC (rev 127618)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp 2012-09-05 18:46:24 UTC (rev 127619)
@@ -104,7 +104,7 @@
// anonymous blocks which are aria-related to themselves have an aria role, nor
// have we encountered instances where the parent of an anonymous block also lacked
// an aria role but the grandparent had one.
- if (renderer()->isAnonymousBlock() && !parent->renderer()->isBody()
+ if (renderer() && renderer()->isAnonymousBlock() && !parent->renderer()->isBody()
&& parent->ariaRoleAttribute() == UnknownRole)
return IgnoreObject;
Modified: releases/WebKitGTK/webkit-1.10/Source/WebKit/gtk/ChangeLog (127618 => 127619)
--- releases/WebKitGTK/webkit-1.10/Source/WebKit/gtk/ChangeLog 2012-09-05 18:40:58 UTC (rev 127618)
+++ releases/WebKitGTK/webkit-1.10/Source/WebKit/gtk/ChangeLog 2012-09-05 18:46:24 UTC (rev 127619)
@@ -1,3 +1,16 @@
+2012-09-04 Joanmarie Diggs <jdi...@igalia.com>
+
+ [GTK] Crash in AccessibilityObject::accessibilityPlatformIncludesObject()
+ https://bugs.webkit.org/show_bug.cgi?id=95740
+
+ Reviewed by Martin Robinson.
+
+ Updated unit test.
+
+ * tests/testatk.c:
+ (testWebkitAtkComboBox): Added checks that the menu popup in a combo box
+ has 0 links and, more importantly, that checking doesn't result in a crash.
+
2012-09-01 Joanmarie Diggs <jdi...@igalia.com>
[Gtk] Incorrect/unexpected characters in the text of certain accessibles
Modified: releases/WebKitGTK/webkit-1.10/Source/WebKit/gtk/tests/testatk.c (127618 => 127619)
--- releases/WebKitGTK/webkit-1.10/Source/WebKit/gtk/tests/testatk.c 2012-09-05 18:40:58 UTC (rev 127618)
+++ releases/WebKitGTK/webkit-1.10/Source/WebKit/gtk/tests/testatk.c 2012-09-05 18:46:24 UTC (rev 127619)
@@ -562,6 +562,10 @@
g_assert(selectedItem == item1);
g_object_unref(selectedItem);
+ /* Check that the menu popup has 0 links and doesn't crash from checking. */
+ gint nLinks = atk_hypertext_get_n_links(ATK_HYPERTEXT(menuPopup));
+ g_assert_cmpint(nLinks, ==, 0);
+
/* Check the implementations of the AtkAction interface. */
g_assert(ATK_IS_ACTION(comboBox));
AtkAction* atkAction = ATK_ACTION(comboBox);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
