| Index: cc/shared_quad_state.h
|
| diff --git a/cc/shared_quad_state.h b/cc/shared_quad_state.h
|
| index 0f5e386410d599588d644bbf42f78912e8d1bef3..5e17536482efa0b8b23e4291a8ee18b17ec487ee 100644
|
| --- a/cc/shared_quad_state.h
|
| +++ b/cc/shared_quad_state.h
|
| @@ -11,7 +11,7 @@
|
|
|
| namespace cc {
|
|
|
| -struct CCSharedQuadState {
|
| +struct SharedQuadState {
|
| int id;
|
|
|
| // Transforms from quad's original content space to its target content space.
|
| @@ -22,10 +22,10 @@ struct CCSharedQuadState {
|
| float opacity;
|
| bool opaque;
|
|
|
| - static scoped_ptr<CCSharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
|
| - CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
|
| + static scoped_ptr<SharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
|
| + SharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
|
|
|
| - scoped_ptr<CCSharedQuadState> copy() const;
|
| + scoped_ptr<SharedQuadState> copy() const;
|
| };
|
|
|
| }
|
|
|