cc: Setup API to release OutputSurface from LTHClient.

cc/trees/layer_tree_host_unittest_context.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/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/heads_up_display_layer.h"
@@ skipping 364 matching lines @@
   }
 
   void DidInitializeOutputSurface() override { EXPECT_TRUE(false); }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostClientNotReadyDoesNotCreateOutputSurface);
 
+class LayerTreeHostClientTakeAwayOutputSurface
+    : public LayerTreeHostContextTest {
+ public:
+  LayerTreeHostClientTakeAwayOutputSurface() : LayerTreeHostContextTest() {
+    setos_counter = 0;
+  }
+
+  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
+
+  void RequestNewOutputSurface() override { CreateAndSetOutputSurface(); }
+
+  void CreateAndSetOutputSurface() {
+    scoped_ptr<OutputSurface> surface =
+        LayerTreeHostContextTest::CreateOutputSurface();
+    CHECK(surface);
+    SetOutputSurface(surface.Pass());
+  }
+
+  void SetOutputSurface(scoped_ptr<OutputSurface> surface) {

[no sievers, 2015/09/10 00:00:22]

Can this just be part of the function above?

[sohanjg, 2015/09/10 15:07:23]

Done.

+    layer_tree_host()->SetOutputSurface(surface.Pass());
+    setos_counter++;
+    if (setos_counter > 1)
+      EndTest();

[no sievers, 2015/09/10 00:00:22]

Don't end the test yet.

[sohanjg, 2015/09/10 15:07:23]

Done.

+  }
+
+  void ReturnOpSurface() {
+    scoped_ptr<OutputSurface> surface = layer_tree_host()->GetOutputSurface();
+  }
+
+  void DidInitializeOutputSurface() override { ReturnOpSurface(); }

[sohanjg, 2015/08/26 14:38:56]

It expects this to be called in ImplThread, if we do it thru posttask in
ImplRunner, then it fails in the layertreetest check for isMainThreadBlocked
etc.
Not sure how to proceed :/

[no sievers, 2015/09/10 00:00:22]

What you can do here is:

  
EXPECT_TRUE(layer_tree_host()->visible());
if (setos_counter == 0) {
  MainThreadTaskRunner()->PostTask(
      FROM_HERE, base::Bind(&LayerTreeHostClientTakeAwayOutputSurface::
                            HideAndReleaseOutputSurface,
                            base::Unretained(this)));
} else {
  EndTest();
}

void HideAndReleaseOutputSurface() {
  EXPECT_TRUE(layer_tree_host()->proxy()->IsMainThread());
  layer_tree_host()->SetVisible(false);
  layer_tree_host()->GetOutputSurface();
  MainThreadTaskRunner()->PostTask(
      FROM_HERE, base::Bind(&LayerTreeHostClientTakeAwayOutputSurface::
                            MakeVisible,
                            base::Unretained(this)));
}

void MakeVisible() {
  EXPECT_TRUE(layer_tree_host()->proxy()->IsMainThread());
  layer_tree_host()->SetVisible(true);
}

[sohanjg, 2015/09/10 15:07:23]

For Single Threaded test, the call to MakeVisible may come after 2nd OS is
requested. So, moved the visibility check inside set_os = 0.

+
+  void AfterTest() override {}
+
+  int setos_counter;
+};
+
+MULTI_THREAD_TEST_F(LayerTreeHostClientTakeAwayOutputSurface);

[no sievers, 2015/09/10 00:00:22]

SINGLE_AND_MULTI_THREAD_TEST_F

[sohanjg, 2015/09/10 15:07:23]

Done.

+
 class MultipleCompositeDoesNotCreateOutputSurface
     : public LayerTreeHostContextTest {
  public:
   MultipleCompositeDoesNotCreateOutputSurface()
       : LayerTreeHostContextTest(), request_count_(0) {}
 
   void InitializeSettings(LayerTreeSettings* settings) override {
     settings->single_thread_proxy_scheduler = false;
     settings->use_zero_copy = true;
     settings->use_one_copy = false;
@@ skipping 1227 matching lines @@
   void AfterTest() override {}
 
   bool deferred_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
 
 }  // namespace
 }  // namespace cc