cc: Switch the DrawQuad enum names to chromium style and remove pragmas

Some cleanup in the direction of making DrawQuad a chromified struct.

R=enne
BUG=152337

Review URL: https://codereview.chromium.org/11417035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168301 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 88 insertions, 128 deletions

diff --git a/cc/checkerboard_draw_quad.cc b/cc/checkerboard_draw_quad.cc
index a553ccf..d12cd4b 100644
--- a/cc/checkerboard_draw_quad.cc
+++ b/cc/checkerboard_draw_quad.cc
@@ -14,14 +14,14 @@ scoped_ptr<CheckerboardDrawQuad> CheckerboardDrawQuad::create(const SharedQuadSt
 }
 
 CheckerboardDrawQuad::CheckerboardDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, SkColor color)
-    : DrawQuad(sharedQuadState, DrawQuad::Checkerboard, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::CHECKERBOARD, quadRect)
     , m_color(color)
 {
 }
 
 const CheckerboardDrawQuad* CheckerboardDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::Checkerboard);
+    DCHECK(quad->material() == DrawQuad::CHECKERBOARD);
     return static_cast<const CheckerboardDrawQuad*>(quad);
 }
 
diff --git a/cc/checkerboard_draw_quad.h b/cc/checkerboard_draw_quad.h
index 439842ea..2306c1c 100644
--- a/cc/checkerboard_draw_quad.h
+++ b/cc/checkerboard_draw_quad.h
@@ -12,8 +12,6 @@
 
 namespace cc {
 
-#pragma pack(push, 4)
-
 class CC_EXPORT CheckerboardDrawQuad : public DrawQuad {
 public:
     static scoped_ptr<CheckerboardDrawQuad> create(const SharedQuadState*, const gfx::Rect&, SkColor);
@@ -27,8 +25,6 @@ private:
     SkColor m_color;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_CHECKERBOARD_DRAW_QUAD_H_
diff --git a/cc/debug_border_draw_quad.cc b/cc/debug_border_draw_quad.cc
index dbcd93f..282f91c 100644
--- a/cc/debug_border_draw_quad.cc
+++ b/cc/debug_border_draw_quad.cc
@@ -14,7 +14,7 @@ scoped_ptr<DebugBorderDrawQuad> DebugBorderDrawQuad::create(const SharedQuadStat
 }
 
 DebugBorderDrawQuad::DebugBorderDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, SkColor color, int width)
-    : DrawQuad(sharedQuadState, DrawQuad::DebugBorder, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::DEBUG_BORDER, quadRect)
     , m_color(color)
     , m_width(width)
 {
@@ -25,7 +25,7 @@ DebugBorderDrawQuad::DebugBorderDrawQuad(const SharedQuadState* sharedQuadState,
 
 const DebugBorderDrawQuad* DebugBorderDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::DebugBorder);
+    DCHECK(quad->material() == DrawQuad::DEBUG_BORDER);
     return static_cast<const DebugBorderDrawQuad*>(quad);
 }
 
diff --git a/cc/debug_border_draw_quad.h b/cc/debug_border_draw_quad.h
index 165aa3e..daee5b0 100644
--- a/cc/debug_border_draw_quad.h
+++ b/cc/debug_border_draw_quad.h
@@ -12,8 +12,6 @@
 
 namespace cc {
 
-#pragma pack(push, 4)
-
 class CC_EXPORT DebugBorderDrawQuad : public DrawQuad {
 public:
     static scoped_ptr<DebugBorderDrawQuad> create(const SharedQuadState*, const gfx::Rect&, SkColor, int width);
@@ -29,8 +27,6 @@ private:
     int m_width;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_DEBUG_BORDER_DRAW_QUAD_H_
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index a740a1f..f8c601d 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/delegated_renderer_layer_impl.cc
@@ -160,7 +160,7 @@ void DelegatedRendererLayerImpl::appendRenderPassQuads(QuadSink& quadSink, Appen
         DCHECK(copiedSharedQuadState);
 
         scoped_ptr<DrawQuad> copyQuad;
-        if (quad->material() != DrawQuad::RenderPass)
+        if (quad->material() != DrawQuad::RENDER_PASS)
             copyQuad = quad->copy(copiedSharedQuadState);
         else {
             RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQuad::materialCast(quad)->renderPassId();
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc
index 27e933b..aba2412 100644
--- a/cc/draw_quad.cc
+++ b/cc/draw_quad.cc
@@ -35,7 +35,7 @@ DrawQuad::DrawQuad(const SharedQuadState* sharedQuadState, Material material, co
     , m_needsBlending(false)
 {
     DCHECK(m_sharedQuadState);
-    DCHECK(m_material != Invalid);
+    DCHECK(m_material != INVALID);
 }
 
 gfx::Rect DrawQuad::opaqueRect() const
@@ -56,32 +56,32 @@ scoped_ptr<DrawQuad> DrawQuad::copy(const SharedQuadState* copiedSharedQuadState
 {
     scoped_ptr<DrawQuad> copyQuad;
     switch (material()) {
-    case Checkerboard:
+    case CHECKERBOARD:
         copyQuad.reset(TypedCopy<CheckerboardDrawQuad>(this));
         break;
-    case DebugBorder:
+    case DEBUG_BORDER:
         copyQuad.reset(TypedCopy<DebugBorderDrawQuad>(this));
         break;
-    case IOSurfaceContent:
+    case IO_SURFACE_CONTENT:
         copyQuad.reset(TypedCopy<IOSurfaceDrawQuad>(this));
         break;
-    case TextureContent:
+    case TEXTURE_CONTENT:
         copyQuad.reset(TypedCopy<TextureDrawQuad>(this));
         break;
-    case SolidColor:
+    case SOLID_COLOR:
         copyQuad.reset(TypedCopy<SolidColorDrawQuad>(this));
         break;
-    case TiledContent:
+    case TILED_CONTENT:
         copyQuad.reset(TypedCopy<TileDrawQuad>(this));
         break;
-    case StreamVideoContent:
+    case STREAM_VIDEO_CONTENT:
         copyQuad.reset(TypedCopy<StreamVideoDrawQuad>(this));
         break;
-    case YUVVideoContent:
+    case YUV_VIDEO_CONTENT:
         copyQuad.reset(TypedCopy<YUVVideoDrawQuad>(this));
         break;
-    case RenderPass:  // RenderPass quads have their own copy() method.
-    case Invalid:
+    case RENDER_PASS:  // RenderPass quads have their own copy() method.
+    case INVALID:
         LOG(FATAL) << "Invalid DrawQuad material " << material();
         break;
     }
diff --git a/cc/draw_quad.h b/cc/draw_quad.h
index 76c2304..dd3c8f2 100644
--- a/cc/draw_quad.h
+++ b/cc/draw_quad.h
@@ -10,16 +10,6 @@
 
 namespace cc {
 
-// WARNING! All XYZDrawQuad classes must remain PODs (plain old data).
-// They are intended to be "serializable" by copying their raw bytes, so they
-// must not contain any non-bit-copyable member variables!
-//
-// Furthermore, the class members need to be packed so they are aligned
-// properly and don't have paddings/gaps, otherwise memory check tools
-// like Valgrind will complain about uninitialized memory usage when
-// transferring these classes over the wire.
-#pragma pack(push, 4)
-
 // DrawQuad is a bag of data used for drawing a quad. Because different
 // materials need different bits of per-quad data to render, classes that derive
 // from DrawQuad store additional data in their derived instance. The Material
@@ -27,16 +17,16 @@ namespace cc {
 class CC_EXPORT DrawQuad {
 public:
     enum Material {
-        Invalid,
-        Checkerboard,
-        DebugBorder,
-        IOSurfaceContent,
-        RenderPass,
-        TextureContent,
-        SolidColor,
-        TiledContent,
-        YUVVideoContent,
-        StreamVideoContent,
+        INVALID,
+        CHECKERBOARD,
+        DEBUG_BORDER,
+        IO_SURFACE_CONTENT,
+        RENDER_PASS,
+        TEXTURE_CONTENT,
+        SOLID_COLOR,
+        TILED_CONTENT,
+        YUV_VIDEO_CONTENT,
+        STREAM_VIDEO_CONTENT,
     };
 
     gfx::Rect quadRect() const { return m_quadRect; }
@@ -52,7 +42,7 @@ public:
     // in will be clipped to quadRect().
     void setQuadVisibleRect(gfx::Rect);
     gfx::Rect quadVisibleRect() const { return m_quadVisibleRect; }
-    bool isDebugQuad() const { return m_material == DebugBorder; }
+    bool isDebugQuad() const { return m_material == DEBUG_BORDER; }
 
     Material material() const { return m_material; }
 
@@ -86,8 +76,6 @@ protected:
     gfx::Rect m_opaqueRect;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_DRAW_QUAD_H_
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index e69d285..895e5db 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -256,34 +256,34 @@ void GLRenderer::drawQuad(DrawingFrame& frame, const DrawQuad* quad)
         GLC(m_context, m_context->disable(GL_BLEND));
 
     switch (quad->material()) {
-    case DrawQuad::Invalid:
+    case DrawQuad::INVALID:
         NOTREACHED();
         break;
-    case DrawQuad::Checkerboard:
+    case DrawQuad::CHECKERBOARD:
         drawCheckerboardQuad(frame, CheckerboardDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::DebugBorder:
+    case DrawQuad::DEBUG_BORDER:
         drawDebugBorderQuad(frame, DebugBorderDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::IOSurfaceContent:
+    case DrawQuad::IO_SURFACE_CONTENT:
         drawIOSurfaceQuad(frame, IOSurfaceDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::RenderPass:
+    case DrawQuad::RENDER_PASS:
         drawRenderPassQuad(frame, RenderPassDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::SolidColor:
+    case DrawQuad::SOLID_COLOR:
         drawSolidColorQuad(frame, SolidColorDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::StreamVideoContent:
+    case DrawQuad::STREAM_VIDEO_CONTENT:
         drawStreamVideoQuad(frame, StreamVideoDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::TextureContent:
+    case DrawQuad::TEXTURE_CONTENT:
         drawTextureQuad(frame, TextureDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::TiledContent:
+    case DrawQuad::TILED_CONTENT:
         drawTileQuad(frame, TileDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::YUVVideoContent:
+    case DrawQuad::YUV_VIDEO_CONTENT:
         drawYUVVideoQuad(frame, YUVVideoDrawQuad::materialCast(quad));
         break;
     }
diff --git a/cc/io_surface_draw_quad.cc b/cc/io_surface_draw_quad.cc
index 3eb09a4..9426a4b 100644
--- a/cc/io_surface_draw_quad.cc
+++ b/cc/io_surface_draw_quad.cc
@@ -14,7 +14,7 @@ scoped_ptr<IOSurfaceDrawQuad> IOSurfaceDrawQuad::create(const SharedQuadState* s
 }
 
 IOSurfaceDrawQuad::IOSurfaceDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, const gfx::Size& ioSurfaceSize, unsigned ioSurfaceTextureId, Orientation orientation)
-    : DrawQuad(sharedQuadState, DrawQuad::IOSurfaceContent, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::IO_SURFACE_CONTENT, quadRect)
     , m_ioSurfaceSize(ioSurfaceSize)
     , m_ioSurfaceTextureId(ioSurfaceTextureId)
     , m_orientation(orientation)
@@ -23,7 +23,7 @@ IOSurfaceDrawQuad::IOSurfaceDrawQuad(const SharedQuadState* sharedQuadState, con
 
 const IOSurfaceDrawQuad* IOSurfaceDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::IOSurfaceContent);
+    DCHECK(quad->material() == DrawQuad::IO_SURFACE_CONTENT);
     return static_cast<const IOSurfaceDrawQuad*>(quad);
 }
 
diff --git a/cc/io_surface_draw_quad.h b/cc/io_surface_draw_quad.h
index 7f83d99..c6ce29b 100644
--- a/cc/io_surface_draw_quad.h
+++ b/cc/io_surface_draw_quad.h
@@ -12,8 +12,6 @@
 
 namespace cc {
 
-#pragma pack(push, 4)
-
 class CC_EXPORT IOSurfaceDrawQuad : public DrawQuad {
 public:
     enum Orientation {
@@ -36,8 +34,6 @@ private:
     Orientation m_orientation;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_IO_SURFACE_DRAW_QUAD_H_
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index e381bac..ea5967f 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -560,7 +560,7 @@ static void removeRenderPassesRecursive(RenderPass::Id removeRenderPassId, Layer
     QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
     for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
         DrawQuad* currentQuad = (*quadListIterator);
-        if (currentQuad->material() != DrawQuad::RenderPass)
+        if (currentQuad->material() != DrawQuad::RENDER_PASS)
             continue;
 
         RenderPass::Id nextRemoveRenderPassId = RenderPassDrawQuad::materialCast(currentQuad)->renderPassId();
@@ -588,7 +588,7 @@ bool LayerTreeHostImpl::CullRenderPassesWithNoQuads::shouldRemoveRenderPass(cons
     for (QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin(); quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
         DrawQuad* currentQuad = *quadListIterator;
 
-        if (currentQuad->material() != DrawQuad::RenderPass)
+        if (currentQuad->material() != DrawQuad::RENDER_PASS)
             return false;
 
         const RenderPass* contributingPass = findRenderPassById(RenderPassDrawQuad::materialCast(currentQuad)->renderPassId(), frame);
@@ -615,7 +615,7 @@ void LayerTreeHostImpl::removeRenderPasses(RenderPassCuller culler, FrameData& f
         for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
             DrawQuad* currentQuad = *quadListIterator;
 
-            if (currentQuad->material() != DrawQuad::RenderPass)
+            if (currentQuad->material() != DrawQuad::RENDER_PASS)
                 continue;
 
             RenderPassDrawQuad* renderPassQuad = static_cast<RenderPassDrawQuad*>(currentQuad);
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index c6aa8f4..e0d5a9a 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -1848,7 +1848,7 @@ TEST_P(LayerTreeHostImplTest, viewportCovered)
 
         size_t numGutterQuads = 0;
         for (size_t i = 0; i < frame.renderPasses[0]->quadList().size(); ++i)
-            numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SolidColor) ? 1 : 0;
+            numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SOLID_COLOR) ? 1 : 0;
         EXPECT_EQ(0u, numGutterQuads);
         EXPECT_EQ(1u, frame.renderPasses[0]->quadList().size());
 
@@ -1872,7 +1872,7 @@ TEST_P(LayerTreeHostImplTest, viewportCovered)
 
         size_t numGutterQuads = 0;
         for (size_t i = 0; i < frame.renderPasses[0]->quadList().size(); ++i)
-            numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SolidColor) ? 1 : 0;
+            numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SOLID_COLOR) ? 1 : 0;
         EXPECT_EQ(1u, numGutterQuads);
         EXPECT_EQ(1u, frame.renderPasses[0]->quadList().size());
 
@@ -1895,7 +1895,7 @@ TEST_P(LayerTreeHostImplTest, viewportCovered)
 
         size_t numGutterQuads = 0;
         for (size_t i = 0; i < frame.renderPasses[0]->quadList().size(); ++i)
-            numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SolidColor) ? 1 : 0;
+            numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SOLID_COLOR) ? 1 : 0;
         EXPECT_EQ(4u, numGutterQuads);
         EXPECT_EQ(5u, frame.renderPasses[0]->quadList().size());
 
@@ -2346,8 +2346,8 @@ TEST_P(LayerTreeHostImplTest, contributingLayerEmptyScissorPartialSwap)
         ASSERT_EQ(2U, frame.renderPasses.size());
         ASSERT_EQ(1U, frame.renderPasses[0]->quadList().size());
         ASSERT_EQ(1U, frame.renderPasses[1]->quadList().size());
-        EXPECT_EQ(DrawQuad::SolidColor, frame.renderPasses[0]->quadList()[0]->material());
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::SOLID_COLOR, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
     }
 }
 
@@ -2367,8 +2367,8 @@ TEST_P(LayerTreeHostImplTest, contributingLayerEmptyScissorNoPartialSwap)
         ASSERT_EQ(2U, frame.renderPasses.size());
         ASSERT_EQ(1U, frame.renderPasses[0]->quadList().size());
         ASSERT_EQ(1U, frame.renderPasses[1]->quadList().size());
-        EXPECT_EQ(DrawQuad::SolidColor, frame.renderPasses[0]->quadList()[0]->material());
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::SOLID_COLOR, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
     }
 }
 
@@ -3137,7 +3137,7 @@ TEST_P(LayerTreeHostImplTest, textureCachingWithClipping)
         // Verify that the render surface texture is *not* clipped.
         EXPECT_RECT_EQ(gfx::Rect(0, 0, 100, 100), frame.renderPasses[0]->outputRect());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0]);
         EXPECT_FALSE(quad->contentsChangedSinceLastFrame().IsEmpty());
 
@@ -3795,7 +3795,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
         EXPECT_EQ(1U, frame.renderPasses[1]->quadList().size());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_FALSE(targetPass->damageRect().IsEmpty());
@@ -3813,7 +3813,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
         ASSERT_EQ(1U, frame.renderPasses.size());
 
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[0]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -3832,7 +3832,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
         ASSERT_EQ(1U, frame.renderPasses.size());
 
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[0]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -3851,9 +3851,9 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
         ASSERT_EQ(2U, frame.renderPasses.size());
 
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
-        EXPECT_EQ(DrawQuad::SolidColor, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::SOLID_COLOR, frame.renderPasses[0]->quadList()[0]->material());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_FALSE(targetPass->damageRect().IsEmpty());
@@ -3880,7 +3880,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
         EXPECT_EQ(1U, frame.renderPasses[1]->quadList().size());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -3901,7 +3901,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
         ASSERT_EQ(1U, frame.renderPasses.size());
 
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[0]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -3922,7 +3922,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
         ASSERT_EQ(1U, frame.renderPasses.size());
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[0]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -3954,7 +3954,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
         EXPECT_EQ(1U, frame.renderPasses[1]->quadList().size());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_FALSE(targetPass->damageRect().IsEmpty());
@@ -3996,7 +3996,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
         ASSERT_EQ(1U, frame.renderPasses.size());
 
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[0]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -4015,9 +4015,9 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
         ASSERT_EQ(2U, frame.renderPasses.size());
 
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
-        EXPECT_EQ(DrawQuad::SolidColor, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::SOLID_COLOR, frame.renderPasses[0]->quadList()[0]->material());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_FALSE(targetPass->damageRect().IsEmpty());
@@ -4044,7 +4044,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
         EXPECT_EQ(1U, frame.renderPasses[1]->quadList().size());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[1]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[1]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -4083,7 +4083,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
         ASSERT_EQ(1U, frame.renderPasses.size());
         EXPECT_EQ(1U, frame.renderPasses[0]->quadList().size());
 
-        EXPECT_EQ(DrawQuad::RenderPass, frame.renderPasses[0]->quadList()[0]->material());
+        EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quadList()[0]->material());
         RenderPassDrawQuad* quad = static_cast<RenderPassDrawQuad*>(frame.renderPasses[0]->quadList()[0]);
         RenderPass* targetPass = frame.renderPassesById.get(quad->renderPassId());
         EXPECT_TRUE(targetPass->damageRect().IsEmpty());
@@ -4259,11 +4259,11 @@ void dumpRenderPassTestData(const RenderPassRemovalTestData& testData, char* buf
         while (quadListIterator != currentPass->quadList().end()) {
             DrawQuad* currentQuad = *quadListIterator;
             switch (currentQuad->material()) {
-            case DrawQuad::SolidColor:
+            case DrawQuad::SOLID_COLOR:
                 *pos = 's';
                 pos++;
                 break;
-            case DrawQuad::RenderPass:
+            case DrawQuad::RENDER_PASS:
                 *pos = RenderPassDrawQuad::materialCast(currentQuad)->renderPassId().layerId;
                 pos++;
                 *pos = RenderPassDrawQuad::materialCast(currentQuad)->renderPassId().index;
diff --git a/cc/nine_patch_layer_impl_unittest.cc b/cc/nine_patch_layer_impl_unittest.cc
index 0c339cb..776beda 100644
--- a/cc/nine_patch_layer_impl_unittest.cc
+++ b/cc/nine_patch_layer_impl_unittest.cc
@@ -75,7 +75,7 @@ TEST(NinePatchLayerImplTest, verifyDrawQuads)
     Region texRemaining(bitmapRect);
     for (size_t i = 0; i < quads.size(); ++i) {
         DrawQuad* quad = quads[i];
-        ASSERT_EQ(quad->material(), DrawQuad::TextureContent);
+        ASSERT_EQ(quad->material(), DrawQuad::TEXTURE_CONTENT);
         TextureDrawQuad* texQuad = static_cast<TextureDrawQuad*>(quad);
         gfx::RectF texRect = texQuad->uvRect();
         texRect.Scale(bitmapSize.width(), bitmapSize.height());
diff --git a/cc/render_pass_draw_quad.cc b/cc/render_pass_draw_quad.cc
index 5b0a19e..4830b42 100644
--- a/cc/render_pass_draw_quad.cc
+++ b/cc/render_pass_draw_quad.cc
@@ -12,7 +12,7 @@ scoped_ptr<RenderPassDrawQuad> RenderPassDrawQuad::create(const SharedQuadState*
 }
 
 RenderPassDrawQuad::RenderPassDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, RenderPass::Id renderPassId, bool isReplica, ResourceProvider::ResourceId maskResourceId, const gfx::Rect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY)
-    : DrawQuad(sharedQuadState, DrawQuad::RenderPass, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::RENDER_PASS, quadRect)
     , m_renderPassId(renderPassId)
     , m_isReplica(isReplica)
     , m_maskResourceId(maskResourceId)
@@ -28,7 +28,7 @@ RenderPassDrawQuad::RenderPassDrawQuad(const SharedQuadState* sharedQuadState, c
 
 const RenderPassDrawQuad* RenderPassDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::RenderPass);
+    DCHECK(quad->material() == DrawQuad::RENDER_PASS);
     return static_cast<const RenderPassDrawQuad*>(quad);
 }
 
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index d7aa06d..2710ba3 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -187,19 +187,19 @@ void SoftwareRenderer::drawQuad(DrawingFrame& frame, const DrawQuad* quad)
     }
 
     switch (quad->material()) {
-    case DrawQuad::DebugBorder:
+    case DrawQuad::DEBUG_BORDER:
         drawDebugBorderQuad(frame, DebugBorderDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::SolidColor:
+    case DrawQuad::SOLID_COLOR:
         drawSolidColorQuad(frame, SolidColorDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::TextureContent:
+    case DrawQuad::TEXTURE_CONTENT:
         drawTextureQuad(frame, TextureDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::TiledContent:
+    case DrawQuad::TILED_CONTENT:
         drawTileQuad(frame, TileDrawQuad::materialCast(quad));
         break;
-    case DrawQuad::RenderPass:
+    case DrawQuad::RENDER_PASS:
         drawRenderPassQuad(frame, RenderPassDrawQuad::materialCast(quad));
         break;
     default:
diff --git a/cc/solid_color_draw_quad.cc b/cc/solid_color_draw_quad.cc
index b1bc3c6..c4a4bad 100644
--- a/cc/solid_color_draw_quad.cc
+++ b/cc/solid_color_draw_quad.cc
@@ -14,7 +14,7 @@ scoped_ptr<SolidColorDrawQuad> SolidColorDrawQuad::create(const SharedQuadState*
 }
 
 SolidColorDrawQuad::SolidColorDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, SkColor color)
-    : DrawQuad(sharedQuadState, DrawQuad::SolidColor, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::SOLID_COLOR, quadRect)
     , m_color(color)
 {
     if (SkColorGetA(m_color) < 255)
@@ -25,7 +25,7 @@ SolidColorDrawQuad::SolidColorDrawQuad(const SharedQuadState* sharedQuadState, c
 
 const SolidColorDrawQuad* SolidColorDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::SolidColor);
+    DCHECK(quad->material() == DrawQuad::SOLID_COLOR);
     return static_cast<const SolidColorDrawQuad*>(quad);
 }
 
diff --git a/cc/solid_color_draw_quad.h b/cc/solid_color_draw_quad.h
index 587f94f..e816936 100644
--- a/cc/solid_color_draw_quad.h
+++ b/cc/solid_color_draw_quad.h
@@ -12,8 +12,6 @@
 
 namespace cc {
 
-#pragma pack(push, 4)
-
 class CC_EXPORT SolidColorDrawQuad : public DrawQuad {
 public:
     static scoped_ptr<SolidColorDrawQuad> create(const SharedQuadState*, const gfx::Rect&, SkColor);
@@ -27,8 +25,6 @@ private:
     SkColor m_color;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_SOLID_COLOR_DRAW_QUAD_H_
diff --git a/cc/stream_video_draw_quad.cc b/cc/stream_video_draw_quad.cc
index 737ac5d..b5c33e2 100644
--- a/cc/stream_video_draw_quad.cc
+++ b/cc/stream_video_draw_quad.cc
@@ -14,7 +14,7 @@ scoped_ptr<StreamVideoDrawQuad> StreamVideoDrawQuad::create(const SharedQuadStat
 }
 
 StreamVideoDrawQuad::StreamVideoDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, unsigned textureId, const WebKit::WebTransformationMatrix& matrix)
-    : DrawQuad(sharedQuadState, DrawQuad::StreamVideoContent, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::STREAM_VIDEO_CONTENT, quadRect)
     , m_textureId(textureId)
     , m_matrix(matrix)
 {
@@ -22,7 +22,7 @@ StreamVideoDrawQuad::StreamVideoDrawQuad(const SharedQuadState* sharedQuadState,
 
 const StreamVideoDrawQuad* StreamVideoDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::StreamVideoContent);
+    DCHECK(quad->material() == DrawQuad::STREAM_VIDEO_CONTENT);
     return static_cast<const StreamVideoDrawQuad*>(quad);
 }
 
diff --git a/cc/stream_video_draw_quad.h b/cc/stream_video_draw_quad.h
index 0dddf22..301f5833 100644
--- a/cc/stream_video_draw_quad.h
+++ b/cc/stream_video_draw_quad.h
@@ -12,8 +12,6 @@
 
 namespace cc {
 
-#pragma pack(push, 4)
-
 class CC_EXPORT StreamVideoDrawQuad : public DrawQuad {
 public:
     static scoped_ptr<StreamVideoDrawQuad> create(const SharedQuadState*, const gfx::Rect&, unsigned textureId, const WebKit::WebTransformationMatrix&);
@@ -29,8 +27,6 @@ private:
     WebKit::WebTransformationMatrix m_matrix;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_STREAM_VIDEO_DRAW_QUAD_H_
diff --git a/cc/texture_draw_quad.cc b/cc/texture_draw_quad.cc
index 36c97be..80a9538 100644
--- a/cc/texture_draw_quad.cc
+++ b/cc/texture_draw_quad.cc
@@ -14,7 +14,7 @@ scoped_ptr<TextureDrawQuad> TextureDrawQuad::create(const SharedQuadState* share
 }
 
 TextureDrawQuad::TextureDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, unsigned resourceId, bool premultipliedAlpha, const gfx::RectF& uvRect, bool flipped)
-    : DrawQuad(sharedQuadState, DrawQuad::TextureContent, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::TEXTURE_CONTENT, quadRect)
     , m_resourceId(resourceId)
     , m_premultipliedAlpha(premultipliedAlpha)
     , m_uvRect(uvRect)
@@ -29,7 +29,7 @@ void TextureDrawQuad::setNeedsBlending()
 
 const TextureDrawQuad* TextureDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::TextureContent);
+    DCHECK(quad->material() == DrawQuad::TEXTURE_CONTENT);
     return static_cast<const TextureDrawQuad*>(quad);
 }
 
diff --git a/cc/texture_draw_quad.h b/cc/texture_draw_quad.h
index 0d64138..cd87c4d 100644
--- a/cc/texture_draw_quad.h
+++ b/cc/texture_draw_quad.h
@@ -12,8 +12,6 @@
 
 namespace cc {
 
-#pragma pack(push, 4)
-
 class CC_EXPORT TextureDrawQuad : public DrawQuad {
 public:
     static scoped_ptr<TextureDrawQuad> create(const SharedQuadState*, const gfx::Rect&, unsigned resourceId, bool premultipliedAlpha, const gfx::RectF& uvRect, bool flipped);
@@ -35,8 +33,6 @@ private:
     bool m_flipped;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_TEXTURE_DRAW_QUAD_H_
diff --git a/cc/tile_draw_quad.cc b/cc/tile_draw_quad.cc
index 0be0e00..7a4da2e 100644
--- a/cc/tile_draw_quad.cc
+++ b/cc/tile_draw_quad.cc
@@ -15,7 +15,7 @@ scoped_ptr<TileDrawQuad> TileDrawQuad::create(const SharedQuadState* sharedQuadS
 }
 
 TileDrawQuad::TileDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Vector2d& textureOffset, const gfx::Size& textureSize, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA)
-    : DrawQuad(sharedQuadState, DrawQuad::TiledContent, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::TILED_CONTENT, quadRect)
     , m_resourceId(resourceId)
     , m_textureOffset(textureOffset)
     , m_textureSize(textureSize)
@@ -32,7 +32,7 @@ TileDrawQuad::TileDrawQuad(const SharedQuadState* sharedQuadState, const gfx::Re
 
 const TileDrawQuad* TileDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::TiledContent);
+    DCHECK(quad->material() == DrawQuad::TILED_CONTENT);
     return static_cast<const TileDrawQuad*>(quad);
 }
 
diff --git a/cc/tile_draw_quad.h b/cc/tile_draw_quad.h
index a772de8..56fb925 100644
--- a/cc/tile_draw_quad.h
+++ b/cc/tile_draw_quad.h
@@ -14,8 +14,6 @@
 
 namespace cc {
 
-#pragma pack(push, 4)
-
 class CC_EXPORT TileDrawQuad : public DrawQuad {
 public:
     static scoped_ptr<TileDrawQuad> create(const SharedQuadState*, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Vector2d& textureOffset, const gfx::Size& textureSize, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
@@ -46,8 +44,6 @@ private:
     bool m_bottomEdgeAA;
 };
 
-#pragma pack(pop)
-
 }
 
 #endif  // CC_TILE_DRAW_QUAD_H_
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index 3494d16..a465771 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -113,7 +113,7 @@ TEST(TiledLayerImplTest, checkerboarding)
         EXPECT_FALSE(data.hadMissingTiles);
 
         for (size_t i = 0; i < quadCuller.quadList().size(); ++i)
-            EXPECT_EQ(quadCuller.quadList()[i]->material(), DrawQuad::TiledContent);
+            EXPECT_EQ(quadCuller.quadList()[i]->material(), DrawQuad::TILED_CONTENT);
     }
 
     for (int i = 0; i < numTilesX; ++i)
@@ -128,7 +128,7 @@ TEST(TiledLayerImplTest, checkerboarding)
         EXPECT_TRUE(data.hadMissingTiles);
         EXPECT_EQ(quadCuller.quadList().size(), 4u);
         for (size_t i = 0; i < quadCuller.quadList().size(); ++i)
-            EXPECT_NE(quadCuller.quadList()[i]->material(), DrawQuad::TiledContent);
+            EXPECT_NE(quadCuller.quadList()[i]->material(), DrawQuad::TILED_CONTENT);
     }
 }
 
@@ -199,7 +199,7 @@ TEST(TiledLayerImplTest, textureInfoForLayerNoBorders)
     getQuads(quads, sharedStates, tileSize, layerSize, LayerTilingData::NoBorderTexels, gfx::Rect(gfx::Point(), layerSize));
 
     for (size_t i = 0; i < quads.size(); ++i) {
-        ASSERT_EQ(quads[i]->material(), DrawQuad::TiledContent) << quadString << i;
+        ASSERT_EQ(quads[i]->material(), DrawQuad::TILED_CONTENT) << quadString << i;
         TileDrawQuad* quad = static_cast<TileDrawQuad*>(quads[i]);
 
         EXPECT_NE(quad->resourceId(), 0u) << quadString << i;
@@ -218,7 +218,7 @@ TEST(TiledLayerImplTest, tileOpaqueRectForLayerNoBorders)
     getQuads(quads, sharedStates, tileSize, layerSize, LayerTilingData::NoBorderTexels, gfx::Rect(gfx::Point(), layerSize));
 
     for (size_t i = 0; i < quads.size(); ++i) {
-        ASSERT_EQ(quads[i]->material(), DrawQuad::TiledContent) << quadString << i;
+        ASSERT_EQ(quads[i]->material(), DrawQuad::TILED_CONTENT) << quadString << i;
         TileDrawQuad* quad = static_cast<TileDrawQuad*>(quads[i]);
 
         EXPECT_EQ(gfx::Rect(0, 0, 1, 1), quad->opaqueRect()) << quadString << i;
diff --git a/cc/yuv_video_draw_quad.cc b/cc/yuv_video_draw_quad.cc
index b781b2c..5efebfc 100644
--- a/cc/yuv_video_draw_quad.cc
+++ b/cc/yuv_video_draw_quad.cc
@@ -28,7 +28,7 @@ YUVVideoDrawQuad::YUVVideoDrawQuad(
     const VideoLayerImpl::FramePlane& yPlane,
     const VideoLayerImpl::FramePlane& uPlane,
     const VideoLayerImpl::FramePlane& vPlane)
-    : DrawQuad(sharedQuadState, DrawQuad::YUVVideoContent, quadRect)
+    : DrawQuad(sharedQuadState, DrawQuad::YUV_VIDEO_CONTENT, quadRect)
     , m_texScale(texScale)
     , m_yPlane(yPlane)
     , m_uPlane(uPlane)
@@ -42,7 +42,7 @@ YUVVideoDrawQuad::~YUVVideoDrawQuad()
 
 const YUVVideoDrawQuad* YUVVideoDrawQuad::materialCast(const DrawQuad* quad)
 {
-    DCHECK(quad->material() == DrawQuad::YUVVideoContent);
+    DCHECK(quad->material() == DrawQuad::YUV_VIDEO_CONTENT);
     return static_cast<const YUVVideoDrawQuad*>(quad);
 }