Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / layers / content_layer.cc

diff --git a/src/cc/layers/content_layer.cc b/src/cc/layers/content_layer.cc
index 8986686..d3e9a28 100644 (file)
--- a/src/cc/layers/content_layer.cc
+++ b/src/cc/layers/content_layer.cc
@@ -44,7 +44,7 @@ ContentLayer::ContentLayer(ContentLayerClient* client)
 ContentLayer::~ContentLayer() {}
 
 void ContentLayer::ClearClient() {
-  client_ = NULL;
+  client_ = nullptr;
   UpdateDrawsContent(HasDrawableContent());
 }
 
@@ -62,7 +62,7 @@ void ContentLayer::SetLayerTreeHost(LayerTreeHost* host) {
     updater_->set_rendering_stats_instrumentation(
         host->rendering_stats_instrumentation());
   } else {
-    updater_->set_rendering_stats_instrumentation(NULL);
+    updater_->set_rendering_stats_instrumentation(nullptr);
   }
 }
 
@@ -99,8 +99,7 @@ LayerUpdater* ContentLayer::Updater() const {
 void ContentLayer::CreateUpdaterIfNeeded() {
   if (updater_.get())
     return;
-  scoped_ptr<LayerPainter> painter =
-      ContentLayerPainter::Create(client_).PassAs<LayerPainter>();
+  scoped_ptr<LayerPainter> painter = ContentLayerPainter::Create(client_);
   if (layer_tree_host()->settings().per_tile_painting_enabled) {
     updater_ = BitmapSkPictureContentLayerUpdater::Create(
         painter.Pass(),
@@ -148,7 +147,7 @@ skia::RefPtr<SkPicture> ContentLayer::GetPicture() const {
   int height = bounds().height();
 
   SkPictureRecorder recorder;
-  SkCanvas* canvas = recorder.beginRecording(width, height, NULL, 0);
+  SkCanvas* canvas = recorder.beginRecording(width, height, nullptr, 0);
   client_->PaintContents(canvas,
                          gfx::Rect(width, height),
                          ContentLayerClient::GRAPHICS_CONTEXT_ENABLED);