Changeset 152574 in webkit

Timestamp:

Jul 11, 2013 11:57:57 AM (11 years ago)

Author:

mario@webkit.org

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 <​mario.prada@samsung.com> 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-11  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [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  <oliver@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -496 +496 @@
 
 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 ]
 
 #////////////////////////////////////////////////////////////////////////////////////////

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-11  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [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  <abucur@adobe.com>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -663 +663 @@
         // 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());
+        }
     }