| 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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 false, false, state_.only_visible_on_secure_output); | 548 false, false, state_.only_visible_on_secure_output); |
| 549 delegated_frame->resource_list.push_back(current_resource_); | 549 delegated_frame->resource_list.push_back(current_resource_); |
| 550 } else { | 550 } else { |
| 551 cc::SolidColorDrawQuad* solid_quad = | 551 cc::SolidColorDrawQuad* solid_quad = |
| 552 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); | 552 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); |
| 553 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); | 553 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); |
| 554 frame_is_opaque = true; | 554 frame_is_opaque = true; |
| 555 } | 555 } |
| 556 | 556 |
| 557 delegated_frame->render_pass_list.push_back(std::move(render_pass)); | 557 delegated_frame->render_pass_list.push_back(std::move(render_pass)); |
| 558 std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); | 558 std::unique_ptr<cc::CompositorFrame> frame(cc::CompositorFrame::Create()); |
| 559 frame->delegated_frame_data = std::move(delegated_frame); | 559 frame->delegated_frame_data = std::move(delegated_frame); |
| 560 | 560 |
| 561 factory_owner_->surface_factory_->SubmitCompositorFrame( | 561 factory_owner_->surface_factory_->SubmitCompositorFrame( |
| 562 surface_id_, std::move(frame), cc::SurfaceFactory::DrawCallback()); | 562 surface_id_, std::move(frame), cc::SurfaceFactory::DrawCallback()); |
| 563 | 563 |
| 564 if (!old_surface_id.is_null() && old_surface_id != surface_id_) { | 564 if (!old_surface_id.is_null() && old_surface_id != surface_id_) { |
| 565 factory_owner_->surface_factory_->SetPreviousFrameSurface(surface_id_, | 565 factory_owner_->surface_factory_->SetPreviousFrameSurface(surface_id_, |
| 566 old_surface_id); | 566 old_surface_id); |
| 567 factory_owner_->surface_factory_->Destroy(old_surface_id); | 567 factory_owner_->surface_factory_->Destroy(old_surface_id); |
| 568 } | 568 } |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 | 777 |
| 778 int64_t Surface::GetPropertyInternal(const void* key, | 778 int64_t Surface::GetPropertyInternal(const void* key, |
| 779 int64_t default_value) const { | 779 int64_t default_value) const { |
| 780 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); | 780 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); |
| 781 if (iter == prop_map_.end()) | 781 if (iter == prop_map_.end()) |
| 782 return default_value; | 782 return default_value; |
| 783 return iter->second.value; | 783 return iter->second.value; |
| 784 } | 784 } |
| 785 | 785 |
| 786 } // namespace exo | 786 } // namespace exo |
| OLD | NEW |