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

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

Issue 643583003: [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: foramted. 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/layers/delegated_frame_resource_collection.h" 5 #include "cc/layers/delegated_frame_resource_collection.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "cc/trees/blocking_task_runner.h" 8 #include "cc/trees/blocking_task_runner.h"
9 9
10 namespace cc { 10 namespace cc {
11 11
12 DelegatedFrameResourceCollection::DelegatedFrameResourceCollection() 12 DelegatedFrameResourceCollection::DelegatedFrameResourceCollection()
13 : client_(NULL), 13 : client_(nullptr), lost_all_resources_(false), weak_ptr_factory_(this) {
14 lost_all_resources_(false),
15 weak_ptr_factory_(this) {
16 DCHECK(main_thread_checker_.CalledOnValidThread()); 14 DCHECK(main_thread_checker_.CalledOnValidThread());
17 } 15 }
18 16
19 DelegatedFrameResourceCollection::~DelegatedFrameResourceCollection() { 17 DelegatedFrameResourceCollection::~DelegatedFrameResourceCollection() {
20 DCHECK(main_thread_checker_.CalledOnValidThread()); 18 DCHECK(main_thread_checker_.CalledOnValidThread());
21 } 19 }
22 20
23 void DelegatedFrameResourceCollection::SetClient( 21 void DelegatedFrameResourceCollection::SetClient(
24 DelegatedFrameResourceCollectionClient* client) { 22 DelegatedFrameResourceCollectionClient* client) {
25 client_ = client; 23 client_ = client;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 &DelegatedFrameResourceCollection::UnrefResources, self, returned)); 120 &DelegatedFrameResourceCollection::UnrefResources, self, returned));
123 } 121 }
124 122
125 ReturnCallback 123 ReturnCallback
126 DelegatedFrameResourceCollection::GetReturnResourcesCallbackForImplThread() { 124 DelegatedFrameResourceCollection::GetReturnResourcesCallbackForImplThread() {
127 return base::Bind(&UnrefResourcesOnImplThread, 125 return base::Bind(&UnrefResourcesOnImplThread,
128 weak_ptr_factory_.GetWeakPtr()); 126 weak_ptr_factory_.GetWeakPtr());
129 } 127 }
130 128
131 } // namespace cc 129 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698