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

Side by Side Diff: cc/delegated_renderer_layer_impl.cc

Issue 11110004: Make gfx::Rect class operations consistently mutate the class they are called on. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: cc/ fixes 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
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | cc/direct_renderer.cc » ('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 "CCDelegatedRendererLayerImpl.h" 7 #include "CCDelegatedRendererLayerImpl.h"
8 8
9 #include "CCAppendQuadsData.h" 9 #include "CCAppendQuadsData.h"
10 #include "cc/math_util.h" 10 #include "cc/math_util.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 clearRenderPasses(); 51 clearRenderPasses();
52 52
53 for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) { 53 for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) {
54 m_renderPassesIndexById.insert(std::pair<RenderPass::Id, int>(renderPass esInDrawOrder[i]->id(), i)); 54 m_renderPassesIndexById.insert(std::pair<RenderPass::Id, int>(renderPass esInDrawOrder[i]->id(), i));
55 m_renderPassesInDrawOrder.append(renderPassesInDrawOrder.take(i)); 55 m_renderPassesInDrawOrder.append(renderPassesInDrawOrder.take(i));
56 } 56 }
57 renderPassesInDrawOrder.clear(); 57 renderPassesInDrawOrder.clear();
58 58
59 if (!m_renderPassesInDrawOrder.isEmpty()) { 59 if (!m_renderPassesInDrawOrder.isEmpty()) {
60 gfx::RectF newRootDamage = m_renderPassesInDrawOrder.last()->damageRect( ); 60 gfx::RectF newRootDamage = m_renderPassesInDrawOrder.last()->damageRect( );
61 m_renderPassesInDrawOrder.last()->setDamageRect(oldRootDamage.Union(newR ootDamage)); 61 newRootDamage.Union(oldRootDamage);
62 m_renderPassesInDrawOrder.last()->setDamageRect(newRootDamage);
62 } 63 }
63 } 64 }
64 65
65 void DelegatedRendererLayerImpl::clearRenderPasses() 66 void DelegatedRendererLayerImpl::clearRenderPasses()
66 { 67 {
67 // FIXME: Release the resources back to the nested compositor. 68 // FIXME: Release the resources back to the nested compositor.
68 m_renderPassesIndexById.clear(); 69 m_renderPassesIndexById.clear();
69 m_renderPassesInDrawOrder.clear(); 70 m_renderPassesInDrawOrder.clear();
70 } 71 }
71 72
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 quadSink.append(copyQuad.Pass(), appendQuadsData); 177 quadSink.append(copyQuad.Pass(), appendQuadsData);
177 } 178 }
178 } 179 }
179 180
180 const char* DelegatedRendererLayerImpl::layerTypeAsString() const 181 const char* DelegatedRendererLayerImpl::layerTypeAsString() const
181 { 182 {
182 return "DelegatedRendererLayer"; 183 return "DelegatedRendererLayer";
183 } 184 }
184 185
185 } 186 }
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | cc/direct_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698