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

Side by Side Diff: cc/test/fake_video_frame_provider.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/test/fake_video_frame_provider.h" 5 #include "cc/test/fake_video_frame_provider.h"
6 6
7 namespace cc { 7 namespace cc {
8 8
9 FakeVideoFrameProvider::FakeVideoFrameProvider() 9 FakeVideoFrameProvider::FakeVideoFrameProvider()
10 : frame_(NULL), client_(NULL) {} 10 : frame_(nullptr), client_(nullptr) {
11 }
11 12
12 FakeVideoFrameProvider::~FakeVideoFrameProvider() { 13 FakeVideoFrameProvider::~FakeVideoFrameProvider() {
13 if (client_) 14 if (client_)
14 client_->StopUsingProvider(); 15 client_->StopUsingProvider();
15 } 16 }
16 17
17 void FakeVideoFrameProvider::SetVideoFrameProviderClient(Client* client) { 18 void FakeVideoFrameProvider::SetVideoFrameProviderClient(Client* client) {
18 client_ = client; 19 client_ = client;
19 } 20 }
20 21
21 scoped_refptr<media::VideoFrame> FakeVideoFrameProvider::GetCurrentFrame() { 22 scoped_refptr<media::VideoFrame> FakeVideoFrameProvider::GetCurrentFrame() {
22 return frame_; 23 return frame_;
23 } 24 }
24 25
25 } // namespace cc 26 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698