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"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/web/WebFont.h"
 #include "third_party/WebKit/public/web/WebFontDescription.h"
 #include "third_party/WebKit/public/web/WebTextRun.h"
 #include "third_party/icu/source/common/unicode/ubidi.h"
 #include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/effects/SkPaintFlagsDrawFilter.h"
 
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_ImageData_API;
 using blink::WebFloatPoint;
 using blink::WebFloatRect;
 using blink::WebFont;
 using blink::WebFontDescription;
 using blink::WebRect;
 using blink::WebTextRun;
@@ skipping 365 matching lines @@
     // 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);
   }
 
+  SkAutoCanvasRestore auto_restore(destination, false);
+  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.
+    destination->save();

[reed1, 2015/03/03 15:04:42]

save(); // will be balanced automatically by auto_restore above...

+    skia::RefPtr<SkDrawFilter> lcd_filter = skia::AdoptRef(
+        new SkPaintFlagsDrawFilter(SkPaint::kLCDRenderText_Flag, 0));
+    destination->setDrawFilter(lcd_filter.get());
+  }
+
   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