Revert of Pepper: Add a nullptr check.

content/renderer/pepper/pepper_plugin_instance_impl.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/renderer/pepper/pepper_plugin_instance_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bit_cast.h"
@@ skipping 760 matching lines @@
       // of us or the view renders via the accelerated compositor which is
       // incompatible with the move and backfill scrolling model.
       InvalidateRect(rect);
     }
   }
 }
 
 void PepperPluginInstanceImpl::CommitTextureMailbox(
     const cc::TextureMailbox& texture_mailbox) {
   if (committed_texture_.IsValid() && !IsTextureInUse(committed_texture_)) {
-    committed_texture_graphics_3d_->ReturnFrontBuffer(
+    bound_graphics_3d_->ReturnFrontBuffer(
         committed_texture_.mailbox(), committed_texture_consumed_sync_token_,
         false);
   }
 
   committed_texture_ = texture_mailbox;
-  committed_texture_graphics_3d_ = bound_graphics_3d_;
   committed_texture_consumed_sync_token_ = gpu::SyncToken();
 
   if (!texture_layer_) {
     UpdateLayer(true);
     return;
   }
 
   PassCommittedTextureToTextureLayer();
   texture_layer_->SetNeedsDisplay();
 }
 
 void PepperPluginInstanceImpl::PassCommittedTextureToTextureLayer() {
   DCHECK(bound_graphics_3d_);
 
   if (!committed_texture_.IsValid())
     return;
 
   std::unique_ptr<cc::SingleReleaseCallback> callback(
       cc::SingleReleaseCallback::Create(base::Bind(
           &PepperPluginInstanceImpl::FinishedConsumingCommittedTexture,
-          weak_factory_.GetWeakPtr(), committed_texture_,
-          committed_texture_graphics_3d_)));
+          weak_factory_.GetWeakPtr(), committed_texture_)));
 
   IncrementTextureReferenceCount(committed_texture_);
   texture_layer_->SetTextureMailbox(committed_texture_, std::move(callback));
 }
 
 void PepperPluginInstanceImpl::FinishedConsumingCommittedTexture(
     const cc::TextureMailbox& texture_mailbox,
-    scoped_refptr<PPB_Graphics3D_Impl> graphics_3d,
     const gpu::SyncToken& sync_token,
     bool is_lost) {
   bool removed = DecrementTextureReferenceCount(texture_mailbox);
   bool is_committed_texture =
       committed_texture_.mailbox() == texture_mailbox.mailbox();
 
   if (is_committed_texture && !is_lost) {
     committed_texture_consumed_sync_token_ = sync_token;
     return;
   }
 
   if (removed && !is_committed_texture) {
-    graphics_3d->ReturnFrontBuffer(texture_mailbox.mailbox(), sync_token,
-                                   is_lost);
+    bound_graphics_3d_->ReturnFrontBuffer(texture_mailbox.mailbox(), sync_token,
+                                          is_lost);
   }
 }
 
 void PepperPluginInstanceImpl::InstanceCrashed() {
   // Force free all resources and vars.
   HostGlobals::Get()->InstanceCrashed(pp_instance());
 
   // Free any associated graphics.
   SetFullscreen(false);
   FlashSetFullscreen(false, false);
@@ skipping 2577 matching lines @@
     const cc::TextureMailbox& mailbox) const {
   auto it =
       std::find_if(texture_ref_counts_.begin(), texture_ref_counts_.end(),
                    [&mailbox](const TextureMailboxRefCount& ref_count) {
                      return ref_count.first.mailbox() == mailbox.mailbox();
                    });
   return it != texture_ref_counts_.end();
 }
 
 }  // namespace content