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

Side by Side Diff: cc/trees/layer_tree_host_impl.cc

Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrequals: followupfix-after-rebase Created 5 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 FindRenderPassById(frame->render_passes, contributing_render_pass_id); 892 FindRenderPassById(frame->render_passes, contributing_render_pass_id);
893 AppendQuadsForRenderSurfaceLayer(target_render_pass, 893 AppendQuadsForRenderSurfaceLayer(target_render_pass,
894 *it, 894 *it,
895 contributing_render_pass, 895 contributing_render_pass,
896 &append_quads_data); 896 &append_quads_data);
897 } else if (it.represents_itself() && !it->visible_layer_rect().IsEmpty()) { 897 } else if (it.represents_itself() && !it->visible_layer_rect().IsEmpty()) {
898 bool occluded = 898 bool occluded =
899 it->draw_properties().occlusion_in_content_space.IsOccluded( 899 it->draw_properties().occlusion_in_content_space.IsOccluded(
900 it->visible_layer_rect()); 900 it->visible_layer_rect());
901 if (!occluded && it->WillDraw(draw_mode, resource_provider_.get())) { 901 if (!occluded && it->WillDraw(draw_mode, resource_provider_.get())) {
902 DCHECK_EQ(active_tree_, it->layer_tree_impl()); 902 DCHECK_EQ(active_tree_.get(), it->layer_tree_impl());
903 903
904 frame->will_draw_layers.push_back(*it); 904 frame->will_draw_layers.push_back(*it);
905 905
906 if (it->HasContributingDelegatedRenderPasses()) { 906 if (it->HasContributingDelegatedRenderPasses()) {
907 RenderPassId contributing_render_pass_id = 907 RenderPassId contributing_render_pass_id =
908 it->FirstContributingRenderPassId(); 908 it->FirstContributingRenderPassId();
909 while (true) { 909 while (true) {
910 RenderPass* pass = FindRenderPassById(frame->render_passes, 910 RenderPass* pass = FindRenderPassById(frame->render_passes,
911 contributing_render_pass_id); 911 contributing_render_pass_id);
912 if (!pass) 912 if (!pass)
(...skipping 2781 matching lines...) Expand 10 before | Expand all | Expand 10 after
3694 return task_runner_provider_->HasImplThread(); 3694 return task_runner_provider_->HasImplThread();
3695 } 3695 }
3696 3696
3697 bool LayerTreeHostImpl::CommitToActiveTree() const { 3697 bool LayerTreeHostImpl::CommitToActiveTree() const {
3698 // In single threaded mode we skip the pending tree and commit directly to the 3698 // In single threaded mode we skip the pending tree and commit directly to the
3699 // active tree. 3699 // active tree.
3700 return !task_runner_provider_->HasImplThread(); 3700 return !task_runner_provider_->HasImplThread();
3701 } 3701 }
3702 3702
3703 } // namespace cc 3703 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/damage_tracker_unittest.cc ('k') | chrome/browser/chromeos/platform_keys/platform_keys_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698