summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 20:32:19 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 20:32:19 +0000
commit693940579680148fb9ad03ba3cbe2dbcfec44e38 (patch)
tree0119278c349d29c951bb678ccd02eb87e7274c76
parent1dccaa76d89df6b7b9b6c7c28471a07f05a58743 (diff)
downloadchromium_src-693940579680148fb9ad03ba3cbe2dbcfec44e38.zip
chromium_src-693940579680148fb9ad03ba3cbe2dbcfec44e38.tar.gz
chromium_src-693940579680148fb9ad03ba3cbe2dbcfec44e38.tar.bz2
Revert 53498 to see if it is causing filterRegions.svg to fail.
TBR=ctruta Review URL: http://codereview.chromium.org/3046017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53506 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--skia/ext/bitmap_platform_device_linux.cc7
-rw-r--r--skia/ext/bitmap_platform_device_mac.cc7
2 files changed, 0 insertions, 14 deletions
diff --git a/skia/ext/bitmap_platform_device_linux.cc b/skia/ext/bitmap_platform_device_linux.cc
index 5535ed1..9b589de 100644
--- a/skia/ext/bitmap_platform_device_linux.cc
+++ b/skia/ext/bitmap_platform_device_linux.cc
@@ -130,13 +130,6 @@ void BitmapPlatformDevice::BitmapPlatformDeviceData::LoadConfig() {
BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height,
bool is_opaque,
cairo_surface_t* surface) {
- if ((width == 0) || (height == 0)) {
- // Empty Skia bitmaps can't be configured. Create a minimal bitmap that
- // allows specific configurations, such as ARGB.
- width = 1;
- height = 1;
- }
-
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height,
cairo_image_surface_get_stride(surface));
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index 3eb1e7e..feb192b 100644
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -181,13 +181,6 @@ BitmapPlatformDevice* BitmapPlatformDevice::Create(CGContextRef context,
int width,
int height,
bool is_opaque) {
- if ((width == 0) || (height == 0)) {
- // Empty Skia bitmaps can't be configured. Create a minimal bitmap that
- // allows specific configurations, such as ARGB.
- width = 1;
- height = 1;
- }
-
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
if (bitmap.allocPixels() != true)