OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 if (!position.anchorNode()) | 74 if (!position.anchorNode()) |
75 return false; | 75 return false; |
76 | 76 |
77 if (position.anchorNode() == node) | 77 if (position.anchorNode() == node) |
78 return true; | 78 return true; |
79 | 79 |
80 if (!node.isElementNode()) | 80 if (!node.isElementNode()) |
81 return false; | 81 return false; |
82 | 82 |
83 Element& element = toElement(node); | 83 Element& element = toElement(node); |
84 return element.containsIncludingShadowDOM(position.anchorNode()); | 84 return element.isShadowIncludingInclusiveAncestorOf(position.anchorNode()); |
85 } | 85 } |
86 | 86 |
87 void DragCaretController::nodeWillBeRemoved(Node& node) | 87 void DragCaretController::nodeWillBeRemoved(Node& node) |
88 { | 88 { |
89 if (!hasCaret() || !node.inActiveDocument()) | 89 if (!hasCaret() || !node.inActiveDocument()) |
90 return; | 90 return; |
91 | 91 |
92 if (!removingNodeRemovesPosition(node, m_position.deepEquivalent())) | 92 if (!removingNodeRemovesPosition(node, m_position.deepEquivalent())) |
93 return; | 93 return; |
94 | 94 |
(...skipping 16 matching lines...) Expand all Loading... |
111 return rootEditableElementOf(m_position); | 111 return rootEditableElementOf(m_position); |
112 } | 112 } |
113 | 113 |
114 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext& con
text, const LayoutPoint& paintOffset) const | 114 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext& con
text, const LayoutPoint& paintOffset) const |
115 { | 115 { |
116 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) | 116 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) |
117 paintCaret(m_position.deepEquivalent().anchorNode(), context, paintOffse
t); | 117 paintCaret(m_position.deepEquivalent().anchorNode(), context, paintOffse
t); |
118 } | 118 } |
119 | 119 |
120 } // namespace blink | 120 } // namespace blink |
OLD | NEW |