summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 17:36:22 +0000
committeralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 17:36:22 +0000
commitaad336c3950c92a5aab85aed87f9e7981f8eaa33 (patch)
tree43afe35f1dc42b39d218a7fc5a3298a8b11838a0 /content
parent4b820efd4e9cdf68507e48d40f030e5536744abd (diff)
downloadchromium_src-aad336c3950c92a5aab85aed87f9e7981f8eaa33.zip
chromium_src-aad336c3950c92a5aab85aed87f9e7981f8eaa33.tar.gz
chromium_src-aad336c3950c92a5aab85aed87f9e7981f8eaa33.tar.bz2
Removing DCHECK and returning instead. It's a valid state for context to be NULL, particularly during teardown.
BUG=176393 Review URL: https://chromiumcodereview.appspot.com/12258037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/browser_plugin/browser_plugin_compositing_helper.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
index e056618..7c14969 100644
--- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
+++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
@@ -68,7 +68,8 @@ void BrowserPluginCompositingHelper::FreeMailboxMemory(
WebKit::WebGraphicsContext3D *context =
WebKit::WebSharedGraphicsContext3D::mainThreadContext();
- DCHECK(context);
+ if (!context)
+ return;
// When a buffer is released from the compositor, we also get a
// sync point that specifies when in the command buffer
// it's safe to use it again.