Source/core/editing/DeleteSelectionCommand.cpp - Issue 14945006: Revert "Avoid adding placeholder when deleting last text in root"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/editing/DeleteSelectionCommand.cpp

Issue 14945006: Revert "Avoid adding placeholder when deleting last text in root" (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: (second upload attempt) Created 7 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/platform/chromium-win/fast/forms/textarea-placeholder-visibility-1-expected.txt ('k') | Source/core/html/HTMLInputElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/editing/DeleteSelectionCommand.cpp

diff --git a/Source/core/editing/DeleteSelectionCommand.cpp b/Source/core/editing/DeleteSelectionCommand.cpp

index fa303858b9b3b910e1f84db6ea3b8ca81a70a27e..868e60ab2be2dd28f78665b3d234ddd0f667b503 100644

--- a/Source/core/editing/DeleteSelectionCommand.cpp

+++ b/Source/core/editing/DeleteSelectionCommand.cpp

@@ -766,12 +766,9 @@ void DeleteSelectionCommand::doApply()

EAffinity affinity = m_selectionToDelete.affinity();

Position downstreamEnd = m_selectionToDelete.end().downstream();

- bool rootWillStayOpenWithoutPlaceholder = downstreamEnd.containerNode() == downstreamEnd.containerNode()->rootEditableElement()

- || (downstreamEnd.containerNode()->isTextNode() && downstreamEnd.containerNode()->parentNode() == downstreamEnd.containerNode()->rootEditableElement());

- m_needPlaceholder = !rootWillStayOpenWithoutPlaceholder

- && isStartOfParagraph(m_selectionToDelete.visibleStart(), CanCrossEditingBoundary)

- && isEndOfParagraph(m_selectionToDelete.visibleEnd(), CanCrossEditingBoundary)

- && !lineBreakExistsAtVisiblePosition(m_selectionToDelete.visibleEnd());

+ m_needPlaceholder = isStartOfParagraph(m_selectionToDelete.visibleStart(), CanCrossEditingBoundary)

+ && isEndOfParagraph(m_selectionToDelete.visibleEnd(), CanCrossEditingBoundary)

+ && !lineBreakExistsAtVisiblePosition(m_selectionToDelete.visibleEnd());

if (m_needPlaceholder) {

// Don't need a placeholder when deleting a selection that starts just before a table

// and ends inside it (we do need placeholders to hold open empty cells, but that's