summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering/InlineTextBox.cpp
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-02-23 13:57:14 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-23 13:57:14 -0800
commit4a5f33e5a7028a2f5ac38cb47533d5470755ec21 (patch)
treead06a0de7a8397e25cc54637c646cd6869463e74 /Source/WebCore/rendering/InlineTextBox.cpp
parent49be9fd5f37bd2633874b9b4236d965933ab24cb (diff)
parente52b702893ce72ec42d7bf62c4975b4ef61067d2 (diff)
downloadexternal_webkit-4a5f33e5a7028a2f5ac38cb47533d5470755ec21.zip
external_webkit-4a5f33e5a7028a2f5ac38cb47533d5470755ec21.tar.gz
external_webkit-4a5f33e5a7028a2f5ac38cb47533d5470755ec21.tar.bz2
Merge "draw inactive find-on-page matches as outlines"
Diffstat (limited to 'Source/WebCore/rendering/InlineTextBox.cpp')
-rw-r--r--Source/WebCore/rendering/InlineTextBox.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
index e8a9c7f..d5eeeae 100644
--- a/Source/WebCore/rendering/InlineTextBox.cpp
+++ b/Source/WebCore/rendering/InlineTextBox.cpp
@@ -1070,8 +1070,12 @@ void InlineTextBox::paintTextMatchMarker(GraphicsContext* pt, const FloatPoint&
renderer()->theme()->platformInactiveTextSearchHighlightColor();
pt->save();
updateGraphicsContext(pt, color, color, 0, style->colorSpace()); // Don't draw text at all!
+#if PLATFORM(ANDROID)
+ pt->drawHighlightForText(font, run, FloatPoint(boxOrigin.x(), boxOrigin.y() - deltaY), selHeight, color, style->colorSpace(), sPos, ePos, marker.activeMatch);
+#else
pt->clip(FloatRect(boxOrigin.x(), boxOrigin.y() - deltaY, m_logicalWidth, selHeight));
pt->drawHighlightForText(font, run, FloatPoint(boxOrigin.x(), boxOrigin.y() - deltaY), selHeight, color, style->colorSpace(), sPos, ePos);
+#endif
pt->restore();
}
}