OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/converters/surfaces/surfaces_type_converters.h" | 5 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <utility> | 10 #include <utility> |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 } | 535 } |
536 | 536 |
537 // static | 537 // static |
538 SyncTokenPtr TypeConverter<SyncTokenPtr, gpu::SyncToken>::Convert( | 538 SyncTokenPtr TypeConverter<SyncTokenPtr, gpu::SyncToken>::Convert( |
539 const gpu::SyncToken& input) { | 539 const gpu::SyncToken& input) { |
540 DCHECK(!input.HasData() || input.verified_flush()); | 540 DCHECK(!input.HasData() || input.verified_flush()); |
541 SyncTokenPtr sync_token(SyncToken::New()); | 541 SyncTokenPtr sync_token(SyncToken::New()); |
542 sync_token->verified_flush = input.verified_flush(); | 542 sync_token->verified_flush = input.verified_flush(); |
543 sync_token->namespace_id = | 543 sync_token->namespace_id = |
544 static_cast<CommandBufferNamespace>(input.namespace_id()); | 544 static_cast<CommandBufferNamespace>(input.namespace_id()); |
| 545 sync_token->extra_data_field = input.extra_data_field(); |
545 sync_token->command_buffer_id = input.command_buffer_id(); | 546 sync_token->command_buffer_id = input.command_buffer_id(); |
546 sync_token->release_count = input.release_count(); | 547 sync_token->release_count = input.release_count(); |
547 return sync_token; | 548 return sync_token; |
548 } | 549 } |
549 | 550 |
550 // static | 551 // static |
551 gpu::SyncToken TypeConverter<gpu::SyncToken, SyncTokenPtr>::Convert( | 552 gpu::SyncToken TypeConverter<gpu::SyncToken, SyncTokenPtr>::Convert( |
552 const SyncTokenPtr& input) { | 553 const SyncTokenPtr& input) { |
553 const gpu::CommandBufferNamespace namespace_id = | 554 const gpu::CommandBufferNamespace namespace_id = |
554 static_cast<gpu::CommandBufferNamespace>(input->namespace_id); | 555 static_cast<gpu::CommandBufferNamespace>(input->namespace_id); |
555 gpu::SyncToken sync_token(namespace_id, 0, | 556 gpu::SyncToken sync_token(namespace_id, input->extra_data_field, |
556 input->command_buffer_id, input->release_count); | 557 input->command_buffer_id, input->release_count); |
557 if (input->verified_flush) | 558 if (input->verified_flush) |
558 sync_token.SetVerifyFlush(); | 559 sync_token.SetVerifyFlush(); |
559 | 560 |
560 return sync_token; | 561 return sync_token; |
561 } | 562 } |
562 | 563 |
563 // static | 564 // static |
564 MailboxHolderPtr TypeConverter<MailboxHolderPtr, gpu::MailboxHolder>::Convert( | 565 MailboxHolderPtr TypeConverter<MailboxHolderPtr, gpu::MailboxHolder>::Convert( |
565 const gpu::MailboxHolder& input) { | 566 const gpu::MailboxHolder& input) { |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
602 transferable.id = input->id; | 603 transferable.id = input->id; |
603 transferable.format = static_cast<cc::ResourceFormat>(input->format); | 604 transferable.format = static_cast<cc::ResourceFormat>(input->format); |
604 transferable.filter = input->filter; | 605 transferable.filter = input->filter; |
605 transferable.size = input->size.To<gfx::Size>(); | 606 transferable.size = input->size.To<gfx::Size>(); |
606 transferable.mailbox_holder = input->mailbox_holder.To<gpu::MailboxHolder>(); | 607 transferable.mailbox_holder = input->mailbox_holder.To<gpu::MailboxHolder>(); |
607 transferable.is_software = input->is_software; | 608 transferable.is_software = input->is_software; |
608 return transferable; | 609 return transferable; |
609 } | 610 } |
610 | 611 |
611 // static | 612 // static |
612 Array<TransferableResourcePtr> TypeConverter< | |
613 Array<TransferableResourcePtr>, | |
614 cc::TransferableResourceArray>::Convert(const cc::TransferableResourceArray& | |
615 input) { | |
616 Array<TransferableResourcePtr> resources(input.size()); | |
617 for (size_t i = 0; i < input.size(); ++i) { | |
618 resources[i] = TransferableResource::From(input[i]); | |
619 } | |
620 return resources; | |
621 } | |
622 | |
623 // static | |
624 cc::TransferableResourceArray | |
625 TypeConverter<cc::TransferableResourceArray, Array<TransferableResourcePtr> >:: | |
626 Convert(const Array<TransferableResourcePtr>& input) { | |
627 cc::TransferableResourceArray resources(input.size()); | |
628 for (size_t i = 0; i < input.size(); ++i) { | |
629 resources[i] = input[i].To<cc::TransferableResource>(); | |
630 } | |
631 return resources; | |
632 } | |
633 | |
634 // static | |
635 ReturnedResourcePtr | 613 ReturnedResourcePtr |
636 TypeConverter<ReturnedResourcePtr, cc::ReturnedResource>::Convert( | 614 TypeConverter<ReturnedResourcePtr, cc::ReturnedResource>::Convert( |
637 const cc::ReturnedResource& input) { | 615 const cc::ReturnedResource& input) { |
638 ReturnedResourcePtr returned = ReturnedResource::New(); | 616 ReturnedResourcePtr returned = ReturnedResource::New(); |
639 returned->id = input.id; | 617 returned->id = input.id; |
640 returned->sync_token = SyncToken::From<gpu::SyncToken>(input.sync_token); | 618 returned->sync_token = SyncToken::From<gpu::SyncToken>(input.sync_token); |
641 returned->count = input.count; | 619 returned->count = input.count; |
642 returned->lost = input.lost; | 620 returned->lost = input.lost; |
643 return returned; | 621 return returned; |
644 } | 622 } |
645 | 623 |
646 // static | 624 // static |
647 cc::ReturnedResource | 625 cc::ReturnedResource |
648 TypeConverter<cc::ReturnedResource, ReturnedResourcePtr>::Convert( | 626 TypeConverter<cc::ReturnedResource, ReturnedResourcePtr>::Convert( |
649 const ReturnedResourcePtr& input) { | 627 const ReturnedResourcePtr& input) { |
650 cc::ReturnedResource returned; | 628 cc::ReturnedResource returned; |
651 returned.id = input->id; | 629 returned.id = input->id; |
652 returned.sync_token = input->sync_token.To<gpu::SyncToken>(); | 630 returned.sync_token = input->sync_token.To<gpu::SyncToken>(); |
653 returned.count = input->count; | 631 returned.count = input->count; |
654 returned.lost = input->lost; | 632 returned.lost = input->lost; |
655 return returned; | 633 return returned; |
656 } | 634 } |
657 | 635 |
658 // static | 636 // static |
659 Array<ReturnedResourcePtr> | |
660 TypeConverter<Array<ReturnedResourcePtr>, cc::ReturnedResourceArray>::Convert( | |
661 const cc::ReturnedResourceArray& input) { | |
662 Array<ReturnedResourcePtr> resources(input.size()); | |
663 for (size_t i = 0; i < input.size(); ++i) { | |
664 resources[i] = ReturnedResource::From(input[i]); | |
665 } | |
666 return resources; | |
667 } | |
668 | |
669 // static | |
670 cc::ReturnedResourceArray | |
671 TypeConverter<cc::ReturnedResourceArray, Array<ReturnedResourcePtr>>::Convert( | |
672 const Array<ReturnedResourcePtr>& input) { | |
673 cc::ReturnedResourceArray resources(input.size()); | |
674 for (size_t i = 0; i < input.size(); ++i) { | |
675 resources[i] = input[i].To<cc::ReturnedResource>(); | |
676 } | |
677 return resources; | |
678 } | |
679 | |
680 // static | |
681 CompositorFrameMetadataPtr | 637 CompositorFrameMetadataPtr |
682 TypeConverter<CompositorFrameMetadataPtr, cc::CompositorFrameMetadata>::Convert( | 638 TypeConverter<CompositorFrameMetadataPtr, cc::CompositorFrameMetadata>::Convert( |
683 const cc::CompositorFrameMetadata& input) { | 639 const cc::CompositorFrameMetadata& input) { |
684 CompositorFrameMetadataPtr metadata = CompositorFrameMetadata::New(); | 640 CompositorFrameMetadataPtr metadata = CompositorFrameMetadata::New(); |
685 metadata->device_scale_factor = input.device_scale_factor; | 641 metadata->device_scale_factor = input.device_scale_factor; |
686 return metadata; | 642 return metadata; |
687 } | 643 } |
688 | 644 |
689 // static | 645 // static |
690 cc::CompositorFrameMetadata | 646 cc::CompositorFrameMetadata |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
737 } | 693 } |
738 | 694 |
739 // static | 695 // static |
740 scoped_ptr<cc::CompositorFrame> | 696 scoped_ptr<cc::CompositorFrame> |
741 TypeConverter<scoped_ptr<cc::CompositorFrame>, CompositorFramePtr>::Convert( | 697 TypeConverter<scoped_ptr<cc::CompositorFrame>, CompositorFramePtr>::Convert( |
742 const CompositorFramePtr& input) { | 698 const CompositorFramePtr& input) { |
743 return ConvertToCompositorFrame(input, nullptr); | 699 return ConvertToCompositorFrame(input, nullptr); |
744 } | 700 } |
745 | 701 |
746 } // namespace mojo | 702 } // namespace mojo |
OLD | NEW |