Changeset 157436 in webkit

Timestamp:

Oct 14, 2013 5:38:10 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Source/WebCore: AX: fieldset should have GroupRole and legend should be description.
​https://bugs.webkit.org/show_bug.cgi?id=122534

Patch by Samuel White <Samuel White> on 2013-10-14
Reviewed by Chris Fleizach.

Changes fieldset to derive AXDescription from legend if one is available. Added
convenience method to AccessibilityObject to fetch element if available.

Test: accessibility/fieldset-element.html

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::canHaveChildren):
(WebCore::AccessibilityNodeObject::alternativeText):

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::element):
(WebCore::AccessibilityObject::isARIAHidden):
(WebCore::AccessibilityObject::isDOMHidden):
(WebCore::AccessibilityObject::defaultObjectInclusion):

• accessibility/AccessibilityObject.h:

(WebCore::AccessibilityObject::isHidden):

• accessibility/AccessibilitySlider.cpp:

(WebCore::AccessibilitySlider::getAttribute):
(WebCore::AccessibilitySlider::valueForRange):
(WebCore::AccessibilitySlider::maxValueForRange):
(WebCore::AccessibilitySlider::minValueForRange):
(WebCore::AccessibilitySlider::setValue):
(WebCore::AccessibilitySlider::inputElement):

• accessibility/AccessibilitySlider.h:
• accessibility/mac/AccessibilityObjectMac.mm:

(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):

• html/HTMLFieldSetElement.cpp:

(WebCore::HTMLFieldSetElement::legend):

• html/HTMLFieldSetElement.h:

LayoutTests: Crash in WebCore::BidiResolver<WebCore::InlineIterator, WebCore::BidiRun>::createBidiRunsForLine
​https://bugs.webkit.org/show_bug.cgi?id=122776

Reviewed by Darin Adler.

• fast/text/whitespace/whitespace-and-margin-wrap-after-list-marker-crash-expected.txt: Added.
• fast/text/whitespace/whitespace-and-margin-wrap-after-list-marker-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/whitespace/whitespace-and-margin-wrap-after-list-marker-crash-expected.txt (added)
• LayoutTests/fast/text/whitespace/whitespace-and-margin-wrap-after-list-marker-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Crash in WebCore::BidiResolver<WebCore::InlineIterator, WebCore::BidiRun>::createBidiRunsForLine
+        https://bugs.webkit.org/show_bug.cgi?id=122776
+
+        Reviewed by Darin Adler.
+
+        * fast/text/whitespace/whitespace-and-margin-wrap-after-list-marker-crash-expected.txt: Added.
+        * fast/text/whitespace/whitespace-and-margin-wrap-after-list-marker-crash.html: Added.
+
 2013-10-14  Samuel White  <samuel_white@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ -40 +40 @@
 
         * WebCore.vcxproj/WebCoreCommon.props:
+
+2013-10-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Crash in WebCore::BidiResolver<WebCore::InlineIterator, WebCore::BidiRun>::createBidiRunsForLine
+        https://bugs.webkit.org/show_bug.cgi?id=122776
+
+        Reviewed by Darin Adler.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/aca89bc4d984705a1f94b623dae0ab03e239a248
+
+        Fix modification of whitespace endpoints to not assume it's operating on RenderTexts
+
+        During line layout, we use midpoints to identify RenderObjects, or parts of
+        RenderObjects, that don't need InlineBoxes, usually because of collapsed whitespace.
+
+        Prior to actually creating BidiRuns (the precursor to InlineBoxes), we use
+        checkMidpoints to fix up our lineMidpointState to handle the case where we start
+        ignoring spaces in our line, but don't stop until somewhere on the following line.
+        Previously, this function assumed that the final midpoint (called an endpoint)
+        was a RenderText, but this assumption is wrong if we have a beginning midpoint
+        created by shouldSkipWhitespaceAfterStartObject (which handles inlines and list
+        markers) and no endpoint on that line. In that case, we'd instead adjust the
+        position backwards on the beginning midpoint, which would cause us to fail to
+        create an InlineBox for the inline or list marker. In the new test added, this
+        would actually trigger a crash due to an assumption when visually re-ordering
+        BidiRuns that a non-empty line would actually contain at least one such run.
+
+        Test: fast/text/whitespace/whitespace-and-margin-wrap-after-list-marker-crash.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::checkMidpoints):
 
 2013-10-14  Ryosuke Niwa  <rniwa@webkit.org>

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -208 +208 @@
             // We hit the line break before the start point.  Shave off the start point.
             lineMidpointState.numMidpoints--;
-            if (endpoint.m_obj->style()->collapseWhiteSpace())
+            if (endpoint.m_obj->style()->collapseWhiteSpace() && endpoint.m_obj->isText())
                 endpoint.m_pos--;
         }