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 29 matching lines...) Expand all Loading... |
40 PassOwnPtrWillBeRawPtr<DragCaretController> DragCaretController::create() | 40 PassOwnPtrWillBeRawPtr<DragCaretController> DragCaretController::create() |
41 { | 41 { |
42 return adoptPtrWillBeNoop(new DragCaretController); | 42 return adoptPtrWillBeNoop(new DragCaretController); |
43 } | 43 } |
44 | 44 |
45 bool DragCaretController::isContentRichlyEditable() const | 45 bool DragCaretController::isContentRichlyEditable() const |
46 { | 46 { |
47 return isRichlyEditablePosition(m_position.deepEquivalent()); | 47 return isRichlyEditablePosition(m_position.deepEquivalent()); |
48 } | 48 } |
49 | 49 |
50 void DragCaretController::setCaretPosition(const VisiblePosition& position) | 50 void DragCaretController::setCaretPosition(const PositionWithAffinity& position) |
51 { | 51 { |
52 // for querying Layer::compositingState() | 52 // for querying Layer::compositingState() |
53 // This code is probably correct, since it doesn't occur in a stack that | 53 // This code is probably correct, since it doesn't occur in a stack that |
54 // involves updating compositing state. | 54 // involves updating compositing state. |
55 DisableCompositingQueryAsserts disabler; | 55 DisableCompositingQueryAsserts disabler; |
56 | 56 |
57 if (Node* node = m_position.deepEquivalent().anchorNode()) | 57 if (Node* node = m_position.deepEquivalent().anchorNode()) |
58 invalidateCaretRect(node); | 58 invalidateCaretRect(node); |
59 m_position = position; | 59 m_position = VisiblePosition(position); |
60 Document* document = nullptr; | 60 Document* document = nullptr; |
61 if (Node* node = m_position.deepEquivalent().anchorNode()) { | 61 if (Node* node = m_position.deepEquivalent().anchorNode()) { |
62 invalidateCaretRect(node); | 62 invalidateCaretRect(node); |
63 document = &node->document(); | 63 document = &node->document(); |
64 } | 64 } |
65 if (m_position.isNull() || m_position.isOrphan()) { | 65 if (m_position.isNull() || m_position.isOrphan()) { |
66 clearCaretRect(); | 66 clearCaretRect(); |
67 } else { | 67 } else { |
68 document->updateLayoutTreeIfNeeded(); | 68 document->updateLayoutTreeIfNeeded(); |
69 updateCaretRect(m_position); | 69 updateCaretRect(m_position); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 return CaretBase::caretLayoutObject(m_position.deepEquivalent().anchorNode()
); | 107 return CaretBase::caretLayoutObject(m_position.deepEquivalent().anchorNode()
); |
108 } | 108 } |
109 | 109 |
110 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext* p,
const LayoutPoint& paintOffset, const LayoutRect& clipRect) const | 110 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext* p,
const LayoutPoint& paintOffset, const LayoutRect& clipRect) const |
111 { | 111 { |
112 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) | 112 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) |
113 paintCaret(m_position.deepEquivalent().anchorNode(), p, paintOffset, cli
pRect); | 113 paintCaret(m_position.deepEquivalent().anchorNode(), p, paintOffset, cli
pRect); |
114 } | 114 } |
115 | 115 |
116 } // namespace blink | 116 } // namespace blink |
OLD | NEW |