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

Side by Side Diff: cc/layer_impl.cc

Issue 11416088: cc: Turn SharedQuadState into a struct-like class similar to DrawQuads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix debug build 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/draw_quad_unittest.cc ('k') | cc/layer_tree_host_impl.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 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/layer_impl.h" 5 #include "cc/layer_impl.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "cc/debug_border_draw_quad.h" 9 #include "cc/debug_border_draw_quad.h"
10 #include "cc/debug_colors.h" 10 #include "cc/debug_colors.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 { 117 {
118 for (size_t i = 0; i < m_children.size(); ++i) { 118 for (size_t i = 0; i < m_children.size(); ++i) {
119 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte nt()) 119 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte nt())
120 return true; 120 return true;
121 } 121 }
122 return false; 122 return false;
123 } 123 }
124 124
125 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const 125 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const
126 { 126 {
127 return SharedQuadState::create(m_drawTransform, m_visibleContentRect, m_draw ableContentRect, m_drawOpacity); 127 scoped_ptr<SharedQuadState> state = SharedQuadState::Create();
128 state->SetAll(m_drawTransform, m_visibleContentRect, m_drawableContentRect, m_ drawOpacity);
129 return state.Pass();
128 } 130 }
129 131
130 void LayerImpl::willDraw(ResourceProvider*) 132 void LayerImpl::willDraw(ResourceProvider*)
131 { 133 {
132 #ifndef NDEBUG 134 #ifndef NDEBUG
133 // willDraw/didDraw must be matched. 135 // willDraw/didDraw must be matched.
134 DCHECK(!m_betweenWillDrawAndDidDraw); 136 DCHECK(!m_betweenWillDrawAndDidDraw);
135 m_betweenWillDrawAndDidDraw = true; 137 m_betweenWillDrawAndDidDraw = true;
136 #endif 138 #endif
137 } 139 }
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 713
712 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer) 714 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer)
713 { 715 {
714 if (!m_scrollbarAnimationController) 716 if (!m_scrollbarAnimationController)
715 m_scrollbarAnimationController = ScrollbarAnimationController::create(th is); 717 m_scrollbarAnimationController = ScrollbarAnimationController::create(th is);
716 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); 718 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
717 m_scrollbarAnimationController->updateScrollOffset(this); 719 m_scrollbarAnimationController->updateScrollOffset(this);
718 } 720 }
719 721
720 } // namespace cc 722 } // namespace cc
OLDNEW
« no previous file with comments | « cc/draw_quad_unittest.cc ('k') | cc/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698