cc: Various code safety improvements in video compositing code.

cc/layers/video_layer_impl_unittest.cc

 // Copyright 2014 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/video_layer_impl.h"
 
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/test/fake_video_frame_provider.h"
 #include "cc/test/layer_test_common.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
+// NOTE: We cannot use DebugScopedSetImplThreadAndMainThreadBlocked in these
+// tests because it gets destroyed before the VideoLayerImpl is destroyed. This
+// causes a DCHECK in VideoLayerImpl's destructor to fail.
+static void DebugSetImplThreadAndMainThreadBlocked(Proxy* proxy) {
+#if DCHECK_IS_ON()
+  proxy->SetCurrentThreadIsImplThread(true);
+  proxy->SetMainThreadBlocked(true);
+#endif
+}
+
 TEST(VideoLayerImplTest, Occlusion) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugScopedSetImplThreadAndMainThreadBlocked thread(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
 
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                      gfx::Size(10, 10),
                                      gfx::Rect(10, 10),
                                      gfx::Size(10, 10),
                                      base::TimeDelta());
   FakeVideoFrameProvider provider;
   provider.set_frame(video_frame);
 
@@ skipping 33 matching lines @@
     LayerTestCommon::VerifyQuadsAreOccluded(
         impl.quad_list(), occluded, &partially_occluded_count);
     // The layer outputs one quad, which is partially occluded.
     EXPECT_EQ(1u, impl.quad_list().size());
     EXPECT_EQ(1u, partially_occluded_count);
   }
 }
 
 TEST(VideoLayerImplTest, DidBecomeActiveShouldSetActiveVideoLayer) {
   LayerTestCommon::LayerImplTest impl;
-  DebugScopedSetImplThreadAndMainThreadBlocked thread(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
 
   FakeVideoFrameProvider provider;
   VideoLayerImpl* video_layer_impl =
       impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_0);
 
   VideoFrameProviderClientImpl* client =
       static_cast<VideoFrameProviderClientImpl*>(provider.client());
   ASSERT_TRUE(client);
-  EXPECT_FALSE(client->active_video_layer());
 
+  EXPECT_FALSE(client->ActiveVideoLayer());
   video_layer_impl->DidBecomeActive();
-  EXPECT_EQ(video_layer_impl, client->active_video_layer());
+  EXPECT_EQ(video_layer_impl, client->ActiveVideoLayer());
 }
 
 TEST(VideoLayerImplTest, Rotated0) {
   gfx::Size layer_size(100, 50);
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugScopedSetImplThreadAndMainThreadBlocked thread(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
 
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                      gfx::Size(20, 10),
                                      gfx::Rect(20, 10),
                                      gfx::Size(20, 10),
                                      base::TimeDelta());
   FakeVideoFrameProvider provider;
   provider.set_frame(video_frame);
 
@@ skipping 15 matching lines @@
   impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(0, 50, 0), p1);
   EXPECT_EQ(gfx::Point3F(100, 0, 0), p2);
 }
 
 TEST(VideoLayerImplTest, Rotated90) {
   gfx::Size layer_size(100, 50);
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugScopedSetImplThreadAndMainThreadBlocked thread(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
 
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                      gfx::Size(20, 10),
                                      gfx::Rect(20, 10),
                                      gfx::Size(20, 10),
                                      base::TimeDelta());
   FakeVideoFrameProvider provider;
   provider.set_frame(video_frame);
 
@@ skipping 15 matching lines @@
   impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(0, 0, 0), p1);
   EXPECT_EQ(gfx::Point3F(100, 50, 0), p2);
 }
 
 TEST(VideoLayerImplTest, Rotated180) {
   gfx::Size layer_size(100, 50);
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugScopedSetImplThreadAndMainThreadBlocked thread(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
 
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                      gfx::Size(20, 10),
                                      gfx::Rect(20, 10),
                                      gfx::Size(20, 10),
                                      base::TimeDelta());
   FakeVideoFrameProvider provider;
   provider.set_frame(video_frame);
 
@@ skipping 15 matching lines @@
   impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(100, 0, 0), p1);
   EXPECT_EQ(gfx::Point3F(0, 50, 0), p2);
 }
 
 TEST(VideoLayerImplTest, Rotated270) {
   gfx::Size layer_size(100, 50);
   gfx::Size viewport_size(1000, 500);
 
   LayerTestCommon::LayerImplTest impl;
-  DebugScopedSetImplThreadAndMainThreadBlocked thread(impl.proxy());
+  DebugSetImplThreadAndMainThreadBlocked(impl.proxy());
 
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                      gfx::Size(20, 10),
                                      gfx::Rect(20, 10),
                                      gfx::Size(20, 10),
                                      base::TimeDelta());
   FakeVideoFrameProvider provider;
   provider.set_frame(video_frame);
 
@@ skipping 12 matching lines @@
   gfx::Point3F p1(0, impl.quad_list().front()->rect.height(), 0);
   gfx::Point3F p2(impl.quad_list().front()->rect.width(), 0, 0);
   impl.quad_list().front()->quadTransform().TransformPoint(&p1);
   impl.quad_list().front()->quadTransform().TransformPoint(&p2);
   EXPECT_EQ(gfx::Point3F(100, 50, 0), p1);
   EXPECT_EQ(gfx::Point3F(0, 0, 0), p2);
 }
 
 }  // namespace
 }  // namespace cc