Switch to pixmap in API.

bench/SkLinearBitmapPipelineBench.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <memory>
 #include "SkColor.h"
 #include "SkLinearBitmapPipeline.h"
@@ skipping 123 matching lines @@
 
         SkAutoTMalloc<SkPM4f> FPbuffer(width*height);
 
         SkFilterQuality filterQuality;
         if (fUseBilerp) {
             filterQuality = SkFilterQuality::kLow_SkFilterQuality;
         } else {
             filterQuality = SkFilterQuality::kNone_SkFilterQuality;
         }
 
+        SkPixmap srcPixmap{fInfo, fBitmap.get(), static_cast<size_t>(4 * width)};
+
         SkLinearBitmapPipeline pipeline{
-            fInvert, filterQuality, fXTile, fYTile, fInfo, fBitmap.get() };
+            fInvert, filterQuality, fXTile, fYTile, srcPixmap};
 
         int count = 100;
 
         for (int n = 0; n < 1000*loops; n++) {
             pipeline.shadeSpan4f(3, 6, FPbuffer, count);
         }
     }
 };
 
 struct SkBitmapFPOrigShader : public CommonBitmapFPBenchmark {
@@ skipping 129 matching lines @@
     SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);)
 
 DEF_BENCH(return new SkBitmapFPGeneral(
     srcSize, kLinear_SkColorProfileType, mR, true,
     SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);)
 
 DEF_BENCH(return new SkBitmapFPOrigShader(
     srcSize, kLinear_SkColorProfileType, mR, true,
     SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);)