diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 13:43:59 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 13:43:59 +0000 |
| commit | 5264cde7cec1460e0c0e540829d1a6456639eed1 (patch) | |
| tree | 5b5d6c707be656f60d7cd95edfab424b7fa4150f /skia | |
| parent | 3b2528815c7a4a2e6ad7f31e43cacc7ac7b920bc (diff) | |
| download | chromium_src-5264cde7cec1460e0c0e540829d1a6456639eed1.zip chromium_src-5264cde7cec1460e0c0e540829d1a6456639eed1.tar.gz chromium_src-5264cde7cec1460e0c0e540829d1a6456639eed1.tar.bz2 | |
Roll Skia DEPS to r7869
control: https://codereview.chromium.org/12335104/
Review URL: https://codereview.chromium.org/12319120
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/platform_canvas_unittest.cc | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc index 572180e..f98a0e9 100644 --- a/skia/ext/platform_canvas_unittest.cc +++ b/skia/ext/platform_canvas_unittest.cc @@ -413,7 +413,7 @@ TEST(PlatformBitmapTest, PlatformBitmap) { EXPECT_FALSE(platform_bitmap->GetBitmap().isNull()); EXPECT_EQ(kWidth, platform_bitmap->GetBitmap().width()); EXPECT_EQ(kHeight, platform_bitmap->GetBitmap().height()); - EXPECT_LE(platform_bitmap->GetBitmap().width()*4, + EXPECT_LE(static_cast<size_t>(platform_bitmap->GetBitmap().width()*4), platform_bitmap->GetBitmap().rowBytes()); EXPECT_EQ(SkBitmap::kARGB_8888_Config, // Same for all platforms. platform_bitmap->GetBitmap().config()); diff --git a/skia/skia.gyp b/skia/skia.gyp index fe02a50..25449ba 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -233,6 +233,7 @@ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', 'SK_DISABLE_BLUR_ROUNDING', + 'SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX', # Disable this check because it is too strict for some Chromium-specific # subclasses of SkPixelRef. See bug: crbug.com/171776. |