Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2893)

Unified Diff: cc/CCRenderPass.cpp

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCRenderPass.h ('k') | cc/CCRenderPassDrawQuad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « cc/CCRenderPass.h ('k') | cc/CCRenderPassDrawQuad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698