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

Side by Side Diff: cc/resources/video_resource_updater_unittest.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. Created 6 years, 2 months 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/resources/video_resource_updater.h" 5 #include "cc/resources/video_resource_updater.h"
6 6
7 #include "base/memory/shared_memory.h" 7 #include "base/memory/shared_memory.h"
8 #include "cc/resources/resource_provider.h" 8 #include "cc/resources/resource_provider.h"
9 #include "cc/test/fake_output_surface.h" 9 #include "cc/test/fake_output_surface.h"
10 #include "cc/test/fake_output_surface_client.h" 10 #include "cc/test/fake_output_surface_client.h"
(...skipping 13 matching lines...) Expand all
24 TestWebGraphicsContext3D::Create(); 24 TestWebGraphicsContext3D::Create();
25 context3d_ = context3d.get(); 25 context3d_ = context3d.get();
26 26
27 output_surface3d_ = 27 output_surface3d_ =
28 FakeOutputSurface::Create3d(context3d.Pass()); 28 FakeOutputSurface::Create3d(context3d.Pass());
29 CHECK(output_surface3d_->BindToClient(&client_)); 29 CHECK(output_surface3d_->BindToClient(&client_));
30 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); 30 shared_bitmap_manager_.reset(new TestSharedBitmapManager());
31 resource_provider3d_ = 31 resource_provider3d_ =
32 ResourceProvider::Create(output_surface3d_.get(), 32 ResourceProvider::Create(output_surface3d_.get(),
33 shared_bitmap_manager_.get(), 33 shared_bitmap_manager_.get(),
34 NULL, 34 nullptr,
35 0, 35 0,
36 false, 36 false,
37 1, 37 1,
38 false); 38 false);
39 } 39 }
40 40
41 scoped_refptr<media::VideoFrame> CreateTestYUVVideoFrame() { 41 scoped_refptr<media::VideoFrame> CreateTestYUVVideoFrame() {
42 const int kDimension = 10; 42 const int kDimension = 10;
43 gfx::Size size(kDimension, kDimension); 43 gfx::Size size(kDimension, kDimension);
44 static uint8 y_data[kDimension * kDimension] = { 0 }; 44 static uint8 y_data[kDimension * kDimension] = { 0 };
(...skipping 27 matching lines...) Expand all
72 resource_provider3d_.get()); 72 resource_provider3d_.get());
73 scoped_refptr<media::VideoFrame> video_frame = CreateTestYUVVideoFrame(); 73 scoped_refptr<media::VideoFrame> video_frame = CreateTestYUVVideoFrame();
74 74
75 VideoFrameExternalResources resources = 75 VideoFrameExternalResources resources =
76 updater.CreateExternalResourcesFromVideoFrame(video_frame); 76 updater.CreateExternalResourcesFromVideoFrame(video_frame);
77 EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type); 77 EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type);
78 } 78 }
79 79
80 } // namespace 80 } // namespace
81 } // namespace cc 81 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698