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

Side by Side Diff: Source/core/editing/ReplaceSelectionCommand.h

Issue 149213006: Replace ASSERT by null-check in InsertedNodes::lastLeafInserted() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add layout test Created 6 years, 10 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, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 virtual EditAction editingAction() const OVERRIDE; 59 virtual EditAction editingAction() const OVERRIDE;
60 60
61 class InsertedNodes { 61 class InsertedNodes {
62 public: 62 public:
63 void respondToNodeInsertion(Node&); 63 void respondToNodeInsertion(Node&);
64 void willRemoveNodePreservingChildren(Node&); 64 void willRemoveNodePreservingChildren(Node&);
65 void willRemoveNode(Node&); 65 void willRemoveNode(Node&);
66 void didReplaceNode(Node&, Node& newNode); 66 void didReplaceNode(Node&, Node& newNode);
67 67
68 Node* firstNodeInserted() const { return m_firstNodeInserted.get(); } 68 Node* firstNodeInserted() const { return m_firstNodeInserted.get(); }
69 Node& lastLeafInserted() const { ASSERT(m_lastNodeInserted); return m_la stNodeInserted->lastDescendant(); } 69 Node* lastLeafInserted() const { return m_lastNodeInserted ? &m_lastNode Inserted->lastDescendant() : 0; }
70 Node* pastLastLeaf() const { return m_lastNodeInserted ? NodeTraversal:: next(lastLeafInserted()) : 0; } 70 Node* pastLastLeaf() const { return m_lastNodeInserted ? NodeTraversal:: next(*lastLeafInserted()) : 0; }
71 71
72 private: 72 private:
73 RefPtr<Node> m_firstNodeInserted; 73 RefPtr<Node> m_firstNodeInserted;
74 RefPtr<Node> m_lastNodeInserted; 74 RefPtr<Node> m_lastNodeInserted;
75 }; 75 };
76 76
77 Node* insertAsListItems(PassRefPtr<HTMLElement> listElement, Node* insertion Node, const Position&, InsertedNodes&); 77 Node* insertAsListItems(PassRefPtr<HTMLElement> listElement, Node* insertion Node, const Position&, InsertedNodes&);
78 78
79 void updateNodesInserted(Node*); 79 void updateNodesInserted(Node*);
80 bool shouldRemoveEndBR(Node*, const VisiblePosition&); 80 bool shouldRemoveEndBR(Node*, const VisiblePosition&);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 bool m_preventNesting; 112 bool m_preventNesting;
113 bool m_movingParagraph; 113 bool m_movingParagraph;
114 EditAction m_editAction; 114 EditAction m_editAction;
115 bool m_sanitizeFragment; 115 bool m_sanitizeFragment;
116 bool m_shouldMergeEnd; 116 bool m_shouldMergeEnd;
117 }; 117 };
118 118
119 } // namespace WebCore 119 } // namespace WebCore
120 120
121 #endif // ReplaceSelectionCommand_h 121 #endif // ReplaceSelectionCommand_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698