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

Unified Diff: Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h

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/Image.cpp ('k') | Source/WebCore/rendering/RenderImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h
===================================================================
--- Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h (revision 93492)
+++ Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h (working copy)
@@ -53,6 +53,8 @@
virtual bool isBitmapImage() const { return true; }
+ virtual bool currentFrameHasAlpha() { return !m_nativeImage.isOpaque(); }
+
virtual IntSize size() const
{
return IntSize(m_nativeImage.width(), m_nativeImage.height());
@@ -72,6 +74,13 @@
return &m_nativeImage;
}
+#if !ASSERT_DISABLED
+ virtual bool notSolidColor()
+ {
+ return m_nativeImage.width() != 1 || m_nativeImage.height() != 1;
+ }
+#endif
+
protected:
virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator);
« no previous file with comments | « Source/WebCore/platform/graphics/Image.cpp ('k') | Source/WebCore/rendering/RenderImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698