Source/core/editing/markers/DocumentMarkerController.h - Issue 1325563002: Avoid style clobbering in setCompositionFromExistingText. (2nd land)

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/markers/DocumentMarkerController.h

Issue 1325563002: Avoid style clobbering in setCompositionFromExistingText. (2nd land) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add new DocumentMarkerController test Created 5 years, 3 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

« Source/core/editing/markers/DocumentMarker.cpp ('K') | « Source/core/editing/markers/DocumentMarker.cpp ('k') | Source/core/editing/markers/DocumentMarkerController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/editing/markers/DocumentMarkerController.h

diff --git a/Source/core/editing/markers/DocumentMarkerController.h b/Source/core/editing/markers/DocumentMarkerController.h

index b30e40571f46c2837a8ae89df2c9a707884088a3..6851ce42a40b28451bc519862e3400d272d02845 100644

--- a/Source/core/editing/markers/DocumentMarkerController.h

+++ b/Source/core/editing/markers/DocumentMarkerController.h

@@ -63,6 +63,7 @@ public:

void clear();

void addMarker(const Position& start, const Position& end, DocumentMarker::MarkerType, const String& description = emptyString(), uint32_t hash = 0);

void addTextMatchMarker(const Range*, bool activeMatch);

+ void addCompositionMarker(const Position& start, const Position& end, Color underlineColor, bool thick, Color backgroundColor);

void copyMarkers(Node* srcNode, unsigned startOffset, int length, Node* dstNode, int delta);