Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(717)

Unified Diff: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp

Issue 2908643002: [DMC #23] Add CompositionMarker (subclass of DocumentMarker) (Closed)
Patch Set: Attempt to fix Android build by using EXPECT_FALSE() Created 3 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 | « third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
index 0e103ea3110c774d7268597ed85d86c1d37446be..17249ed37e86c7bbcef00f726bac08e932e87b9e 100644
--- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
@@ -6,6 +6,7 @@
#include "core/editing/CompositionUnderline.h"
#include "core/editing/Editor.h"
+#include "core/editing/markers/CompositionMarker.h"
#include "core/editing/markers/DocumentMarkerController.h"
#include "core/editing/markers/TextMatchMarker.h"
#include "core/frame/LocalFrame.h"
@@ -676,9 +677,12 @@ void InlineTextBoxPainter::PaintDocumentMarkers(
}
break;
case DocumentMarker::kComposition: {
- CompositionUnderline underline(marker.StartOffset(), marker.EndOffset(),
- marker.UnderlineColor(), marker.Thick(),
- marker.BackgroundColor());
+ const CompositionMarker& composition_marker =
+ ToCompositionMarker(marker);
+ CompositionUnderline underline(
+ composition_marker.StartOffset(), composition_marker.EndOffset(),
+ composition_marker.UnderlineColor(), composition_marker.Thick(),
+ composition_marker.BackgroundColor());
if (marker_paint_phase == DocumentMarkerPaintPhase::kBackground)
PaintSingleCompositionBackgroundRun(
paint_info.context, box_origin, style, font,
« no previous file with comments | « third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698