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

Unified Diff: Source/WebCore/platform/graphics/Image.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
Index: Source/WebCore/platform/graphics/Image.cpp
===================================================================
--- Source/WebCore/platform/graphics/Image.cpp (revision 93492)
+++ Source/WebCore/platform/graphics/Image.cpp (working copy)
@@ -114,7 +114,7 @@
// See <https://webkit.org/b/59043>.
#if !PLATFORM(WX)
- ASSERT(!isBitmapImage() || static_cast<BitmapImage*>(this)->notSolidColor());
+ ASSERT(!isBitmapImage() || notSolidColor());
#endif
FloatSize intrinsicTileSize = size();
« no previous file with comments | « Source/WebCore/platform/graphics/Image.h ('k') | Source/WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698