Title: [152574] trunk
Revision
152574
Author
[email protected]
Date
2013-07-11 11:57:57 -0700 (Thu, 11 Jul 2013)

Log Message

[GTK] Layout Test accessibility/deleting-iframe-destroys-axcache.html, platform/gtk/accessibility/replaced-objects-in-anonymous-blocks.html are failing
https://bugs.webkit.org/show_bug.cgi?id=118552

Patch by Mario Sanchez Prada <[email protected]> on 2013-07-11
Reviewed by Chris Fleizach.

Source/WebCore:

Do not assume always that we have a RenderText renderer when
calling to toRenderText(), since we might be executing that part
of the code due to have requested to include all the children.

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::textUnderElement): Add
missing guard for RenderText, needed after r152537.

LayoutTests:

Remove tests that are no longer expected to crash.

* platform/gtk/TestExpectations: Removed tests.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (152573 => 152574)


--- trunk/LayoutTests/ChangeLog	2013-07-11 18:35:35 UTC (rev 152573)
+++ trunk/LayoutTests/ChangeLog	2013-07-11 18:57:57 UTC (rev 152574)
@@ -1,3 +1,14 @@
+2013-07-11  Mario Sanchez Prada  <[email protected]>
+
+        [GTK] Layout Test accessibility/deleting-iframe-destroys-axcache.html, platform/gtk/accessibility/replaced-objects-in-anonymous-blocks.html are failing
+        https://bugs.webkit.org/show_bug.cgi?id=118552
+
+        Reviewed by Chris Fleizach.
+
+        Remove tests that are no longer expected to crash.
+
+        * platform/gtk/TestExpectations: Removed tests.
+
 2013-07-10  Oliver Hunt  <[email protected]>
 
         NativeExecutable cache needs to use both call and construct functions for key

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (152573 => 152574)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2013-07-11 18:35:35 UTC (rev 152573)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2013-07-11 18:57:57 UTC (rev 152574)
@@ -496,10 +496,6 @@
 
 webkit.org/b/118423 http/tests/misc/iframe-reparenting-id-collision.html [ Crash Pass ]
 
-webkit.org/b/118552 [ Debug ] accessibility/deleting-iframe-destroys-axcache.html [ Crash ]
-
-webkit.org/b/118552 [ Debug ] platform/gtk/accessibility/replaced-objects-in-anonymous-blocks.html [ Crash ]
-
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Crashing tests
 #////////////////////////////////////////////////////////////////////////////////////////

Modified: trunk/Source/WebCore/ChangeLog (152573 => 152574)


--- trunk/Source/WebCore/ChangeLog	2013-07-11 18:35:35 UTC (rev 152573)
+++ trunk/Source/WebCore/ChangeLog	2013-07-11 18:57:57 UTC (rev 152574)
@@ -1,3 +1,18 @@
+2013-07-11  Mario Sanchez Prada  <[email protected]>
+
+        [GTK] Layout Test accessibility/deleting-iframe-destroys-axcache.html, platform/gtk/accessibility/replaced-objects-in-anonymous-blocks.html are failing
+        https://bugs.webkit.org/show_bug.cgi?id=118552
+
+        Reviewed by Chris Fleizach.
+
+        Do not assume always that we have a RenderText renderer when
+        calling to toRenderText(), since we might be executing that part
+        of the code due to have requested to include all the children.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::textUnderElement): Add
+        missing guard for RenderText, needed after r152537.
+
 2013-07-11  Andrei Bucur  <[email protected]>
 
         [CSS Regions] In a region chain with auto-height regions, lines get their length based only on the first region

Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (152573 => 152574)


--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2013-07-11 18:35:35 UTC (rev 152573)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2013-07-11 18:57:57 UTC (rev 152574)
@@ -662,11 +662,13 @@
     
         // Sometimes text fragments don't have Nodes associated with them (like when
         // CSS content is used to insert text or when a RenderCounter is used.)
-        RenderText* renderTextObject = toRenderText(m_renderer);
-        if (renderTextObject->isTextFragment())
-            return String(static_cast<RenderTextFragment*>(m_renderer)->contentString());
-        else
+        if (m_renderer->isText()) {
+            RenderText* renderTextObject = toRenderText(m_renderer);
+            if (renderTextObject->isTextFragment())
+                return String(static_cast<RenderTextFragment*>(m_renderer)->contentString());
+
             return String(renderTextObject->text());
+        }
     }
     
     return AccessibilityNodeObject::textUnderElement(mode);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to