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

Side by Side Diff: third_party/WebKit/Source/core/editing/commands/InsertIntoTextNodeCommand.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) 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 30 matching lines...) Expand all
41 { 41 {
42 DCHECK(m_node); 42 DCHECK(m_node);
43 DCHECK_LE(m_offset, m_node->length()); 43 DCHECK_LE(m_offset, m_node->length());
44 DCHECK(!m_text.isEmpty()); 44 DCHECK(!m_text.isEmpty());
45 } 45 }
46 46
47 void InsertIntoTextNodeCommand::doApply(EditingState*) 47 void InsertIntoTextNodeCommand::doApply(EditingState*)
48 { 48 {
49 bool passwordEchoEnabled = document().settings() && document().settings()->p asswordEchoEnabled(); 49 bool passwordEchoEnabled = document().settings() && document().settings()->p asswordEchoEnabled();
50 if (passwordEchoEnabled) 50 if (passwordEchoEnabled)
51 document().updateLayoutIgnorePendingStylesheets(); 51 document().updateStyleAndLayoutIgnorePendingStylesheets();
52 52
53 if (!m_node->hasEditableStyle()) 53 if (!m_node->hasEditableStyle())
54 return; 54 return;
55 55
56 if (passwordEchoEnabled) { 56 if (passwordEchoEnabled) {
57 LayoutText* layoutText = m_node->layoutObject(); 57 LayoutText* layoutText = m_node->layoutObject();
58 if (layoutText && layoutText->isSecure()) 58 if (layoutText && layoutText->isSecure())
59 layoutText->momentarilyRevealLastTypedCharacter(m_offset + m_text.le ngth() - 1); 59 layoutText->momentarilyRevealLastTypedCharacter(m_offset + m_text.le ngth() - 1);
60 } 60 }
61 61
62 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::Deprec atedRecalcStyleImmediatlelyForEditing); 62 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::Deprec atedRecalcStyleImmediatlelyForEditing);
63 } 63 }
64 64
65 void InsertIntoTextNodeCommand::doUnapply() 65 void InsertIntoTextNodeCommand::doUnapply()
66 { 66 {
67 if (!m_node->hasEditableStyle()) 67 if (!m_node->hasEditableStyle())
68 return; 68 return;
69 69
70 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION, CharacterDat a::DeprecatedRecalcStyleImmediatlelyForEditing); 70 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION, CharacterDat a::DeprecatedRecalcStyleImmediatlelyForEditing);
71 } 71 }
72 72
73 DEFINE_TRACE(InsertIntoTextNodeCommand) 73 DEFINE_TRACE(InsertIntoTextNodeCommand)
74 { 74 {
75 visitor->trace(m_node); 75 visitor->trace(m_node);
76 SimpleEditCommand::trace(visitor); 76 SimpleEditCommand::trace(visitor);
77 } 77 }
78 78
79 } // namespace blink 79 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698