Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: cc/draw_quad.h

Issue 11417035: cc: Switch the DrawQuad enum names to chromium style and remove pragmas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/delegated_renderer_layer_impl.cc ('k') | cc/draw_quad.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/draw_quad.h
diff --git a/cc/draw_quad.h b/cc/draw_quad.h
index 76c2304b1ef0f7557fa417fcd3c8881d26e6db22..dd3c8f29bdf04dcd6fe727efcc127bf2b553e42e 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_
« no previous file with comments | « cc/delegated_renderer_layer_impl.cc ('k') | cc/draw_quad.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698