Roll Skia to r14226.

skia/ext/pixel_ref_utils_unittest.cc

 // Copyright 2014 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 "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/test/geometry_test_utils.h"
 #include "skia/ext/pixel_ref_utils.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 33 matching lines @@
 
   virtual SkShader::BitmapType asABitmap(SkBitmap* bitmap,
                                          SkMatrix* matrix,
                                          TileMode xy[2]) const OVERRIDE {
     if (bitmap)
       *bitmap = bitmap_;
     return SkShader::kDefault_BitmapType;
   }
 
   // Pure virtual implementaiton.
-  virtual void shadeSpan(int x, int y, SkPMColor[], int count) OVERRIDE {}
+  virtual SkShader::Context* createContext(const SkBitmap& device,
+                                           const SkPaint& paint,
+                                           const SkMatrix& matrix,
+                                           void* storage) const OVERRIDE {
+    return NULL;
+  };
+  virtual size_t contextSize() const OVERRIDE {
+    return sizeof(SkShader::Context);
+  }
+
   SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestDiscardableShader);
 
  private:
   SkBitmap bitmap_;
 };
 
 void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) {
   const SkImageInfo info = {
     size.width(), size.height(), kPMColor_SkColorType, kPremul_SkAlphaType
   };
@@ skipping 592 matching lines @@
   EXPECT_EQ(3u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 90, 90),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 40, 40),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 55, 150, 145),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
 }
 
 }  // namespace skia