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

Unified Diff: content/common/gpu/client/gl_helper_scaling.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
Index: content/common/gpu/client/gl_helper_scaling.cc
diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc
index dea58e751becfaa66462633b820b04fc02cb9891..353016d73a5952a9ccc9830b8e889db6c8321fc9 100644
--- a/content/common/gpu/client/gl_helper_scaling.cc
+++ b/content/common/gpu/client/gl_helper_scaling.cc
@@ -151,7 +151,7 @@ class ScalerImpl : public GLHelper::ScalerInterface,
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
- NULL);
+ nullptr);
}
}
@@ -283,7 +283,7 @@ void GLHelperScaling::ConvertScalerOpsToScalerStages(
std::vector<ScalerStage>* scaler_stages) {
while (!x_ops->empty() || !y_ops->empty()) {
gfx::Size intermediate_size = src_subrect.size();
- std::deque<ScaleOp>* current_queue = NULL;
+ std::deque<ScaleOp>* current_queue = nullptr;
if (!y_ops->empty()) {
current_queue = y_ops;
@@ -451,9 +451,9 @@ GLHelper::ScalerInterface* GLHelperScaling::CreateScaler(
swizzle,
&scaler_stages);
- ScalerImpl* ret = NULL;
+ ScalerImpl* ret = nullptr;
for (unsigned int i = 0; i < scaler_stages.size(); i++) {
- ret = new ScalerImpl(gl_, this, scaler_stages[i], ret, NULL);
+ ret = new ScalerImpl(gl_, this, scaler_stages[i], ret, nullptr);
}
return ret;
}
@@ -472,7 +472,7 @@ GLHelper::ScalerInterface* GLHelperScaling::CreatePlanarScaler(
true,
vertically_flip_texture,
swizzle);
- return new ScalerImpl(gl_, this, stage, NULL, color_weights);
+ return new ScalerImpl(gl_, this, stage, nullptr, color_weights);
}
GLHelperScaling::ShaderInterface* GLHelperScaling::CreateYuvMrtShader(
@@ -490,7 +490,7 @@ GLHelperScaling::ShaderInterface* GLHelperScaling::CreateYuvMrtShader(
true,
vertically_flip_texture,
swizzle);
- return new ScalerImpl(gl_, this, stage, NULL, NULL);
+ return new ScalerImpl(gl_, this, stage, nullptr, nullptr);
}
const GLfloat GLHelperScaling::kVertexAttributes[] = {
« no previous file with comments | « content/common/gpu/client/gl_helper_readback_support.cc ('k') | content/common/gpu/client/gl_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698