Revert 220418 "cc: Block commit on activate by setting a flag on..."

trunk/src/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/location.h"
 #include "base/synchronization/lock.h"
 #include "cc/layers/texture_layer_client.h"
@@ skipping 120 matching lines @@
   DCHECK(uses_mailbox_);
   DCHECK(!mailbox.IsValid() || !holder_ref_ ||
          !mailbox.Equals(holder_ref_->holder()->mailbox()));
   // If we never commited the mailbox, we need to release it here.
   if (mailbox.IsValid())
     holder_ref_ = MailboxHolder::Create(mailbox);
   else
     holder_ref_.reset();
   needs_set_mailbox_ = true;
   SetNeedsCommit();
-  // The active frame needs to be replaced and the mailbox returned before the
-  // commit is called complete.
-  SetNextCommitWaitsForActivation();
 }
 
 void TextureLayer::WillModifyTexture() {
   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());
 }
 
 void TextureLayer::SetLayerTreeHost(LayerTreeHost* host) {
   if (layer_tree_host() == host) {
     Layer::SetLayerTreeHost(host);
     return;
   }
 
   if (layer_tree_host()) {
-    if (texture_id_) {
+    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());
   }
   // 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_) {
+  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();
-  }
   Layer::SetLayerTreeHost(host);
 }
 
 bool TextureLayer::DrawsContent() const {
   return (client_ || texture_id_ || holder_ref_) && Layer::DrawsContent();
 }
 
 bool TextureLayer::Update(ResourceUpdateQueue* queue,
                           const OcclusionTracker* occlusion) {
   bool updated = Layer::Update(queue, occlusion);
   if (client_) {
     if (uses_mailbox_) {
       TextureMailbox mailbox;
       if (client_->PrepareTextureMailbox(
               &mailbox, layer_tree_host()->UsingSharedMemoryResources())) {
         SetTextureMailbox(mailbox);
         updated = true;
       }
     } else {
       texture_id_ = client_->PrepareTexture();
       DCHECK_EQ(!!texture_id_, !!client_->Context3d());
       if (client_->Context3d() &&
           client_->Context3d()->getGraphicsResetStatusARB() != GL_NO_ERROR)
         texture_id_ = 0;
       updated = true;
-      // 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
   // different textures.  Such callers notify this layer that the texture has
   // changed by calling SetNeedsDisplay, so check for that here.
   return updated || !update_rect_.IsEmpty();
 }
 
 void TextureLayer::PushPropertiesTo(LayerImpl* layer) {
@@ skipping 25 matching lines @@
 Region TextureLayer::VisibleContentOpaqueRegion() const {
   if (contents_opaque())
     return visible_content_rect();
 
   if (blend_background_color_ && (SkColorGetA(background_color()) == 0xFF))
     return visible_content_rect();
 
   return Region();
 }
 
+bool TextureLayer::BlocksPendingCommit() const {
+  // Double-buffered texture layers need to be blocked until they can be made
+  // triple-buffered.  Single-buffered layers already prevent draws, so
+  // can block too for simplicity.
+  return DrawsContent();
+}
+
 bool TextureLayer::CanClipSelf() const {
   return true;
 }
 
 TextureLayer::MailboxHolder::MainThreadReference::MainThreadReference(
     MailboxHolder* holder)
     : holder_(holder) {
   holder_->InternalAddRef();
 }
 
@@ skipping 47 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