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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 completion.Wait(); | 431 completion.Wait(); |
432 } | 432 } |
433 | 433 |
434 void ProxyMain::UpdateTopControlsState(TopControlsState constraints, | 434 void ProxyMain::UpdateTopControlsState(TopControlsState constraints, |
435 TopControlsState current, | 435 TopControlsState current, |
436 bool animate) { | 436 bool animate) { |
437 DCHECK(IsMainThread()); | 437 DCHECK(IsMainThread()); |
438 channel_main_->UpdateTopControlsStateOnImpl(constraints, current, animate); | 438 channel_main_->UpdateTopControlsStateOnImpl(constraints, current, animate); |
439 } | 439 } |
440 | 440 |
441 void ProxyMain::SetOutputIsSecure(bool output_is_secure) { | |
442 NOTREACHED() << "Only used by SingleProxyMain"; | |
443 } | |
444 | |
445 bool ProxyMain::SendCommitRequestToImplThreadIfNeeded( | 441 bool ProxyMain::SendCommitRequestToImplThreadIfNeeded( |
446 CommitPipelineStage required_stage) { | 442 CommitPipelineStage required_stage) { |
447 DCHECK(IsMainThread()); | 443 DCHECK(IsMainThread()); |
448 DCHECK_NE(NO_PIPELINE_STAGE, required_stage); | 444 DCHECK_NE(NO_PIPELINE_STAGE, required_stage); |
449 bool already_posted = max_requested_pipeline_stage_ != NO_PIPELINE_STAGE; | 445 bool already_posted = max_requested_pipeline_stage_ != NO_PIPELINE_STAGE; |
450 max_requested_pipeline_stage_ = | 446 max_requested_pipeline_stage_ = |
451 std::max(max_requested_pipeline_stage_, required_stage); | 447 std::max(max_requested_pipeline_stage_, required_stage); |
452 if (already_posted) | 448 if (already_posted) |
453 return false; | 449 return false; |
454 channel_main_->SetNeedsCommitOnImpl(); | 450 channel_main_->SetNeedsCommitOnImpl(); |
455 return true; | 451 return true; |
456 } | 452 } |
457 | 453 |
458 bool ProxyMain::IsMainThread() const { | 454 bool ProxyMain::IsMainThread() const { |
459 return task_runner_provider_->IsMainThread(); | 455 return task_runner_provider_->IsMainThread(); |
460 } | 456 } |
461 | 457 |
462 } // namespace cc | 458 } // namespace cc |
OLD | NEW |