Revert "Revert of add colortable support to imagegenerator (https://codereview.chromium.org/3044430…

src/effects/SkBlurMaskFilter.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
@@ skipping 224 matching lines @@
 static bool draw_rects_into_mask(const SkRect rects[], int count, SkMask* mask) {
     if (!prepare_to_draw_into_mask(rects[0], mask)) {
         return false;
     }
 
     SkBitmap bitmap;
     bitmap.installPixels(SkImageInfo::Make(mask->fBounds.width(),
                                            mask->fBounds.height(),
                                            kAlpha_8_SkColorType,
                                            kPremul_SkAlphaType),
-                         mask->fImage, mask->fRowBytes, NULL, NULL);
+                         mask->fImage, mask->fRowBytes);
 
     SkCanvas canvas(bitmap);
     canvas.translate(-SkIntToScalar(mask->fBounds.left()),
                      -SkIntToScalar(mask->fBounds.top()));
 
     SkPaint paint;
     paint.setAntiAlias(true);
 
     if (1 == count) {
         canvas.drawRect(rects[0], paint);
@@ skipping 968 matching lines @@
     } else {
         str->append("None");
     }
     str->append("))");
 }
 #endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END