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

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

Issue 2171493003: [Editing][DOM][CodeHealth] Make Node::hasEditableStyle global functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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().updateStyleAndLayoutIgnorePendingStylesheets(); 51 document().updateStyleAndLayoutIgnorePendingStylesheets();
52 52
53 if (!m_node->hasEditableStyle()) 53 if (!hasEditableStyle(*m_node))
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); 62 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION);
63 document().updateStyleAndLayout(); 63 document().updateStyleAndLayout();
64 } 64 }
65 65
66 void InsertIntoTextNodeCommand::doUnapply() 66 void InsertIntoTextNodeCommand::doUnapply()
67 { 67 {
68 if (!m_node->hasEditableStyle()) 68 if (!hasEditableStyle(*m_node))
69 return; 69 return;
70 70
71 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION); 71 m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION);
72 document().updateStyleAndLayout(); 72 document().updateStyleAndLayout();
73 } 73 }
74 74
75 DEFINE_TRACE(InsertIntoTextNodeCommand) 75 DEFINE_TRACE(InsertIntoTextNodeCommand)
76 { 76 {
77 visitor->trace(m_node); 77 visitor->trace(m_node);
78 SimpleEditCommand::trace(visitor); 78 SimpleEditCommand::trace(visitor);
79 } 79 }
80 80
81 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698