| 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 "examples/surfaces_app/embedder.h" | 5 #include "examples/surfaces_app/embedder.h" |
| 6 | 6 |
| 7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
| 8 #include "cc/output/delegated_frame_data.h" | 8 #include "cc/output/delegated_frame_data.h" |
| 9 #include "cc/quads/render_pass.h" | 9 #include "cc/quads/render_pass.h" |
| 10 #include "cc/quads/solid_color_draw_quad.h" | 10 #include "cc/quads/solid_color_draw_quad.h" |
| 11 #include "cc/quads/surface_draw_quad.h" | 11 #include "cc/quads/surface_draw_quad.h" |
| 12 #include "examples/surfaces_app/surfaces_util.h" | 12 #include "examples/surfaces_app/surfaces_util.h" |
| 13 #include "mojo/converters/surfaces/surfaces_type_converters.h" | 13 #include "mojo/converters/surfaces/surfaces_type_converters.h" |
| 14 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h" | 14 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h" |
| 15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
| 16 #include "ui/gfx/size.h" | 16 #include "ui/gfx/size.h" |
| 17 #include "ui/gfx/transform.h" | 17 #include "ui/gfx/transform.h" |
| 18 | 18 |
| 19 namespace mojo { | 19 namespace mojo { |
| 20 namespace examples { | 20 namespace examples { |
| 21 | 21 |
| 22 using cc::RenderPass; | 22 using cc::RenderPass; |
| 23 using cc::RenderPassId; | 23 using cc::RenderPassId; |
| 24 using cc::SurfaceDrawQuad; | 24 using cc::SurfaceDrawQuad; |
| 25 using cc::DrawQuad; | 25 using cc::DrawQuad; |
| 26 using cc::SolidColorDrawQuad; | 26 using cc::SolidColorDrawQuad; |
| 27 using cc::DelegatedFrameData; | 27 using cc::DelegatedFrameData; |
| 28 using cc::CompositorFrame; | 28 using cc::CompositorFrame; |
| 29 | 29 |
| 30 Embedder::Embedder() : surface_(nullptr) { | 30 Embedder::Embedder(uint32_t local_id, Surface* surface) |
| 31 : local_id_(local_id), surface_(surface) { |
| 31 } | 32 } |
| 32 | 33 |
| 33 Embedder::~Embedder() { | 34 Embedder::~Embedder() { |
| 34 } | 35 } |
| 35 | 36 |
| 36 void Embedder::ProduceFrame(cc::SurfaceId child_one, | 37 void Embedder::ProduceFrame(cc::SurfaceId child_one, |
| 37 cc::SurfaceId child_two, | 38 cc::SurfaceId child_two, |
| 38 const gfx::Size& child_size, | 39 const gfx::Size& child_size, |
| 39 const gfx::Size& size, | 40 const gfx::Size& size, |
| 40 int offset) { | 41 int offset) { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 rect, | 83 rect, |
| 83 SK_ColorYELLOW, | 84 SK_ColorYELLOW, |
| 84 force_anti_aliasing_off); | 85 force_anti_aliasing_off); |
| 85 | 86 |
| 86 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 87 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); |
| 87 delegated_frame_data->render_pass_list.push_back(pass.Pass()); | 88 delegated_frame_data->render_pass_list.push_back(pass.Pass()); |
| 88 | 89 |
| 89 scoped_ptr<CompositorFrame> frame(new CompositorFrame); | 90 scoped_ptr<CompositorFrame> frame(new CompositorFrame); |
| 90 frame->delegated_frame_data = delegated_frame_data.Pass(); | 91 frame->delegated_frame_data = delegated_frame_data.Pass(); |
| 91 | 92 |
| 92 surface_->SubmitFrame(id_.Clone(), mojo::Frame::From(*frame), | 93 surface_->SubmitFrame(local_id_, mojo::Frame::From(*frame), mojo::Closure()); |
| 93 mojo::Closure()); | |
| 94 } | 94 } |
| 95 | 95 |
| 96 } // namespace examples | 96 } // namespace examples |
| 97 } // namespace mojo | 97 } // namespace mojo |
| OLD | NEW |