Remove WGC3D::isContextLost references from cc

cc/layers/texture_layer.cc

 // Copyright 2010 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 "cc/layers/texture_layer.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/synchronization/lock.h"
@@ skipping 32 matching lines @@
   vertex_opacity_[1] = 1.0f;
   vertex_opacity_[2] = 1.0f;
   vertex_opacity_[3] = 1.0f;
 }
 
 TextureLayer::~TextureLayer() {
 }
 
 void TextureLayer::ClearClient() {
   if (rate_limit_context_ && client_ && layer_tree_host())
-    layer_tree_host()->StopRateLimiter(client_->Context3d());
+    layer_tree_host()->StopRateLimiter(client_);
   client_ = NULL;
   if (uses_mailbox_)
     SetTextureMailbox(TextureMailbox(), scoped_ptr<SingleReleaseCallback>());
   else
     SetTextureId(0);
 }
 
 scoped_ptr<LayerImpl> TextureLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) {
   return TextureLayerImpl::Create(tree_impl, id(), uses_mailbox_).
       PassAs<LayerImpl>();
@@ skipping 43 matching lines @@
 
 void TextureLayer::SetBlendBackgroundColor(bool blend) {
   if (blend_background_color_ == blend)
     return;
   blend_background_color_ = blend;
   SetNeedsCommit();
 }
 
 void TextureLayer::SetRateLimitContext(bool rate_limit) {
   if (!rate_limit && rate_limit_context_ && client_ && layer_tree_host())
-    layer_tree_host()->StopRateLimiter(client_->Context3d());
+    layer_tree_host()->StopRateLimiter(client_);
 
   rate_limit_context_ = rate_limit;
 }
 
 void TextureLayer::SetTextureId(unsigned id) {
   DCHECK(!uses_mailbox_);
   if (texture_id_ == id)
     return;
   if (texture_id_ && layer_tree_host())
     layer_tree_host()->AcquireLayerTextures();
@@ skipping 43 matching lines @@
   if (layer_tree_host() && (DrawsContent() || content_committed_)) {
     layer_tree_host()->AcquireLayerTextures();
     content_committed_ = false;
   }
 }
 
 void TextureLayer::SetNeedsDisplayRect(const gfx::RectF& dirty_rect) {
   Layer::SetNeedsDisplayRect(dirty_rect);
 
   if (rate_limit_context_ && client_ && layer_tree_host() && DrawsContent())
-    layer_tree_host()->StartRateLimiter(client_->Context3d());
+    layer_tree_host()->StartRateLimiter(client_);
 }
 
 void TextureLayer::SetLayerTreeHost(LayerTreeHost* host) {
   if (layer_tree_host() == host) {
     Layer::SetLayerTreeHost(host);
     return;
   }
 
   if (layer_tree_host()) {
     if (texture_id_) {
       layer_tree_host()->AcquireLayerTextures();
       // The texture id needs to be removed from the active tree before the
       // commit is called complete.
       SetNextCommitWaitsForActivation();
     }
     if (rate_limit_context_ && client_)
-      layer_tree_host()->StopRateLimiter(client_->Context3d());
+      layer_tree_host()->StopRateLimiter(client_);
   }
   // If we're removed from the tree, the TextureLayerImpl will be destroyed, and
   // we will need to set the mailbox again on a new TextureLayerImpl the next
   // time we push.
   if (!host && uses_mailbox_ && holder_ref_) {
     needs_set_mailbox_ = true;
     // The active frame needs to be replaced and the mailbox returned before the
     // commit is called complete.
     SetNextCommitWaitsForActivation();
   }
@@ skipping 17 matching lines @@
               layer_tree_host()->UsingSharedMemoryResources())) {
         // Already within a commit, no need to do another one immediately.
         SetTextureMailboxInternal(
             mailbox,
             release_callback.Pass(),
             false /* requires_commit */);
         updated = true;
       }
     } else {
       texture_id_ = client_->PrepareTexture();
-      DCHECK_EQ(!!texture_id_, !!client_->Context3d());
-      if (client_->Context3d() &&
-          client_->Context3d()->getGraphicsResetStatusARB() != GL_NO_ERROR)
+      DCHECK_EQ(!!texture_id_, !client_->IsContextLost());

[piman, 2013/11/01 23:15:35]

I don't think this DCHECK is valid. For example, the TextureLayerClient may have
had cached the texture id, but doesn't know yet that the context is lost.
An alternative is to change the contract to make the client responsible for
checking, and returning 0 if its context is lost. That's reasonable too, and
would simplify a bit (you wouldn't need IsContextLost() anymore)?

+      if (client_->IsContextLost())
         texture_id_ = 0;
       updated = true;
       SetNeedsPushProperties();
       // The texture id needs to be removed from the active tree before the
       // commit is called complete.
       SetNextCommitWaitsForActivation();
     }
   }
 
   // SetTextureMailbox could be called externally and the same mailbox used for
@@ skipping 101 matching lines @@
 }
 
 void TextureLayer::MailboxHolder::ReturnAndReleaseOnImplThread(
     unsigned sync_point, bool is_lost) {
   Return(sync_point, is_lost);
   message_loop_->PostTask(FROM_HERE,
                           base::Bind(&MailboxHolder::InternalRelease, this));
 }
 
 }  // namespace cc