Add cc:DrawQuad type for surfaces

content/common/cc_messages_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/cc_messages.h"
 
 #include <string.h>
 
 #include <algorithm>
 
 #include "cc/output/compositor_frame.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 
 using cc::CheckerboardDrawQuad;
 using cc::DelegatedFrameData;
 using cc::DebugBorderDrawQuad;
 using cc::DrawQuad;
 using cc::FilterOperation;
 using cc::FilterOperations;
 using cc::IOSurfaceDrawQuad;
 using cc::PictureDrawQuad;
 using cc::RenderPass;
 using cc::RenderPassDrawQuad;
 using cc::ResourceProvider;
 using cc::SharedQuadState;
 using cc::SolidColorDrawQuad;
+using cc::SurfaceDrawQuad;
 using cc::TextureDrawQuad;
 using cc::TileDrawQuad;
 using cc::TransferableResource;
 using cc::StreamVideoDrawQuad;
 using cc::VideoLayerImpl;
 using cc::YUVVideoDrawQuad;
 using gfx::Transform;
 
 namespace content {
 namespace {
@@ skipping 58 matching lines @@
                 TileDrawQuad::MaterialCast(b));
         break;
       case DrawQuad::SOLID_COLOR:
         Compare(SolidColorDrawQuad::MaterialCast(a),
                 SolidColorDrawQuad::MaterialCast(b));
         break;
       case DrawQuad::STREAM_VIDEO_CONTENT:
         Compare(StreamVideoDrawQuad::MaterialCast(a),
                 StreamVideoDrawQuad::MaterialCast(b));
         break;
+      case DrawQuad::SURFACE_CONTENT:
+        Compare(SurfaceDrawQuad::MaterialCast(a),

[danakj, 2014/01/14 18:31:57]

This Compare method is not implemented yet.

+                SurfaceDrawQuad::MaterialCast(b));
+        break;
       case DrawQuad::YUV_VIDEO_CONTENT:
         Compare(YUVVideoDrawQuad::MaterialCast(a),
                 YUVVideoDrawQuad::MaterialCast(b));
         break;
       case DrawQuad::INVALID:
         break;
     }
   }
 
   void Compare(const CheckerboardDrawQuad* a, const CheckerboardDrawQuad* b) {
@@ skipping 236 matching lines @@
       StreamVideoDrawQuad::Create();
   streamvideo_in->SetAll(shared_state3_in.get(),
                          arbitrary_rect2,
                          arbitrary_rect2_inside_rect2,
                          arbitrary_rect1_inside_rect2,
                          arbitrary_bool1,
                          arbitrary_resourceid2,
                          arbitrary_matrix);
   scoped_ptr<DrawQuad> streamvideo_cmp = streamvideo_in->Copy(
       streamvideo_in->shared_quad_state);
 

[danakj, 2014/01/14 18:31:57]

add a surfacedrawquad into the frame here?

   scoped_ptr<TextureDrawQuad> texture_in = TextureDrawQuad::Create();
   texture_in->SetAll(shared_state3_in.get(),
                      arbitrary_rect2,
                      arbitrary_rect2_inside_rect2,
                      arbitrary_rect1_inside_rect2,
                      arbitrary_bool1,
                      arbitrary_resourceid1,
                      arbitrary_bool2,
                      arbitrary_pointf1,
                      arbitrary_pointf2,
@@ skipping 315 matching lines @@
         break;
       case cc::DrawQuad::TEXTURE_CONTENT:
         largest = std::max(largest, sizeof(cc::TextureDrawQuad));
         break;
       case cc::DrawQuad::RENDER_PASS:
         largest = std::max(largest, sizeof(cc::RenderPassDrawQuad));
         break;
       case cc::DrawQuad::SOLID_COLOR:
         largest = std::max(largest, sizeof(cc::SolidColorDrawQuad));
         break;
       case cc::DrawQuad::TILED_CONTENT:

[danakj, 2014/01/14 18:31:57]

add the surface draw quad here

         largest = std::max(largest, sizeof(cc::TileDrawQuad));
         break;
       case cc::DrawQuad::STREAM_VIDEO_CONTENT:
         largest = std::max(largest, sizeof(cc::StreamVideoDrawQuad));
         break;
       case cc::DrawQuad::YUV_VIDEO_CONTENT:
         largest = std::max(largest, sizeof(cc::YUVVideoDrawQuad));
         break;
       case cc::DrawQuad::INVALID:
         break;
       default:
         done = true;
     }
   }
 
   // Verify the largest DrawQuad type is RenderPassDrawQuad. If this ever
   // changes, then the ReserveSizeForRenderPassWrite() method needs to be
   // updated as well to use the new largest quad.
   EXPECT_EQ(sizeof(RenderPassDrawQuad), largest);
 }
 
 }  // namespace
 }  // namespace content