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

Unified Diff: Source/core/page/FocusController.cpp

Issue 374133002: Remove remaining callers of deprecatedShadowAncestorNode (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 5 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 | « Source/core/dom/Node.cpp ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/FocusController.cpp
diff --git a/Source/core/page/FocusController.cpp b/Source/core/page/FocusController.cpp
index b8c2276bd90e38f1560f60bb9b8560fa61268158..2f3173962b8c6d642cf89752a69ac69d50b2852b 100644
--- a/Source/core/page/FocusController.cpp
+++ b/Source/core/page/FocusController.cpp
@@ -654,7 +654,10 @@ static void clearSelectionIfNeeded(LocalFrame* oldFocusedFrame, LocalFrame* newF
return;
Node* selectionStartNode = selection.selection().start().deprecatedNode();
- if (selectionStartNode == newFocusedNode || selectionStartNode->isDescendantOf(newFocusedNode) || selectionStartNode->deprecatedShadowAncestorNode() == newFocusedNode)
+ if (selectionStartNode == newFocusedNode || selectionStartNode->isDescendantOf(newFocusedNode))
+ return;
+
+ if (selectionStartNode->isInShadowTree() && selectionStartNode->shadowHost() == newFocusedNode)
return;
if (Node* mousePressNode = newFocusedFrame->eventHandler().mousePressNode()) {
« no previous file with comments | « Source/core/dom/Node.cpp ('k') | Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698