From 8a6896793700c59472c3b577d454113eda57c146 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Mon, 8 Aug 2016 15:56:16 +0300
Subject: [PATCH] Fix debug assertion in CefImageImpl::AddBitmap.

---
 libcef/browser/image_impl.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libcef/browser/image_impl.cc b/libcef/browser/image_impl.cc
index 8d8113677..0ba906860 100644
--- a/libcef/browser/image_impl.cc
+++ b/libcef/browser/image_impl.cc
@@ -329,7 +329,12 @@ gfx::ImageSkia CefImageImpl::GetForced1xScaleRepresentation(
 
 bool CefImageImpl::AddBitmap(float scale_factor,
                              const SkBitmap& bitmap) {
-  DCHECK(bitmap.readyToDraw());
+#if DCHECK_IS_ON()
+  {
+    SkAutoLockPixels bitmap_lock(bitmap);
+    DCHECK(bitmap.readyToDraw());
+  }
+#endif
   DCHECK(bitmap.colorType() == kBGRA_8888_SkColorType ||
          bitmap.colorType() == kRGBA_8888_SkColorType);