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

Unified Diff: ui/gfx/render_text.cc

Issue 1634103003: Fix gfx::Canvas::DrawStringRectWithHalo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 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: ui/gfx/render_text.cc
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index f2f691ee9e283f214f5606dc22edb72a7ecd425d..ff0de8a91607e43c872a0a07e10ab2ef1e3dd533 100644
--- a/ui/gfx/render_text.cc
+++ b/ui/gfx/render_text.cc
@@ -22,6 +22,7 @@
#include "third_party/skia/include/core/SkDrawLooper.h"
#include "third_party/skia/include/core/SkTypeface.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
+#include "third_party/skia/include/effects/SkMorphologyImageFilter.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/safe_integer_conversions.h"
@@ -255,6 +256,10 @@ void SkiaTextRenderer::SetShader(sk_sp<SkShader> shader) {
paint_.setShader(std::move(shader));
}
+void SkiaTextRenderer::SetHaloEffect() {
+ paint_.setImageFilter(SkDilateImageFilter::Make(1, 1, nullptr));
+}
+
void SkiaTextRenderer::SetUnderlineMetrics(SkScalar thickness,
SkScalar position) {
underline_thickness_ = thickness;
@@ -830,6 +835,8 @@ void RenderText::Draw(Canvas* canvas) {
if (!text().empty()) {
internal::SkiaTextRenderer renderer(canvas);
+ if (halo_effect())
+ renderer.SetHaloEffect();
DrawVisualText(&renderer);
}

Powered by Google App Engine
This is Rietveld 408576698