cc: Update Main RendererCapabilities on DeferredInitialize

cc/layers/texture_layer_unittest.cc

 // Copyright 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 "cc/layers/texture_layer.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 777 matching lines @@
     root_->SetBounds(bounds);
 
     layer_ = TextureLayer::CreateForMailbox(NULL);
     layer_->SetIsDrawable(true);
     layer_->SetAnchorPoint(gfx::PointF());
     layer_->SetBounds(bounds);
 
     root_->AddChild(layer_);
     layer_tree_host()->SetRootLayer(root_);
     layer_tree_host()->SetViewportSize(bounds);
-    SetMailbox('1');
-    EXPECT_EQ(0, callback_count_);
-
-    // Case #1: change mailbox before the commit. The old mailbox should be
-    // released immediately.
-    SetMailbox('2');
-    EXPECT_EQ(1, callback_count_);
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidCommit() OVERRIDE {
     ++commit_count_;
     switch (commit_count_) {
       case 1:
+        // First commit from setting up tree. Nothing to check.
+        SetMailbox('1');
+        EXPECT_EQ(0, callback_count_);
+        break;
+      case 2:
         // Case #2: change mailbox after the commit (and draw), where the
         // layer draws. The old mailbox should be released during the next
         // commit.
-        SetMailbox('3');
+        SetMailbox('2');
+        EXPECT_EQ(0, callback_count_);
+        break;
+      case 3:
         EXPECT_EQ(1, callback_count_);
-        break;
-      case 2:
-        EXPECT_EQ(2, callback_count_);
         // Case #3: change mailbox when the layer doesn't draw. The old
         // mailbox should be released during the next commit.
         layer_->SetBounds(gfx::Size());
-        SetMailbox('4');
+        SetMailbox('3');
         break;
-      case 3:
-        EXPECT_EQ(3, callback_count_);
+      case 4:
+        EXPECT_EQ(2, callback_count_);
         // Case #4: release mailbox that was committed but never drawn. The
         // old mailbox should be released during the next commit.
         layer_->SetTextureMailbox(TextureMailbox(),
                                   scoped_ptr<SingleReleaseCallback>());
         break;
-      case 4:
+      case 5:
         if (layer_tree_host()->settings().impl_side_painting) {
           // With impl painting, the texture mailbox will still be on the impl
           // thread when the commit finishes, because the layer is not drawble
           // when it has no texture mailbox, and thus does not block the commit
           // on activation. So, we wait for activation.
           // TODO(danakj): fix this. crbug.com/277953
           layer_tree_host()->SetNeedsCommit();
           break;
         } else {
           ++commit_count_;
         }
-      case 5:
-        EXPECT_EQ(4, callback_count_);
+      case 6:
+        EXPECT_EQ(3, callback_count_);
         // Restore a mailbox for the next step.
-        SetMailbox('5');
+        SetMailbox('4');
         break;
-      case 6:
+      case 7:
         // Case #5: remove layer from tree. Callback should *not* be called, the
         // mailbox is returned to the main thread.
-        EXPECT_EQ(4, callback_count_);
+        EXPECT_EQ(3, callback_count_);
         layer_->RemoveFromParent();
         break;
-      case 7:
+      case 8:
         if (layer_tree_host()->settings().impl_side_painting) {
           // With impl painting, the texture mailbox will still be on the impl
           // thread when the commit finishes, because the layer is not around to
           // block the commit on activation anymore. So, we wait for activation.
           // TODO(danakj): fix this. crbug.com/277953
           layer_tree_host()->SetNeedsCommit();
           break;
         } else {
           ++commit_count_;
         }
-      case 8:
-        EXPECT_EQ(4, callback_count_);
+      case 9:
+        EXPECT_EQ(3, callback_count_);
         // Resetting the mailbox will call the callback now.
         layer_->SetTextureMailbox(TextureMailbox(),
                                   scoped_ptr<SingleReleaseCallback>());
-        EXPECT_EQ(5, callback_count_);
+        EXPECT_EQ(4, callback_count_);
         EndTest();
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
   virtual void AfterTest() OVERRIDE {}
 
@@ skipping 1291 matching lines @@
   int callback_count_;
   scoped_refptr<Layer> root_;
   scoped_refptr<TextureLayer> layer_;
 };
 
 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
     TextureLayerWithMailboxImplThreadDeleted);
 
 }  // namespace
 }  // namespace cc