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

Side by Side Diff: cc/test/fake_picture_layer_tiling_client.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_picture_layer_tiling_client.h" 5 #include "cc/test/fake_picture_layer_tiling_client.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "cc/test/fake_picture_pile_impl.h" 9 #include "cc/test/fake_picture_pile_impl.h"
10 #include "cc/test/fake_tile_manager.h" 10 #include "cc/test/fake_tile_manager.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 FakePictureLayerTilingClient::FakePictureLayerTilingClient() 14 FakePictureLayerTilingClient::FakePictureLayerTilingClient()
15 : tile_manager_(new FakeTileManager(&tile_manager_client_)), 15 : tile_manager_(new FakeTileManager(&tile_manager_client_)),
16 pile_(FakePicturePileImpl::CreateInfiniteFilledPile()), 16 pile_(FakePicturePileImpl::CreateInfiniteFilledPile()),
17 twin_tiling_(NULL), 17 twin_tiling_(nullptr),
18 recycled_twin_tiling_(NULL), 18 recycled_twin_tiling_(nullptr),
19 allow_create_tile_(true), 19 allow_create_tile_(true),
20 max_tiles_for_interest_area_(10000), 20 max_tiles_for_interest_area_(10000),
21 skewport_target_time_in_seconds_(1.0f), 21 skewport_target_time_in_seconds_(1.0f),
22 skewport_extrapolation_limit_in_content_pixels_(2000) { 22 skewport_extrapolation_limit_in_content_pixels_(2000) {
23 } 23 }
24 24
25 FakePictureLayerTilingClient::FakePictureLayerTilingClient( 25 FakePictureLayerTilingClient::FakePictureLayerTilingClient(
26 ResourceProvider* resource_provider) 26 ResourceProvider* resource_provider)
27 : resource_pool_( 27 : resource_pool_(
28 ResourcePool::Create(resource_provider, GL_TEXTURE_2D, RGBA_8888)), 28 ResourcePool::Create(resource_provider, GL_TEXTURE_2D, RGBA_8888)),
29 tile_manager_( 29 tile_manager_(
30 new FakeTileManager(&tile_manager_client_, resource_pool_.get())), 30 new FakeTileManager(&tile_manager_client_, resource_pool_.get())),
31 pile_(FakePicturePileImpl::CreateInfiniteFilledPile()), 31 pile_(FakePicturePileImpl::CreateInfiniteFilledPile()),
32 twin_tiling_(NULL), 32 twin_tiling_(nullptr),
33 recycled_twin_tiling_(NULL), 33 recycled_twin_tiling_(nullptr),
34 allow_create_tile_(true), 34 allow_create_tile_(true),
35 max_tiles_for_interest_area_(10000), 35 max_tiles_for_interest_area_(10000),
36 skewport_target_time_in_seconds_(1.0f) { 36 skewport_target_time_in_seconds_(1.0f) {
37 } 37 }
38 38
39 FakePictureLayerTilingClient::~FakePictureLayerTilingClient() { 39 FakePictureLayerTilingClient::~FakePictureLayerTilingClient() {
40 } 40 }
41 41
42 scoped_refptr<Tile> FakePictureLayerTilingClient::CreateTile( 42 scoped_refptr<Tile> FakePictureLayerTilingClient::CreateTile(
43 PictureLayerTiling*, 43 PictureLayerTiling*,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 WhichTree FakePictureLayerTilingClient::GetTree() const { 90 WhichTree FakePictureLayerTilingClient::GetTree() const {
91 return tree_; 91 return tree_;
92 } 92 }
93 93
94 bool FakePictureLayerTilingClient::RequiresHighResToDraw() const { 94 bool FakePictureLayerTilingClient::RequiresHighResToDraw() const {
95 return false; 95 return false;
96 } 96 }
97 97
98 } // namespace cc 98 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698