introduce Props to surface

src/core/SkBitmapDevice.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkConfig8888.h"
 #include "SkDraw.h"
@@ skipping 38 matching lines @@
             break;
         default:
             return false;
     }
 
     if (newAlphaType) {
         *newAlphaType = canonicalAlphaType;
     }
     return true;
 }
 

[robertphillips, 2014/09/16 14:15:18]

Why this change?

[reed1, 2014/09/16 18:16:01]

Historical edit/unedit. Fixed.

-SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap) : fBitmap(bitmap) {
+SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap) : fBitmap(bitmap)
+{
     SkASSERT(valid_for_bitmap_device(bitmap.info(), NULL));
 }
 
 SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties& deviceProperties)
     : SkBaseDevice(deviceProperties)
     , fBitmap(bitmap)
 {
     SkASSERT(valid_for_bitmap_device(bitmap.info(), NULL));
 }
 
@@ skipping 295 matching lines @@
     return NULL;
 }
 
 SkImageFilter::Cache* SkBitmapDevice::getImageFilterCache() {
     SkImageFilter::Cache* cache = SkImageFilter::Cache::Get();
     cache->ref();
     return cache;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 

[robertphillips, 2014/09/16 14:15:18]

Rename to supports_lcd and switch sense?

[reed1, 2014/09/16 18:16:01]

Done.

+static bool disable_lcd(const SkBitmap& target) {
+    return kN32_SkColorType != target.colorType();
+}
+
 bool SkBitmapDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
-    if (!paint.isLCDRenderText() || !paint.isAntiAlias()) {
-        // we're cool with the paint as is
-        return false;
+    uint32_t clearMask = 0;
+
+    if (paint.isLCDRenderText() && paint.isAntiAlias() && disable_lcd(fBitmap)) {
+        clearMask |= SkPaint::kLCDRenderText_Flag;
     }
 
-    if (kN32_SkColorType != fBitmap.colorType() ||
-        paint.getRasterizer() ||
-        paint.getPathEffect() ||
-        paint.isFakeBoldText() ||
-        paint.getStyle() != SkPaint::kFill_Style ||
-        !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)) {
-        // turn off lcd
-        flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag;
+    if (clearMask) {
+        flags->fFlags = paint.getFlags() & ~clearMask;
         flags->fHinting = paint.getHinting();
         return true;
     }
     // we're cool with the paint as is
     return false;
 }