From a983b4f522207c1b94d2d7cc2065c498dd57af34 Mon Sep 17 00:00:00 2001
From: "sievers@chromium.org"
 <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 19 Sep 2012 18:31:33 +0000
Subject: [PATCH] Add a NULL-check in Android's
 CompositorImpl::OnSurfaceUpdated()

TBR=piman@chromium.org

Review URL: https://codereview.chromium.org/10941039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157572 0039d316-1c4b-4281-b951-d872f2087c98
---
 content/browser/renderer_host/compositor_impl_android.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index ecc6c4c38063..9d625ec7b529 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -96,7 +96,8 @@ CompositorImpl::~CompositorImpl() {
 
 void CompositorImpl::OnSurfaceUpdated(
     const SurfacePresentedCallback& callback) {
-  host_->composite();
+  if (host_->get())
+    host_->composite();
   // TODO(sievers): Let RWHV do this
   uint32 sync_point =
       ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint();
-- 
2.11.4.GIT