| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "CCDelegatedRendererLayerImpl.h" | 7 #include "CCDelegatedRendererLayerImpl.h" |
| 8 | 8 |
| 9 #include "CCAppendQuadsData.h" | 9 #include "CCAppendQuadsData.h" |
| 10 #include "CCQuadSink.h" | 10 #include "CCQuadSink.h" |
| 11 #include "CCRenderPassDrawQuad.h" | 11 #include "CCRenderPassDrawQuad.h" |
| 12 #include "CCRenderPassSink.h" | 12 #include "CCRenderPassSink.h" |
| 13 #include "FloatRect.h" |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 | 16 |
| 16 CCDelegatedRendererLayerImpl::CCDelegatedRendererLayerImpl(int id) | 17 CCDelegatedRendererLayerImpl::CCDelegatedRendererLayerImpl(int id) |
| 17 : CCLayerImpl(id) | 18 : CCLayerImpl(id) |
| 18 { | 19 { |
| 19 } | 20 } |
| 20 | 21 |
| 21 CCDelegatedRendererLayerImpl::~CCDelegatedRendererLayerImpl() | 22 CCDelegatedRendererLayerImpl::~CCDelegatedRendererLayerImpl() |
| 22 { | 23 { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 50 clearRenderPasses(); | 51 clearRenderPasses(); |
| 51 | 52 |
| 52 for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) { | 53 for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) { |
| 53 m_renderPassesIndexById.insert(std::pair<CCRenderPass::Id, int>(renderPa
ssesInDrawOrder[i]->id(), i)); | 54 m_renderPassesIndexById.insert(std::pair<CCRenderPass::Id, int>(renderPa
ssesInDrawOrder[i]->id(), i)); |
| 54 m_renderPassesInDrawOrder.append(renderPassesInDrawOrder.take(i)); | 55 m_renderPassesInDrawOrder.append(renderPassesInDrawOrder.take(i)); |
| 55 } | 56 } |
| 56 renderPassesInDrawOrder.clear(); | 57 renderPassesInDrawOrder.clear(); |
| 57 | 58 |
| 58 if (!m_renderPassesInDrawOrder.isEmpty()) { | 59 if (!m_renderPassesInDrawOrder.isEmpty()) { |
| 59 FloatRect newRootDamage = m_renderPassesInDrawOrder.last()->damageRect()
; | 60 FloatRect newRootDamage = m_renderPassesInDrawOrder.last()->damageRect()
; |
| 60 m_renderPassesInDrawOrder.last()->setDamageRect(unionRect(oldRootDamage,
newRootDamage)); | 61 m_renderPassesInDrawOrder.last()->setDamageRect(static_cast<FloatRect>(u
nionRect(oldRootDamage, newRootDamage))); |
| 61 } | 62 } |
| 62 } | 63 } |
| 63 | 64 |
| 64 void CCDelegatedRendererLayerImpl::clearRenderPasses() | 65 void CCDelegatedRendererLayerImpl::clearRenderPasses() |
| 65 { | 66 { |
| 66 // FIXME: Release the resources back to the nested compositor. | 67 // FIXME: Release the resources back to the nested compositor. |
| 67 m_renderPassesIndexById.clear(); | 68 m_renderPassesIndexById.clear(); |
| 68 m_renderPassesInDrawOrder.clear(); | 69 m_renderPassesInDrawOrder.clear(); |
| 69 } | 70 } |
| 70 | 71 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 quadSink.append(copyQuad.Pass(), appendQuadsData); | 176 quadSink.append(copyQuad.Pass(), appendQuadsData); |
| 176 } | 177 } |
| 177 } | 178 } |
| 178 | 179 |
| 179 const char* CCDelegatedRendererLayerImpl::layerTypeAsString() const | 180 const char* CCDelegatedRendererLayerImpl::layerTypeAsString() const |
| 180 { | 181 { |
| 181 return "DelegatedRendererLayer"; | 182 return "DelegatedRendererLayer"; |
| 182 } | 183 } |
| 183 | 184 |
| 184 } | 185 } |
| OLD | NEW |