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

Unified Diff: cc/layers/scrollbar_layer_impl_base.h

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 side-by-side diff with in-line comments
Download patch
Index: cc/layers/scrollbar_layer_impl_base.h
diff --git a/cc/layers/scrollbar_layer_impl_base.h b/cc/layers/scrollbar_layer_impl_base.h
index 7d37acc4083985c18724246a7863953f64de14c7..a98c3ea5622284201580ae6b51e09126aa2af644 100644
--- a/cc/layers/scrollbar_layer_impl_base.h
+++ b/cc/layers/scrollbar_layer_impl_base.h
@@ -24,8 +24,8 @@ class CC_EXPORT ScrollbarLayerImplBase : public LayerImpl {
}
void SetScrollLayerAndClipLayerByIds(int scroll_layer_id, int clip_layer_id);
- void ClearScrollLayer() { scroll_layer_ = NULL; }
- void ClearClipLayer() { clip_layer_ = NULL; }
+ void ClearScrollLayer() { scroll_layer_ = nullptr; }
+ void ClearClipLayer() { clip_layer_ = nullptr; }
float current_pos() const { return current_pos_; }
bool SetCurrentPos(float current_pos);

Powered by Google App Engine
This is Rietveld 408576698