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

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: 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
Index: Source/core/page/FocusController.cpp
diff --git a/Source/core/page/FocusController.cpp b/Source/core/page/FocusController.cpp
index b8c2276bd90e38f1560f60bb9b8560fa61268158..b980c62306d0bc3505475da38069afb4574614f4 100644
--- a/Source/core/page/FocusController.cpp
+++ b/Source/core/page/FocusController.cpp
@@ -654,9 +654,14 @@ 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()) {
tkent 2014/07/08 23:33:01 nit: if (selectionStartNode->isInShadowTree() && s
deepak.sa 2014/07/10 13:52:03 Done.
+ if (selectionStartNode->shadowHost() == newFocusedNode)
+ return;
+ }
+
if (Node* mousePressNode = newFocusedFrame->eventHandler().mousePressNode()) {
if (mousePressNode->renderer() && !mousePressNode->canStartSelection()) {
// Don't clear the selection for contentEditable elements, but do

Powered by Google App Engine
This is Rietveld 408576698