Find In Page hides the text when text color matches text search hightlight color.

third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp

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 bac8976e35ac6e246d80beb64a79d6c2c440115b..2ede1eb4846af46abd2eb51ba5b218bda22bb46a 100644
--- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -65,11 +65,15 @@ void SVGInlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin
         // TODO(chrishtr): passing the cull rect is incorrect.
         DrawingRecorder recorder(paintInfo.context, m_svgInlineTextBox, displayItemType, FloatRect(paintInfo.cullRect().m_rect));
         InlineTextBoxPainter(m_svgInlineTextBox).paintDocumentMarkers(
-            paintInfo.context, paintOffset, style,
+            paintInfo, paintOffset, style,
             textLayoutObject.scaledFont(), true);
 
         if (!m_svgInlineTextBox.textFragments().isEmpty())
             paintTextFragments(paintInfo, parentLayoutObject);
+
+        InlineTextBoxPainter(m_svgInlineTextBox).paintDocumentMarkers(
+            paintInfo, paintOffset, style,
+            textLayoutObject.scaledFont(), false);

[fs, 2015/12/17 10:10:55]

Maybe we should change this 'background' bool to an enum { MarkerForeground,
MarkerBackground } or some such. I guess we can punt on that though.

[ramya.v, 2015/12/18 03:43:33]

Done.

     }
 }
 
@@ -169,17 +173,12 @@ void SVGInlineTextBoxPainter::paintSelectionBackground(const PaintInfo& paintInf
     int startPosition, endPosition;
     m_svgInlineTextBox.selectionStartEnd(startPosition, endPosition);
 
-    int fragmentStartPosition = 0;
-    int fragmentEndPosition = 0;
     AffineTransform fragmentTransform;
-    unsigned textFragmentsSize = m_svgInlineTextBox.textFragments().size();
+    Vector<SVGTextFragmentWithRange> fragmentInfoList = collectFragments(startPosition, endPosition);
+    unsigned textFragmentsSize = fragmentInfoList.size();
     for (unsigned i = 0; i < textFragmentsSize; ++i) {

[fs, 2015/12/17 10:10:55]

Using a range-based loop here would be an improvement:

for (const SVGTextFragmentWithRange& fragmentWithRange : fragmentInfoList)

[ramya.v, 2015/12/18 03:43:32]

Done.

-        const SVGTextFragment& fragment = m_svgInlineTextBox.textFragments().at(i);
-
-        fragmentStartPosition = startPosition;
-        fragmentEndPosition = endPosition;
-        if (!m_svgInlineTextBox.mapStartEndPositionsIntoFragmentCoordinates(fragment, fragmentStartPosition, fragmentEndPosition))
-            continue;
+        SVGTextFragmentWithRange& fragmentInfo = fragmentInfoList.at(i);
+        const SVGTextFragment& fragment = *(fragmentInfo.fragment);
 
         GraphicsContextStateSaver stateSaver(paintInfo.context);
         fragment.buildFragmentTransform(fragmentTransform);
@@ -187,7 +186,7 @@ void SVGInlineTextBoxPainter::paintSelectionBackground(const PaintInfo& paintInf
             paintInfo.context.concatCTM(fragmentTransform);
 
         paintInfo.context.setFillColor(backgroundColor);
-        paintInfo.context.fillRect(m_svgInlineTextBox.selectionRectForTextFragment(fragment, fragmentStartPosition, fragmentEndPosition, style), backgroundColor);
+        paintInfo.context.fillRect(m_svgInlineTextBox.selectionRectForTextFragment(fragment, fragmentInfo.fragmentStartPosition, fragmentInfo.fragmentEndPosition, style), backgroundColor);
     }
 }
 
@@ -401,15 +400,19 @@ void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, const Comput
         paintTextWithShadows(paintInfo, style, textRun, fragment, endPosition, fragment.length, resourceMode);
 }
 
-void SVGInlineTextBoxPainter::paintTextMatchMarker(GraphicsContext& context, const LayoutPoint&, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
+Vector<SVGTextFragmentWithRange> SVGInlineTextBoxPainter::collectTextMatches(const PaintInfo& paintInfo, DocumentMarker* marker)
 {
-    // SVG is only interested in the TextMatch markers.
+    Vector<SVGTextFragmentWithRange> textMatchInfoList;
+
+    // SVG does not support grammar or spellcheck markers, so skip anything but TextMatch.
     if (marker->type() != DocumentMarker::TextMatch)
-        return;
+        return textMatchInfoList;
+
+    if (!LineLayoutPaintShim::layoutObjectFrom(m_svgInlineTextBox.lineLayoutItem())->frame()->editor().markedTextMatchesAreHighlighted())
+        return textMatchInfoList;
 
     LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(*LineLayoutPaintShim::layoutObjectFrom(m_svgInlineTextBox.lineLayoutItem()));
 
-    AffineTransform fragmentTransform;
     for (InlineTextBox* box = textLayoutObject.firstTextBox(); box; box = box->nextTextBox()) {

[fs, 2015/12/17 10:10:54]

I still don't think this additional nesting is needed.

Actually, the way the code is written right now it essentially depends on not
really doing anything for any other inline-box (collectFragments operate on
m_svgInlineTextBox and not the box that's iterated here.)

[ramya.v, 2015/12/18 03:43:32]

Done.

         if (!box->isSVGInlineTextBox())
             continue;
@@ -422,32 +425,87 @@ void SVGInlineTextBoxPainter::paintTextMatchMarker(GraphicsContext& context, con
         if (markerStartPosition >= markerEndPosition)
             continue;
 
-        const Vector<SVGTextFragment>& fragments = textBox->textFragments();
-        unsigned textFragmentsSize = fragments.size();
+        Vector<SVGTextFragmentWithRange> fragmentList = collectFragments(markerStartPosition, markerEndPosition);
+        unsigned textFragmentsSize = fragmentList.size();
         for (unsigned i = 0; i < textFragmentsSize; ++i) {
-            const SVGTextFragment& fragment = fragments.at(i);
-
-            int fragmentStartPosition = markerStartPosition;
-            int fragmentEndPosition = markerEndPosition;
-            if (!textBox->mapStartEndPositionsIntoFragmentCoordinates(fragment, fragmentStartPosition, fragmentEndPosition))
-                continue;
-
-            FloatRect fragmentRect = textBox->selectionRectForTextFragment(fragment, fragmentStartPosition, fragmentEndPosition, style);
-            fragment.buildFragmentTransform(fragmentTransform);
-
-            // Draw the marker highlight.
-            if (LineLayoutPaintShim::layoutObjectFrom(m_svgInlineTextBox.lineLayoutItem())->frame()->editor().markedTextMatchesAreHighlighted()) {
-                Color color = marker->activeMatch() ?
-                    LayoutTheme::theme().platformActiveTextSearchHighlightColor() :
-                    LayoutTheme::theme().platformInactiveTextSearchHighlightColor();
-                GraphicsContextStateSaver stateSaver(context);
-                if (!fragmentTransform.isIdentity())
-                    context.concatCTM(fragmentTransform);
-                context.setFillColor(color);
-                context.fillRect(fragmentRect, color);
-            }
+            textMatchInfoList.append(fragmentList.at(i));

[fs, 2015/12/17 10:10:55]

Use appendVector or appendRange instead. Per above it shouldn't be needed
though.

[ramya.v, 2015/12/18 03:43:32]

Done.

         }
     }
+    return textMatchInfoList;
+}
+
+Vector<SVGTextFragmentWithRange> SVGInlineTextBoxPainter::collectFragments(int startPosition, int endPosition)

[fs, 2015/12/17 10:10:54]

collectFragmentsInRange or something more narrow like that seems more
appropriate.

That being said though, I'm a bit irked by the potential for allocator churn
here (especially for the <textPath> case where there'll potentially be lots of
fragments.) I guess we can wish for few fragments for now though...

Could probably use a "functional" iteration style, but let's go with this for
now.

[ramya.v, 2015/12/18 03:43:33]

Done.

+{
+    Vector<SVGTextFragmentWithRange> fragmentInfoList;
+    const Vector<SVGTextFragment>& fragments = m_svgInlineTextBox.textFragments();
+    unsigned textFragmentsSize = fragments.size();
+    for (unsigned i = 0; i < textFragmentsSize; ++i) {

[fs, 2015/12/17 10:10:55]

Use a range-based for-loop.

[ramya.v, 2015/12/18 03:43:32]

Done.

+        const SVGTextFragment& fragment = fragments.at(i);
+
+        int fragmentStartPosition = startPosition;
+        int fragmentEndPosition = endPosition;
+        if (!m_svgInlineTextBox.mapStartEndPositionsIntoFragmentCoordinates(fragment, fragmentStartPosition, fragmentEndPosition))
+            continue;
+
+        SVGTextFragmentWithRange fragmentInfo;
+        fragmentInfo.fragment = &fragment;
+        fragmentInfo.fragmentStartPosition = fragmentStartPosition;
+        fragmentInfo.fragmentEndPosition = fragmentEndPosition;
+
+        fragmentInfoList.append(fragmentInfo);

[fs, 2015/12/17 10:10:55]

With a constructor for SVGTextFragmentWithRange, this would turn into:

fragmentInfoList.append(SVGTextFragmentWithRange(fragment, ..., ...));

[ramya.v, 2015/12/18 03:43:33]

Done.

+    }
+    return fragmentInfoList;
+}
+
+void SVGInlineTextBoxPainter::paintTextMatchMarkerForeground(const PaintInfo& paintInfo, const LayoutPoint& point, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
+{
+    Vector<SVGTextFragmentWithRange> textMatchInfoList = collectTextMatches(paintInfo, marker);
+    unsigned textFragmentsSize = textMatchInfoList.size();
+    if (textFragmentsSize == 0)
+        return;
+
+    Color textColor = marker->activeMatch() ?

[fs, 2015/12/17 10:10:55]

Same comment as for other instances of this.

[ramya.v, 2015/12/18 03:43:33]

Done.

+        LayoutTheme::theme().platformTextSearchColor(true) :
+        LayoutTheme::theme().platformTextSearchColor(false);
+
+    AffineTransform fragmentTransform;
+    for (unsigned i = 0; i < textFragmentsSize; ++i) {

[fs, 2015/12/17 10:10:55]

Use range-based for-loop.

[ramya.v, 2015/12/18 03:43:33]

Done.

+        SVGTextFragmentWithRange& textMatchInfo = textMatchInfoList.at(i);
+        const SVGTextFragment& fragment = *(textMatchInfo.fragment);
+        GraphicsContextStateSaver stateSaver(paintInfo.context);
+        fragment.buildFragmentTransform(fragmentTransform);
+        if (!fragmentTransform.isIdentity())
+            paintInfo.context.concatCTM(fragmentTransform);
+        RefPtr<ComputedStyle> markerStyle = ComputedStyle::clone(style);
+        markerStyle->setFillPaintColor(textColor);
+        TextRun textRun = m_svgInlineTextBox.constructTextRun(*markerStyle, fragment);
+        paintTextWithShadows(paintInfo, *markerStyle, textRun, fragment, textMatchInfo.fragmentStartPosition, textMatchInfo.fragmentEndPosition, ApplyToFillMode);
+    }
+}
+
+void SVGInlineTextBoxPainter::paintTextMatchMarkerBackground(const PaintInfo& paintInfo, const LayoutPoint& point, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
+{
+    Vector<SVGTextFragmentWithRange> textMatchInfoList = collectTextMatches(paintInfo, marker);
+    unsigned textFragmentsSize = textMatchInfoList.size();
+    if (textFragmentsSize == 0)
+        return;
+
+    Color color = marker->activeMatch() ?

[fs, 2015/12/17 10:10:55]

Again.

[ramya.v, 2015/12/18 03:43:32]

Done.

+        LayoutTheme::theme().platformTextSearchHighlightColor(true) :
+        LayoutTheme::theme().platformTextSearchHighlightColor(false);
+
+    AffineTransform fragmentTransform;
+    for (unsigned i = 0; i < textFragmentsSize; ++i) {

[fs, 2015/12/17 10:10:54]

Use range-based for-loop.

[ramya.v, 2015/12/18 03:43:33]

Done.

+        SVGTextFragmentWithRange& textMatchInfo = textMatchInfoList.at(i);
+        const SVGTextFragment& fragment = *(textMatchInfo.fragment);
+        GraphicsContextStateSaver stateSaver(paintInfo.context);
+        fragment.buildFragmentTransform(fragmentTransform);
+        if (!fragmentTransform.isIdentity())
+            paintInfo.context.concatCTM(fragmentTransform);
+        FloatRect fragmentRect = m_svgInlineTextBox.selectionRectForTextFragment(fragment, textMatchInfo.fragmentStartPosition, textMatchInfo.fragmentEndPosition, style);
+        paintInfo.context.setFillColor(color);
+        paintInfo.context.fillRect(fragmentRect, color);
+    }
 }
 
 } // namespace blink