Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1041)

Unified Diff: Source/core/rendering/RenderObject.cpp

Issue 220343006: Fix for ::selection pseudo element to work on input elements (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added Layout Test Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 36cc3c3a510e50dfaeb972df4d7b9afffce99ba7..34d9465d34a710ac7a5fcc30922b544210b208aa 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -1787,6 +1787,17 @@ Color RenderObject::selectionBackgroundColor() const
if (RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION)))
return resolveColor(pseudoStyle.get(), CSSPropertyBackgroundColor).blendWithWhite();
+
+ // If the element is in shadow tree of input element, then get the PseudoStyle
+ // from the input element.
+ if (node() && node()->shadowHost()) {
+ RenderObject* shadowHostRenderer = node()->shadowHost()->renderer();
+ if (shadowHostRenderer->isTextControl()) {
ojan 2014/04/09 01:57:53 Special casing text controls is not right. For exa
+ if (RefPtr<RenderStyle> pseudoStyle = shadowHostRenderer->getUncachedPseudoStyle(PseudoStyleRequest(SELECTION)))
+ return resolveColor(pseudoStyle.get(), CSSPropertyBackgroundColor).blendWithWhite();
+ }
+ }
+
return frame()->selection().isFocusedAndActive() ?
RenderTheme::theme().activeSelectionBackgroundColor() :
RenderTheme::theme().inactiveSelectionBackgroundColor();
@@ -1801,6 +1812,17 @@ Color RenderObject::selectionColor(int colorProperty) const
if (RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION)))
return resolveColor(pseudoStyle.get(), colorProperty);
+
+ // If the element is in shadow tree of input element, then get the PseudoStyle
+ // from the input element.
+ if (node() && node()->shadowHost()) {
+ RenderObject* shadowHostRenderer = node()->shadowHost()->renderer();
+ if (shadowHostRenderer->isTextControl()) {
+ if (RefPtr<RenderStyle> pseudoStyle = shadowHostRenderer->getUncachedPseudoStyle(PseudoStyleRequest(SELECTION)))
+ return resolveColor(pseudoStyle.get(), colorProperty);
+ }
+ }
+
if (!RenderTheme::theme().supportsSelectionForegroundColors())
return resolveColor(colorProperty);
return frame()->selection().isFocusedAndActive() ?

Powered by Google App Engine
This is Rietveld 408576698