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

Unified Diff: content/common/cursors/webcursor_ozone.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors 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
« no previous file with comments | « content/common/cursors/webcursor_aurawin.cc ('k') | content/common/font_cache_dispatcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cursors/webcursor_ozone.cc
diff --git a/content/common/cursors/webcursor_ozone.cc b/content/common/cursors/webcursor_ozone.cc
index 39a356d28347a2a5ac646801f3efd080ebcc391e..b04dea52bdaaf0e581434b30a935f42aaf1f9f9b 100644
--- a/content/common/cursors/webcursor_ozone.cc
+++ b/content/common/cursors/webcursor_ozone.cc
@@ -34,13 +34,13 @@ void WebCursor::SetDisplayInfo(const gfx::Display& display) {
rotation_ = display.rotation();
if (platform_cursor_)
ui::CursorFactoryOzone::GetInstance()->UnrefImageCursor(platform_cursor_);
- platform_cursor_ = NULL;
+ platform_cursor_ = nullptr;
// It is not necessary to recreate platform_cursor_ yet, since it will be
// recreated on demand when GetPlatformCursor is called.
}
void WebCursor::InitPlatformData() {
- platform_cursor_ = NULL;
+ platform_cursor_ = nullptr;
device_scale_factor_ = 1.f;
rotation_ = gfx::Display::ROTATE_0;
}
@@ -60,7 +60,7 @@ bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
void WebCursor::CleanupPlatformData() {
if (platform_cursor_) {
ui::CursorFactoryOzone::GetInstance()->UnrefImageCursor(platform_cursor_);
- platform_cursor_ = NULL;
+ platform_cursor_ = nullptr;
}
}
« no previous file with comments | « content/common/cursors/webcursor_aurawin.cc ('k') | content/common/font_cache_dispatcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698