| 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[] = {
|
|
|