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

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

Issue 424493003: Use tighter typing in editing: CompositeEditCommand (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2005 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 18 matching lines...) Expand all
29 #include "core/HTMLNames.h" 29 #include "core/HTMLNames.h"
30 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
31 #include "core/dom/Element.h" 31 #include "core/dom/Element.h"
32 #include "core/dom/NodeTraversal.h" 32 #include "core/dom/NodeTraversal.h"
33 #include "core/dom/Text.h" 33 #include "core/dom/Text.h"
34 #include "core/editing/EditingBoundary.h" 34 #include "core/editing/EditingBoundary.h"
35 #include "core/editing/Editor.h" 35 #include "core/editing/Editor.h"
36 #include "core/editing/VisibleUnits.h" 36 #include "core/editing/VisibleUnits.h"
37 #include "core/editing/htmlediting.h" 37 #include "core/editing/htmlediting.h"
38 #include "core/frame/LocalFrame.h" 38 #include "core/frame/LocalFrame.h"
39 #include "core/html/HTMLBRElement.h"
39 #include "core/html/HTMLInputElement.h" 40 #include "core/html/HTMLInputElement.h"
40 #include "core/rendering/RenderTableCell.h" 41 #include "core/rendering/RenderTableCell.h"
41 42
42 namespace blink { 43 namespace blink {
43 44
44 using namespace HTMLNames; 45 using namespace HTMLNames;
45 46
46 static bool isTableCellEmpty(Node* cell) 47 static bool isTableCellEmpty(Node* cell)
47 { 48 {
48 ASSERT(isTableCell(cell)); 49 ASSERT(isTableCell(cell));
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 830
830 removePreviouslySelectedEmptyTableRows(); 831 removePreviouslySelectedEmptyTableRows();
831 832
832 if (!m_needPlaceholder && rootWillStayOpenWithoutPlaceholder) { 833 if (!m_needPlaceholder && rootWillStayOpenWithoutPlaceholder) {
833 VisiblePosition visualEnding(m_endingPosition); 834 VisiblePosition visualEnding(m_endingPosition);
834 bool hasPlaceholder = lineBreakExistsAtVisiblePosition(visualEnding) 835 bool hasPlaceholder = lineBreakExistsAtVisiblePosition(visualEnding)
835 && visualEnding.next(CannotCrossEditingBoundary).isNull(); 836 && visualEnding.next(CannotCrossEditingBoundary).isNull();
836 m_needPlaceholder = hasPlaceholder && lineBreakBeforeStart && !lineBreak AtEndOfSelectionToDelete; 837 m_needPlaceholder = hasPlaceholder && lineBreakBeforeStart && !lineBreak AtEndOfSelectionToDelete;
837 } 838 }
838 839
839 RefPtrWillBeRawPtr<Node> placeholder = m_needPlaceholder ? createBreakElemen t(document()) : nullptr; 840 RefPtrWillBeRawPtr<HTMLBRElement> placeholder = m_needPlaceholder ? createBr eakElement(document()) : nullptr;
840 841
841 if (placeholder) { 842 if (placeholder) {
842 if (m_sanitizeMarkup) 843 if (m_sanitizeMarkup)
843 removeRedundantBlocks(); 844 removeRedundantBlocks();
844 insertNodeAt(placeholder.get(), m_endingPosition); 845 insertNodeAt(placeholder.get(), m_endingPosition);
845 } 846 }
846 847
847 rebalanceWhitespaceAt(m_endingPosition); 848 rebalanceWhitespaceAt(m_endingPosition);
848 849
849 calculateTypingStyleAfterDelete(); 850 calculateTypingStyleAfterDelete();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 visitor->trace(m_deleteIntoBlockquoteStyle); 885 visitor->trace(m_deleteIntoBlockquoteStyle);
885 visitor->trace(m_startRoot); 886 visitor->trace(m_startRoot);
886 visitor->trace(m_endRoot); 887 visitor->trace(m_endRoot);
887 visitor->trace(m_startTableRow); 888 visitor->trace(m_startTableRow);
888 visitor->trace(m_endTableRow); 889 visitor->trace(m_endTableRow);
889 visitor->trace(m_temporaryPlaceholder); 890 visitor->trace(m_temporaryPlaceholder);
890 CompositeEditCommand::trace(visitor); 891 CompositeEditCommand::trace(visitor);
891 } 892 }
892 893
893 } // namespace blink 894 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/CompositeEditCommand.cpp ('k') | Source/core/editing/FormatBlockCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698