| Index: third_party/WebKit/Source/core/editing/markers/DocumentMarker.h
|
| diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h
|
| index 06f90d4a9d9b801d5c207d81a848d0a6d113e0ad..040b222040a87c29bd14f592b0b0fe1f7c018c22 100644
|
| --- a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h
|
| +++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h
|
| @@ -46,6 +46,7 @@ class CORE_EXPORT DocumentMarker : public GarbageCollected<DocumentMarker> {
|
| TextMatchMarkerIndex,
|
| InvisibleSpellcheckMarkerIndex,
|
| CompositionMarkerIndex,
|
| + PersistingCompositionMarkerIndex,
|
| MarkerTypeIndexesCount
|
| };
|
|
|
| @@ -55,6 +56,7 @@ class CORE_EXPORT DocumentMarker : public GarbageCollected<DocumentMarker> {
|
| TextMatch = 1 << TextMatchMarkerIndex,
|
| InvisibleSpellcheck = 1 << InvisibleSpellcheckMarkerIndex,
|
| Composition = 1 << CompositionMarkerIndex,
|
| + PersistingComposition = 1 << PersistingCompositionMarkerIndex,
|
| };
|
|
|
| class MarkerTypes {
|
| @@ -82,7 +84,8 @@ class CORE_EXPORT DocumentMarker : public GarbageCollected<DocumentMarker> {
|
| public:
|
| AllMarkers()
|
| : MarkerTypes(Spelling | Grammar | TextMatch | InvisibleSpellcheck |
|
| - Composition) {}
|
| + Composition |
|
| + PersistingComposition) {}
|
| };
|
|
|
| class MisspellingMarkers : public MarkerTypes {
|
| @@ -106,7 +109,8 @@ class CORE_EXPORT DocumentMarker : public GarbageCollected<DocumentMarker> {
|
| unsigned endOffset,
|
| Color underlineColor,
|
| bool thick,
|
| - Color backgroundColor);
|
| + Color backgroundColor,
|
| + bool persist);
|
|
|
| DocumentMarker(const DocumentMarker&);
|
|
|
|
|