diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 16:06:54 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 16:06:54 +0000 |
| commit | e8afa45f4a075f6ad47d430639a94f98f28dbff3 (patch) | |
| tree | 45680b06b3f57edb048598949e2728176bbb39ed /skia | |
| parent | 88c5700761aa9669a1b85feabe50adc83f3c22d8 (diff) | |
| download | chromium_src-e8afa45f4a075f6ad47d430639a94f98f28dbff3.zip chromium_src-e8afa45f4a075f6ad47d430639a94f98f28dbff3.tar.gz chromium_src-e8afa45f4a075f6ad47d430639a94f98f28dbff3.tar.bz2 | |
Roll Skia DEPS to r13390
R=reed@google.com
Review URL: https://codereview.chromium.org/155683003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/analysis_canvas_unittest.cc | 3 | ||||
| -rw-r--r-- | skia/skia_library_opts.gyp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/skia/ext/analysis_canvas_unittest.cc b/skia/ext/analysis_canvas_unittest.cc index 0b61031..79d97ad 100644 --- a/skia/ext/analysis_canvas_unittest.cc +++ b/skia/ext/analysis_canvas_unittest.cc @@ -108,7 +108,8 @@ TEST(AnalysisCanvasTest, ComplexActions) { // Draw bitmap test. SolidColorFill(canvas); SkBitmap secondBitmap; - secondBitmap.setConfig(SkBitmap::kNo_Config, 255, 255); + secondBitmap.setConfig(SkBitmap::kARGB_8888_Config, 255, 255); + secondBitmap.allocPixels(); canvas.drawBitmap(secondBitmap, 0, 0); EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor)); diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index 9b0b93e..3e2a4f8 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -119,7 +119,9 @@ '../third_party/skia/src/opts/SkBlitMask_opts_arm.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_arm.h', - '../third_party/skia/src/opts/opts_check_arm.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp', + '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp', + '../third_party/skia/src/opts/SkUtils_opts_arm.cpp', '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', ], }], |