Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Unified Diff: Source/WebCore/rendering/RenderImage.cpp

Issue 7696019: Merge 93441 - REGRESSION(r91628): 3 canvas tests crash on Chromium Linux and one test fail on Chr... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderImage.cpp
===================================================================
--- Source/WebCore/rendering/RenderImage.cpp (revision 93492)
+++ Source/WebCore/rendering/RenderImage.cpp (working copy)
@@ -408,13 +408,9 @@
// Check for bitmap image with alpha.
Image* image = m_imageResource->image().get();
- if (!image || !image->isBitmapImage())
+ if (!image || !image->isBitmapImage() || image->currentFrameHasAlpha())
return false;
- BitmapImage* bitmapImage = static_cast<BitmapImage*>(image);
- if (bitmapImage->currentFrameHasAlpha())
- return false;
-
return true;
}
« no previous file with comments | « Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698