diff options
Diffstat (limited to 'WebCore/accessibility')
-rw-r--r-- | WebCore/accessibility/AccessibilityRenderObject.cpp | 24 | ||||
-rw-r--r-- | WebCore/accessibility/AccessibilityTable.cpp | 4 | ||||
-rw-r--r-- | WebCore/accessibility/mac/AccessibilityObjectWrapper.mm | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp index 785ee31..6077aae 100644 --- a/WebCore/accessibility/AccessibilityRenderObject.cpp +++ b/WebCore/accessibility/AccessibilityRenderObject.cpp @@ -168,10 +168,10 @@ static inline RenderObject* lastChildConsideringContinuation(RenderObject* rende lastChild = lc; if (cur->isRenderInline()) { - cur = toRenderInline(cur)->inlineContinuation(); + cur = toRenderInline(cur)->inlineElementContinuation(); ASSERT(cur || !toRenderInline(prev)->continuation()); } else - cur = toRenderBlock(cur)->inlineContinuation(); + cur = toRenderBlock(cur)->inlineElementContinuation(); } return lastChild; @@ -205,12 +205,12 @@ AccessibilityObject* AccessibilityRenderObject::lastChild() const static inline RenderInline* startOfContinuations(RenderObject* r) { - if (r->isInlineContinuation()) + if (r->isInlineElementContinuation()) return toRenderInline(r->node()->renderer()); // Blocks with a previous continuation always have a next continuation - if (r->isRenderBlock() && toRenderBlock(r)->inlineContinuation()) - return toRenderInline(toRenderBlock(r)->inlineContinuation()->node()->renderer()); + if (r->isRenderBlock() && toRenderBlock(r)->inlineElementContinuation()) + return toRenderInline(toRenderBlock(r)->inlineElementContinuation()->node()->renderer()); return 0; } @@ -226,10 +226,10 @@ static inline RenderObject* endOfContinuations(RenderObject* renderer) while (cur) { prev = cur; if (cur->isRenderInline()) { - cur = toRenderInline(cur)->inlineContinuation(); + cur = toRenderInline(cur)->inlineElementContinuation(); ASSERT(cur || !toRenderInline(prev)->continuation()); } else - cur = toRenderBlock(cur)->inlineContinuation(); + cur = toRenderBlock(cur)->inlineElementContinuation(); } return prev; @@ -258,7 +258,7 @@ static inline RenderObject* childBeforeConsideringContinuations(RenderInline* r, return prev; prev = curContainer; - curContainer = toRenderBlock(curContainer)->inlineContinuation(); + curContainer = toRenderBlock(curContainer)->inlineElementContinuation(); } } @@ -269,7 +269,7 @@ static inline RenderObject* childBeforeConsideringContinuations(RenderInline* r, static inline bool firstChildIsInlineContinuation(RenderObject* renderer) { - return renderer->firstChild() && renderer->firstChild()->isInlineContinuation(); + return renderer->firstChild() && renderer->firstChild()->isInlineElementContinuation(); } AccessibilityObject* AccessibilityRenderObject::previousSibling() const @@ -320,7 +320,7 @@ AccessibilityObject* AccessibilityRenderObject::nextSibling() const // Case 1: node is a block and has an inline continuation. Next sibling is the inline continuation's // first child. RenderInline* inlineContinuation; - if (m_renderer->isRenderBlock() && (inlineContinuation = toRenderBlock(m_renderer)->inlineContinuation())) + if (m_renderer->isRenderBlock() && (inlineContinuation = toRenderBlock(m_renderer)->inlineElementContinuation())) nextSibling = firstChildConsideringContinuation(inlineContinuation); // Case 2: Anonymous block parent of the start of a continuation - skip all the way to @@ -774,8 +774,8 @@ Element* AccessibilityRenderObject::anchorElement() const // Search up the render tree for a RenderObject with a DOM node. Defer to an earlier continuation, though. for (currRenderer = m_renderer; currRenderer && !currRenderer->node(); currRenderer = currRenderer->parent()) { - if (currRenderer->isRenderBlock()) { - RenderInline* continuation = toRenderBlock(currRenderer)->inlineContinuation(); + if (currRenderer->isAnonymousBlock()) { + RenderObject* continuation = toRenderBlock(currRenderer)->continuation(); if (continuation) return cache->getOrCreate(continuation)->anchorElement(); } diff --git a/WebCore/accessibility/AccessibilityTable.cpp b/WebCore/accessibility/AccessibilityTable.cpp index aed8867..8e0562c 100644 --- a/WebCore/accessibility/AccessibilityTable.cpp +++ b/WebCore/accessibility/AccessibilityTable.cpp @@ -126,7 +126,7 @@ bool AccessibilityTable::isTableExposableThroughAccessibility() RenderStyle* tableStyle = table->style(); if (!tableStyle) return false; - Color tableBGColor = tableStyle->backgroundColor(); + Color tableBGColor = tableStyle->visitedDependentColor(CSSPropertyBackgroundColor); // check enough of the cells to find if the table matches our criteria // Criteria: @@ -169,7 +169,7 @@ bool AccessibilityTable::isTableExposableThroughAccessibility() // if the cell has a different color from the table and there is cell spacing, // then it is probably a data table cell (spacing and colors take the place of borders) - Color cellColor = renderStyle->backgroundColor(); + Color cellColor = renderStyle->visitedDependentColor(CSSPropertyBackgroundColor); if (table->hBorderSpacing() > 0 && table->vBorderSpacing() > 0 && tableBGColor != cellColor && cellColor.alpha() != 1) backgroundDifferenceCellCount++; diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm index 97aaaf2..4734d4e 100644 --- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm +++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm @@ -315,8 +315,8 @@ static void AXAttributeStringSetStyle(NSMutableAttributedString* attrString, Ren AXAttributeStringSetFont(attrString, NSAccessibilityFontTextAttribute, style->font().primaryFont()->getNSFont(), range); // set basic colors - AXAttributeStringSetColor(attrString, NSAccessibilityForegroundColorTextAttribute, nsColor(style->color()), range); - AXAttributeStringSetColor(attrString, NSAccessibilityBackgroundColorTextAttribute, nsColor(style->backgroundColor()), range); + AXAttributeStringSetColor(attrString, NSAccessibilityForegroundColorTextAttribute, nsColor(style->visitedDependentColor(CSSPropertyColor)), range); + AXAttributeStringSetColor(attrString, NSAccessibilityBackgroundColorTextAttribute, nsColor(style->visitedDependentColor(CSSPropertyBackgroundColor)), range); // set super/sub scripting EVerticalAlign alignment = style->verticalAlign(); |