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 "components/exo/surface.h" | 5 #include "components/exo/surface.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 | 421 |
422 if (delegate_) { | 422 if (delegate_) { |
423 delegate_->OnSurfaceCommit(); | 423 delegate_->OnSurfaceCommit(); |
424 } else { | 424 } else { |
425 CheckIfSurfaceHierarchyNeedsCommitToNewSurfaces(); | 425 CheckIfSurfaceHierarchyNeedsCommitToNewSurfaces(); |
426 CommitSurfaceHierarchy(); | 426 CommitSurfaceHierarchy(); |
427 } | 427 } |
428 | 428 |
429 if (current_begin_frame_ack_.sequence_number != | 429 if (current_begin_frame_ack_.sequence_number != |
430 cc::BeginFrameArgs::kInvalidFrameNumber) { | 430 cc::BeginFrameArgs::kInvalidFrameNumber) { |
431 if (begin_frame_source_) | |
432 begin_frame_source_->DidFinishFrame(this, current_begin_frame_ack_); | |
433 if (!current_begin_frame_ack_.has_damage) { | 431 if (!current_begin_frame_ack_.has_damage) { |
434 compositor_frame_sink_holder_->GetCompositorFrameSink() | 432 compositor_frame_sink_holder_->GetCompositorFrameSink() |
435 ->DidNotProduceFrame(current_begin_frame_ack_); | 433 ->DidNotProduceFrame(current_begin_frame_ack_); |
436 } | 434 } |
437 current_begin_frame_ack_.sequence_number = | 435 current_begin_frame_ack_.sequence_number = |
438 cc::BeginFrameArgs::kInvalidFrameNumber; | 436 cc::BeginFrameArgs::kInvalidFrameNumber; |
| 437 if (begin_frame_source_) |
| 438 begin_frame_source_->DidFinishFrame(this); |
439 } | 439 } |
440 } | 440 } |
441 | 441 |
442 void Surface::CommitSurfaceHierarchy() { | 442 void Surface::CommitSurfaceHierarchy() { |
443 DCHECK(needs_commit_surface_hierarchy_); | 443 DCHECK(needs_commit_surface_hierarchy_); |
444 needs_commit_surface_hierarchy_ = false; | 444 needs_commit_surface_hierarchy_ = false; |
445 has_pending_layer_changes_ = false; | 445 has_pending_layer_changes_ = false; |
446 | 446 |
447 state_ = pending_state_; | 447 state_ = pending_state_; |
448 pending_state_.only_visible_on_secure_output = false; | 448 pending_state_.only_visible_on_secure_output = false; |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); | 855 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); |
856 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); | 856 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); |
857 } | 857 } |
858 | 858 |
859 frame.render_pass_list.push_back(std::move(render_pass)); | 859 frame.render_pass_list.push_back(std::move(render_pass)); |
860 compositor_frame_sink_holder_->GetCompositorFrameSink() | 860 compositor_frame_sink_holder_->GetCompositorFrameSink() |
861 ->SubmitCompositorFrame(std::move(frame)); | 861 ->SubmitCompositorFrame(std::move(frame)); |
862 } | 862 } |
863 | 863 |
864 } // namespace exo | 864 } // namespace exo |
OLD | NEW |