Title: [179072] branches/safari-600.1.4.15-branch
- Revision
- 179072
- Author
- [email protected]
- Date
- 2015-01-24 12:30:35 -0800 (Sat, 24 Jan 2015)
Log Message
Merged r176321. rdar://problem/19369495
Modified Paths
Added Paths
Diff
Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179071 => 179072)
--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-24 20:16:36 UTC (rev 179071)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-24 20:30:35 UTC (rev 179072)
@@ -1,5 +1,19 @@
2015-01-24 David Kilzer <[email protected]>
+ Merge r176321.
+
+ 2014-11-19 Chris Fleizach <[email protected]>
+
+ AX: Safari fails to load a web page with VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=138849
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/inline-block-assertion-expected.txt: Added.
+ * accessibility/inline-block-assertion.html: Added.
+
+2015-01-24 David Kilzer <[email protected]>
+
Merge r176262.
2014-11-17 David Hyatt <[email protected]>
Added: branches/safari-600.1.4.15-branch/LayoutTests/accessibility/inline-block-assertion-expected.txt (0 => 179072)
--- branches/safari-600.1.4.15-branch/LayoutTests/accessibility/inline-block-assertion-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/accessibility/inline-block-assertion-expected.txt 2015-01-24 20:30:35 UTC (rev 179072)
@@ -0,0 +1,11 @@
+
+Make sure that an inline block element is not cast incorrectly causing an assertion.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+ROLE: AXRole: AXWebArea
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: branches/safari-600.1.4.15-branch/LayoutTests/accessibility/inline-block-assertion.html (0 => 179072)
--- branches/safari-600.1.4.15-branch/LayoutTests/accessibility/inline-block-assertion.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/accessibility/inline-block-assertion.html 2015-01-24 20:30:35 UTC (rev 179072)
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body id="body">
+
+<embed src="" type="application/x-shockwave-flash" allowfullscreen="true" width="362" height="298" data-original-width="425" data-original-height="350">
+<div pseudo="-webkit-plugin-replacement" style="display: inline-block; position: relative; width: 100; height: 100;" id="group">
+<iframe width="100%" id="iframe" style="max-height: 100%" height="350" src="" frameborder="0" scrolling="no"></iframe>
+</div>
+</embed>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("Make sure that an inline block element is not cast incorrectly causing an assertion.");
+
+ if (window.accessibilityController) {
+ var element = accessibilityController.accessibleElementById("group").childAtIndex(0).childAtIndex(0);
+ debug("ROLE: " + element.role);
+ }
+
+</script>
+
+<script src=""
+</body>
+</html>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179071 => 179072)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-24 20:16:36 UTC (rev 179071)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-24 20:30:35 UTC (rev 179072)
@@ -1,5 +1,23 @@
2015-01-24 David Kilzer <[email protected]>
+ Merge r176321.
+
+ 2014-11-19 Chris Fleizach <[email protected]>
+
+ AX: Safari fails to load a web page with VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=138849
+
+ Reviewed by Mario Sanchez Prada.
+
+ Sometimes an inlineElementContinuation will continue to an inline RenderBlock, so we case this incorrectly and bad things happen.
+
+ Test: accessibility/inline-block-assertion.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::startOfContinuations):
+
+2015-01-24 David Kilzer <[email protected]>
+
Merge r176262.
2014-11-17 David Hyatt <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (179071 => 179072)
--- branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-01-24 20:16:36 UTC (rev 179071)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-01-24 20:30:35 UTC (rev 179072)
@@ -255,7 +255,7 @@
static inline RenderInline* startOfContinuations(RenderObject* r)
{
- if (r->isInlineElementContinuation())
+ if (r->isInlineElementContinuation() && r->node()->renderer()->isRenderInline())
return toRenderInline(r->node()->renderer());
// Blocks with a previous continuation always have a next continuation
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
