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

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

Issue 2102423002: Move |updateStyleAndLayout()| call from |updateTextLayoutObject()| to call sites (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2016-06-29T16:59:47 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/editing/commands/InsertIntoTextNodeCommand.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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 DCHECK(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);
58 m_node->document().updateStyleAndLayout();
58 } 59 }
59 60
60 void DeleteFromTextNodeCommand::doUnapply() 61 void DeleteFromTextNodeCommand::doUnapply()
61 { 62 {
62 DCHECK(m_node); 63 DCHECK(m_node);
63 64
64 if (!m_node->hasEditableStyle()) 65 if (!m_node->hasEditableStyle())
65 return; 66 return;
66 67
67 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION, CharacterData::Deprec atedRecalcStyleImmediatlelyForEditing); 68 m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION);
69 m_node->document().updateStyleAndLayout();
68 } 70 }
69 71
70 DEFINE_TRACE(DeleteFromTextNodeCommand) 72 DEFINE_TRACE(DeleteFromTextNodeCommand)
71 { 73 {
72 visitor->trace(m_node); 74 visitor->trace(m_node);
73 SimpleEditCommand::trace(visitor); 75 SimpleEditCommand::trace(visitor);
74 } 76 }
75 77
76 } // namespace blink 78 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/editing/commands/InsertIntoTextNodeCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698