| Index: cc/shared_quad_state.cc
|
| diff --git a/cc/shared_quad_state.cc b/cc/shared_quad_state.cc
|
| index 914cbc227ad64c0f1688a93b7303ea101a6a3178..94505bc2da77c7c56c5ca7a0e6d91232a5a019f1 100644
|
| --- a/cc/shared_quad_state.cc
|
| +++ b/cc/shared_quad_state.cc
|
| @@ -6,24 +6,23 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<SharedQuadState> SharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const gfx::Rect& visibleContentRect, const gfx::Rect& clippedRectInTarget, float opacity, bool opaque)
|
| +scoped_ptr<SharedQuadState> SharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const gfx::Rect& visibleContentRect, const gfx::Rect& clippedRectInTarget, float opacity)
|
| {
|
| - return make_scoped_ptr(new SharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| + return make_scoped_ptr(new SharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity));
|
| }
|
|
|
| -SharedQuadState::SharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const gfx::Rect& visibleContentRect, const gfx::Rect& clippedRectInTarget, float opacity, bool opaque)
|
| +SharedQuadState::SharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const gfx::Rect& visibleContentRect, const gfx::Rect& clippedRectInTarget, float opacity)
|
| : id(-1)
|
| , quadTransform(quadTransform)
|
| , visibleContentRect(visibleContentRect)
|
| , clippedRectInTarget(clippedRectInTarget)
|
| , opacity(opacity)
|
| - , opaque(opaque)
|
| {
|
| }
|
|
|
| scoped_ptr<SharedQuadState> SharedQuadState::copy() const
|
| {
|
| - scoped_ptr<SharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| + scoped_ptr<SharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity));
|
| copiedState->id = id;
|
| return copiedState.Pass();
|
| }
|
|
|