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

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

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 | « Source/core/editing/HTMLInterchange.cpp ('k') | Source/core/editing/InsertLineBreakCommand.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) 2005, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2008 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 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/editing/InsertIntoTextNodeCommand.h" 27 #include "core/editing/InsertIntoTextNodeCommand.h"
28 28
29 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 29 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
30 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
31 #include "core/dom/Text.h" 31 #include "core/dom/Text.h"
32 #include "core/frame/Settings.h" 32 #include "core/frame/Settings.h"
33 #include "core/rendering/RenderText.h" 33 #include "core/layout/LayoutText.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 InsertIntoTextNodeCommand::InsertIntoTextNodeCommand(PassRefPtrWillBeRawPtr<Text > node, unsigned offset, const String& text) 37 InsertIntoTextNodeCommand::InsertIntoTextNodeCommand(PassRefPtrWillBeRawPtr<Text > node, unsigned offset, const String& text)
38 : SimpleEditCommand(node->document()) 38 : SimpleEditCommand(node->document())
39 , m_node(node) 39 , m_node(node)
40 , m_offset(offset) 40 , m_offset(offset)
41 , m_text(text) 41 , m_text(text)
42 { 42 {
43 ASSERT(m_node); 43 ASSERT(m_node);
44 ASSERT(m_offset <= m_node->length()); 44 ASSERT(m_offset <= m_node->length());
45 ASSERT(!m_text.isEmpty()); 45 ASSERT(!m_text.isEmpty());
46 } 46 }
47 47
48 void InsertIntoTextNodeCommand::doApply() 48 void InsertIntoTextNodeCommand::doApply()
49 { 49 {
50 bool passwordEchoEnabled = document().settings() && document().settings()->p asswordEchoEnabled(); 50 bool passwordEchoEnabled = document().settings() && document().settings()->p asswordEchoEnabled();
51 if (passwordEchoEnabled) 51 if (passwordEchoEnabled)
52 document().updateLayoutIgnorePendingStylesheets(); 52 document().updateLayoutIgnorePendingStylesheets();
53 53
54 if (!m_node->hasEditableStyle()) 54 if (!m_node->hasEditableStyle())
55 return; 55 return;
56 56
57 if (passwordEchoEnabled) { 57 if (passwordEchoEnabled) {
58 RenderText* renderText = m_node->renderer(); 58 LayoutText* renderText = m_node->renderer();
59 if (renderText && renderText->isSecure()) 59 if (renderText && renderText->isSecure())
60 renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.le ngth() - 1); 60 renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.le ngth() - 1);
61 } 61 }
62 62
63 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::Deprec atedRecalcStyleImmediatlelyForEditing); 63 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::Deprec atedRecalcStyleImmediatlelyForEditing);
64 } 64 }
65 65
66 void InsertIntoTextNodeCommand::doUnapply() 66 void InsertIntoTextNodeCommand::doUnapply()
67 { 67 {
68 if (!m_node->hasEditableStyle()) 68 if (!m_node->hasEditableStyle())
69 return; 69 return;
70 70
71 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION, CharacterDat a::DeprecatedRecalcStyleImmediatlelyForEditing); 71 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION, CharacterDat a::DeprecatedRecalcStyleImmediatlelyForEditing);
72 } 72 }
73 73
74 DEFINE_TRACE(InsertIntoTextNodeCommand) 74 DEFINE_TRACE(InsertIntoTextNodeCommand)
75 { 75 {
76 visitor->trace(m_node); 76 visitor->trace(m_node);
77 SimpleEditCommand::trace(visitor); 77 SimpleEditCommand::trace(visitor);
78 } 78 }
79 79
80 } // namespace blink 80 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/HTMLInterchange.cpp ('k') | Source/core/editing/InsertLineBreakCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698