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

Side by Side Diff: cc/quad_culler.cc

Issue 11275113: Remove most remaining references to IntRect and FloatRect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compositor bindings Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/page_scale_animation.cc ('k') | cc/render_pass.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "cc/quad_culler.h" 7 #include "cc/quad_culler.h"
8 8
9 #include "Region.h" 9 #include "Region.h"
10 #include "cc/append_quads_data.h" 10 #include "cc/append_quads_data.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 m_sharedQuadStateList.append(sharedQuadState.Pass()); 46 m_sharedQuadStateList.append(sharedQuadState.Pass());
47 return m_currentSharedQuadState; 47 return m_currentSharedQuadState;
48 } 48 }
49 49
50 static inline bool appendQuadInternal(scoped_ptr<DrawQuad> drawQuad, const gfx:: Rect& culledRect, QuadList& quadList, const OcclusionTrackerImpl& occlusionTrack er, bool createDebugBorderQuads) 50 static inline bool appendQuadInternal(scoped_ptr<DrawQuad> drawQuad, const gfx:: Rect& culledRect, QuadList& quadList, const OcclusionTrackerImpl& occlusionTrack er, bool createDebugBorderQuads)
51 { 51 {
52 bool keepQuad = !culledRect.IsEmpty(); 52 bool keepQuad = !culledRect.IsEmpty();
53 if (keepQuad) 53 if (keepQuad)
54 drawQuad->setQuadVisibleRect(culledRect); 54 drawQuad->setQuadVisibleRect(culledRect);
55 55
56 occlusionTracker.overdrawMetrics().didCullForDrawing(drawQuad->quadTransform (), cc::IntRect(drawQuad->quadRect()), cc::IntRect(culledRect)); 56 occlusionTracker.overdrawMetrics().didCullForDrawing(drawQuad->quadTransform (), drawQuad->quadRect(), culledRect);
57 occlusionTracker.overdrawMetrics().didDraw(drawQuad->quadTransform(), cc::In tRect(culledRect), cc::IntRect(drawQuad->opaqueRect())); 57 occlusionTracker.overdrawMetrics().didDraw(drawQuad->quadTransform(), culled Rect, drawQuad->opaqueRect());
58 58
59 if (keepQuad) { 59 if (keepQuad) {
60 if (createDebugBorderQuads && !drawQuad->isDebugQuad() && drawQuad->quad VisibleRect() != drawQuad->quadRect()) { 60 if (createDebugBorderQuads && !drawQuad->isDebugQuad() && drawQuad->quad VisibleRect() != drawQuad->quadRect()) {
61 SkColor borderColor = SkColorSetARGB(debugTileBorderAlpha, debugTile BorderColorRed, debugTileBorderColorGreen, debugTileBorderColorBlue); 61 SkColor borderColor = SkColorSetARGB(debugTileBorderAlpha, debugTile BorderColorRed, debugTileBorderColorGreen, debugTileBorderColorBlue);
62 quadList.append(DebugBorderDrawQuad::create(drawQuad->sharedQuadStat e(), drawQuad->quadVisibleRect(), borderColor, debugTileBorderWidth).PassAs<Draw Quad>()); 62 quadList.append(DebugBorderDrawQuad::create(drawQuad->sharedQuadStat e(), drawQuad->quadVisibleRect(), borderColor, debugTileBorderWidth).PassAs<Draw Quad>());
63 } 63 }
64 64
65 // Pass the quad after we're done using it. 65 // Pass the quad after we're done using it.
66 quadList.append(drawQuad.Pass()); 66 quadList.append(drawQuad.Pass());
67 } 67 }
68 return keepQuad; 68 return keepQuad;
69 } 69 }
70 70
71 bool QuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData& appendQu adsData) 71 bool QuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData& appendQu adsData)
72 { 72 {
73 DCHECK(drawQuad->sharedQuadState() == m_currentSharedQuadState); 73 DCHECK(drawQuad->sharedQuadState() == m_currentSharedQuadState);
74 DCHECK(drawQuad->sharedQuadStateId() == m_currentSharedQuadState->id); 74 DCHECK(drawQuad->sharedQuadStateId() == m_currentSharedQuadState->id);
75 DCHECK(!m_sharedQuadStateList.isEmpty()); 75 DCHECK(!m_sharedQuadStateList.isEmpty());
76 DCHECK(m_sharedQuadStateList.last() == m_currentSharedQuadState); 76 DCHECK(m_sharedQuadStateList.last() == m_currentSharedQuadState);
77 77
78 gfx::Rect culledRect; 78 gfx::Rect culledRect;
79 bool hasOcclusionFromOutsideTargetSurface; 79 bool hasOcclusionFromOutsideTargetSurface;
80 bool implDrawTransformIsUnknown = false; 80 bool implDrawTransformIsUnknown = false;
81 81
82 if (m_forSurface) 82 if (m_forSurface)
83 culledRect = m_occlusionTracker->unoccludedContributingSurfaceContentRec t(m_layer, false, cc::IntRect(drawQuad->quadRect()), &hasOcclusionFromOutsideTar getSurface); 83 culledRect = m_occlusionTracker->unoccludedContributingSurfaceContentRec t(m_layer, false, drawQuad->quadRect(), &hasOcclusionFromOutsideTargetSurface);
84 else 84 else
85 culledRect = m_occlusionTracker->unoccludedContentRect(m_layer->renderTa rget(), cc::IntRect(drawQuad->quadRect()), drawQuad->quadTransform(), implDrawTr ansformIsUnknown, cc::IntRect(drawQuad->clippedRectInTarget()), &hasOcclusionFro mOutsideTargetSurface); 85 culledRect = m_occlusionTracker->unoccludedContentRect(m_layer->renderTa rget(), drawQuad->quadRect(), drawQuad->quadTransform(), implDrawTransformIsUnkn own, drawQuad->clippedRectInTarget(), &hasOcclusionFromOutsideTargetSurface);
86 86
87 appendQuadsData.hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOuts ideTargetSurface; 87 appendQuadsData.hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOuts ideTargetSurface;
88 88
89 return appendQuadInternal(drawQuad.Pass(), culledRect, m_quadList, *m_occlus ionTracker, m_showCullingWithDebugBorderQuads); 89 return appendQuadInternal(drawQuad.Pass(), culledRect, m_quadList, *m_occlus ionTracker, m_showCullingWithDebugBorderQuads);
90 } 90 }
91 91
92 } // namespace cc 92 } // namespace cc
OLDNEW
« no previous file with comments | « cc/page_scale_animation.cc ('k') | cc/render_pass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698