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

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

Issue 14519003: Absolutify paths to dom/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix testrunner Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/SetSelectionCommand.cpp ('k') | Source/core/editing/SpellChecker.h » ('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) 2012 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Computer, 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/editing/SimplifyMarkupCommand.h" 27 #include "core/editing/SimplifyMarkupCommand.h"
28 28
29 #include "NodeRenderStyle.h" 29 #include "core/dom/NodeRenderStyle.h"
30 #include "NodeTraversal.h" 30 #include "core/dom/NodeTraversal.h"
31 #include "core/rendering/RenderInline.h" 31 #include "core/rendering/RenderInline.h"
32 #include "core/rendering/RenderObject.h" 32 #include "core/rendering/RenderObject.h"
33 #include "core/rendering/style/RenderStyle.h" 33 #include "core/rendering/style/RenderStyle.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 SimplifyMarkupCommand::SimplifyMarkupCommand(Document* document, Node* firstNode , Node* nodeAfterLast) 37 SimplifyMarkupCommand::SimplifyMarkupCommand(Document* document, Node* firstNode , Node* nodeAfterLast)
38 : CompositeEditCommand(document), m_firstNode(firstNode), m_nodeAfterLast(no deAfterLast) 38 : CompositeEditCommand(document), m_firstNode(firstNode), m_nodeAfterLast(no deAfterLast)
39 { 39 {
40 } 40 }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 return 0; 114 return 0;
115 115
116 removeNode(nodesToRemove[startNodeIndex], AssumeContentIsAlwaysEditable); 116 removeNode(nodesToRemove[startNodeIndex], AssumeContentIsAlwaysEditable);
117 insertNodeBefore(nodesToRemove[startNodeIndex], highestAncestorToRemove, Ass umeContentIsAlwaysEditable); 117 insertNodeBefore(nodesToRemove[startNodeIndex], highestAncestorToRemove, Ass umeContentIsAlwaysEditable);
118 removeNode(highestAncestorToRemove, AssumeContentIsAlwaysEditable); 118 removeNode(highestAncestorToRemove, AssumeContentIsAlwaysEditable);
119 119
120 return pastLastNodeToRemove - startNodeIndex - 1; 120 return pastLastNodeToRemove - startNodeIndex - 1;
121 } 121 }
122 122
123 } // namespace WebCore 123 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/SetSelectionCommand.cpp ('k') | Source/core/editing/SpellChecker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698