Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Side by Side Diff: cc/layers/video_layer_impl_unittest.cc

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/video_layer.cc ('k') | cc/output/bsp_tree.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/video_layer_impl.h" 5 #include "cc/layers/video_layer_impl.h"
6 6
7 #include "cc/layers/video_frame_provider_client_impl.h" 7 #include "cc/layers/video_frame_provider_client_impl.h"
8 #include "cc/output/context_provider.h" 8 #include "cc/output/context_provider.h"
9 #include "cc/output/output_surface.h" 9 #include "cc/output/output_surface.h"
10 #include "cc/quads/draw_quad.h" 10 #include "cc/quads/draw_quad.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 layer_impl->SetDrawsContent(true); 98 layer_impl->SetDrawsContent(true);
99 const auto& draw_properties = layer_impl->draw_properties(); 99 const auto& draw_properties = layer_impl->draw_properties();
100 100
101 FakeVideoFrameProvider provider; 101 FakeVideoFrameProvider provider;
102 scoped_ptr<VideoLayerImpl> video_layer_impl = VideoLayerImpl::Create( 102 scoped_ptr<VideoLayerImpl> video_layer_impl = VideoLayerImpl::Create(
103 active_tree, 4, &provider, media::VIDEO_ROTATION_0); 103 active_tree, 4, &provider, media::VIDEO_ROTATION_0);
104 video_layer_impl->SetBounds(layer_size); 104 video_layer_impl->SetBounds(layer_size);
105 video_layer_impl->SetDrawsContent(true); 105 video_layer_impl->SetDrawsContent(true);
106 video_layer_impl->SetContentsOpaque(true); 106 video_layer_impl->SetContentsOpaque(true);
107 107
108 layer_impl->AddChild(video_layer_impl.Pass()); 108 layer_impl->AddChild(std::move(video_layer_impl));
109 active_tree->SetRootLayer(layer_impl.Pass()); 109 active_tree->SetRootLayer(std::move(layer_impl));
110 110
111 active_tree->BuildPropertyTreesForTesting(); 111 active_tree->BuildPropertyTreesForTesting();
112 112
113 active_tree->UpdateDrawProperties(false); 113 active_tree->UpdateDrawProperties(false);
114 114
115 // We don't have a frame yet, so the video doesn't occlude the layer below it. 115 // We don't have a frame yet, so the video doesn't occlude the layer below it.
116 EXPECT_FALSE(draw_properties.occlusion_in_content_space.IsOccluded(visible)); 116 EXPECT_FALSE(draw_properties.occlusion_in_content_space.IsOccluded(visible));
117 117
118 scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame( 118 scoped_refptr<media::VideoFrame> video_frame = media::VideoFrame::CreateFrame(
119 media::PIXEL_FORMAT_YV12, gfx::Size(10, 10), gfx::Rect(10, 10), 119 media::PIXEL_FORMAT_YV12, gfx::Size(10, 10), gfx::Rect(10, 10),
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 const YUVVideoDrawQuad* yuv_draw_quad = 361 const YUVVideoDrawQuad* yuv_draw_quad =
362 static_cast<const YUVVideoDrawQuad*>(draw_quad); 362 static_cast<const YUVVideoDrawQuad*>(draw_quad);
363 EXPECT_EQ(yuv_draw_quad->uv_tex_size.height(), 363 EXPECT_EQ(yuv_draw_quad->uv_tex_size.height(),
364 (yuv_draw_quad->ya_tex_size.height() + 1) / 2); 364 (yuv_draw_quad->ya_tex_size.height() + 1) / 2);
365 EXPECT_EQ(yuv_draw_quad->uv_tex_size.width(), 365 EXPECT_EQ(yuv_draw_quad->uv_tex_size.width(),
366 (yuv_draw_quad->ya_tex_size.width() + 1) / 2); 366 (yuv_draw_quad->ya_tex_size.width() + 1) / 2);
367 } 367 }
368 368
369 } // namespace 369 } // namespace
370 } // namespace cc 370 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/video_layer.cc ('k') | cc/output/bsp_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698