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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 17176012: Remove NULL ResourceProvider, TileManager early outs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/layers/picture_layer_impl.cc ('k') | cc/trees/thread_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index ffd48bffcd3dd098d7fd757450d0f119cb0c5075..94653f77165bda80a1dd5eb557174db39b31c494 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -751,10 +751,8 @@ bool LayerTreeHostImpl::CalculateRenderPasses(FrameData* frame) {
RemoveRenderPasses(CullRenderPassesWithNoQuads(), frame);
if (!output_surface_->ForcedDrawToSoftwareDevice())
danakj 2013/06/20 18:00:33 Should this go away (in another CL)?
boliu 2013/06/20 21:01:43 I think so after the WillDraw change that skips dr
renderer_->DecideRenderPassAllocationsForFrame(frame->render_passes);
- if (renderer_) {
boliu 2013/06/20 17:13:53 I'm not sure why this was added. Renderer was alwa
- RemoveRenderPasses(CullRenderPassesWithCachedTextures(renderer_.get()),
- frame);
- }
+ RemoveRenderPasses(CullRenderPassesWithCachedTextures(renderer_.get()),
+ frame);
// If we're making a frame to draw, it better have at least one render pass.
DCHECK(!frame->render_passes.empty());
@@ -1218,8 +1216,7 @@ void LayerTreeHostImpl::DidDrawAllLayers(const FrameData& frame) {
// Once all layers have been drawn, pending texture uploads should no
// longer block future uploads.
- if (resource_provider_)
- resource_provider_->MarkPendingUploadsAsNonBlocking();
+ resource_provider_->MarkPendingUploadsAsNonBlocking();
}
void LayerTreeHostImpl::FinishAllRendering() {
« no previous file with comments | « cc/layers/picture_layer_impl.cc ('k') | cc/trees/thread_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698