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

Side by Side Diff: cc/layer_tree_impl.cc

Issue 12648005: cc: Chromify the LayerTreeHostImpl class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compl Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/layer_tree_impl.h ('k') | cc/layer_unittest.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_tree_impl.h" 5 #include "cc/layer_tree_impl.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "cc/heads_up_display_layer_impl.h" 8 #include "cc/heads_up_display_layer_impl.h"
9 #include "cc/layer_tree_host_common.h" 9 #include "cc/layer_tree_host_common.h"
10 #include "cc/layer_tree_host_impl.h" 10 #include "cc/layer_tree_host_impl.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 54
55 return 0; 55 return 0;
56 } 56 }
57 57
58 void LayerTreeImpl::SetRootLayer(scoped_ptr<LayerImpl> layer) { 58 void LayerTreeImpl::SetRootLayer(scoped_ptr<LayerImpl> layer) {
59 root_layer_ = layer.Pass(); 59 root_layer_ = layer.Pass();
60 root_scroll_layer_ = NULL; 60 root_scroll_layer_ = NULL;
61 currently_scrolling_layer_ = NULL; 61 currently_scrolling_layer_ = NULL;
62 62
63 layer_tree_host_impl_->OnCanDrawStateChangedForTree(this); 63 layer_tree_host_impl_->OnCanDrawStateChangedForTree();
64 } 64 }
65 65
66 void LayerTreeImpl::FindRootScrollLayer() { 66 void LayerTreeImpl::FindRootScrollLayer() {
67 root_scroll_layer_ = findRootScrollLayer(root_layer_.get()); 67 root_scroll_layer_ = findRootScrollLayer(root_layer_.get());
68 68
69 if (root_layer_ && scrolling_layer_id_from_previous_tree_) { 69 if (root_layer_ && scrolling_layer_id_from_previous_tree_) {
70 currently_scrolling_layer_ = LayerTreeHostCommon::findLayerInSubtree( 70 currently_scrolling_layer_ = LayerTreeHostCommon::findLayerInSubtree(
71 root_layer_.get(), 71 root_layer_.get(),
72 scrolling_layer_id_from_previous_tree_); 72 scrolling_layer_id_from_previous_tree_);
73 } 73 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 target_tree->ResetContentsTexturesPurged(); 106 target_tree->ResetContentsTexturesPurged();
107 107
108 if (ViewportSizeInvalid()) 108 if (ViewportSizeInvalid())
109 target_tree->SetViewportSizeInvalid(); 109 target_tree->SetViewportSizeInvalid();
110 else 110 else
111 target_tree->ResetViewportSizeInvalid(); 111 target_tree->ResetViewportSizeInvalid();
112 112
113 if (hud_layer()) 113 if (hud_layer())
114 target_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>( 114 target_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(
115 LayerTreeHostCommon::findLayerInSubtree( 115 LayerTreeHostCommon::findLayerInSubtree(
116 target_tree->RootLayer(), hud_layer()->id()))); 116 target_tree->root_layer(), hud_layer()->id())));
117 else 117 else
118 target_tree->set_hud_layer(NULL); 118 target_tree->set_hud_layer(NULL);
119 } 119 }
120 120
121 LayerImpl* LayerTreeImpl::RootScrollLayer() { 121 LayerImpl* LayerTreeImpl::RootScrollLayer() {
122 DCHECK(IsActiveTree()); 122 DCHECK(IsActiveTree());
123 return root_scroll_layer_; 123 return root_scroll_layer_;
124 } 124 }
125 125
126 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() { 126 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() {
(...skipping 25 matching lines...) Expand all
152 delta = min_page_scale_factor_ / page_scale_factor_; 152 delta = min_page_scale_factor_ / page_scale_factor_;
153 else if (max_page_scale_factor_ && total > max_page_scale_factor_) 153 else if (max_page_scale_factor_ && total > max_page_scale_factor_)
154 delta = max_page_scale_factor_ / page_scale_factor_; 154 delta = max_page_scale_factor_ / page_scale_factor_;
155 155
156 if (delta == page_scale_delta_) 156 if (delta == page_scale_delta_)
157 return; 157 return;
158 158
159 page_scale_delta_ = delta; 159 page_scale_delta_ = delta;
160 160
161 if (IsActiveTree()) { 161 if (IsActiveTree()) {
162 LayerTreeImpl* pending_tree = layer_tree_host_impl_->pendingTree(); 162 LayerTreeImpl* pending_tree = layer_tree_host_impl_->pending_tree();
163 if (pending_tree) { 163 if (pending_tree) {
164 DCHECK_EQ(1, pending_tree->sent_page_scale_delta()); 164 DCHECK_EQ(1, pending_tree->sent_page_scale_delta());
165 pending_tree->SetPageScaleDelta(page_scale_delta_ / sent_page_scale_delta_ ); 165 pending_tree->SetPageScaleDelta(page_scale_delta_ / sent_page_scale_delta_ );
166 } 166 }
167 } 167 }
168 168
169 UpdateMaxScrollOffset(); 169 UpdateMaxScrollOffset();
170 set_needs_update_draw_properties(); 170 set_needs_update_draw_properties();
171 } 171 }
172 172
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 } 210 }
211 211
212 struct UpdateTilePrioritiesForLayer { 212 struct UpdateTilePrioritiesForLayer {
213 void operator()(LayerImpl *layer) { 213 void operator()(LayerImpl *layer) {
214 layer->UpdateTilePriorities(); 214 layer->UpdateTilePriorities();
215 } 215 }
216 }; 216 };
217 217
218 void LayerTreeImpl::UpdateDrawProperties(UpdateDrawPropertiesReason reason) { 218 void LayerTreeImpl::UpdateDrawProperties(UpdateDrawPropertiesReason reason) {
219 if (!needs_update_draw_properties_) { 219 if (!needs_update_draw_properties_) {
220 if (reason == UPDATE_ACTIVE_TREE_FOR_DRAW && RootLayer()) 220 if (reason == UPDATE_ACTIVE_TREE_FOR_DRAW && root_layer())
221 LayerTreeHostCommon::callFunctionForSubtree<UpdateTilePrioritiesForLayer>( 221 LayerTreeHostCommon::callFunctionForSubtree<UpdateTilePrioritiesForLayer>(
222 RootLayer()); 222 root_layer());
223 return; 223 return;
224 } 224 }
225 225
226 needs_update_draw_properties_ = false; 226 needs_update_draw_properties_ = false;
227 render_surface_layer_list_.clear(); 227 render_surface_layer_list_.clear();
228 228
229 // For maxTextureSize. 229 // For maxTextureSize.
230 if (!layer_tree_host_impl_->renderer()) 230 if (!layer_tree_host_impl_->renderer())
231 return; 231 return;
232 232
233 if (!RootLayer()) 233 if (!root_layer())
234 return; 234 return;
235 235
236 if (root_scroll_layer_) { 236 if (root_scroll_layer_) {
237 root_scroll_layer_->SetImplTransform(ImplTransform()); 237 root_scroll_layer_->SetImplTransform(ImplTransform());
238 // Setting the impl transform re-sets this. 238 // Setting the impl transform re-sets this.
239 needs_update_draw_properties_ = false; 239 needs_update_draw_properties_ = false;
240 } 240 }
241 241
242 { 242 {
243 TRACE_EVENT1("cc", "LayerTreeImpl::UpdateDrawProperties", "IsActive", IsActi veTree()); 243 TRACE_EVENT1("cc",
244 "LayerTreeImpl::UpdateDrawProperties",
245 "IsActive",
246 IsActiveTree());
244 bool update_tile_priorities = 247 bool update_tile_priorities =
245 reason == UPDATE_PENDING_TREE || 248 reason == UPDATE_PENDING_TREE ||
246 reason == UPDATE_ACTIVE_TREE_FOR_DRAW; 249 reason == UPDATE_ACTIVE_TREE_FOR_DRAW;
247 LayerTreeHostCommon::calculateDrawProperties( 250 LayerTreeHostCommon::calculateDrawProperties(
248 RootLayer(), 251 root_layer(),
249 device_viewport_size(), 252 device_viewport_size(),
250 device_scale_factor(), 253 device_scale_factor(),
251 total_page_scale_factor(), 254 total_page_scale_factor(),
252 MaxTextureSize(), 255 MaxTextureSize(),
253 settings().canUseLCDText, 256 settings().canUseLCDText,
254 render_surface_layer_list_, 257 render_surface_layer_list_,
255 update_tile_priorities); 258 update_tile_priorities);
256 } 259 }
257 260
258 DCHECK(!needs_update_draw_properties_) << 261 DCHECK(!needs_update_draw_properties_) <<
259 "calcDrawProperties should not set_needs_update_draw_properties()"; 262 "calcDrawProperties should not set_needs_update_draw_properties()";
260 } 263 }
261 264
262 static void ClearRenderSurfacesOnLayerImplRecursive(LayerImpl* current) 265 static void ClearRenderSurfacesOnLayerImplRecursive(LayerImpl* current)
263 { 266 {
264 DCHECK(current); 267 DCHECK(current);
265 for (size_t i = 0; i < current->children().size(); ++i) 268 for (size_t i = 0; i < current->children().size(); ++i)
266 ClearRenderSurfacesOnLayerImplRecursive(current->children()[i]); 269 ClearRenderSurfacesOnLayerImplRecursive(current->children()[i]);
267 current->ClearRenderSurface(); 270 current->ClearRenderSurface();
268 } 271 }
269 272
270 void LayerTreeImpl::ClearRenderSurfaces() { 273 void LayerTreeImpl::ClearRenderSurfaces() {
271 ClearRenderSurfacesOnLayerImplRecursive(RootLayer()); 274 ClearRenderSurfacesOnLayerImplRecursive(root_layer());
272 render_surface_layer_list_.clear(); 275 render_surface_layer_list_.clear();
273 set_needs_update_draw_properties(); 276 set_needs_update_draw_properties();
274 } 277 }
275 278
276 bool LayerTreeImpl::AreVisibleResourcesReady() const { 279 bool LayerTreeImpl::AreVisibleResourcesReady() const {
277 TRACE_EVENT0("cc", "LayerTreeImpl::AreVisibleResourcesReady"); 280 TRACE_EVENT0("cc", "LayerTreeImpl::AreVisibleResourcesReady");
278 281
279 typedef LayerIterator<LayerImpl, 282 typedef LayerIterator<LayerImpl,
280 std::vector<LayerImpl*>, 283 std::vector<LayerImpl*>,
281 RenderSurfaceImpl, 284 RenderSurfaceImpl,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } 316 }
314 317
315 void LayerTreeImpl::UnregisterLayer(LayerImpl* layer) { 318 void LayerTreeImpl::UnregisterLayer(LayerImpl* layer) {
316 DCHECK(LayerById(layer->id())); 319 DCHECK(LayerById(layer->id()));
317 layer_id_map_.erase(layer->id()); 320 layer_id_map_.erase(layer->id());
318 } 321 }
319 322
320 void LayerTreeImpl::PushPersistedState(LayerTreeImpl* pendingTree) { 323 void LayerTreeImpl::PushPersistedState(LayerTreeImpl* pendingTree) {
321 int id = currently_scrolling_layer_ ? currently_scrolling_layer_->id() : 0; 324 int id = currently_scrolling_layer_ ? currently_scrolling_layer_->id() : 0;
322 pendingTree->set_currently_scrolling_layer( 325 pendingTree->set_currently_scrolling_layer(
323 LayerTreeHostCommon::findLayerInSubtree(pendingTree->RootLayer(), id)); 326 LayerTreeHostCommon::findLayerInSubtree(pendingTree->root_layer(), id));
324 } 327 }
325 328
326 static void DidBecomeActiveRecursive(LayerImpl* layer) { 329 static void DidBecomeActiveRecursive(LayerImpl* layer) {
327 layer->DidBecomeActive(); 330 layer->DidBecomeActive();
328 for (size_t i = 0; i < layer->children().size(); ++i) 331 for (size_t i = 0; i < layer->children().size(); ++i)
329 DidBecomeActiveRecursive(layer->children()[i]); 332 DidBecomeActiveRecursive(layer->children()[i]);
330 } 333 }
331 334
332 void LayerTreeImpl::DidBecomeActive() { 335 void LayerTreeImpl::DidBecomeActive() {
333 if (RootLayer()) 336 if (root_layer())
334 DidBecomeActiveRecursive(RootLayer()); 337 DidBecomeActiveRecursive(root_layer());
335 FindRootScrollLayer(); 338 FindRootScrollLayer();
336 UpdateMaxScrollOffset(); 339 UpdateMaxScrollOffset();
337 } 340 }
338 341
339 bool LayerTreeImpl::ContentsTexturesPurged() const { 342 bool LayerTreeImpl::ContentsTexturesPurged() const {
340 return contents_textures_purged_; 343 return contents_textures_purged_;
341 } 344 }
342 345
343 void LayerTreeImpl::SetContentsTexturesPurged() { 346 void LayerTreeImpl::SetContentsTexturesPurged() {
344 contents_textures_purged_ = true; 347 contents_textures_purged_ = true;
345 layer_tree_host_impl_->OnCanDrawStateChangedForTree(this); 348 layer_tree_host_impl_->OnCanDrawStateChangedForTree();
346 } 349 }
347 350
348 void LayerTreeImpl::ResetContentsTexturesPurged() { 351 void LayerTreeImpl::ResetContentsTexturesPurged() {
349 contents_textures_purged_ = false; 352 contents_textures_purged_ = false;
350 layer_tree_host_impl_->OnCanDrawStateChangedForTree(this); 353 layer_tree_host_impl_->OnCanDrawStateChangedForTree();
351 } 354 }
352 355
353 bool LayerTreeImpl::ViewportSizeInvalid() const { 356 bool LayerTreeImpl::ViewportSizeInvalid() const {
354 return viewport_size_invalid_; 357 return viewport_size_invalid_;
355 } 358 }
356 359
357 void LayerTreeImpl::SetViewportSizeInvalid() { 360 void LayerTreeImpl::SetViewportSizeInvalid() {
358 viewport_size_invalid_ = true; 361 viewport_size_invalid_ = true;
359 layer_tree_host_impl_->OnCanDrawStateChangedForTree(this); 362 layer_tree_host_impl_->OnCanDrawStateChangedForTree();
360 } 363 }
361 364
362 void LayerTreeImpl::ResetViewportSizeInvalid() { 365 void LayerTreeImpl::ResetViewportSizeInvalid() {
363 viewport_size_invalid_ = false; 366 viewport_size_invalid_ = false;
364 layer_tree_host_impl_->OnCanDrawStateChangedForTree(this); 367 layer_tree_host_impl_->OnCanDrawStateChangedForTree();
365 } 368 }
366 369
367 Proxy* LayerTreeImpl::proxy() const { 370 Proxy* LayerTreeImpl::proxy() const {
368 return layer_tree_host_impl_->proxy(); 371 return layer_tree_host_impl_->proxy();
369 } 372 }
370 373
371 const LayerTreeSettings& LayerTreeImpl::settings() const { 374 const LayerTreeSettings& LayerTreeImpl::settings() const {
372 return layer_tree_host_impl_->Settings(); 375 return layer_tree_host_impl_->settings();
373 } 376 }
374 377
375 const RendererCapabilities& LayerTreeImpl::rendererCapabilities() const { 378 const RendererCapabilities& LayerTreeImpl::rendererCapabilities() const {
376 return layer_tree_host_impl_->rendererCapabilities(); 379 return layer_tree_host_impl_->GetRendererCapabilities();
377 } 380 }
378 381
379 OutputSurface* LayerTreeImpl::output_surface() const { 382 OutputSurface* LayerTreeImpl::output_surface() const {
380 return layer_tree_host_impl_->outputSurface(); 383 return layer_tree_host_impl_->output_surface();
381 } 384 }
382 385
383 ResourceProvider* LayerTreeImpl::resource_provider() const { 386 ResourceProvider* LayerTreeImpl::resource_provider() const {
384 return layer_tree_host_impl_->resourceProvider(); 387 return layer_tree_host_impl_->resource_provider();
385 } 388 }
386 389
387 TileManager* LayerTreeImpl::tile_manager() const { 390 TileManager* LayerTreeImpl::tile_manager() const {
388 return layer_tree_host_impl_->tileManager(); 391 return layer_tree_host_impl_->tile_manager();
389 } 392 }
390 393
391 FrameRateCounter* LayerTreeImpl::frame_rate_counter() const { 394 FrameRateCounter* LayerTreeImpl::frame_rate_counter() const {
392 return layer_tree_host_impl_->fpsCounter(); 395 return layer_tree_host_impl_->fps_counter();
393 } 396 }
394 397
395 PaintTimeCounter* LayerTreeImpl::paint_time_counter() const { 398 PaintTimeCounter* LayerTreeImpl::paint_time_counter() const {
396 return layer_tree_host_impl_->paintTimeCounter(); 399 return layer_tree_host_impl_->paint_time_counter();
397 } 400 }
398 401
399 MemoryHistory* LayerTreeImpl::memory_history() const { 402 MemoryHistory* LayerTreeImpl::memory_history() const {
400 return layer_tree_host_impl_->memoryHistory(); 403 return layer_tree_host_impl_->memory_history();
401 } 404 }
402 405
403 bool LayerTreeImpl::IsActiveTree() const { 406 bool LayerTreeImpl::IsActiveTree() const {
404 return layer_tree_host_impl_->activeTree() == this; 407 return layer_tree_host_impl_->active_tree() == this;
405 } 408 }
406 409
407 bool LayerTreeImpl::IsPendingTree() const { 410 bool LayerTreeImpl::IsPendingTree() const {
408 return layer_tree_host_impl_->pendingTree() == this; 411 return layer_tree_host_impl_->pending_tree() == this;
409 } 412 }
410 413
411 bool LayerTreeImpl::IsRecycleTree() const { 414 bool LayerTreeImpl::IsRecycleTree() const {
412 return layer_tree_host_impl_->recycleTree() == this; 415 return layer_tree_host_impl_->recycle_tree() == this;
413 } 416 }
414 417
415 LayerImpl* LayerTreeImpl::FindActiveTreeLayerById(int id) { 418 LayerImpl* LayerTreeImpl::FindActiveTreeLayerById(int id) {
416 LayerTreeImpl* tree = layer_tree_host_impl_->activeTree(); 419 LayerTreeImpl* tree = layer_tree_host_impl_->active_tree();
417 if (!tree) 420 if (!tree)
418 return NULL; 421 return NULL;
419 return tree->LayerById(id); 422 return tree->LayerById(id);
420 } 423 }
421 424
422 LayerImpl* LayerTreeImpl::FindPendingTreeLayerById(int id) { 425 LayerImpl* LayerTreeImpl::FindPendingTreeLayerById(int id) {
423 LayerTreeImpl* tree = layer_tree_host_impl_->pendingTree(); 426 LayerTreeImpl* tree = layer_tree_host_impl_->pending_tree();
424 if (!tree) 427 if (!tree)
425 return NULL; 428 return NULL;
426 return tree->LayerById(id); 429 return tree->LayerById(id);
427 } 430 }
428 431
429 int LayerTreeImpl::MaxTextureSize() const { 432 int LayerTreeImpl::MaxTextureSize() const {
430 return layer_tree_host_impl_->rendererCapabilities().max_texture_size; 433 return layer_tree_host_impl_->GetRendererCapabilities().max_texture_size;
431 } 434 }
432 435
433 bool LayerTreeImpl::PinchGestureActive() const { 436 bool LayerTreeImpl::PinchGestureActive() const {
434 return layer_tree_host_impl_->pinchGestureActive(); 437 return layer_tree_host_impl_->pinch_gesture_active();
435 } 438 }
436 439
437 base::TimeTicks LayerTreeImpl::CurrentFrameTime() const { 440 base::TimeTicks LayerTreeImpl::CurrentFrameTime() const {
438 return layer_tree_host_impl_->currentFrameTime(); 441 return layer_tree_host_impl_->CurrentFrameTime();
439 } 442 }
440 443
441 void LayerTreeImpl::SetNeedsRedraw() { 444 void LayerTreeImpl::SetNeedsRedraw() {
442 layer_tree_host_impl_->setNeedsRedraw(); 445 layer_tree_host_impl_->setNeedsRedraw();
443 } 446 }
444 447
445 const LayerTreeDebugState& LayerTreeImpl::debug_state() const { 448 const LayerTreeDebugState& LayerTreeImpl::debug_state() const {
446 return layer_tree_host_impl_->debugState(); 449 return layer_tree_host_impl_->debug_state();
447 } 450 }
448 451
449 float LayerTreeImpl::device_scale_factor() const { 452 float LayerTreeImpl::device_scale_factor() const {
450 return layer_tree_host_impl_->deviceScaleFactor(); 453 return layer_tree_host_impl_->device_scale_factor();
451 } 454 }
452 455
453 gfx::Size LayerTreeImpl::device_viewport_size() const { 456 gfx::Size LayerTreeImpl::device_viewport_size() const {
454 return layer_tree_host_impl_->DeviceViewportSize(); 457 return layer_tree_host_impl_->device_viewport_size();
455 } 458 }
456 459
457 const gfx::Size& LayerTreeImpl::layout_viewport_size() const { 460 gfx::Size LayerTreeImpl::layout_viewport_size() const {
458 return layer_tree_host_impl_->layoutViewportSize(); 461 return layer_tree_host_impl_->layout_viewport_size();
459 } 462 }
460 463
461 std::string LayerTreeImpl::layer_tree_as_text() const { 464 std::string LayerTreeImpl::layer_tree_as_text() const {
462 return layer_tree_host_impl_->layerTreeAsText(); 465 return layer_tree_host_impl_->LayerTreeAsText();
463 } 466 }
464 467
465 DebugRectHistory* LayerTreeImpl::debug_rect_history() const { 468 DebugRectHistory* LayerTreeImpl::debug_rect_history() const {
466 return layer_tree_host_impl_->debugRectHistory(); 469 return layer_tree_host_impl_->debug_rect_history();
467 } 470 }
468 471
469 AnimationRegistrar* LayerTreeImpl::animationRegistrar() const { 472 AnimationRegistrar* LayerTreeImpl::animationRegistrar() const {
470 return layer_tree_host_impl_->animationRegistrar(); 473 return layer_tree_host_impl_->animation_registrar();
471 } 474 }
472 475
473 scoped_ptr<base::Value> LayerTreeImpl::AsValue() const { 476 scoped_ptr<base::Value> LayerTreeImpl::AsValue() const {
474 scoped_ptr<base::ListValue> state(new base::ListValue()); 477 scoped_ptr<base::ListValue> state(new base::ListValue());
475 typedef LayerIterator<LayerImpl, 478 typedef LayerIterator<LayerImpl,
476 std::vector<LayerImpl*>, 479 std::vector<LayerImpl*>,
477 RenderSurfaceImpl, 480 RenderSurfaceImpl,
478 LayerIteratorActions::BackToFront> LayerIteratorType; 481 LayerIteratorActions::BackToFront> LayerIteratorType;
479 LayerIteratorType end = LayerIteratorType::end(&render_surface_layer_list_); 482 LayerIteratorType end = LayerIteratorType::end(&render_surface_layer_list_);
480 for (LayerIteratorType it = LayerIteratorType::begin( 483 for (LayerIteratorType it = LayerIteratorType::begin(
481 &render_surface_layer_list_); it != end; ++it) { 484 &render_surface_layer_list_); it != end; ++it) {
482 if (!it.representsItself()) 485 if (!it.representsItself())
483 continue; 486 continue;
484 state->Append((*it)->AsValue().release()); 487 state->Append((*it)->AsValue().release());
485 } 488 }
486 return state.PassAs<base::Value>(); 489 return state.PassAs<base::Value>();
487 } 490 }
488 491
489 } // namespace cc 492 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layer_tree_impl.h ('k') | cc/layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698