third_party/WebKit/Source/core/editing/VisibleSelection.cpp - Issue 1412713003: Reland 'Use FrameSelection::selectedText where possible.'

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: third_party/WebKit/Source/core/editing/VisibleSelection.cpp

Issue 1412713003: Reland 'Use FrameSelection::selectedText where possible.' Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use SelectionEditor::setWithoutValidation. Created 5 years, 2 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:

Index: third_party/WebKit/Source/core/editing/VisibleSelection.cpp

diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp

index 504a98c688b2619cf98ea95c0e05b7768545a06e..3369e7f6598644c725faf02d4648c0335f38697b 100644

--- a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp

+++ b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp

@@ -650,8 +650,11 @@ bool VisibleSelectionTemplate<Strategy>::isValidFor(const Document& document) co

template <typename Strategy>

void VisibleSelectionTemplate<Strategy>::setWithoutValidation(const PositionTemplate<Strategy>& base, const PositionTemplate<Strategy>& extent)

{

- ASSERT(!base.isNull());

- ASSERT(!extent.isNull());

+ if (base.isNull() || extent.isNull()) {

+ m_base = m_extent = m_start = m_end = PositionTemplate<Strategy>();

+ updateSelectionType();

+ return;

+ }

// TODO(hajimehoshi): We doubt this assertion is needed. This was introduced

// by http://trac.webkit.org/browser/trunk/WebCore/editing/Selection.cpp?annotate=blame&rev=21071