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

Side by Side Diff: cc/layers/render_surface.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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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/render_surface.h" 5 #include "cc/layers/render_surface.h"
6 6
7 #include "cc/base/math_util.h" 7 #include "cc/base/math_util.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "ui/gfx/transform.h" 9 #include "ui/gfx/transform.h"
10 10
11 namespace cc { 11 namespace cc {
12 12
13 RenderSurface::RenderSurface(Layer* owning_layer) 13 RenderSurface::RenderSurface(Layer* owning_layer)
14 : owning_layer_(owning_layer), 14 : owning_layer_(owning_layer),
15 draw_opacity_(1), 15 draw_opacity_(1),
16 draw_opacity_is_animating_(false), 16 draw_opacity_is_animating_(false),
17 target_surface_transforms_are_animating_(false), 17 target_surface_transforms_are_animating_(false),
18 screen_space_transforms_are_animating_(false), 18 screen_space_transforms_are_animating_(false),
19 is_clipped_(false), 19 is_clipped_(false),
20 contributes_to_drawn_surface_(false), 20 contributes_to_drawn_surface_(false),
21 nearest_occlusion_immune_ancestor_(NULL) {} 21 nearest_occlusion_immune_ancestor_(nullptr) {
22 }
22 23
23 RenderSurface::~RenderSurface() { 24 RenderSurface::~RenderSurface() {
24 for (size_t i = 0; i < layer_list_.size(); ++i) { 25 for (size_t i = 0; i < layer_list_.size(); ++i) {
25 DCHECK(!layer_list_.at(i)->render_surface()) << 26 DCHECK(!layer_list_.at(i)->render_surface()) <<
26 "RenderSurfaces should be cleared from the contributing layers " << 27 "RenderSurfaces should be cleared from the contributing layers " <<
27 "before destroying this surface to avoid leaking a circular " << 28 "before destroying this surface to avoid leaking a circular " <<
28 "reference on the contributing layer. Probably the " << 29 "reference on the contributing layer. Probably the " <<
29 "RenderSurfaceLayerList should just be destroyed before destroying " << 30 "RenderSurfaceLayerList should just be destroyed before destroying " <<
30 "any RenderSurfaces on layers."; 31 "any RenderSurfaces on layers.";
31 } 32 }
32 } 33 }
33 34
34 gfx::RectF RenderSurface::DrawableContentRect() const { 35 gfx::RectF RenderSurface::DrawableContentRect() const {
35 gfx::RectF drawable_content_rect = 36 gfx::RectF drawable_content_rect =
36 MathUtil::MapClippedRect(draw_transform_, content_rect_); 37 MathUtil::MapClippedRect(draw_transform_, content_rect_);
37 if (owning_layer_->has_replica()) 38 if (owning_layer_->has_replica())
38 drawable_content_rect.Union( 39 drawable_content_rect.Union(
39 MathUtil::MapClippedRect(replica_draw_transform_, content_rect_)); 40 MathUtil::MapClippedRect(replica_draw_transform_, content_rect_));
40 return drawable_content_rect; 41 return drawable_content_rect;
41 } 42 }
42 43
43 void RenderSurface::ClearLayerLists() { 44 void RenderSurface::ClearLayerLists() {
44 layer_list_.clear(); 45 layer_list_.clear();
45 } 46 }
46 47
47 } // namespace cc 48 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698