| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "services/gfx/compositor/compositor_engine.h" | 5 #include "services/gfx/compositor/compositor_engine.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <sstream> | 8 #include <sstream> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 return; | 250 return; |
| 251 } | 251 } |
| 252 | 252 |
| 253 // Update the root. | 253 // Update the root. |
| 254 if (renderer_state->SetRootScene(scene_state, scene_version, *viewport)) { | 254 if (renderer_state->SetRootScene(scene_state, scene_version, *viewport)) { |
| 255 ScheduleFrameForRenderer(renderer_state, | 255 ScheduleFrameForRenderer(renderer_state, |
| 256 Scheduler::SchedulingMode::kSnapshot); | 256 Scheduler::SchedulingMode::kSnapshot); |
| 257 } | 257 } |
| 258 } | 258 } |
| 259 | 259 |
| 260 void CompositorEngine::ResetRootScene(RendererState* renderer_state) { | 260 void CompositorEngine::ClearRootScene(RendererState* renderer_state) { |
| 261 DCHECK(IsRendererStateRegisteredDebug(renderer_state)); | 261 DCHECK(IsRendererStateRegisteredDebug(renderer_state)); |
| 262 DVLOG(1) << "ResetRootScene: renderer=" << renderer_state; | 262 DVLOG(1) << "ClearRootScene: renderer=" << renderer_state; |
| 263 | 263 |
| 264 // Update the root. | 264 // Update the root. |
| 265 if (renderer_state->ResetRootScene()) { | 265 if (renderer_state->ClearRootScene()) { |
| 266 ScheduleFrameForRenderer(renderer_state, | 266 ScheduleFrameForRenderer(renderer_state, |
| 267 Scheduler::SchedulingMode::kSnapshot); | 267 Scheduler::SchedulingMode::kSnapshot); |
| 268 } | 268 } |
| 269 } | 269 } |
| 270 | 270 |
| 271 void CompositorEngine::HitTest( | 271 void CompositorEngine::HitTest( |
| 272 RendererState* renderer_state, | 272 RendererState* renderer_state, |
| 273 mojo::PointPtr point, | 273 mojo::PointPtr point, |
| 274 const mojo::gfx::composition::HitTester::HitTestCallback& callback) { | 274 const mojo::gfx::composition::HitTester::HitTestCallback& callback) { |
| 275 DCHECK(IsRendererStateRegisteredDebug(renderer_state)); | 275 DCHECK(IsRendererStateRegisteredDebug(renderer_state)); |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 | 464 |
| 465 SceneDef::Disposition disposition = | 465 SceneDef::Disposition disposition = |
| 466 PresentScene(scene_state, presentation_time); | 466 PresentScene(scene_state, presentation_time); |
| 467 if (disposition == SceneDef::Disposition::kFailed) | 467 if (disposition == SceneDef::Disposition::kFailed) |
| 468 DestroyScene(scene_state); | 468 DestroyScene(scene_state); |
| 469 else if (disposition == SceneDef::Disposition::kSucceeded) | 469 else if (disposition == SceneDef::Disposition::kSucceeded) |
| 470 InvalidateScene(scene_state); | 470 InvalidateScene(scene_state); |
| 471 } | 471 } |
| 472 | 472 |
| 473 } // namespace compositor | 473 } // namespace compositor |
| OLD | NEW |