Remove deferred fade shader workaround from RenderText

ui/gfx/render_text.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/render_text.h"
 
 #include <algorithm>
 #include <climits>
 
 #include "base/command_line.h"
@@ skipping 198 matching lines @@
 
 void SkiaTextRenderer::SetDrawLooper(SkDrawLooper* draw_looper) {
   paint_.setLooper(draw_looper);
 }
 
 void SkiaTextRenderer::SetFontRenderParams(const FontRenderParams& params,
                                            bool background_is_transparent) {
   ApplyRenderParams(params, background_is_transparent, &paint_);
 }
 
+#if defined(OS_WIN)
+void SkiaTextRenderer::CorrectPaintFlags(bool background_is_transparent) {
+  paint_.setFlags(SkSetClearMask(paint_.getFlags(), background_is_transparent,

[msw, 2014/08/27 19:16:40]

Can you make this part of SetFontRenderParams?

+                                 SkPaint::kGenA8FromLCD_Flag));

[msw, 2014/08/27 19:16:40]

This is cited as a "hack for GDI -- do not use if you can help it" by
third_party/skia/include/core/SkFont.h. Put a comment here citing that we should
remove this hack when we switch to DirectWrite on Windows; but maybe we can't
actually remove it entirely until we drop support for Windows machines without
DirectWrite support (Win XP and maybe some Vista systems only have GDI, afaik).

+}
+#endif  // OS_WIN
+
 void SkiaTextRenderer::SetTypeface(SkTypeface* typeface) {
   paint_.setTypeface(typeface);
 }
 
 void SkiaTextRenderer::SetTextSize(SkScalar size) {
   paint_.setTextSize(size);
 }
 
 void SkiaTextRenderer::SetFontFamilyWithStyle(const std::string& family,
                                               int style) {
@@ skipping 23 matching lines @@
                                            SkScalar position) {
   underline_thickness_ = thickness;
   underline_position_ = position;
 }
 
 void SkiaTextRenderer::DrawPosText(const SkPoint* pos,
                                    const uint16* glyphs,
                                    size_t glyph_count) {
   if (!started_drawing_) {
     started_drawing_ = true;
     // Work-around for http://crbug.com/122743, where non-ClearType text is

[msw, 2014/08/27 19:16:40]

Can we remove this workaround given the changes in this CL?

     // rendered with incorrect gamma when using the fade shader. Draw the text
     // to a layer and restore it faded by drawing a rect in kDstIn_Mode mode.
     //
     // Skip this when there is a looper which seems not working well with
     // deferred paint. Currently a looper is only used for text shadows.
     //
     // TODO(asvitkine): Remove this work-around once the Skia bug is fixed.
     //                  http://code.google.com/p/skia/issues/detail?id=590
     if (!paint_.isLCDRenderText() &&
         paint_.getShader() &&
@@ skipping 1158 matching lines @@
   SetDisplayOffset(display_offset_.x() + delta_x);
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, selection_background_focused_color_);
 }
 
 }  // namespace gfx