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

Unified Diff: ui/gfx/image/image_skia.cc

Issue 11418263: Revert "Enable DCHECK in GetBitmap on WIN" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_skia.cc
diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
index 88df621769aac342bc006ff663d9d2630568c9cb..6089de8c2a71907985300ca0a2650d07247c2c6a 100644
--- a/ui/gfx/image/image_skia.cc
+++ b/ui/gfx/image/image_skia.cc
@@ -385,7 +385,11 @@ SkBitmap& ImageSkia::GetBitmap() const {
return NullImageRep().mutable_sk_bitmap();
}
+ // TODO(oshima): This made a few tests flaky on Windows.
+ // Fix the root cause and re-enable this. crbug.com/145623.
+#if !defined(OS_WIN)
CHECK(CanRead());
+#endif
ImageSkiaReps::iterator it =
storage_->FindRepresentation(ui::SCALE_FACTOR_100P, true);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698