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

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

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 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/EditingStyle.cpp ('k') | Source/core/frame/FrameView.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) 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
(...skipping 12 matching lines...) Expand all
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 "core/dom/NodeComputedStyle.h" 29 #include "core/dom/NodeComputedStyle.h"
30 #include "core/dom/NodeTraversal.h" 30 #include "core/dom/NodeTraversal.h"
31 #include "core/layout/LayoutInline.h" 31 #include "core/layout/LayoutInline.h"
32 #include "core/layout/LayoutObject.h" 32 #include "core/layout/LayoutObject.h"
33 #include "core/layout/style/ComputedStyle.h" 33 #include "core/style/ComputedStyle.h"
34 34
35 namespace blink { 35 namespace blink {
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 }
41 41
42 void SimplifyMarkupCommand::doApply() 42 void SimplifyMarkupCommand::doApply()
43 { 43 {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 122 }
123 123
124 DEFINE_TRACE(SimplifyMarkupCommand) 124 DEFINE_TRACE(SimplifyMarkupCommand)
125 { 125 {
126 visitor->trace(m_firstNode); 126 visitor->trace(m_firstNode);
127 visitor->trace(m_nodeAfterLast); 127 visitor->trace(m_nodeAfterLast);
128 CompositeEditCommand::trace(visitor); 128 CompositeEditCommand::trace(visitor);
129 } 129 }
130 130
131 } // namespace blink 131 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698