BrowserFontResource should not push opacity info to Blink

content/child/browser_font_resource_trusted.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 "content/child/browser_font_resource_trusted.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/web_preferences.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
@@ skipping 301 matching lines @@
   SkCanvas* canvas = image->GetPlatformCanvas();
   bool needs_unmapping = false;
   if (!canvas) {
     needs_unmapping = true;
     image->Map();
     canvas = image->GetPlatformCanvas();
     if (!canvas)
       return result;  // Failure mapping.
   }
 
-  DrawTextToCanvas(canvas, *text, position, color, clip, image_data_is_opaque);
+  if (!PP_ToBool(image_data_is_opaque)) {
+    // Ideally, LCD text should be configured at canvas creation time using
+    // SkSurfaceProps. But because the API exposes image_data_is_opaque per
+    // draw text call (allowing clients to essentially change their mind),
+    // we have to handle it here.
+    SkImageInfo info;
+    size_t row_bytes;
+    void* pixels = canvas->accessTopLayerPixels(&info, &row_bytes);
+    if (!pixels)
+      return result;
+
+    SkBitmap bm;
+    if (!bm.installPixels(info, pixels, row_bytes))
+      return result;
+
+    SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+    SkCanvas temp_canvas(bm, props);
+
+    DrawTextToCanvas(&temp_canvas, *text, position, color, clip);
+  } else {
+    DrawTextToCanvas(canvas, *text, position, color, clip);
+  }
 
   if (needs_unmapping)
     image->Unmap();
   return PP_TRUE;
 }
 
 int32_t BrowserFontResource_Trusted::MeasureText(
     const PP_BrowserFont_Trusted_TextRun* text) {
   WebTextRun run;
   if (!PPTextRunToWebTextRun(*text, &run))
@@ skipping 51 matching lines @@
     }
   }
   return -1;  // Requested a char beyond the end.
 }
 
 void BrowserFontResource_Trusted::DrawTextToCanvas(
     SkCanvas* destination,
     const PP_BrowserFont_Trusted_TextRun& text,
     const PP_Point* position,
     uint32_t color,
-    const PP_Rect* clip,
-    PP_Bool image_data_is_opaque) {
+    const PP_Rect* clip) {
   // Convert position and clip.
   WebFloatPoint web_position(static_cast<float>(position->x),
                              static_cast<float>(position->y));
   WebRect web_clip;
   if (!clip) {
     // Use entire canvas. SkCanvas doesn't have a size on it, so we just use
     // the current clip bounds.
     SkRect skclip;
     destination->getClipBounds(&skclip);
     web_clip = WebRect(skclip.fLeft, skclip.fTop, skclip.fRight - skclip.fLeft,
                        skclip.fBottom - skclip.fTop);
   } else {
     web_clip = WebRect(clip->point.x, clip->point.y,
                        clip->size.width, clip->size.height);
   }
 
   TextRunCollection runs(text);
   for (int i = 0; i < runs.num_runs(); i++) {
     int32_t run_begin = 0;
     int32_t run_len = 0;
     WebTextRun run = runs.GetRunAt(i, &run_begin, &run_len);
-    font_->drawText(destination, run, web_position, color, web_clip,
-                    PP_ToBool(image_data_is_opaque));
+    font_->drawText(destination, run, web_position, color, web_clip);
 
     // Advance to the next run. Note that we avoid doing this for the last run
     // since it's unnecessary, measuring text is slow, and most of the time
     // there will be only one run anyway.
     if (i != runs.num_runs() - 1)
       web_position.x += font_->calculateWidth(run);
   }
 }
 
 }  // namespace content