Changeset 169024 in webkit

Timestamp:

May 18, 2014 4:25:17 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Input ::selection pseudo class does not work leading to hidden selection
​https://bugs.webkit.org/show_bug.cgi?id=38943

Source/WebCore:

Patch by Svetlana Redchenko <​redchenko@yandex-team.ru> on 2014-05-18
Reviewed by Darin Adler.

Test: fast/selectors/input-with-selection-pseudo-element.html

When text is selected inside input element, it should change the
color and background color according to the ::selection pseudo element.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::selectionBackgroundColor):
(WebCore::RenderObject::selectionColor):
(WebCore::RenderObject::selectionPseudoStyle):

• rendering/RenderObject.h:

LayoutTests:

Patch by Svetlana Redchenko <​redchenko@yandex-team.ru> on 2014-05-18
Reviewed by Darin Adler.

• fast/selectors/input-with-selection-pseudo-element-expected.html: Added.
• fast/selectors/input-with-selection-pseudo-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/selectors/input-with-selection-pseudo-element-expected.html (added)
• LayoutTests/fast/selectors/input-with-selection-pseudo-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-05-18  Svetlana Redchenko  <redchenko@yandex-team.ru>
+
+        Input ::selection pseudo class does not work leading to hidden selection
+        https://bugs.webkit.org/show_bug.cgi?id=38943
+        
+        Reviewed by Darin Adler.
+
+        * fast/selectors/input-with-selection-pseudo-element-expected.html: Added.
+        * fast/selectors/input-with-selection-pseudo-element.html: Added.
+
 2014-05-18  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-18  Svetlana Redchenko  <redchenko@yandex-team.ru>
+
+        Input ::selection pseudo class does not work leading to hidden selection
+        https://bugs.webkit.org/show_bug.cgi?id=38943
+
+        Reviewed by Darin Adler.
+
+        Test: fast/selectors/input-with-selection-pseudo-element.html
+
+        When text is selected inside input element, it should change the
+        color and background color according to the ::selection pseudo element.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::selectionBackgroundColor):
+        (WebCore::RenderObject::selectionColor):
+        (WebCore::RenderObject::selectionPseudoStyle):
+        * rendering/RenderObject.h:
+
 2014-05-18  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -63 +63 @@
 #include "SVGRenderSupport.h"
 #include "Settings.h"
+#include "ShadowRoot.h"
 #include "StyleResolver.h"
 #include "TransformState.h"
@@ -1500 +1501 @@
             color = style().visitedDependentColor(CSSPropertyColor).blendWithWhite();
         else {
-            RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
+            RefPtr<RenderStyle> pseudoStyle = selectionPseudoStyle();
             if (pseudoStyle && pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
                 color = pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).blendWithWhite();
@@ -1520 +1521 @@
         return color;
 
-    if (RefPtr<RenderStyle> pseudoStyle = getUncachedPseudoStyle(PseudoStyleRequest(SELECTION))) {
+    if (RefPtr<RenderStyle> pseudoStyle = selectionPseudoStyle()) {
         color = pseudoStyle->visitedDependentColor(colorProperty);
         if (!color.isValid())
@@ -1528 +1529 @@
 
     return color;
+}
+
+PassRefPtr<RenderStyle> RenderObject::selectionPseudoStyle() const
+{
+    if (isAnonymous())
+        return nullptr;
+
+    if (ShadowRoot* root = m_node.containingShadowRoot()) {
+        if (root->type() == ShadowRoot::UserAgentShadowRoot) {
+            if (Element* shadowHost = m_node.shadowHost())
+                return shadowHost->renderer()->getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
+        }
+    }
+
+    return getUncachedPseudoStyle(PseudoStyleRequest(SELECTION));
 }
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -898 +898 @@
 
     Color selectionColor(int colorProperty) const;
+    PassRefPtr<RenderStyle> selectionPseudoStyle() const;
 
     Node* generatingPseudoHostElement() const;