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

Unified Diff: cc/CCDirectRenderer.cpp

Issue 10989028: cc: Remove WebCore dependecies from CCRenderPass and CCDrawQuad classes. (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
Index: cc/CCDirectRenderer.cpp
diff --git a/cc/CCDirectRenderer.cpp b/cc/CCDirectRenderer.cpp
index 8bf3c4b014eba97e814a8f71235c2e43e479aad1..c64ca6075b6888c98702381dcf09c36bb40a9f32 100644
--- a/cc/CCDirectRenderer.cpp
+++ b/cc/CCDirectRenderer.cpp
@@ -152,13 +152,13 @@ void CCDirectRenderer::decideRenderPassAllocationsForFrame(const CCRenderPassLis
void CCDirectRenderer::drawFrame(const CCRenderPassList& renderPassesInDrawOrder, const CCRenderPassIdHashMap& renderPassesById)
{
- const CCRenderPass* rootRenderPass = renderPassesInDrawOrder.last();
+ const CCRenderPass* rootRenderPass = renderPassesInDrawOrder.back();
ASSERT(rootRenderPass);
DrawingFrame frame;
frame.renderPassesById = &renderPassesById;
frame.rootRenderPass = rootRenderPass;
- frame.rootDamageRect = capabilities().usingPartialSwap ? rootRenderPass->damageRect() : rootRenderPass->outputRect();
+ frame.rootDamageRect = capabilities().usingPartialSwap ? static_cast<FloatRect>(rootRenderPass->damageRect()) : static_cast<IntRect>(rootRenderPass->outputRect());
frame.rootDamageRect.intersect(IntRect(IntPoint::zero(), viewportSize()));
beginDrawingFrame(frame);
@@ -173,7 +173,7 @@ void CCDirectRenderer::drawRenderPass(DrawingFrame& frame, const CCRenderPass* r
return;
frame.scissorRectInRenderPassSpace = frame.currentRenderPass->outputRect();
- if (frame.rootDamageRect != frame.rootRenderPass->outputRect()) {
+ if (frame.rootDamageRect != static_cast<IntRect>(frame.rootRenderPass->outputRect())) {
WebTransformationMatrix inverseTransformToRoot = frame.currentRenderPass->transformToRootTarget().inverse();
frame.scissorRectInRenderPassSpace.intersect(CCMathUtil::projectClippedRect(inverseTransformToRoot, frame.rootDamageRect));
}
@@ -184,7 +184,7 @@ void CCDirectRenderer::drawRenderPass(DrawingFrame& frame, const CCRenderPass* r
const CCQuadList& quadList = renderPass->quadList();
for (CCQuadList::constBackToFrontIterator it = quadList.backToFrontBegin(); it != quadList.backToFrontEnd(); ++it) {
FloatRect quadScissorRect = frame.scissorRectInRenderPassSpace;
- quadScissorRect.intersect((*it)->clippedRectInTarget());
+ quadScissorRect.intersect(static_cast<FloatRect>((*it)->clippedRectInTarget()));
if (!quadScissorRect.isEmpty()) {
enableScissorTestRect(moveScissorToWindowSpace(frame, quadScissorRect));
drawQuad(frame, *it);
@@ -204,7 +204,7 @@ bool CCDirectRenderer::useRenderPass(DrawingFrame& frame, const CCRenderPass* re
if (renderPass == frame.rootRenderPass) {
bindFramebufferToOutputSurface(frame);
initializeMatrices(frame, renderPass->outputRect(), flippedFramebuffer());
- setDrawViewportSize(renderPass->outputRect().size());
+ setDrawViewportSize(static_cast<IntRect>(renderPass->outputRect()).size());
return true;
}
@@ -225,7 +225,7 @@ bool CCDirectRenderer::haveCachedResourcesForRenderPassId(CCRenderPass::Id id) c
// static
IntSize CCDirectRenderer::renderPassTextureSize(const CCRenderPass* pass)
{
- return pass->outputRect().size();
+ return static_cast<IntRect>(pass->outputRect()).size();
}
// static
« no previous file with comments | « cc/CCDelegatedRendererLayerImpl.cpp ('k') | cc/CCDrawQuad.h » ('j') | cc/scoped_ptr_hash_map.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698