summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2015-12-01 08:52:05 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-01 16:52:47 +0000
commitf9aea998358ece4467542f3c14a8b812af531d5b (patch)
tree9833f48754a4da772294516971d8cc0696409eb3
parent9115430381c61b9e6801a56e5a8c292cfd392070 (diff)
downloadchromium_src-f9aea998358ece4467542f3c14a8b812af531d5b.zip
chromium_src-f9aea998358ece4467542f3c14a8b812af531d5b.tar.gz
chromium_src-f9aea998358ece4467542f3c14a8b812af531d5b.tar.bz2
bitmap_uploader: Remove DCHECK on LostContext
This is not a fatal error and it's causing an unclean shutdown in mustash. BUG=none Review URL: https://codereview.chromium.org/1480363004 Cr-Commit-Position: refs/heads/master@{#362436}
-rw-r--r--components/bitmap_uploader/bitmap_uploader.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc
index d570952..2a9a081 100644
--- a/components/bitmap_uploader/bitmap_uploader.cc
+++ b/components/bitmap_uploader/bitmap_uploader.cc
@@ -23,7 +23,7 @@ namespace {
const uint32_t g_transparent_color = 0x00000000;
void LostContext(void*) {
- DCHECK(false);
+ // TODO(fsamuel): Figure out if there's something useful to do here.
}
void OnGotContentHandlerID(uint32_t content_handler_id) {}
@@ -66,7 +66,7 @@ void BitmapUploader::Init(mojo::Shell* shell) {
gles2_context_ = MojoGLES2CreateContext(
gles2_client.PassInterface().PassHandle().release().value(),
nullptr,
- &LostContext, NULL, mojo::Environment::GetDefaultAsyncWaiter());
+ &LostContext, nullptr, mojo::Environment::GetDefaultAsyncWaiter());
MojoGLES2MakeCurrent(gles2_context_);
}