| Index: cc/layer.cc
|
| diff --git a/cc/layer.cc b/cc/layer.cc
|
| index 82b797c591b3c838abf22fa5bcc95ce9a62eb635..57d1c1731221fcb2b4464ce3373e84db072278c6 100644
|
| --- a/cc/layer.cc
|
| +++ b/cc/layer.cc
|
| @@ -54,12 +54,6 @@ Layer::Layer()
|
| , m_drawCheckerboardForMissingTiles(false)
|
| , m_forceRenderSurface(false)
|
| , m_replicaLayer(0)
|
| - , m_drawOpacity(0)
|
| - , m_drawOpacityIsAnimating(false)
|
| - , m_renderTarget(0)
|
| - , m_drawTransformIsAnimating(false)
|
| - , m_screenSpaceTransformIsAnimating(false)
|
| - , m_isClipped(false)
|
| , m_rasterScale(1.0)
|
| , m_automaticallyComputeRasterScale(false)
|
| , m_boundsContainPageScale(false)
|
| @@ -696,9 +690,9 @@ void Layer::setBoundsContainPageScale(bool boundsContainPageScale)
|
|
|
| void Layer::createRenderSurface()
|
| {
|
| - DCHECK(!m_renderSurface);
|
| - m_renderSurface = make_scoped_ptr(new RenderSurface(this));
|
| - setRenderTarget(this);
|
| + DCHECK(!m_drawProperties.render_surface);
|
| + m_drawProperties.render_surface = make_scoped_ptr(new RenderSurface(this));
|
| + m_drawProperties.render_target = this;
|
| }
|
|
|
| int Layer::descendantsDrawContent()
|
|
|