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

Side by Side Diff: Source/core/editing/DragCaretController.cpp

Issue 1326563002: Introduce visiblePositionOf() with PositionWithAffinity as replacement of VisiblePosition constructo (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-01T10:55:04 Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 void DragCaretController::setCaretPosition(const PositionWithAffinity& 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 = VisiblePosition(position); 59 m_position = visiblePositionOf(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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 return rootEditableElementOf(m_position); 112 return rootEditableElementOf(m_position);
113 } 113 }
114 114
115 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext* p, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const 115 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext* p, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
116 { 116 {
117 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame) 117 if (m_position.deepEquivalent().anchorNode()->document().frame() == frame)
118 paintCaret(m_position.deepEquivalent().anchorNode(), p, paintOffset, cli pRect); 118 paintCaret(m_position.deepEquivalent().anchorNode(), p, paintOffset, cli pRect);
119 } 119 }
120 120
121 } // namespace blink 121 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698