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

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

Patch Set: Reimplement setSelectionInTextFormControl: use setSelection. 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:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/editing/FrameSelection.cpp ('K') | « third_party/WebKit/Source/core/editing/VisibleSelection.cpp ('k') | third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

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

index 68ff853e28e8592669a25d85eacdc8cdfa908369..178eea8f5e3012359a27b5910482290aa3a8f644 100644

--- a/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

+++ b/third_party/WebKit/Source/core/editing/serializers/Serialization.cpp

@@ -243,8 +243,9 @@ template <typename Strategy>

String CreateMarkupAlgorithm<Strategy>::createMarkup(const PositionTemplate<Strategy>& startPosition, const PositionTemplate<Strategy>& endPosition,

EAnnotateForInterchange shouldAnnotate, ConvertBlocksToInlines convertBlocksToInlines, EAbsoluteURLs shouldResolveURLs, Node* constrainingAncestor)

{

- ASSERT(startPosition.isNotNull());

- ASSERT(endPosition.isNotNull());

+ if (startPosition.isNull() || endPosition.isNull())

+ return emptyString();

ASSERT(startPosition.compareTo(endPosition) <= 0);

bool collapsed = startPosition == endPosition;

@@ -264,13 +265,11 @@ String CreateMarkupAlgorithm<Strategy>::createMarkup(const PositionTemplate<Stra

String createMarkup(const Position& startPosition, const Position& endPosition, EAnnotateForInterchange shouldAnnotate, ConvertBlocksToInlines convertBlocksToInlines, EAbsoluteURLs shouldResolveURLs, Node* constrainingAncestor)

{

- ASSERT(startPosition.compareTo(endPosition) <= 0);

return CreateMarkupAlgorithm<EditingStrategy>::createMarkup(startPosition, endPosition, shouldAnnotate, convertBlocksToInlines, shouldResolveURLs, constrainingAncestor);

}

String createMarkup(const PositionInComposedTree& startPosition, const PositionInComposedTree& endPosition, EAnnotateForInterchange shouldAnnotate, ConvertBlocksToInlines convertBlocksToInlines, EAbsoluteURLs shouldResolveURLs, Node* constrainingAncestor)

{

- ASSERT(startPosition.compareTo(endPosition) <= 0);

return CreateMarkupAlgorithm<EditingInComposedTreeStrategy>::createMarkup(startPosition, endPosition, shouldAnnotate, convertBlocksToInlines, shouldResolveURLs, constrainingAncestor);

}