Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / debug / picture_record_benchmark.cc

diff --git a/src/cc/debug/picture_record_benchmark.cc b/src/cc/debug/picture_record_benchmark.cc
index e6a5a65..5f832ae 100644 (file)
--- a/src/cc/debug/picture_record_benchmark.cc
+++ b/src/cc/debug/picture_record_benchmark.cc
@@ -12,7 +12,7 @@
 #include "cc/layers/picture_layer.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
@@ -31,13 +31,13 @@ PictureRecordBenchmark::PictureRecordBenchmark(
   if (!value)
     return;
 
-  base::ListValue* list = NULL;
+  base::ListValue* list = nullptr;
   value->GetAsList(&list);
   if (!list)
     return;
 
   for (base::ListValue::iterator it = list->begin(); it != list->end(); ++it) {
-    base::DictionaryValue* dictionary = NULL;
+    base::DictionaryValue* dictionary = nullptr;
     (*it)->GetAsDictionary(&dictionary);
     if (!dictionary ||
         !dictionary->HasKey("width") ||
@@ -80,7 +80,7 @@ void PictureRecordBenchmark::DidUpdateLayers(LayerTreeHost* host) {
     results->Append(result.release());
   }
 
-  NotifyDone(results.PassAs<base::Value>());
+  NotifyDone(results.Pass());
 }
 
 void PictureRecordBenchmark::Run(Layer* layer) {