Fix sporadic crash at the end of gles2 ppapi plugin

ppapi/examples/gles2/gles2.cc

 // Copyright (c) 2011 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 <string.h>
 
 #include <iostream>
 #include <sstream>
 #include <list>
 #include <map>
@@ skipping 67 matching lines @@
 
   // Callbacks passed into pp:VideoDecoder_Dev functions.
   void DecoderInitDone(int32_t result);
   void DecoderBitstreamDone(int32_t result, int bitstream_buffer_id);
   void DecoderFlushDone(int32_t result);
 
   // Decode helpers.
   void DecodeNextNALUs();
   void DecodeNextNALU();
   void GetNextNALUBoundary(size_t start_pos, size_t* end_pos);
-  void Render(const PP_PictureBuffer_Dev& buffer);
+  void PaintStart(const PP_Picture_Dev& picture);
   void DeleteOutstandingBitstreamBuffers();
 
   // GL-related functions.
   void InitGL();
   GLuint CreateTexture(int32_t width, int32_t height);
   void CreateGLObjects();
   void CreateShader(GLuint program, GLenum type, const char* source, int size);
   void DeleteTexture(GLuint id);
   void DeleteOutstandingTextures();
   void PaintFinished(int32_t result, int picture_buffer_id);
@@ skipping 218 matching lines @@
   assert(decoder == video_decoder_->pp_resource());
   PictureBufferMap::iterator it = buffers_by_id_.find(picture_buffer_id);
   assert(it != buffers_by_id_.end());
   DeleteTexture(it->second.texture_id);
   buffers_by_id_.erase(it);
 }
 
 void GLES2DemoInstance::PictureReady(PP_Resource decoder,
                                      const PP_Picture_Dev& picture) {
   assert(decoder == video_decoder_->pp_resource());
+  PaintStart(picture);
+}
+
+void GLES2DemoInstance::PaintStart(const PP_Picture_Dev& picture) {
   if (first_frame_delivered_ticks_ == -1)
     assert((first_frame_delivered_ticks_ = core_if_->GetTimeTicks()) != -1);
   if (is_painting_) {
     pictures_pending_paint_.push_back(picture);
     return;
   }
   PictureBufferMap::iterator it =
       buffers_by_id_.find(picture.picture_buffer_id);
   assert(it != buffers_by_id_.end());
-  Render(it->second);
+  const PP_PictureBuffer_Dev& buffer = it->second;
+  assert(!is_painting_);
+  is_painting_ = true;
+  gles2_if_->ActiveTexture(context_->pp_resource(), GL_TEXTURE0);
+  gles2_if_->BindTexture(
+      context_->pp_resource(), GL_TEXTURE_2D, buffer.texture_id);
+  gles2_if_->DrawArrays(context_->pp_resource(), GL_TRIANGLE_STRIP, 0, 4);
+  pp::CompletionCallback cb =
+      callback_factory_.NewCallback(
+          &GLES2DemoInstance::PaintFinished, buffer.id);
+  last_swap_request_ticks_ = core_if_->GetTimeTicks();
+  assert(surface_->SwapBuffers(cb) == PP_OK_COMPLETIONPENDING);
 }
 
 void GLES2DemoInstance::EndOfStream(PP_Resource decoder) {
   assert(decoder == video_decoder_->pp_resource());
 }
 
 void GLES2DemoInstance::NotifyError(PP_Resource decoder,
                                     PP_VideoDecodeError_Dev error) {
   assert(decoder == video_decoder_->pp_resource());
   LogError(this).s() << "Received error: " << error;
@@ skipping 34 matching lines @@
   gles2_if_->Clear(context_->pp_resource(), GL_COLOR_BUFFER_BIT);
   gles2_if_->Viewport(context_->pp_resource(), 0, 0,
                       position_size_.width(), position_size_.height());
 
   assert(BindGraphics(*surface_));
   assertNoGLError();
 
   CreateGLObjects();
 }
 
-void GLES2DemoInstance::Render(const PP_PictureBuffer_Dev& buffer) {
-  assert(!is_painting_);
-  is_painting_ = true;
-  gles2_if_->ActiveTexture(context_->pp_resource(), GL_TEXTURE0);
-  gles2_if_->BindTexture(
-      context_->pp_resource(), GL_TEXTURE_2D, buffer.texture_id);
-  gles2_if_->DrawArrays(context_->pp_resource(), GL_TRIANGLE_STRIP, 0, 4);
-  pp::CompletionCallback cb =
-      callback_factory_.NewCallback(
-          &GLES2DemoInstance::PaintFinished, buffer.id);
-  last_swap_request_ticks_ = core_if_->GetTimeTicks();
-  assert(surface_->SwapBuffers(cb) == PP_OK_COMPLETIONPENDING);
-}
-
 void GLES2DemoInstance::PaintFinished(int32_t result, int picture_buffer_id) {
   swap_ticks_ += core_if_->GetTimeTicks() - last_swap_request_ticks_;
   is_painting_ = false;
   ++num_frames_rendered_;
   if (num_frames_rendered_ % 50 == 0) {
     double elapsed = core_if_->GetTimeTicks() - first_frame_delivered_ticks_;
     double fps = (elapsed > 0) ? num_frames_rendered_ / elapsed : 1000;
     double ms_per_swap = (swap_ticks_ * 1e3) / num_frames_rendered_;
     LogError(this).s() << "Rendered frames: " << num_frames_rendered_
                        << ", fps: " << fps << ", with average ms/swap of: "
                        << ms_per_swap;
   }
   if (video_decoder_)
     video_decoder_->ReusePictureBuffer(picture_buffer_id);
-  while (!pictures_pending_paint_.empty() && !is_painting_) {
+  if (!pictures_pending_paint_.empty()) {
     PP_Picture_Dev picture = pictures_pending_paint_.front();
     pictures_pending_paint_.pop_front();
-    PictureReady(video_decoder_->pp_resource(), picture);
+    PaintStart(picture);
   }
 }
 
 GLuint GLES2DemoInstance::CreateTexture(int32_t width, int32_t height) {
   GLuint texture_id;
   gles2_if_->GenTextures(context_->pp_resource(), 1, &texture_id);
   assertNoGLError();
   // Assign parameters.
   gles2_if_->ActiveTexture(context_->pp_resource(), GL_TEXTURE0);
   gles2_if_->BindTexture(
@@ skipping 95 matching lines @@
   gles2_if_->DeleteShader(context_->pp_resource(), shader);
 }
 }  // anonymous namespace
 
 namespace pp {
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new GLES2DemoModule();
 }
 }  // namespace pp