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

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

Issue 23819007: Have Node::document() return a reference instead of a pointer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 3 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
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 15 matching lines...) Expand all
26 #include "config.h" 26 #include "config.h"
27 #include "core/editing/RemoveNodeCommand.h" 27 #include "core/editing/RemoveNodeCommand.h"
28 28
29 #include "bindings/v8/ExceptionStatePlaceholder.h" 29 #include "bindings/v8/ExceptionStatePlaceholder.h"
30 #include "core/dom/Node.h" 30 #include "core/dom/Node.h"
31 #include "wtf/Assertions.h" 31 #include "wtf/Assertions.h"
32 32
33 namespace WebCore { 33 namespace WebCore {
34 34
35 RemoveNodeCommand::RemoveNodeCommand(PassRefPtr<Node> node, ShouldAssumeContentI sAlwaysEditable shouldAssumeContentIsAlwaysEditable) 35 RemoveNodeCommand::RemoveNodeCommand(PassRefPtr<Node> node, ShouldAssumeContentI sAlwaysEditable shouldAssumeContentIsAlwaysEditable)
36 : SimpleEditCommand(node->document()) 36 : SimpleEditCommand(&node->document())
37 , m_node(node) 37 , m_node(node)
38 , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable) 38 , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable)
39 { 39 {
40 ASSERT(m_node); 40 ASSERT(m_node);
41 ASSERT(m_node->parentNode()); 41 ASSERT(m_node->parentNode());
42 } 42 }
43 43
44 void RemoveNodeCommand::doApply() 44 void RemoveNodeCommand::doApply()
45 { 45 {
46 ContainerNode* parent = m_node->parentNode(); 46 ContainerNode* parent = m_node->parentNode();
(...skipping 21 matching lines...) Expand all
68 #ifndef NDEBUG 68 #ifndef NDEBUG
69 void RemoveNodeCommand::getNodesInCommand(HashSet<Node*>& nodes) 69 void RemoveNodeCommand::getNodesInCommand(HashSet<Node*>& nodes)
70 { 70 {
71 addNodeAndDescendants(m_parent.get(), nodes); 71 addNodeAndDescendants(m_parent.get(), nodes);
72 addNodeAndDescendants(m_refChild.get(), nodes); 72 addNodeAndDescendants(m_refChild.get(), nodes);
73 addNodeAndDescendants(m_node.get(), nodes); 73 addNodeAndDescendants(m_node.get(), nodes);
74 } 74 }
75 #endif 75 #endif
76 76
77 } 77 }
OLDNEW
« no previous file with comments | « Source/core/editing/MoveSelectionCommand.cpp ('k') | Source/core/editing/RemoveNodePreservingChildrenCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698