| 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 "cc/trees/proxy_main.h" | 5 #include "cc/trees/proxy_main.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 } | 394 } |
| 395 | 395 |
| 396 void ProxyMain::ReleaseCompositorFrameSink() { | 396 void ProxyMain::ReleaseCompositorFrameSink() { |
| 397 DCHECK(IsMainThread()); | 397 DCHECK(IsMainThread()); |
| 398 DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_); | 398 DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_); |
| 399 CompletionEvent completion; | 399 CompletionEvent completion; |
| 400 channel_main_->ReleaseCompositorFrameSinkOnImpl(&completion); | 400 channel_main_->ReleaseCompositorFrameSinkOnImpl(&completion); |
| 401 completion.Wait(); | 401 completion.Wait(); |
| 402 } | 402 } |
| 403 | 403 |
| 404 void ProxyMain::UpdateTopControlsState(TopControlsState constraints, | 404 void ProxyMain::UpdateTopControlsState(BrowserControlsState constraints, |
| 405 TopControlsState current, | 405 BrowserControlsState current, |
| 406 bool animate) { | 406 bool animate) { |
| 407 DCHECK(IsMainThread()); | 407 DCHECK(IsMainThread()); |
| 408 channel_main_->UpdateTopControlsStateOnImpl(constraints, current, animate); | 408 channel_main_->UpdateTopControlsStateOnImpl(constraints, current, animate); |
| 409 } | 409 } |
| 410 | 410 |
| 411 bool ProxyMain::SendCommitRequestToImplThreadIfNeeded( | 411 bool ProxyMain::SendCommitRequestToImplThreadIfNeeded( |
| 412 CommitPipelineStage required_stage) { | 412 CommitPipelineStage required_stage) { |
| 413 DCHECK(IsMainThread()); | 413 DCHECK(IsMainThread()); |
| 414 DCHECK_NE(NO_PIPELINE_STAGE, required_stage); | 414 DCHECK_NE(NO_PIPELINE_STAGE, required_stage); |
| 415 bool already_posted = max_requested_pipeline_stage_ != NO_PIPELINE_STAGE; | 415 bool already_posted = max_requested_pipeline_stage_ != NO_PIPELINE_STAGE; |
| 416 max_requested_pipeline_stage_ = | 416 max_requested_pipeline_stage_ = |
| 417 std::max(max_requested_pipeline_stage_, required_stage); | 417 std::max(max_requested_pipeline_stage_, required_stage); |
| 418 if (already_posted) | 418 if (already_posted) |
| 419 return false; | 419 return false; |
| 420 channel_main_->SetNeedsCommitOnImpl(); | 420 channel_main_->SetNeedsCommitOnImpl(); |
| 421 return true; | 421 return true; |
| 422 } | 422 } |
| 423 | 423 |
| 424 bool ProxyMain::IsMainThread() const { | 424 bool ProxyMain::IsMainThread() const { |
| 425 return task_runner_provider_->IsMainThread(); | 425 return task_runner_provider_->IsMainThread(); |
| 426 } | 426 } |
| 427 | 427 |
| 428 } // namespace cc | 428 } // namespace cc |
| OLD | NEW |