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

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

Issue 181693003: Have Document::markers() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/SpellChecker.cpp ('k') | Source/core/editing/TextCheckingHelper.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ContainerNode* parent = m_text2->parentNode(); 55 ContainerNode* parent = m_text2->parentNode();
56 if (!parent || !parent->rendererIsEditable()) 56 if (!parent || !parent->rendererIsEditable())
57 return; 57 return;
58 58
59 String prefixText = m_text2->substringData(0, m_offset, IGNORE_EXCEPTION); 59 String prefixText = m_text2->substringData(0, m_offset, IGNORE_EXCEPTION);
60 if (prefixText.isEmpty()) 60 if (prefixText.isEmpty())
61 return; 61 return;
62 62
63 m_text1 = Text::create(document(), prefixText); 63 m_text1 = Text::create(document(), prefixText);
64 ASSERT(m_text1); 64 ASSERT(m_text1);
65 document().markers()->copyMarkers(m_text2.get(), 0, m_offset, m_text1.get(), 0); 65 document().markers().copyMarkers(m_text2.get(), 0, m_offset, m_text1.get(), 0);
66 66
67 insertText1AndTrimText2(); 67 insertText1AndTrimText2();
68 } 68 }
69 69
70 void SplitTextNodeCommand::doUnapply() 70 void SplitTextNodeCommand::doUnapply()
71 { 71 {
72 if (!m_text1 || !m_text1->rendererIsEditable()) 72 if (!m_text1 || !m_text1->rendererIsEditable())
73 return; 73 return;
74 74
75 ASSERT(m_text1->document() == document()); 75 ASSERT(m_text1->document() == document());
76 76
77 String prefixText = m_text1->data(); 77 String prefixText = m_text1->data();
78 78
79 m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION, CharacterData::Depre catedRecalcStyleImmediatlelyForEditing); 79 m_text2->insertData(0, prefixText, ASSERT_NO_EXCEPTION, CharacterData::Depre catedRecalcStyleImmediatlelyForEditing);
80 80
81 document().markers()->copyMarkers(m_text1.get(), 0, prefixText.length(), m_t ext2.get(), 0); 81 document().markers().copyMarkers(m_text1.get(), 0, prefixText.length(), m_te xt2.get(), 0);
82 m_text1->remove(ASSERT_NO_EXCEPTION); 82 m_text1->remove(ASSERT_NO_EXCEPTION);
83 } 83 }
84 84
85 void SplitTextNodeCommand::doReapply() 85 void SplitTextNodeCommand::doReapply()
86 { 86 {
87 if (!m_text1 || !m_text2) 87 if (!m_text1 || !m_text2)
88 return; 88 return;
89 89
90 ContainerNode* parent = m_text2->parentNode(); 90 ContainerNode* parent = m_text2->parentNode();
91 if (!parent || !parent->rendererIsEditable()) 91 if (!parent || !parent->rendererIsEditable())
92 return; 92 return;
93 93
94 insertText1AndTrimText2(); 94 insertText1AndTrimText2();
95 } 95 }
96 96
97 void SplitTextNodeCommand::insertText1AndTrimText2() 97 void SplitTextNodeCommand::insertText1AndTrimText2()
98 { 98 {
99 TrackExceptionState exceptionState; 99 TrackExceptionState exceptionState;
100 m_text2->parentNode()->insertBefore(m_text1.get(), m_text2.get(), exceptionS tate); 100 m_text2->parentNode()->insertBefore(m_text1.get(), m_text2.get(), exceptionS tate);
101 if (exceptionState.hadException()) 101 if (exceptionState.hadException())
102 return; 102 return;
103 m_text2->deleteData(0, m_offset, exceptionState, CharacterData::DeprecatedRe calcStyleImmediatlelyForEditing); 103 m_text2->deleteData(0, m_offset, exceptionState, CharacterData::DeprecatedRe calcStyleImmediatlelyForEditing);
104 } 104 }
105 105
106 } // namespace WebCore 106 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/SpellChecker.cpp ('k') | Source/core/editing/TextCheckingHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698