| Index: cc/CCRenderPass.cpp
|
| diff --git a/cc/CCRenderPass.cpp b/cc/CCRenderPass.cpp
|
| index 9990f2e3ee36ab21f080ea12bdb83c6525e29762..2f79cab0c15b63606425f273b890bc31be2b4399 100644
|
| --- a/cc/CCRenderPass.cpp
|
| +++ b/cc/CCRenderPass.cpp
|
| @@ -17,19 +17,33 @@ using WebKit::WebTransformationMatrix;
|
|
|
| namespace WebCore {
|
|
|
| -PassOwnPtr<CCRenderPass> CCRenderPass::create(int id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
|
| +PassOwnPtr<CCRenderPass> CCRenderPass::create(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
|
| {
|
| return adoptPtr(new CCRenderPass(id, outputRect, transformToRootTarget));
|
| }
|
|
|
| -CCRenderPass::CCRenderPass(int id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
|
| +CCRenderPass::CCRenderPass(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
|
| : m_id(id)
|
| , m_transformToRootTarget(transformToRootTarget)
|
| , m_outputRect(outputRect)
|
| , m_hasTransparentBackground(true)
|
| , m_hasOcclusionFromOutsideTargetSurface(false)
|
| {
|
| - ASSERT(id > 0);
|
| + ASSERT(id.layerId > 0);
|
| + ASSERT(id.index >= 0);
|
| +}
|
| +
|
| +PassOwnPtr<CCRenderPass> CCRenderPass::copy(Id newId) const
|
| +{
|
| + ASSERT(newId != m_id);
|
| +
|
| + OwnPtr<CCRenderPass> copyPass(create(newId, m_outputRect, m_transformToRootTarget));
|
| + copyPass->setDamageRect(m_damageRect);
|
| + copyPass->setHasTransparentBackground(m_hasTransparentBackground);
|
| + copyPass->setHasOcclusionFromOutsideTargetSurface(m_hasOcclusionFromOutsideTargetSurface);
|
| + copyPass->setFilters(m_filters);
|
| + copyPass->setBackgroundFilters(m_backgroundFilters);
|
| + return copyPass.release();
|
| }
|
|
|
| void CCRenderPass::appendQuadsForLayer(CCLayerImpl* layer, CCOcclusionTrackerImpl* occlusionTracker, CCAppendQuadsData& appendQuadsData)
|
|
|