browser: Fix null ANativeWindow reference.

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <map>
 
@@ skipping 145 matching lines @@
     tracker->SetSurfaceHandle(
         surface_id_,
         gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NATIVE_DIRECT));
     SetVisible(true);
   }
 }
 
 void CompositorImpl::SetSurface(jobject surface) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> j_surface(env, surface);
-  if (surface) {
-    ANativeWindow* window = ANativeWindow_fromSurface(env, surface);
+  ANativeWindow* window = NULL;
+  if (surface)
+    window = ANativeWindow_fromSurface(env, surface);
+  if (window) {
     SetWindowSurface(window);
     ANativeWindow_release(window);
     {
       base::AutoLock lock(g_surface_map_lock.Get());
       g_surface_map.Get().insert(std::make_pair(surface_id_, j_surface));
     }
   } else {
     {

[no sievers, 2013/04/18 01:08:50]

but don't fall into 'else' here if surface is not null.

       base::AutoLock lock(g_surface_map_lock.Get());
       g_surface_map.Get().erase(surface_id_);
     }
     SetWindowSurface(NULL);
   }
 }
 
 void CompositorImpl::SetVisible(bool visible) {
   if (!visible) {
     host_.reset();
@@ skipping 260 matching lines @@
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_UNSIGNED_SHORT_5_6_5;
   }
 }
 
 } // namespace content