| Index: mojo/converters/surfaces/surfaces_type_converters.cc
|
| diff --git a/mojo/converters/surfaces/surfaces_type_converters.cc b/mojo/converters/surfaces/surfaces_type_converters.cc
|
| index 23ba8fd515f7c95f1fd1d68484dacc9d7f4b6e3c..6ade3eeab5d468cc9d44252c022f6a927e80640c 100644
|
| --- a/mojo/converters/surfaces/surfaces_type_converters.cc
|
| +++ b/mojo/converters/surfaces/surfaces_type_converters.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/macros.h"
|
| #include "cc/output/compositor_frame.h"
|
| #include "cc/output/delegated_frame_data.h"
|
| -#include "cc/quads/checkerboard_draw_quad.h"
|
| #include "cc/quads/debug_border_draw_quad.h"
|
| #include "cc/quads/draw_quad.h"
|
| #include "cc/quads/render_pass.h"
|
| @@ -29,7 +28,6 @@ namespace mojo {
|
| MATERIAL_##value), \
|
| value##_enum_value_matches)
|
|
|
| -ASSERT_ENUM_VALUES_EQUAL(CHECKERBOARD);
|
| ASSERT_ENUM_VALUES_EQUAL(DEBUG_BORDER);
|
| ASSERT_ENUM_VALUES_EQUAL(IO_SURFACE_CONTENT);
|
| ASSERT_ENUM_VALUES_EQUAL(PICTURE_CONTENT);
|
| @@ -67,19 +65,6 @@ bool ConvertDrawQuad(const QuadPtr& input,
|
| cc::SharedQuadState* sqs,
|
| cc::RenderPass* render_pass) {
|
| switch (input->material) {
|
| - case MATERIAL_CHECKERBOARD: {
|
| - cc::CheckerboardDrawQuad* checkerboard_quad =
|
| - render_pass->CreateAndAppendDrawQuad<cc::CheckerboardDrawQuad>();
|
| - checkerboard_quad->SetAll(
|
| - sqs,
|
| - input->rect.To<gfx::Rect>(),
|
| - input->opaque_rect.To<gfx::Rect>(),
|
| - input->visible_rect.To<gfx::Rect>(),
|
| - input->needs_blending,
|
| - input->checkerboard_quad_state->color.To<SkColor>(),
|
| - input->checkerboard_quad_state->scale);
|
| - break;
|
| - }
|
| case MATERIAL_DEBUG_BORDER: {
|
| cc::DebugBorderDrawQuad* debug_border_quad =
|
| render_pass->CreateAndAppendDrawQuad<cc::DebugBorderDrawQuad>();
|
| @@ -274,16 +259,6 @@ QuadPtr TypeConverter<QuadPtr, cc::DrawQuad>::Convert(
|
| // state list.
|
| quad->shared_quad_state_index = UINT32_MAX;
|
| switch (input.material) {
|
| - case cc::DrawQuad::CHECKERBOARD: {
|
| - const cc::CheckerboardDrawQuad* checkerboard_quad =
|
| - cc::CheckerboardDrawQuad::MaterialCast(&input);
|
| - CheckerboardQuadStatePtr checkerboard_state =
|
| - CheckerboardQuadState::New();
|
| - checkerboard_state->color = Color::From(checkerboard_quad->color);
|
| - checkerboard_state->scale = checkerboard_quad->scale;
|
| - quad->checkerboard_quad_state = checkerboard_state.Pass();
|
| - break;
|
| - }
|
| case cc::DrawQuad::DEBUG_BORDER: {
|
| const cc::DebugBorderDrawQuad* debug_border_quad =
|
| cc::DebugBorderDrawQuad::MaterialCast(&input);
|
|
|