cc: Fix IOSurfaceLayer freezing during aborts

cc/trees/layer_tree_host_unittest.cc

 // Copyright 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 "cc/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 4007 matching lines @@
 };
 
 TEST_F(LayerTreeHostTestTreeActivationCallback, DirectRenderer) {
   RunTest(true, false, true);
 }
 
 TEST_F(LayerTreeHostTestTreeActivationCallback, DelegatingRenderer) {
   RunTest(true, true, true);
 }
 
-// VideoLayer must support being invalidated and then passing that along
-// to the compositor thread, even though no resources are updated in
-// response to that invalidation.
-class LayerTreeHostTestVideoLayerInvalidate : public LayerTreeHostTest {
+class LayerInvalidateCausesDraw : public LayerTreeHostTest {
  public:
-  LayerTreeHostTestVideoLayerInvalidate() : num_commits_(0), num_draws_(0) {}
-
-  virtual void SetupTree() OVERRIDE {
-    LayerTreeHostTest::SetupTree();
-    video_layer_ = VideoLayer::Create(&provider_);
-    video_layer_->SetBounds(gfx::Size(10, 10));
-    video_layer_->SetIsDrawable(true);
-    layer_tree_host()->root_layer()->AddChild(video_layer_);
-  }
+  LayerInvalidateCausesDraw() : num_commits_(0), num_draws_(0) {}
 
   virtual void BeginTest() OVERRIDE {
+    ASSERT_TRUE(!!invalidate_layer_)
+        << "Derived tests must set this in SetupTree";
+
     // One initial commit.
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    // After commit, invalidate the video layer.  This should cause a commit.
+    // After commit, invalidate the layer.  This should cause a commit.
     if (layer_tree_host()->source_frame_number() == 1)
-     video_layer_->SetNeedsDisplay();
+     invalidate_layer_->SetNeedsDisplay();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     num_draws_++;
     if (impl->active_tree()->source_frame_number() == 1)
       EndTest();
   }
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     num_commits_++;
   }
 
   virtual void AfterTest() OVERRIDE {
     EXPECT_GE(2, num_commits_);
     EXPECT_GE(2, num_draws_);
   }
 
+ protected:
+  scoped_refptr<Layer> invalidate_layer_;
+
+ private:
+  int num_commits_;
+  int num_draws_;
+};
+
+// VideoLayer must support being invalidated and then passing that along
+// to the compositor thread, even though no resources are updated in
+// response to that invalidation.
+class LayerTreeHostTestVideoLayerInvalidate : public LayerInvalidateCausesDraw {
+ public:
+  virtual void SetupTree() OVERRIDE {
+    LayerTreeHostTest::SetupTree();
+    scoped_refptr<VideoLayer> video_layer = VideoLayer::Create(&provider_);
+    video_layer->SetBounds(gfx::Size(10, 10));
+    video_layer->SetIsDrawable(true);
+    layer_tree_host()->root_layer()->AddChild(video_layer);
+
+    invalidate_layer_ = video_layer;
+  }
+
  private:
   FakeVideoFrameProvider provider_;
-  scoped_refptr<VideoLayer> video_layer_;
-  int num_commits_;
-  int num_draws_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestVideoLayerInvalidate);
 
+// IOSurfaceLayer must support being invalidated and then passing that along
+// to the compositor thread, even though no resources are updated in
+// response to that invalidation.
+class LayerTreeHostTestIOSurfaceLayerInvalidate
+    : public LayerInvalidateCausesDraw {
+ public:
+  virtual void SetupTree() OVERRIDE {
+    LayerTreeHostTest::SetupTree();
+    scoped_refptr<IOSurfaceLayer> layer = IOSurfaceLayer::Create();
+    layer->SetBounds(gfx::Size(10, 10));
+    uint32_t fake_io_surface_id = 7;
+    layer->SetIOSurfaceProperties(fake_io_surface_id, layer->bounds());
+    layer->SetIsDrawable(true);
+    layer_tree_host()->root_layer()->AddChild(layer);
+
+    invalidate_layer_ = layer;
+  }
+};
+
+// TODO(danakj): IOSurface layer can not be transported. crbug.com/239335
+SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
+    LayerTreeHostTestIOSurfaceLayerInvalidate);
+
 class LayerTreeHostTestPushHiddenLayer : public LayerTreeHostTest {
  protected:
   virtual void SetupTree() OVERRIDE {
     root_layer_ = Layer::Create();
     root_layer_->SetAnchorPoint(gfx::PointF());
     root_layer_->SetPosition(gfx::Point());
     root_layer_->SetBounds(gfx::Size(10, 10));
 
     parent_layer_ = SolidColorLayer::Create();
     parent_layer_->SetAnchorPoint(gfx::PointF());
@@ skipping 88 matching lines @@
   virtual void AfterTest() OVERRIDE {}
 
   FakeContentLayerClient client_;
   scoped_refptr<FakePictureLayer> root_layer_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestUpdateLayerInEmptyViewport);
 
 }  // namespace
 }  // namespace cc