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

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

Issue 1878473002: ASSERT -> DCHECK in core/editing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Output info for some DCHECKs, add TODOs. Created 4 years, 8 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 19 matching lines...) Expand all
30 #include "core/dom/Text.h" 30 #include "core/dom/Text.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(Text* node, unsigned offset , unsigned count) 34 DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(Text* node, unsigned offset , unsigned count)
35 : SimpleEditCommand(node->document()) 35 : SimpleEditCommand(node->document())
36 , m_node(node) 36 , m_node(node)
37 , m_offset(offset) 37 , m_offset(offset)
38 , m_count(count) 38 , m_count(count)
39 { 39 {
40 ASSERT(m_node); 40 DCHECK(m_node);
41 ASSERT(m_offset <= m_node->length()); 41 DCHECK_LE(m_offset, m_node->length());
42 ASSERT(m_offset + m_count <= m_node->length()); 42 DCHECK_LE(m_offset + m_count, m_node->length());
43 } 43 }
44 44
45 void DeleteFromTextNodeCommand::doApply(EditingState*) 45 void DeleteFromTextNodeCommand::doApply(EditingState*)
46 { 46 {
47 ASSERT(m_node); 47 DCHECK(m_node);
48 48
49 if (!m_node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)) 49 if (!m_node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable))
50 return; 50 return;
51 51
52 TrackExceptionState exceptionState; 52 TrackExceptionState exceptionState;
53 m_text = m_node->substringData(m_offset, m_count, exceptionState); 53 m_text = m_node->substringData(m_offset, m_count, exceptionState);
54 if (exceptionState.hadException()) 54 if (exceptionState.hadException())
55 return; 55 return;
56 56
57 m_node->deleteData(m_offset, m_count, exceptionState, CharacterData::Depreca tedRecalcStyleImmediatlelyForEditing); 57 m_node->deleteData(m_offset, m_count, exceptionState, CharacterData::Depreca tedRecalcStyleImmediatlelyForEditing);
58 } 58 }
59 59
60 void DeleteFromTextNodeCommand::doUnapply() 60 void DeleteFromTextNodeCommand::doUnapply()
61 { 61 {
62 ASSERT(m_node); 62 DCHECK(m_node);
63 63
64 if (!m_node->hasEditableStyle()) 64 if (!m_node->hasEditableStyle())
65 return; 65 return;
66 66
67 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::Deprec atedRecalcStyleImmediatlelyForEditing); 67 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::Deprec atedRecalcStyleImmediatlelyForEditing);
68 } 68 }
69 69
70 DEFINE_TRACE(DeleteFromTextNodeCommand) 70 DEFINE_TRACE(DeleteFromTextNodeCommand)
71 { 71 {
72 visitor->trace(m_node); 72 visitor->trace(m_node);
73 SimpleEditCommand::trace(visitor); 73 SimpleEditCommand::trace(visitor);
74 } 74 }
75 75
76 } // namespace blink 76 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698