Upstream version 5.34.104.0

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

diff --git a/src/cc/layers/delegated_frame_provider_unittest.cc b/src/cc/layers/delegated_frame_provider_unittest.cc
index 871b421..f29488d 100644 (file)
--- a/src/cc/layers/delegated_frame_provider_unittest.cc
+++ b/src/cc/layers/delegated_frame_provider_unittest.cc
@@ -20,8 +20,9 @@ class DelegatedFrameProviderTest
  protected:
   DelegatedFrameProviderTest() : resources_available_(false) {}
 
-  scoped_ptr<DelegatedFrameData> CreateFrameData(gfx::Rect root_output_rect,
-                                                 gfx::Rect root_damage_rect) {
+  scoped_ptr<DelegatedFrameData> CreateFrameData(
+          const gfx::Rect& root_output_rect,
+          const gfx::Rect& root_damage_rect) {
     scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData);
 
     scoped_ptr<RenderPass> root_pass(RenderPass::Create());
@@ -37,7 +38,7 @@ class DelegatedFrameProviderTest
                                ResourceProvider::ResourceId resource_id) {
     TransferableResource resource;
     resource.id = resource_id;
-    resource.target = GL_TEXTURE_2D;
+    resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
     frame->resource_list.push_back(resource);
   }
 
@@ -150,9 +151,9 @@ TEST_F(DelegatedFrameProviderTest, RefResources) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;
 
@@ -208,9 +209,9 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProvider) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;
 
@@ -250,9 +251,9 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProviderUntilDestroy) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;
 
@@ -294,9 +295,9 @@ TEST_F(DelegatedFrameProviderTest, Damage) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;