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

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

Issue 2599483002: Extract helper function. (Closed)
Patch Set: Created 4 years 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/SVGInlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
index 212bf6e9e394b16ab3d42491b84a30eba39a6bfb..c0e66f75a44b9e36767476f313a1ec495f3e96d4 100644
--- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -539,21 +539,21 @@ void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo,
}
Vector<SVGTextFragmentWithRange> SVGInlineTextBoxPainter::collectTextMatches(
- DocumentMarker* marker) const {
+ const DocumentMarker& marker) const {
const Vector<SVGTextFragmentWithRange> emptyTextMatchList;
// SVG does not support grammar or spellcheck markers, so skip anything but
// TextMatch.
- if (marker->type() != DocumentMarker::TextMatch)
+ if (marker.type() != DocumentMarker::TextMatch)
return emptyTextMatchList;
if (!inlineLayoutObject().frame()->editor().markedTextMatchesAreHighlighted())
return emptyTextMatchList;
int markerStartPosition =
- std::max<int>(marker->startOffset() - m_svgInlineTextBox.start(), 0);
+ std::max<int>(marker.startOffset() - m_svgInlineTextBox.start(), 0);
int markerEndPosition =
- std::min<int>(marker->endOffset() - m_svgInlineTextBox.start(),
+ std::min<int>(marker.endOffset() - m_svgInlineTextBox.start(),
m_svgInlineTextBox.len());
if (markerStartPosition >= markerEndPosition)
@@ -584,7 +584,7 @@ SVGInlineTextBoxPainter::collectFragmentsInRange(int startPosition,
void SVGInlineTextBoxPainter::paintTextMatchMarkerForeground(
const PaintInfo& paintInfo,
const LayoutPoint& point,
- DocumentMarker* marker,
+ const DocumentMarker& marker,
const ComputedStyle& style,
const Font& font) {
const Vector<SVGTextFragmentWithRange> textMatchInfoList =
@@ -593,7 +593,7 @@ void SVGInlineTextBoxPainter::paintTextMatchMarkerForeground(
return;
Color textColor =
- LayoutTheme::theme().platformTextSearchColor(marker->activeMatch());
+ LayoutTheme::theme().platformTextSearchColor(marker.activeMatch());
SkPaint fillPaint;
fillPaint.setColor(textColor.rgb());
@@ -625,7 +625,7 @@ void SVGInlineTextBoxPainter::paintTextMatchMarkerForeground(
void SVGInlineTextBoxPainter::paintTextMatchMarkerBackground(
const PaintInfo& paintInfo,
const LayoutPoint& point,
- DocumentMarker* marker,
+ const DocumentMarker& marker,
const ComputedStyle& style,
const Font& font) {
const Vector<SVGTextFragmentWithRange> textMatchInfoList =
@@ -634,7 +634,7 @@ void SVGInlineTextBoxPainter::paintTextMatchMarkerBackground(
return;
Color color = LayoutTheme::theme().platformTextSearchHighlightColor(
- marker->activeMatch());
+ marker.activeMatch());
for (const SVGTextFragmentWithRange& textMatchInfo : textMatchInfoList) {
const SVGTextFragment& fragment = textMatchInfo.fragment;

Powered by Google App Engine
This is Rietveld 408576698