| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 void DragCaretController::setCaretPosition(const PositionWithAffinity& position) | 63 void DragCaretController::setCaretPosition(const PositionWithAffinity& position) |
| 64 { | 64 { |
| 65 // for querying Layer::compositingState() | 65 // for querying Layer::compositingState() |
| 66 // This code is probably correct, since it doesn't occur in a stack that | 66 // This code is probably correct, since it doesn't occur in a stack that |
| 67 // involves updating compositing state. | 67 // involves updating compositing state. |
| 68 DisableCompositingQueryAsserts disabler; | 68 DisableCompositingQueryAsserts disabler; |
| 69 | 69 |
| 70 if (Node* node = m_position.deepEquivalent().anchorNode()) | 70 if (Node* node = m_position.deepEquivalent().anchorNode()) |
| 71 m_caretBase->invalidateCaretRect(node); | 71 m_caretBase->invalidateCaretRect(node); |
| 72 m_position = createVisiblePosition(position); | 72 m_position = createVisiblePositionDeprecated(position); |
| 73 Document* document = nullptr; | 73 Document* document = nullptr; |
| 74 if (Node* node = m_position.deepEquivalent().anchorNode()) { | 74 if (Node* node = m_position.deepEquivalent().anchorNode()) { |
| 75 m_caretBase->invalidateCaretRect(node); | 75 m_caretBase->invalidateCaretRect(node); |
| 76 document = &node->document(); | 76 document = &node->document(); |
| 77 } | 77 } |
| 78 if (m_position.isNull() || m_position.isOrphan()) { | 78 if (m_position.isNull() || m_position.isOrphan()) { |
| 79 m_caretBase->clearCaretRect(); | 79 m_caretBase->clearCaretRect(); |
| 80 } else { | 80 } else { |
| 81 document->updateStyleAndLayoutTree(); | 81 document->updateStyleAndLayoutTree(); |
| 82 m_caretBase->updateCaretRect(m_position); | 82 m_caretBase->updateCaretRect(m_position); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 visitor->trace(m_caretBase); | 116 visitor->trace(m_caretBase); |
| 117 } | 117 } |
| 118 | 118 |
| 119 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext& con
text, const LayoutPoint& paintOffset) const | 119 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext& con
text, const LayoutPoint& paintOffset) const |
| 120 { | 120 { |
| 121 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) | 121 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) |
| 122 m_caretBase->paintCaret(m_position.deepEquivalent().anchorNode(), contex
t, paintOffset, DisplayItem::kDragCaret); | 122 m_caretBase->paintCaret(m_position.deepEquivalent().anchorNode(), contex
t, paintOffset, DisplayItem::kDragCaret); |
| 123 } | 123 } |
| 124 | 124 |
| 125 } // namespace blink | 125 } // namespace blink |
| OLD | NEW |