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

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

Issue 2171493003: [Editing][DOM][CodeHealth] Make Node::hasEditableStyle global functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // and event handlers may break the document. We check the document state 57 // and event handlers may break the document. We check the document state
58 // here in order to prevent further processing in bad situation. 58 // here in order to prevent further processing in bad situation.
59 ABORT_EDITING_COMMAND_IF(!m_node->document().frame()); 59 ABORT_EDITING_COMMAND_IF(!m_node->document().frame());
60 ABORT_EDITING_COMMAND_IF(!m_node->document().documentElement()); 60 ABORT_EDITING_COMMAND_IF(!m_node->document().documentElement());
61 } 61 }
62 62
63 void RemoveNodeCommand::doUnapply() 63 void RemoveNodeCommand::doUnapply()
64 { 64 {
65 ContainerNode* parent = m_parent.release(); 65 ContainerNode* parent = m_parent.release();
66 Node* refChild = m_refChild.release(); 66 Node* refChild = m_refChild.release();
67 if (!parent || !parent->hasEditableStyle()) 67 if (!parent || !hasEditableStyle(*parent))
68 return; 68 return;
69 69
70 parent->insertBefore(m_node.get(), refChild, IGNORE_EXCEPTION); 70 parent->insertBefore(m_node.get(), refChild, IGNORE_EXCEPTION);
71 } 71 }
72 72
73 DEFINE_TRACE(RemoveNodeCommand) 73 DEFINE_TRACE(RemoveNodeCommand)
74 { 74 {
75 visitor->trace(m_node); 75 visitor->trace(m_node);
76 visitor->trace(m_parent); 76 visitor->trace(m_parent);
77 visitor->trace(m_refChild); 77 visitor->trace(m_refChild);
78 SimpleEditCommand::trace(visitor); 78 SimpleEditCommand::trace(visitor);
79 } 79 }
80 80
81 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698