Update To 11.40.268.0

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

diff --git a/src/cc/layers/picture_layer_impl_perftest.cc b/src/cc/layers/picture_layer_impl_perftest.cc
index 1aff9ad..aeea2bb 100644 (file)
--- a/src/cc/layers/picture_layer_impl_perftest.cc
+++ b/src/cc/layers/picture_layer_impl_perftest.cc
@@ -45,9 +45,8 @@ class PictureLayerImplPerfTest : public testing::Test {
                base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                kTimeCheckInterval) {}
 
-  virtual void SetUp() OVERRIDE {
-    host_impl_.InitializeRenderer(
-        FakeOutputSurface::Create3d().PassAs<OutputSurface>());
+  virtual void SetUp() override {
+    host_impl_.InitializeRenderer(FakeOutputSurface::Create3d());
   }
 
   void SetupPendingTree(const gfx::Size& layer_bounds,
@@ -61,7 +60,7 @@ class PictureLayerImplPerfTest : public testing::Test {
     scoped_ptr<FakePictureLayerImpl> pending_layer =
         FakePictureLayerImpl::CreateWithPile(pending_tree, 7, pile);
     pending_layer->SetDrawsContent(true);
-    pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());
+    pending_tree->SetRootLayer(pending_layer.Pass());
 
     pending_layer_ = static_cast<FakePictureLayerImpl*>(
         host_impl_.pending_tree()->LayerById(7));
@@ -81,7 +80,7 @@ class PictureLayerImplPerfTest : public testing::Test {
       PictureLayerImpl::LayerRasterTileIterator it(pending_layer_, false);
       while (count--) {
         ASSERT_TRUE(it) << "count: " << count;
-        ASSERT_TRUE(*it != NULL) << "count: " << count;
+        ASSERT_TRUE(*it != nullptr) << "count: " << count;
         ++it;
       }
       timer_.NextLap();
@@ -98,7 +97,8 @@ class PictureLayerImplPerfTest : public testing::Test {
   void RunRasterIteratorConstructTest(const std::string& test_name,
                                       const gfx::Rect& viewport) {
     host_impl_.SetViewportSize(viewport.size());
-    pending_layer_->SetScrollOffset(gfx::Vector2d(viewport.x(), viewport.y()));
+    pending_layer_->SetScrollOffset(
+        gfx::ScrollOffset(viewport.x(), viewport.y()));
     host_impl_.pending_tree()->UpdateDrawProperties();
 
     timer_.Reset();
@@ -133,7 +133,7 @@ class PictureLayerImplPerfTest : public testing::Test {
           pending_layer_, priorities[priority_count]);
       while (count--) {
         ASSERT_TRUE(it) << "count: " << count;
-        ASSERT_TRUE(*it != NULL) << "count: " << count;
+        ASSERT_TRUE(*it != nullptr) << "count: " << count;
         ++it;
       }
       priority_count = (priority_count + 1) % arraysize(priorities);
@@ -151,7 +151,8 @@ class PictureLayerImplPerfTest : public testing::Test {
   void RunEvictionIteratorConstructTest(const std::string& test_name,
                                         const gfx::Rect& viewport) {
     host_impl_.SetViewportSize(viewport.size());
-    pending_layer_->SetScrollOffset(gfx::Vector2d(viewport.x(), viewport.y()));
+    pending_layer_->SetScrollOffset(
+        gfx::ScrollOffset(viewport.x(), viewport.y()));
     host_impl_.pending_tree()->UpdateDrawProperties();
 
     TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
@@ -236,7 +237,7 @@ TEST_F(PictureLayerImplPerfTest, LayerEvictionTileIteratorConstructAndIterate) {
   AddTiling(1.0f, pending_layer_, &all_tiles);
   AddTiling(2.0f, pending_layer_, &all_tiles);
 
-  ASSERT_TRUE(host_impl_.tile_manager() != NULL);
+  ASSERT_TRUE(host_impl_.tile_manager() != nullptr);
   host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles);
 
   RunEvictionIteratorConstructAndIterateTest(
@@ -261,7 +262,7 @@ TEST_F(PictureLayerImplPerfTest, LayerEvictionTileIteratorConstruct) {
   AddTiling(1.0f, pending_layer_, &all_tiles);
   AddTiling(2.0f, pending_layer_, &all_tiles);
 
-  ASSERT_TRUE(host_impl_.tile_manager() != NULL);
+  ASSERT_TRUE(host_impl_.tile_manager() != nullptr);
   host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles);
 
   RunEvictionIteratorConstructTest("0_0_100x100", gfx::Rect(0, 0, 100, 100));