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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 640203002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format 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 side-by-side diff with in-line comments
Download patch
« cc/trees/layer_tree_host_impl.h ('K') | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/occlusion_tracker.cc » ('j') | cc/trees/tree_synchronizer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 172e16f9ad3c88e85cd67a9cdb03954a91966f17..d9dacba05a0032d7f0e39aa7a11d21f65252c7eb 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -74,13 +74,13 @@ LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl)
: layer_tree_host_impl_(layer_tree_host_impl),
source_frame_number_(-1),
hud_layer_(0),
- currently_scrolling_layer_(NULL),
- root_layer_scroll_offset_delegate_(NULL),
+ currently_scrolling_layer_(nullptr),
+ root_layer_scroll_offset_delegate_(nullptr),
background_color_(0),
has_transparent_background_(false),
- page_scale_layer_(NULL),
- inner_viewport_scroll_layer_(NULL),
- outer_viewport_scroll_layer_(NULL),
+ page_scale_layer_(nullptr),
+ inner_viewport_scroll_layer_(nullptr),
+ outer_viewport_scroll_layer_(nullptr),
page_scale_factor_(1),
page_scale_delta_(1),
sent_page_scale_delta_(1),
@@ -120,17 +120,17 @@ void LayerTreeImpl::ReleaseResources() {
void LayerTreeImpl::SetRootLayer(scoped_ptr<LayerImpl> layer) {
if (inner_viewport_scroll_layer_)
- inner_viewport_scroll_layer_->SetScrollOffsetDelegate(NULL);
+ inner_viewport_scroll_layer_->SetScrollOffsetDelegate(nullptr);
if (outer_viewport_scroll_layer_)
- outer_viewport_scroll_layer_->SetScrollOffsetDelegate(NULL);
+ outer_viewport_scroll_layer_->SetScrollOffsetDelegate(nullptr);
inner_viewport_scroll_delegate_proxy_ = nullptr;
outer_viewport_scroll_delegate_proxy_ = nullptr;
root_layer_ = layer.Pass();
- currently_scrolling_layer_ = NULL;
- inner_viewport_scroll_layer_ = NULL;
- outer_viewport_scroll_layer_ = NULL;
- page_scale_layer_ = NULL;
+ currently_scrolling_layer_ = nullptr;
+ inner_viewport_scroll_layer_ = nullptr;
+ outer_viewport_scroll_layer_ = nullptr;
+ page_scale_layer_ = nullptr;
layer_tree_host_impl_->OnCanDrawStateChangedForTree();
}
@@ -181,15 +181,15 @@ scoped_ptr<LayerImpl> LayerTreeImpl::DetachLayerTree() {
scrolling_layer_id_from_previous_tree_ =
currently_scrolling_layer_ ? currently_scrolling_layer_->id() : 0;
if (inner_viewport_scroll_layer_)
- inner_viewport_scroll_layer_->SetScrollOffsetDelegate(NULL);
+ inner_viewport_scroll_layer_->SetScrollOffsetDelegate(nullptr);
if (outer_viewport_scroll_layer_)
- outer_viewport_scroll_layer_->SetScrollOffsetDelegate(NULL);
+ outer_viewport_scroll_layer_->SetScrollOffsetDelegate(nullptr);
inner_viewport_scroll_delegate_proxy_ = nullptr;
outer_viewport_scroll_delegate_proxy_ = nullptr;
- inner_viewport_scroll_layer_ = NULL;
- outer_viewport_scroll_layer_ = NULL;
- page_scale_layer_ = NULL;
- currently_scrolling_layer_ = NULL;
+ inner_viewport_scroll_layer_ = nullptr;
+ outer_viewport_scroll_layer_ = nullptr;
+ page_scale_layer_ = nullptr;
+ currently_scrolling_layer_ = nullptr;
render_surface_layer_list_.clear();
set_needs_update_draw_properties();
@@ -254,7 +254,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
LayerTreeHostCommon::FindLayerInSubtree(
target_tree->root_layer(), hud_layer()->id())));
else
- target_tree->set_hud_layer(NULL);
+ target_tree->set_hud_layer(nullptr);
target_tree->has_ever_been_drawn_ = false;
}
@@ -262,7 +262,7 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const {
return inner_viewport_scroll_layer_
? inner_viewport_scroll_layer_->scroll_clip_layer()
- : NULL;
+ : nullptr;
}
LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const {
@@ -284,7 +284,7 @@ void LayerTreeImpl::SetCurrentlyScrollingLayer(LayerImpl* layer) {
}
void LayerTreeImpl::ClearCurrentlyScrollingLayer() {
- SetCurrentlyScrollingLayer(NULL);
+ SetCurrentlyScrollingLayer(nullptr);
scrolling_layer_id_from_previous_tree_ = 0;
}
@@ -448,9 +448,9 @@ void LayerTreeImpl::SetViewportLayersFromIds(
}
void LayerTreeImpl::ClearViewportLayers() {
- page_scale_layer_ = NULL;
- inner_viewport_scroll_layer_ = NULL;
- outer_viewport_scroll_layer_ = NULL;
+ page_scale_layer_ = nullptr;
+ inner_viewport_scroll_layer_ = nullptr;
+ outer_viewport_scroll_layer_ = nullptr;
}
bool LayerTreeImpl::UpdateDrawProperties() {
@@ -580,7 +580,7 @@ gfx::Size LayerTreeImpl::ScrollableSize() const {
LayerImpl* LayerTreeImpl::LayerById(int id) {
LayerIdMap::iterator iter = layer_id_map_.find(id);
- return iter != layer_id_map_.end() ? iter->second : NULL;
+ return iter != layer_id_map_.end() ? iter->second : nullptr;
}
void LayerTreeImpl::RegisterLayer(LayerImpl* layer) {
@@ -731,21 +731,21 @@ bool LayerTreeImpl::IsRecycleTree() const {
LayerImpl* LayerTreeImpl::FindActiveTreeLayerById(int id) {
LayerTreeImpl* tree = layer_tree_host_impl_->active_tree();
if (!tree)
- return NULL;
+ return nullptr;
return tree->LayerById(id);
}
LayerImpl* LayerTreeImpl::FindPendingTreeLayerById(int id) {
LayerTreeImpl* tree = layer_tree_host_impl_->pending_tree();
if (!tree)
- return NULL;
+ return nullptr;
return tree->LayerById(id);
}
LayerImpl* LayerTreeImpl::FindRecycleTreeLayerById(int id) {
LayerTreeImpl* tree = layer_tree_host_impl_->recycle_tree();
if (!tree)
- return NULL;
+ return nullptr;
return tree->LayerById(id);
}
@@ -890,9 +890,9 @@ void LayerTreeImpl::SetRootLayerScrollOffsetDelegate(
// Make sure we remove the proxies from their layers before
// releasing them.
if (InnerViewportScrollLayer())
- InnerViewportScrollLayer()->SetScrollOffsetDelegate(NULL);
+ InnerViewportScrollLayer()->SetScrollOffsetDelegate(nullptr);
if (OuterViewportScrollLayer())
- OuterViewportScrollLayer()->SetScrollOffsetDelegate(NULL);
+ OuterViewportScrollLayer()->SetScrollOffsetDelegate(nullptr);
inner_viewport_scroll_delegate_proxy_ = nullptr;
outer_viewport_scroll_delegate_proxy_ = nullptr;
}
@@ -1204,14 +1204,14 @@ static bool PointIsClippedBySurfaceOrClipRect(
!PointHitsRect(screen_space_point,
layer->render_surface()->screen_space_transform(),
layer->render_surface()->content_rect(),
- NULL))
+ nullptr))
return true;
if (LayerClipsSubtree(layer) &&
!PointHitsRect(screen_space_point,
layer->screen_space_transform(),
gfx::Rect(layer->content_bounds()),
- NULL))
+ nullptr))
return true;
}
@@ -1245,7 +1245,7 @@ static bool PointHitsLayer(const LayerImpl* layer,
struct FindClosestMatchingLayerDataForRecursion {
FindClosestMatchingLayerDataForRecursion()
- : closest_match(NULL),
+ : closest_match(nullptr),
closest_distance(-std::numeric_limits<float>::infinity()) {}
LayerImpl* closest_match;
// Note that the positive z-axis points towards the camera, so bigger means
@@ -1319,9 +1319,9 @@ struct HitTestVisibleScrollableOrTouchableFunctor {
LayerImpl* LayerTreeImpl::FindLayerThatIsHitByPoint(
const gfx::PointF& screen_space_point) {
if (!root_layer())
- return NULL;
+ return nullptr;
if (!UpdateDrawProperties())
- return NULL;
+ return nullptr;
FindClosestMatchingLayerDataForRecursion data_for_recursion;
FindClosestMatchingLayer(screen_space_point,
root_layer(),
@@ -1362,9 +1362,9 @@ struct FindTouchEventLayerFunctor {
LayerImpl* LayerTreeImpl::FindLayerThatIsHitByPointInTouchHandlerRegion(
const gfx::PointF& screen_space_point) {
if (!root_layer())
- return NULL;
+ return nullptr;
if (!UpdateDrawProperties())
- return NULL;
+ return nullptr;
FindTouchEventLayerFunctor func = {screen_space_point};
FindClosestMatchingLayerDataForRecursion data_for_recursion;
FindClosestMatchingLayer(
@@ -1430,17 +1430,18 @@ void LayerTreeImpl::GetViewportSelection(ViewportSelectionBound* start,
DCHECK(start);
DCHECK(end);
- *start = ComputeViewportSelection(
- selection_start_,
- selection_start_.layer_id ? LayerById(selection_start_.layer_id) : NULL,
- device_scale_factor());
+ *start = ComputeViewportSelection(selection_start_,
+ selection_start_.layer_id
+ ? LayerById(selection_start_.layer_id)
+ : nullptr,
+ device_scale_factor());
if (start->type == SELECTION_BOUND_CENTER ||
start->type == SELECTION_BOUND_EMPTY) {
*end = *start;
} else {
*end = ComputeViewportSelection(
selection_end_,
- selection_end_.layer_id ? LayerById(selection_end_.layer_id) : NULL,
+ selection_end_.layer_id ? LayerById(selection_end_.layer_id) : nullptr,
device_scale_factor());
}
}
« cc/trees/layer_tree_host_impl.h ('K') | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/occlusion_tracker.cc » ('j') | cc/trees/tree_synchronizer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698