| Index: cc/CCDelegatedRendererLayerImpl.cpp
|
| diff --git a/cc/CCDelegatedRendererLayerImpl.cpp b/cc/CCDelegatedRendererLayerImpl.cpp
|
| index d6574ec50b686f5f0a91cddc3302030a9ef90172..050f2aa41fdd832d91e176b4d20121234c213fdc 100644
|
| --- a/cc/CCDelegatedRendererLayerImpl.cpp
|
| +++ b/cc/CCDelegatedRendererLayerImpl.cpp
|
| @@ -43,7 +43,7 @@ bool CCDelegatedRendererLayerImpl::hasContributingDelegatedRenderPasses() const
|
|
|
| void CCDelegatedRendererLayerImpl::setRenderPasses(OwnPtrVector<CCRenderPass>& renderPassesInDrawOrder)
|
| {
|
| - FloatRect oldRootDamage;
|
| + ccmath::FloatRect oldRootDamage;
|
| if (!m_renderPassesInDrawOrder.isEmpty())
|
| oldRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
|
|
|
| @@ -56,8 +56,8 @@ void CCDelegatedRendererLayerImpl::setRenderPasses(OwnPtrVector<CCRenderPass>& r
|
| renderPassesInDrawOrder.clear();
|
|
|
| if (!m_renderPassesInDrawOrder.isEmpty()) {
|
| - FloatRect newRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
|
| - m_renderPassesInDrawOrder.last()->setDamageRect(unionRect(oldRootDamage, newRootDamage));
|
| + ccmath::FloatRect newRootDamage = m_renderPassesInDrawOrder.last()->damageRect();
|
| + m_renderPassesInDrawOrder.last()->setDamageRect(ccmath::FloatRect::Union(oldRootDamage, newRootDamage));
|
| }
|
| }
|
|
|
|
|