diff options
Diffstat (limited to 'WebCore/rendering/RenderObject.cpp')
| -rw-r--r-- | WebCore/rendering/RenderObject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp index d7df436..2893d67 100644 --- a/WebCore/rendering/RenderObject.cpp +++ b/WebCore/rendering/RenderObject.cpp @@ -1385,9 +1385,9 @@ Color RenderObject::selectionBackgroundColor() const { Color color; if (style()->userSelect() != SELECT_NONE) { - RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(SELECTION); - if (pseudoStyle && pseudoStyle->backgroundColor().isValid()) - color = pseudoStyle->backgroundColor().blendWithWhite(); + RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(SELECTION); + if (pseudoStyle && pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).isValid()) + color = pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).blendWithWhite(); else color = document()->frame()->selection()->isFocusedAndActive() ? theme()->activeSelectionBackgroundColor() : @@ -1404,9 +1404,9 @@ Color RenderObject::selectionForegroundColor() const return color; if (RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(SELECTION)) { - color = pseudoStyle->textFillColor(); + color = pseudoStyle->visitedDependentColor(CSSPropertyWebkitTextFillColor); if (!color.isValid()) - color = pseudoStyle->color(); + color = pseudoStyle->visitedDependentColor(CSSPropertyColor); } else color = document()->frame()->selection()->isFocusedAndActive() ? theme()->activeSelectionForegroundColor() : @@ -2224,8 +2224,8 @@ void RenderObject::getTextDecorationColors(int decorations, Color& underline, Co } } curr = curr->parent(); - if (curr && curr->isRenderBlock() && toRenderBlock(curr)->inlineContinuation()) - curr = toRenderBlock(curr)->inlineContinuation(); + if (curr && curr->isAnonymousBlock() && toRenderBlock(curr)->continuation()) + curr = toRenderBlock(curr)->continuation(); } while (curr && decorations && (!quirksMode || !curr->node() || (!curr->node()->hasTagName(aTag) && !curr->node()->hasTagName(fontTag)))); |