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

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

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 m_caretBase->invalidateCaretRect(node); 57 m_caretBase->invalidateCaretRect(node);
58 m_position = createVisiblePosition(position); 58 m_position = createVisiblePosition(position);
59 Document* document = nullptr; 59 Document* document = nullptr;
60 if (Node* node = m_position.deepEquivalent().anchorNode()) { 60 if (Node* node = m_position.deepEquivalent().anchorNode()) {
61 m_caretBase->invalidateCaretRect(node); 61 m_caretBase->invalidateCaretRect(node);
62 document = &node->document(); 62 document = &node->document();
63 } 63 }
64 if (m_position.isNull() || m_position.isOrphan()) { 64 if (m_position.isNull() || m_position.isOrphan()) {
65 m_caretBase->clearCaretRect(); 65 m_caretBase->clearCaretRect();
66 } else { 66 } else {
67 document->updateLayoutTree(); 67 document->updateStyleAndLayoutTree();
68 m_caretBase->updateCaretRect(m_position); 68 m_caretBase->updateCaretRect(m_position);
69 } 69 }
70 } 70 }
71 71
72 static bool removingNodeRemovesPosition(Node& node, const Position& position) 72 static bool removingNodeRemovesPosition(Node& node, const Position& position)
73 { 73 {
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)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 m_caretBase->paintCaret(m_position.deepEquivalent().anchorNode(), contex t, paintOffset); 117 m_caretBase->paintCaret(m_position.deepEquivalent().anchorNode(), contex t, paintOffset);
118 } 118 }
119 119
120 } // namespace blink 120 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Text.cpp ('k') | third_party/WebKit/Source/core/editing/EditingUtilities.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698