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

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

Issue 2909553002: [DMC #20] Remove DocumentMarker::IsActiveMatch() and SetIsActiveMatch() methods (Closed)
Patch Set: Rebase 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
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 2e4a3b60265dfc4c9c2035f08501a625fb8ba4c3..d49f3e1de7497c086dcdd3b734b068756bc80478 100644
--- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
@@ -7,6 +7,7 @@
#include "core/editing/CompositionUnderline.h"
#include "core/editing/Editor.h"
#include "core/editing/markers/DocumentMarkerController.h"
+#include "core/editing/markers/TextMatchMarker.h"
#include "core/frame/LocalFrame.h"
#include "core/layout/LayoutTextCombine.h"
#include "core/layout/LayoutTheme.h"
@@ -677,12 +678,13 @@ void InlineTextBoxPainter::PaintDocumentMarkers(
marker, style, font, true);
break;
case DocumentMarker::kTextMatch:
- if (marker_paint_phase == DocumentMarkerPaintPhase::kBackground)
+ if (marker_paint_phase == DocumentMarkerPaintPhase::kBackground) {
inline_text_box_.PaintTextMatchMarkerBackground(
- paint_info, box_origin, marker, style, font);
- else
+ paint_info, box_origin, ToTextMatchMarker(marker), style, font);
+ } else {
inline_text_box_.PaintTextMatchMarkerForeground(
- paint_info, box_origin, marker, style, font);
+ paint_info, box_origin, ToTextMatchMarker(marker), style, font);
+ }
break;
case DocumentMarker::kComposition: {
CompositionUnderline underline(marker.StartOffset(), marker.EndOffset(),
@@ -1120,7 +1122,7 @@ void InlineTextBoxPainter::PaintCompositionUnderline(
void InlineTextBoxPainter::PaintTextMatchMarkerForeground(
const PaintInfo& paint_info,
const LayoutPoint& box_origin,
- const DocumentMarker& marker,
+ const TextMatchMarker& marker,
const ComputedStyle& style,
const Font& font) {
if (!InlineLayoutObject()
@@ -1162,7 +1164,7 @@ void InlineTextBoxPainter::PaintTextMatchMarkerForeground(
void InlineTextBoxPainter::PaintTextMatchMarkerBackground(
const PaintInfo& paint_info,
const LayoutPoint& box_origin,
- const DocumentMarker& marker,
+ const TextMatchMarker& marker,
const ComputedStyle& style,
const Font& font) {
if (!LineLayoutAPIShim::LayoutObjectFrom(inline_text_box_.GetLineLayoutItem())

Powered by Google App Engine
This is Rietveld 408576698