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

Unified Diff: Source/core/dom/ContainerNode.cpp

Issue 1177673005: Implement ShadowRoot.delegatesFocus 4/4 (match CSS :focus for shadow host) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix for comments Created 5 years, 6 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
« no previous file with comments | « LayoutTests/fast/dom/shadow/focus-with-dom-mutation-expected.txt ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ContainerNode.cpp
diff --git a/Source/core/dom/ContainerNode.cpp b/Source/core/dom/ContainerNode.cpp
index f399213a53970bcd7f8a6b467d8ce43cac065ba5..ce718da1e55f91bd9880f00fe5f64e59af609d9b 100644
--- a/Source/core/dom/ContainerNode.cpp
+++ b/Source/core/dom/ContainerNode.cpp
@@ -1084,6 +1084,21 @@ void ContainerNode::focusStateChanged()
void ContainerNode::setFocus(bool received)
{
+ // Recurse up author shadow trees to mark shadow hosts if it matches :focus.
+ // TODO(kochi): Handle UA shadows which marks multiple nodes as focused such as
+ // <input type="date"> the same way as author shadow.
+ if (ShadowRoot* root = containingShadowRoot()) {
+ if (root->type() == ShadowRoot::OpenShadowRoot)
+ shadowHost()->setFocus(received);
+ }
+
+ // If this is an author shadow host and indirectly focused (has focused element within
+ // its shadow root), update focus.
+ if (isElementNode() && document().focusedElement() && document().focusedElement() != this) {
+ if (toElement(this)->shadowRoot())
+ received = received && toElement(this)->shadowRoot()->delegatesFocus();
+ }
+
if (focused() == received)
return;
« no previous file with comments | « LayoutTests/fast/dom/shadow/focus-with-dom-mutation-expected.txt ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698